X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22b6de6a70900550b5411f14fffc9d48adbbf222..f06832c1b6caae13c0bddf8f3a8aeb1114f4392b:/src/unix/gsocket.cpp?ds=inline diff --git a/src/unix/gsocket.cpp b/src/unix/gsocket.cpp index 56cd066119..5cb9783b71 100644 --- a/src/unix/gsocket.cpp +++ b/src/unix/gsocket.cpp @@ -21,7 +21,6 @@ #ifndef __GSOCKET_STANDALONE__ #include "wx/defs.h" #include "wx/private/gsocketiohandler.h" -#include "wx/thread.h" #endif #if defined(__VISAGECPP__) @@ -451,36 +450,26 @@ struct servent *wxGetservbyname_r(const char *port, const char *protocol, # define GSocket_Debug(args) #endif /* __GSOCKET_DEBUG__ */ +#if wxUSE_IPV6 +typedef struct sockaddr_storage wxSockAddr; +#else +typedef struct sockaddr wxSockAddr; +#endif + /* Table of GUI-related functions. We must call them indirectly because * of wxBase and GUI separation: */ -static GSocketGUIFunctionsTable *gs_gui_functions; - -/* Global initialisers */ - -void GSocket_SetGUIFunctions(GSocketGUIFunctionsTable *guifunc) +bool GSocket_Init() { - gs_gui_functions = guifunc; + GSocketManager * const manager = GSocketManager::Get(); + return manager && manager->OnInit(); } -int GSocket_Init(void) +void GSocket_Cleanup() { - if (!gs_gui_functions) - { - static GSocketGUIFunctionsTableConcrete table; - gs_gui_functions = &table; - } - if ( !gs_gui_functions->OnInit() ) - return 0; - return 1; -} - -void GSocket_Cleanup(void) -{ - if (gs_gui_functions) - { - gs_gui_functions->OnExit(); - } + GSocketManager * const manager = GSocketManager::Get(); + if ( manager ) + manager->OnExit(); } /* Constructors / Destructors for GSocket */ @@ -511,20 +500,27 @@ GSocket::GSocket() /* 10 minutes * 60 sec * 1000 millisec */ m_establishing = false; m_use_events = false; + m_initialRecvBufferSize = -1; + m_initialSendBufferSize = -1; - assert(gs_gui_functions); - /* Per-socket GUI-specific initialization */ - m_ok = gs_gui_functions->Init_Socket(this); + m_ok = GSocketManager::Get()->Init_Socket(this); } void GSocket::Close() { if (m_use_events) DisableEvents(); - /* gsockosx.c calls CFSocketInvalidate which closes the socket for us */ -#if !(defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__))) - close(m_fd); -#endif + + /* When running on OS X, the gsockosx implementation of GSocketGUIFunctionsTable + will close the socket during Disable_Events. However, it will only do this + if it is being used. That is, it won't do it in a console program. To + ensure we get the right behavior, we have gsockosx set m_fd = INVALID_SOCKET + if it has closed the socket which indicates to us (at runtime, instead of + at compile time as this had been before) that the socket has already + been closed. + */ + if(m_fd != INVALID_SOCKET) + close(m_fd); m_fd = INVALID_SOCKET; } @@ -536,9 +532,7 @@ GSocket::~GSocket() if (m_fd != INVALID_SOCKET) Shutdown(); - /* Per-socket GUI-specific cleanup */ - if (m_use_events) - gs_gui_functions->Destroy_Socket(this); + GSocketManager::Get()->Destroy_Socket(this); delete m_handler; @@ -643,7 +637,7 @@ GSocketError GSocket::SetPeer(GAddress *address) GAddress *GSocket::GetLocal() { GAddress *address; - struct sockaddr addr; + wxSockAddr addr; WX_SOCKLEN_T size = sizeof(addr); GSocketError err; @@ -660,7 +654,7 @@ GAddress *GSocket::GetLocal() return NULL; } - if (getsockname(m_fd, &addr, (WX_SOCKLEN_T *) &size) < 0) + if (getsockname(m_fd, (sockaddr*)&addr, (WX_SOCKLEN_T *) &size) < 0) { m_error = GSOCK_IOERR; return NULL; @@ -674,7 +668,7 @@ GAddress *GSocket::GetLocal() return NULL; } - err = _GAddress_translate_from(address, &addr, size); + err = _GAddress_translate_from(address, (sockaddr*)&addr, size); if (err != GSOCK_NOERROR) { GAddress_destroy(address); @@ -793,7 +787,7 @@ GSocketError GSocket::SetServer() */ GSocket *GSocket::WaitConnection() { - struct sockaddr from; + wxSockAddr from; WX_SOCKLEN_T fromlen = sizeof(from); GSocket *connection; GSocketError err; @@ -825,7 +819,7 @@ GSocket *GSocket::WaitConnection() return NULL; } - connection->m_fd = accept(m_fd, &from, (WX_SOCKLEN_T *) &fromlen); + connection->m_fd = accept(m_fd, (sockaddr*)&from, (WX_SOCKLEN_T *) &fromlen); /* Reenable CONNECTION events */ Enable(GSOCK_CONNECTION); @@ -854,7 +848,7 @@ GSocket *GSocket::WaitConnection() return NULL; } - err = _GAddress_translate_from(connection->m_peer, &from, fromlen); + err = _GAddress_translate_from(connection->m_peer, (sockaddr*)&from, fromlen); if (err != GSOCK_NOERROR) { delete connection; @@ -875,20 +869,18 @@ GSocket *GSocket::WaitConnection() void GSocket::Notify(bool flag) { - if ( flag == m_use_events ) + if (flag == m_use_events) return; - // it is not safe to attach or detach i/o descriptor in child thread - wxASSERT_MSG(wxThread::IsMain(),wxT("wxSocketBase::Notify can be called in main thread only")); m_use_events = flag; EnableEvents(flag); } void GSocket::EnableEvents(bool flag) { - if ( flag ) - gs_gui_functions->Enable_Events(this); + if (flag) + GSocketManager::Get()->Enable_Events(this); else - gs_gui_functions->Disable_Events(this); + GSocketManager::Get()->Disable_Events(this); } bool GSocket::SetReusable() @@ -1006,6 +998,11 @@ GSocketError GSocket::Connect(GSocketStream stream) #endif } + if (m_initialRecvBufferSize >= 0) + setsockopt(m_fd, SOL_SOCKET, SO_RCVBUF, (const char*)&m_initialRecvBufferSize, sizeof(m_initialRecvBufferSize)); + if (m_initialSendBufferSize >= 0) + setsockopt(m_fd, SOL_SOCKET, SO_SNDBUF, (const char*)&m_initialSendBufferSize, sizeof(m_initialSendBufferSize)); + // If a local address has been set, then we need to bind to it before calling connect if (m_local && m_local->m_addr) { @@ -1023,7 +1020,7 @@ GSocketError GSocket::Connect(GSocketStream stream) * call to Enable_Events now. */ - if ( m_use_events && (m_non_blocking || ret == 0) ) + if (m_use_events && (m_non_blocking || ret == 0)) EnableEvents(); if (ret == -1) @@ -1049,7 +1046,7 @@ GSocketError GSocket::Connect(GSocketStream stream) SOCKOPTLEN_T len = sizeof(error); getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (char*) &error, &len); - if ( m_use_events ) + if (m_use_events) EnableEvents(); if (!error) @@ -1130,7 +1127,7 @@ GSocketError GSocket::SetNonOriented() #else ioctl(m_fd, FIONBIO, &arg); #endif - if ( m_use_events ) + if (m_use_events) EnableEvents(); if (m_reusable) @@ -1196,11 +1193,16 @@ int GSocket::Read(char *buffer, int size) else ret = Recv_Dgram(buffer, size); - /* If recv returned zero, then the connection has been gracefully closed. - * 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. + /* + * If recv returned zero for a TCP socket (if m_stream == NULL, it's an UDP + * socket and empty datagrams are possible), then the connection has been + * gracefully closed. + * + * 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. */ - if (ret == 0) + if ((ret == 0) && m_stream) { /* Make sure wxSOCKET_LOST event gets sent and shut down the socket */ if (m_use_events) @@ -1292,116 +1294,101 @@ int GSocket::Write(const char *buffer, int size) */ GSocketEventFlags GSocket::Select(GSocketEventFlags flags) { - if (!gs_gui_functions->CanUseEventLoop()) - { - - GSocketEventFlags result = 0; - fd_set readfds; - fd_set writefds; - fd_set exceptfds; - struct timeval tv; + assert(this); - assert(this); + GSocketEventFlags result = 0; + fd_set readfds; + fd_set writefds; + fd_set exceptfds; + struct timeval tv; - if (m_fd == -1) - return (GSOCK_LOST_FLAG & flags); + if (m_fd == -1) + return (GSOCK_LOST_FLAG & flags); - /* Do not use a static struct, Linux can garble it */ - tv.tv_sec = m_timeout / 1000; - tv.tv_usec = (m_timeout % 1000) * 1000; + /* Do not use a static struct, Linux can garble it */ + tv.tv_sec = 0; + tv.tv_usec = 0; - wxFD_ZERO(&readfds); - wxFD_ZERO(&writefds); - wxFD_ZERO(&exceptfds); - wxFD_SET(m_fd, &readfds); - if (flags & GSOCK_OUTPUT_FLAG || flags & GSOCK_CONNECTION_FLAG) - wxFD_SET(m_fd, &writefds); - wxFD_SET(m_fd, &exceptfds); + wxFD_ZERO(&readfds); + wxFD_ZERO(&writefds); + wxFD_ZERO(&exceptfds); + wxFD_SET(m_fd, &readfds); + if (flags & GSOCK_OUTPUT_FLAG || flags & GSOCK_CONNECTION_FLAG) + wxFD_SET(m_fd, &writefds); + wxFD_SET(m_fd, &exceptfds); - /* Check 'sticky' CONNECTION flag first */ - result |= (GSOCK_CONNECTION_FLAG & m_detected); + /* Check 'sticky' CONNECTION flag first */ + result |= GSOCK_CONNECTION_FLAG & m_detected; - /* If we have already detected a LOST event, then don't try - * to do any further processing. - */ - if ((m_detected & GSOCK_LOST_FLAG) != 0) - { - m_establishing = false; + /* If we have already detected a LOST event, then don't try + * to do any further processing. + */ + if ((m_detected & GSOCK_LOST_FLAG) != 0) + { + m_establishing = false; + return (GSOCK_LOST_FLAG & flags); + } - return (GSOCK_LOST_FLAG & flags); - } + /* Try select now */ + if (select(m_fd + 1, &readfds, &writefds, &exceptfds, &tv) < 0) + { + /* What to do here? */ + return (result & flags); + } - /* Try select now */ - if (select(m_fd + 1, &readfds, &writefds, &exceptfds, &tv) <= 0) - { - /* What to do here? */ - return (result & flags); - } + /* Check for exceptions and errors */ + if (wxFD_ISSET(m_fd, &exceptfds)) + { + m_establishing = false; + m_detected = GSOCK_LOST_FLAG; - /* 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); + } - /* LOST event: Abort any further processing */ - return (GSOCK_LOST_FLAG & flags); - } + /* Check for readability */ + if (wxFD_ISSET(m_fd, &readfds)) + { + result |= GSOCK_INPUT_FLAG; - /* Check for readability */ - if (wxFD_ISSET(m_fd, &readfds)) + if (m_server && m_stream) { - result |= GSOCK_INPUT_FLAG; - - if (m_server && m_stream) - { - /* 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; - } + /* 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. */ + m_detected |= GSOCK_CONNECTION_FLAG; } + } - /* Check for writability */ - if (wxFD_ISSET(m_fd, &writefds)) + /* Check for writability */ + if (wxFD_ISSET(m_fd, &writefds)) + { + if (m_establishing && !m_server) { - if (m_establishing && !m_server) - { - int error; - SOCKOPTLEN_T len = sizeof(error); - - m_establishing = false; - - getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (char*)&error, &len); + int error; + SOCKOPTLEN_T len = sizeof(error); + m_establishing = false; + getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (char*)&error, &len); - if (error) - { - m_detected = GSOCK_LOST_FLAG; + if (error) + { + m_detected = GSOCK_LOST_FLAG; - /* LOST event: Abort any further processing */ - return (GSOCK_LOST_FLAG & flags); - } - else - { - result |= GSOCK_CONNECTION_FLAG; - m_detected |= GSOCK_CONNECTION_FLAG; - } + /* LOST event: Abort any further processing */ + return (GSOCK_LOST_FLAG & flags); } else { - result |= GSOCK_OUTPUT_FLAG; + m_detected |= GSOCK_CONNECTION_FLAG; } } - - return (result & flags); - - } - else - { - assert(this); - return flags & m_detected; + else + { + result |= GSOCK_OUTPUT_FLAG; + } } + + return (result | m_detected) & flags; } /* Flags */ @@ -1536,19 +1523,19 @@ GSocketError GSocket::SetSockOpt(int level, int optname, void GSocket::Enable(GSocketEvent event) { - if ( m_use_events ) + if (m_use_events) { m_detected &= ~(1 << event); - gs_gui_functions->Install_Callback(this, event); + GSocketManager::Get()->Install_Callback(this, event); } } void GSocket::Disable(GSocketEvent event) { - if ( m_use_events ) + if (m_use_events) { m_detected |= (1 << event); - gs_gui_functions->Uninstall_Callback(this, event); + GSocketManager::Get()->Uninstall_Callback(this, event); } } @@ -1663,7 +1650,7 @@ int GSocket::Recv_Stream(char *buffer, int size) int GSocket::Recv_Dgram(char *buffer, int size) { - struct sockaddr from; + wxSockAddr from; WX_SOCKLEN_T fromlen = sizeof(from); int ret; GSocketError err; @@ -1672,7 +1659,7 @@ int GSocket::Recv_Dgram(char *buffer, int size) do { - ret = recvfrom(m_fd, buffer, size, 0, &from, (WX_SOCKLEN_T *) &fromlen); + ret = recvfrom(m_fd, buffer, size, 0, (sockaddr*)&from, (WX_SOCKLEN_T *) &fromlen); } while (ret == -1 && errno == EINTR); /* Loop until not interrupted */ @@ -1690,7 +1677,7 @@ int GSocket::Recv_Dgram(char *buffer, int size) } } - err = _GAddress_translate_from(m_peer, &from, fromlen); + err = _GAddress_translate_from(m_peer, (sockaddr*)&from, fromlen); if (err != GSOCK_NOERROR) { GAddress_destroy(m_peer); @@ -1790,9 +1777,17 @@ void GSocket::Detected_Read() } else if (num == 0) { - /* graceful shutdown */ - CALL_CALLBACK(this, GSOCK_LOST); - Shutdown(); + if (m_stream) + { + /* graceful shutdown */ + CALL_CALLBACK(this, GSOCK_LOST); + Shutdown(); + } + else + { + /* Empty datagram received */ + CALL_CALLBACK(this, GSOCK_INPUT); + } } else { @@ -1979,11 +1974,11 @@ GSocketError _GAddress_translate_from(GAddress *address, case AF_UNIX: address->m_family = GSOCK_UNIX; break; -#ifdef AF_INET6 +#if wxUSE_IPV6 case AF_INET6: address->m_family = GSOCK_INET6; break; -#endif +#endif // wxUSE_IPV6 default: { address->m_error = GSOCK_INVOP; @@ -2246,6 +2241,169 @@ unsigned short GAddress_INET_GetPort(GAddress *address) return ntohs(addr->sin_port); } +#if wxUSE_IPV6 +/* + * ------------------------------------------------------------------------- + * Internet IPv6 address family + * ------------------------------------------------------------------------- + */ + +GSocketError _GAddress_Init_INET6(GAddress *address) +{ + struct in6_addr any_address = IN6ADDR_ANY_INIT; + address->m_len = sizeof(struct sockaddr_in6); + address->m_addr = (struct sockaddr *) malloc(address->m_len); + if (address->m_addr == NULL) + { + address->m_error = GSOCK_MEMERR; + return GSOCK_MEMERR; + } + memset(address->m_addr,0,address->m_len); + + address->m_family = GSOCK_INET6; + address->m_realfamily = AF_INET6; + ((struct sockaddr_in6 *)address->m_addr)->sin6_family = AF_INET6; + ((struct sockaddr_in6 *)address->m_addr)->sin6_addr = any_address; + + return GSOCK_NOERROR; +} + +GSocketError GAddress_INET6_SetHostName(GAddress *address, const char *hostname) +{ + assert(address != NULL); + CHECK_ADDRESS(address, INET6); + + addrinfo hints; + memset( & hints, 0, sizeof( hints ) ); + hints.ai_family = AF_INET6; + addrinfo * info = 0; + if ( getaddrinfo( hostname, "0", & hints, & info ) || ! info ) + { + address->m_error = GSOCK_NOHOST; + return GSOCK_NOHOST; + } + + memcpy( address->m_addr, info->ai_addr, info->ai_addrlen ); + freeaddrinfo( info ); + return GSOCK_NOERROR; +} + +GSocketError GAddress_INET6_SetAnyAddress(GAddress *address) +{ + assert(address != NULL); + + CHECK_ADDRESS(address, INET6); + + struct in6_addr addr; + memset( & addr, 0, sizeof( addr ) ); + return GAddress_INET6_SetHostAddress(address, addr); +} +GSocketError GAddress_INET6_SetHostAddress(GAddress *address, + struct in6_addr hostaddr) +{ + assert(address != NULL); + + CHECK_ADDRESS(address, INET6); + + ((struct sockaddr_in6 *)address->m_addr)->sin6_addr = hostaddr; + + return GSOCK_NOERROR; +} + +GSocketError GAddress_INET6_SetPortName(GAddress *address, const char *port, + const char *protocol) +{ + struct servent *se; + struct sockaddr_in6 *addr; + + assert(address != NULL); + CHECK_ADDRESS(address, INET6); + + if (!port) + { + address->m_error = GSOCK_INVPORT; + return GSOCK_INVPORT; + } + + se = getservbyname(port, protocol); + if (!se) + { + if (isdigit(port[0])) + { + int port_int; + + port_int = atoi(port); + addr = (struct sockaddr_in6 *)address->m_addr; + addr->sin6_port = htons((u_short) port_int); + return GSOCK_NOERROR; + } + + address->m_error = GSOCK_INVPORT; + return GSOCK_INVPORT; + } + + addr = (struct sockaddr_in6 *)address->m_addr; + addr->sin6_port = se->s_port; + + return GSOCK_NOERROR; +} + +GSocketError GAddress_INET6_SetPort(GAddress *address, unsigned short port) +{ + struct sockaddr_in6 *addr; + + assert(address != NULL); + CHECK_ADDRESS(address, INET6); + + addr = (struct sockaddr_in6 *)address->m_addr; + addr->sin6_port = htons(port); + + return GSOCK_NOERROR; +} + +GSocketError GAddress_INET6_GetHostName(GAddress *address, char *hostname, size_t sbuf) +{ + struct hostent *he; + char *addr_buf; + struct sockaddr_in6 *addr; + + assert(address != NULL); + CHECK_ADDRESS(address, INET6); + + addr = (struct sockaddr_in6 *)address->m_addr; + addr_buf = (char *)&(addr->sin6_addr); + + he = gethostbyaddr(addr_buf, sizeof(addr->sin6_addr), AF_INET6); + if (he == NULL) + { + address->m_error = GSOCK_NOHOST; + return GSOCK_NOHOST; + } + + strncpy(hostname, he->h_name, sbuf); + + return GSOCK_NOERROR; +} + +GSocketError GAddress_INET6_GetHostAddress(GAddress *address,struct in6_addr *hostaddr) +{ + assert(address != NULL); + assert(hostaddr != NULL); + CHECK_ADDRESS_RETVAL(address, INET6, GSOCK_INVADDR); + *hostaddr = ( (struct sockaddr_in6 *)address->m_addr )->sin6_addr; + return GSOCK_NOERROR; +} + +unsigned short GAddress_INET6_GetPort(GAddress *address) +{ + assert(address != NULL); + CHECK_ADDRESS_RETVAL(address, INET6, 0); + + return ntohs( ((struct sockaddr_in6 *)address->m_addr)->sin6_port ); +} + +#endif // wxUSE_IPV6 + /* * ------------------------------------------------------------------------- * Unix address family