X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f0b805fab61f0150fe429f70155e7e81f89cc698..3d63133a5ef146494fa821c76c705e535990086a:/src/unix/gsocket.cpp diff --git a/src/unix/gsocket.cpp b/src/unix/gsocket.cpp index 63bed5a32f..cba3dd30f8 100644 --- a/src/unix/gsocket.cpp +++ b/src/unix/gsocket.cpp @@ -39,6 +39,10 @@ #include #include +#ifdef HAVE_SYS_SELECT_H +# include +#endif + #ifdef __VMS__ #include struct sockaddr_un @@ -197,40 +201,87 @@ static struct hostent * deepCopyHostent(struct hostent *h, const struct hostent *he, char *buffer, int size, int *err) { + /* copy old structure */ memcpy(h, he, sizeof(struct hostent)); + + /* copy name */ int len = strlen(h->h_name); if (len > size) - len = size - 1; + { + *err = ENOMEM; + return NULL; + } memcpy(buffer, h->h_name, len); buffer[len] = '\0'; h->h_name = buffer; - buffer += len + 1; - size -= len + 1; + + /* track position in the buffer */ + int pos = len + 1; + + /* reuse len to store address length */ len = h->h_length; - for (char **p = h->h_addr_list; *p != 0; p++) { - if (size < len){ + + /* ensure pointer alignment */ + unsigned int misalign = sizeof(char *) - pos%sizeof(char *); + if(misalign < sizeof(char *)) + pos += misalign; + + /* leave space for pointer list */ + char **p = h->h_addr_list, **q; + char **h_addr_list = (char **)(buffer + pos); + while(*(p++) != 0) + pos += sizeof(char *); + + /* copy addresses and fill new pointer list */ + for (p = h->h_addr_list, q = h_addr_list; *p != 0; p++, q++) + { + if (size < pos + len) + { + *err = ENOMEM; + return NULL; + } + memcpy(buffer + pos, *p, len); /* copy content */ + *q = buffer + pos; /* set copied pointer to copied content */ + pos += len; + } + *++q = 0; /* null terminate the pointer list */ + h->h_addr_list = h_addr_list; /* copy pointer to pointers */ + + /* ensure word alignment of pointers */ + misalign = sizeof(char *) - pos%sizeof(char *); + if(misalign < sizeof(char *)) + pos += misalign; + + /* leave space for pointer list */ + p = h->h_aliases; + char **h_aliases = (char **)(buffer + pos); + while(*(p++) != 0) + pos += sizeof(char *); + + /* copy aliases and fill new pointer list */ + for (p = h->h_aliases, q = h_aliases; *p != 0; p++, q++) + { + len = strlen(*p); + if (size <= pos + len) + { *err = ENOMEM; return NULL; } - memcpy(buffer, *p, len); - *p = buffer; - buffer += len; - size -= len; - } - for (char **q = h->h_aliases; size > 0 && *q != 0; q++){ - len = strlen(*q); - if (len > size) - len = size - 1; - memcpy(buffer, *q, len); - buffer[len] = '\0'; - *q = buffer; - buffer += len + 1; - size -= len + 1; + memcpy(buffer + pos, *p, len); /* copy content */ + buffer[pos + len] = '\0'; + *q = buffer + pos; /* set copied pointer to copied content */ + pos += len + 1; } + *++q = 0; /* null terminate the pointer list */ + h->h_aliases = h_aliases; /* copy pointer to pointers */ + return h; } #endif +#if defined(HAVE_GETHOSTBYNAME) && wxUSE_THREADS +static wxMutex nameLock; +#endif struct hostent * wxGethostbyname_r(const char *hostname, struct hostent *h, void *buffer, int size, int *err) @@ -252,7 +303,6 @@ struct hostent * wxGethostbyname_r(const char *hostname, struct hostent *h, he = h; #elif defined(HAVE_GETHOSTBYNAME) #if wxUSE_THREADS - static wxMutex nameLock; wxMutexLocker locker(nameLock); #endif he = gethostbyname(hostname); @@ -264,6 +314,9 @@ struct hostent * wxGethostbyname_r(const char *hostname, struct hostent *h, return he; } +#if defined(HAVE_GETHOSTBYNAME) && wxUSE_THREADS +static wxMutex addrLock; +#endif struct hostent * wxGethostbyaddr_r(const char *addr_buf, int buf_size, int proto, struct hostent *h, void *buffer, int size, int *err) @@ -287,7 +340,6 @@ struct hostent * wxGethostbyaddr_r(const char *addr_buf, int buf_size, he = h; #elif defined(HAVE_GETHOSTBYNAME) #if wxUSE_THREADS - static wxMutex addrLock; wxMutexLocker locker(addrLock); #endif he = gethostbyaddr(addr_buf, buf_size, proto); @@ -304,37 +356,67 @@ static struct servent * deepCopyServent(struct servent *s, const struct servent *se, char *buffer, int size) { + /* copy plain old structure */ memcpy(s, se, sizeof(struct servent)); + + /* copy name */ int len = strlen(s->s_name); - if (len > size) - len = size - 1; + if (len >= size) + { + return NULL; + } memcpy(buffer, s->s_name, len); buffer[len] = '\0'; s->s_name = buffer; - buffer += len + 1; - size -= len + 1; + + /* track position in the buffer */ + int pos = len + 1; + + /* copy protocol */ len = strlen(s->s_proto); - if (len > size) - len = size - 1; - memcpy(buffer, s->s_proto, len); - buffer[len] = '\0'; - s->s_proto = buffer; - buffer += len + 1; - size -= len + 1; - for (char **q = s->s_aliases; size > 0 && *q != 0; q++){ - len = strlen(*q); - if (len > size) - len = size - 1; - memcpy(buffer, *q, len); - buffer[len] = '\0'; - *q = buffer; - buffer += len + 1; - size -= len + 1; + if (pos + len >= size) + { + return NULL; } + memcpy(buffer + pos, s->s_proto, len); + buffer[pos + len] = '\0'; + s->s_proto = buffer + pos; + + /* track position in the buffer */ + pos += len + 1; + + /* ensure pointer alignment */ + unsigned int misalign = sizeof(char *) - pos%sizeof(char *); + if(misalign < sizeof(char *)) + pos += misalign; + + /* leave space for pointer list */ + char **p = s->s_aliases, **q; + char **s_aliases = (char **)(buffer + pos); + while(*(p++) != 0) + pos += sizeof(char *); + + /* copy addresses and fill new pointer list */ + for (p = s->s_aliases, q = s_aliases; *p != 0; p++, q++){ + len = strlen(*p); + if (size <= pos + len) + { + return NULL; + } + memcpy(buffer + pos, *p, len); /* copy content */ + buffer[pos + len] = '\0'; + *q = buffer + pos; /* set copied pointer to copied content */ + pos += len + 1; + } + *++q = 0; /* null terminate the pointer list */ + s->s_aliases = s_aliases; /* copy pointer to pointers */ return s; } #endif +#if defined(HAVE_GETSERVBYNAME) && wxUSE_THREADS +static wxMutex servLock; +#endif struct servent *wxGetservbyname_r(const char *port, const char *protocol, struct servent *serv, void *buffer, int size) { @@ -351,7 +433,6 @@ struct servent *wxGetservbyname_r(const char *port, const char *protocol, se = serv; #elif defined(HAVE_GETSERVBYNAME) #if wxUSE_THREADS - static wxMutex servLock; wxMutexLocker locker(servLock); #endif se = getservbyname(port, protocol); @@ -691,7 +772,12 @@ GSocketError GSocket::SetServer() state after being previously closed. */ if (m_reusable) + { setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(u_long)); +#ifdef SO_REUSEPORT + setsockopt(m_fd, SOL_SOCKET, SO_REUSEPORT, (const char*)&arg, sizeof(u_long)); +#endif + } /* Bind to the local address, * retrieve the actual address bound, @@ -890,6 +976,21 @@ GSocketError GSocket::Connect(GSocketStream stream) ioctl(m_fd, FIONBIO, &arg); #endif + // If the reuse flag is set, use the applicable socket reuse flags(s) + if (m_reusable) + { + setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(u_long)); +#ifdef SO_REUSEPORT + setsockopt(m_fd, SOL_SOCKET, SO_REUSEPORT, (const char*)&arg, sizeof(u_long)); +#endif + } + + // If a local address has been set, then we need to bind to it before calling connect + if (m_local && m_local->m_addr) + { + bind(m_fd, m_local->m_addr, m_local->m_len); + } + /* Connect it to the peer address, with a timeout (see below) */ ret = connect(m_fd, m_peer->m_addr, m_peer->m_len); @@ -1064,7 +1165,13 @@ int GSocket::Read(char *buffer, int size) * socket only if errno does _not_ indicate that there may be more data to read. */ if (ret == 0) + { m_error = GSOCK_IOERR; + m_detected = GSOCK_LOST_FLAG; + Close(); + // Signal an error for return + return -1; + } else if (ret == -1) { if ((errno == EWOULDBLOCK) || (errno == EAGAIN)) @@ -1193,37 +1300,28 @@ GSocketEventFlags GSocket::Select(GSocketEventFlags flags) return (result & flags); } + /* Check for exceptions and errors */ + if (wxFD_ISSET(m_fd, &exceptfds)) + { + m_establishing = false; + m_detected = GSOCK_LOST_FLAG; + + /* LOST event: Abort any further processing */ + return (GSOCK_LOST_FLAG & flags); + } + /* Check for readability */ if (wxFD_ISSET(m_fd, &readfds)) { - char c; + result |= GSOCK_INPUT_FLAG; - int num = recv(m_fd, &c, 1, MSG_PEEK | GSOCKET_MSG_NOSIGNAL); - - if (num > 0) - { - result |= GSOCK_INPUT_FLAG; - } - else + if (m_server && m_stream) { - if (m_server && m_stream) - { - result |= GSOCK_CONNECTION_FLAG; - m_detected |= GSOCK_CONNECTION_FLAG; - } - /* If recv returned zero, then the connection is lost, and errno is not set. - * Otherwise, recv has returned an error (-1), in which case we have lost the - * socket only if errno does _not_ indicate that there may be more data to read. - */ - else if (num == 0 || - (errno != EWOULDBLOCK) && (errno != EAGAIN) && (errno != EINTR)) - { - m_detected = GSOCK_LOST_FLAG; - m_establishing = false; - - /* LOST event: Abort any further processing */ - return (GSOCK_LOST_FLAG & flags); - } + /* This is a TCP server socket that detected a connection. + While the INPUT_FLAG is also set, it doesn't matter on + this kind of sockets, as we can only Accept() from them. */ + result |= GSOCK_CONNECTION_FLAG; + m_detected |= GSOCK_CONNECTION_FLAG; } } @@ -1258,16 +1356,6 @@ GSocketEventFlags GSocket::Select(GSocketEventFlags flags) } } - /* Check for exceptions and errors (is this useful in Unices?) */ - if (wxFD_ISSET(m_fd, &exceptfds)) - { - m_establishing = false; - m_detected = GSOCK_LOST_FLAG; - - /* LOST event: Abort any further processing */ - return (GSOCK_LOST_FLAG & flags); - } - return (result & flags); }