X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/71b4a9b87889824ce3cb6406e040be69e5b5e0f4..9c8cfcb9c56798ebd29184e40227451a194c0c49:/src/unix/gsocket.cpp diff --git a/src/unix/gsocket.cpp b/src/unix/gsocket.cpp index 31a7c6e36c..97eeb0153b 100644 --- a/src/unix/gsocket.cpp +++ b/src/unix/gsocket.cpp @@ -235,7 +235,7 @@ struct hostent * wxGethostbyname_r(const char *hostname, struct hostent *h, void *buffer, int size, int *err) { - struct hostent *he; + struct hostent *he = NULL; *err = 0; #if defined(HAVE_FUNC_GETHOSTBYNAME_R_6) if (gethostbyname_r(hostname, h, (char*)buffer, size, &he, err)) @@ -268,7 +268,7 @@ struct hostent * wxGethostbyaddr_r(const char *addr_buf, int buf_size, int proto, struct hostent *h, void *buffer, int size, int *err) { - struct hostent *he; + struct hostent *he = NULL; *err = 0; #if defined(HAVE_FUNC_GETHOSTBYNAME_R_6) if (gethostbyaddr_r(addr_buf, buf_size, proto, h, @@ -299,7 +299,7 @@ struct hostent * wxGethostbyaddr_r(const char *addr_buf, int buf_size, return he; } -#if defined(HAVE_GETHOSTBYNAME) +#if defined(HAVE_GETSERVBYNAME) static struct servent * deepCopyServent(struct servent *s, const struct servent *se, char *buffer, int size) @@ -338,7 +338,7 @@ static struct servent * deepCopyServent(struct servent *s, struct servent *wxGetservbyname_r(const char *port, const char *protocol, struct servent *serv, void *buffer, int size) { - struct servent *se; + struct servent *se = NULL; #if defined(HAVE_FUNC_GETSERVBYNAME_R_6) if (getservbyname_r(port, protocol, serv, (char*)buffer, size, &se)) se = NULL; @@ -691,7 +691,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 +895,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); @@ -1193,37 +1213,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; - - int num = recv(m_fd, &c, 1, MSG_PEEK | GSOCKET_MSG_NOSIGNAL); + result |= GSOCK_INPUT_FLAG; - if (num > 0) + if (m_server && m_stream) { - result |= GSOCK_INPUT_FLAG; - } - else - { - 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 +1269,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); } @@ -1944,7 +1945,15 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname) struct in_addr *array_addr; /* It is a real name, we solve it */ - if ((he = gethostbyname(hostname)) == NULL) + struct hostent h; +#if defined(HAVE_FUNC_GETHOSTBYNAME_R_3) + struct hostent_data buffer; +#else + char buffer[1024]; +#endif + int err; + he = wxGethostbyname_r(hostname, &h, (void*)&buffer, sizeof(buffer), &err); + if (he == NULL) { /* Reset to invalid address */ addr->s_addr = INADDR_NONE; @@ -1994,11 +2003,14 @@ GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port, return GSOCK_INVPORT; } -#if defined(__WXPM__) && defined(__EMX__) - se = getservbyname(port, (char*)protocol); +#if defined(HAVE_FUNC_GETSERVBYNAME_R_4) + struct servent_data buffer; #else - se = getservbyname(port, protocol); + char buffer[1024]; #endif + struct servent serv; + se = wxGetservbyname_r(port, protocol, &serv, + (void*)&buffer, sizeof(buffer)); if (!se) { /* the cast to int suppresses compiler warnings about subscript having the @@ -2048,7 +2060,15 @@ GSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, size_t addr = (struct sockaddr_in *)address->m_addr; addr_buf = (char *)&(addr->sin_addr); - he = gethostbyaddr(addr_buf, sizeof(addr->sin_addr), AF_INET); + struct hostent temphost; +#if defined(HAVE_FUNC_GETHOSTBYNAME_R_3) + struct hostent_data buffer; +#else + char buffer[1024]; +#endif + int err; + he = wxGethostbyaddr_r(addr_buf, sizeof(addr->sin_addr), AF_INET, &temphost, + (void*)&buffer, sizeof(buffer), &err); if (he == NULL) { address->m_error = GSOCK_NOHOST;