X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14372de82e2129fab7d416de79fc3d95e57960b9..8ba4faba4de4af7613911d83263b9470e5bb1207:/src/msw/sockmsw.cpp diff --git a/src/msw/sockmsw.cpp b/src/msw/sockmsw.cpp index dc20dcf9ba..d531813ca6 100644 --- a/src/msw/sockmsw.cpp +++ b/src/msw/sockmsw.cpp @@ -7,7 +7,7 @@ // (C) 1999-2000, Guillermo Rodriguez Garcia // (C) 2008 Vadim Zeitlin // RCS_ID: $Id$ -// License: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -30,9 +30,11 @@ #include "wx/private/socket.h" #include "wx/msw/private.h" // for wxGetInstance() +#include "wx/private/fd.h" #include "wx/apptrait.h" #include "wx/thread.h" #include "wx/dynlib.h" +#include "wx/link.h" #ifdef __WXWINCE__ /* @@ -179,8 +181,10 @@ public: { return new wxSocketImplMSW(wxsocket); } - virtual void Install_Callback(wxSocketImpl *socket, wxSocketNotify event); - virtual void Uninstall_Callback(wxSocketImpl *socket, wxSocketNotify event); + virtual void Install_Callback(wxSocketImpl *socket, + wxSocketNotify event = wxSOCKET_LOST); + virtual void Uninstall_Callback(wxSocketImpl *socket, + wxSocketNotify event = wxSOCKET_LOST); private: static wxDynamicLibrary gs_wsock32dll; @@ -209,9 +213,9 @@ bool wxSocketMSWManager::OnInit() // dependencies on it for all the application using wx even if they don't use // sockets #ifdef __WXWINCE__ - #define WINSOCK_DLL_NAME _T("ws2.dll") + #define WINSOCK_DLL_NAME wxT("ws2.dll") #else - #define WINSOCK_DLL_NAME _T("wsock32.dll") + #define WINSOCK_DLL_NAME wxT("wsock32.dll") #endif gs_wsock32dll.Load(WINSOCK_DLL_NAME, wxDL_VERBATIM | wxDL_QUIET); @@ -325,12 +329,33 @@ LRESULT CALLBACK wxSocket_Internal_WinProc(HWND hWnd, if ( !socket ) return 0; + // the socket may be already closed but we could still receive + // notifications for it sent (asynchronously) before it got closed + if ( socket->m_fd == INVALID_SOCKET ) + return 0; + wxASSERT_MSG( socket->m_fd == (SOCKET)wParam, "mismatch between message and socket?" ); - switch WSAGETSELECTEVENT(lParam) + switch ( WSAGETSELECTEVENT(lParam) ) { case FD_READ: + // We may get a FD_READ notification even when there is no data + // to read on the socket, in particular this happens on socket + // creation when we seem to always get FD_CONNECT, FD_WRITE and + // FD_READ notifications all at once (but it doesn't happen + // only then). Ignore such dummy notifications. + { + fd_set fds; + timeval tv = { 0, 0 }; + + wxFD_ZERO(&fds); + wxFD_SET(socket->m_fd, &fds); + + if ( select(socket->m_fd + 1, &fds, NULL, NULL, &tv) != 1 ) + return 0; + } + event = wxSOCKET_INPUT; break; @@ -402,7 +427,7 @@ void wxSocketMSWManager::Install_Callback(wxSocketImpl *socket_, * Disable event notifications (used when shutting down the socket) */ void wxSocketMSWManager::Uninstall_Callback(wxSocketImpl *socket_, - wxSocketNotify WXUNUSED(event)) + wxSocketNotify WXUNUSED(event)) { wxSocketImplMSW * const socket = static_cast(socket_); @@ -430,20 +455,16 @@ static struct ManagerSetter } } gs_managerSetter; +// see the relative linker macro in socket.cpp +wxFORCE_LINK_THIS_MODULE( mswsocket ); + // ============================================================================ // wxSocketImpl implementation // ============================================================================ -/* static */ -wxSocketImpl *wxSocketImpl::Create(wxSocketBase& wxsocket) -{ - return new wxSocketImplMSW(wxsocket); -} - void wxSocketImplMSW::DoClose() { - wxSocketManager::Get()-> - Uninstall_Callback(this, wxSOCKET_MAX_EVENT /* unused anyhow */); + wxSocketManager::Get()->Uninstall_Callback(this); closesocket(m_fd); } @@ -466,509 +487,4 @@ wxSocketError wxSocketImplMSW::GetLastError() const } } -/* - * ------------------------------------------------------------------------- - * GAddress - * ------------------------------------------------------------------------- - */ - -/* CHECK_ADDRESS verifies that the current address family is either - * wxSOCKET_NOFAMILY or wxSOCKET_*family*, and if it is wxSOCKET_NOFAMILY, it - * initalizes it to be a wxSOCKET_*family*. In other cases, it returns - * an appropiate error code. - * - * CHECK_ADDRESS_RETVAL does the same but returning 'retval' on error. - */ -#define CHECK_ADDRESS(address, family) \ -{ \ - if (address->m_family == wxSOCKET_NOFAMILY) \ - if (_GAddress_Init_##family(address) != wxSOCKET_NOERROR) \ - return address->m_error; \ - if (address->m_family != wxSOCKET_##family) \ - { \ - address->m_error = wxSOCKET_INVADDR; \ - return wxSOCKET_INVADDR; \ - } \ -} - -#define CHECK_ADDRESS_RETVAL(address, family, retval) \ -{ \ - if (address->m_family == wxSOCKET_NOFAMILY) \ - if (_GAddress_Init_##family(address) != wxSOCKET_NOERROR) \ - return retval; \ - if (address->m_family != wxSOCKET_##family) \ - { \ - address->m_error = wxSOCKET_INVADDR; \ - return retval; \ - } \ -} - - -GAddress *GAddress_new() -{ - GAddress *address; - - if ((address = (GAddress *) malloc(sizeof(GAddress))) == NULL) - return NULL; - - address->m_family = wxSOCKET_NOFAMILY; - address->m_addr = NULL; - address->m_len = 0; - - return address; -} - -GAddress *GAddress_copy(GAddress *address) -{ - GAddress *addr2; - - if ((addr2 = (GAddress *) malloc(sizeof(GAddress))) == NULL) - return NULL; - - memcpy(addr2, address, sizeof(GAddress)); - - if (address->m_addr) - { - addr2->m_addr = (struct sockaddr *) malloc(addr2->m_len); - if (addr2->m_addr == NULL) - { - free(addr2); - return NULL; - } - memcpy(addr2->m_addr, address->m_addr, addr2->m_len); - } - - return addr2; -} - -void GAddress_destroy(GAddress *address) -{ - if (address->m_addr) - free(address->m_addr); - - free(address); -} - -void GAddress_SetFamily(GAddress *address, GAddressType type) -{ - address->m_family = type; -} - -GAddressType GAddress_GetFamily(GAddress *address) -{ - return address->m_family; -} - -wxSocketError _GAddress_translate_from(GAddress *address, - struct sockaddr *addr, int len) -{ - address->m_realfamily = addr->sa_family; - switch (addr->sa_family) - { - case AF_INET: - address->m_family = wxSOCKET_INET; - break; - case AF_UNIX: - address->m_family = wxSOCKET_UNIX; - break; -#if wxUSE_IPV6 - case AF_INET6: - address->m_family = wxSOCKET_INET6; - break; -#endif - default: - { - address->m_error = wxSOCKET_INVOP; - return wxSOCKET_INVOP; - } - } - - if (address->m_addr) - free(address->m_addr); - - address->m_len = len; - address->m_addr = (struct sockaddr *) malloc(len); - - if (address->m_addr == NULL) - { - address->m_error = wxSOCKET_MEMERR; - return wxSOCKET_MEMERR; - } - memcpy(address->m_addr, addr, len); - - return wxSOCKET_NOERROR; -} - -wxSocketError _GAddress_translate_to(GAddress *address, - struct sockaddr **addr, int *len) -{ - if (!address->m_addr) - { - address->m_error = wxSOCKET_INVADDR; - return wxSOCKET_INVADDR; - } - - *len = address->m_len; - *addr = (struct sockaddr *) malloc(address->m_len); - if (*addr == NULL) - { - address->m_error = wxSOCKET_MEMERR; - return wxSOCKET_MEMERR; - } - - memcpy(*addr, address->m_addr, address->m_len); - return wxSOCKET_NOERROR; -} - -/* - * ------------------------------------------------------------------------- - * Internet address family - * ------------------------------------------------------------------------- - */ - -wxSocketError _GAddress_Init_INET(GAddress *address) -{ - address->m_len = sizeof(struct sockaddr_in); - address->m_addr = (struct sockaddr *) malloc(address->m_len); - if (address->m_addr == NULL) - { - address->m_error = wxSOCKET_MEMERR; - return wxSOCKET_MEMERR; - } - - address->m_family = wxSOCKET_INET; - address->m_realfamily = AF_INET; - ((struct sockaddr_in *)address->m_addr)->sin_family = AF_INET; - ((struct sockaddr_in *)address->m_addr)->sin_addr.s_addr = INADDR_ANY; - - return wxSOCKET_NOERROR; -} - -wxSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname) -{ - struct hostent *he; - struct in_addr *addr; - - CHECK_ADDRESS(address, INET); - - addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr); - - addr->s_addr = inet_addr(hostname); - - /* If it is a numeric host name, convert it now */ - if (addr->s_addr == INADDR_NONE) - { - struct in_addr *array_addr; - - /* It is a real name, we solve it */ - if ((he = gethostbyname(hostname)) == NULL) - { - /* addr->s_addr = INADDR_NONE just done by inet_addr() above */ - address->m_error = wxSOCKET_NOHOST; - return wxSOCKET_NOHOST; - } - array_addr = (struct in_addr *) *(he->h_addr_list); - addr->s_addr = array_addr[0].s_addr; - } - return wxSOCKET_NOERROR; -} - -wxSocketError GAddress_INET_SetBroadcastAddress(GAddress *address) -{ - return GAddress_INET_SetHostAddress(address, INADDR_BROADCAST); -} - -wxSocketError GAddress_INET_SetAnyAddress(GAddress *address) -{ - return GAddress_INET_SetHostAddress(address, INADDR_ANY); -} - -wxSocketError GAddress_INET_SetHostAddress(GAddress *address, - unsigned long hostaddr) -{ - struct in_addr *addr; - - CHECK_ADDRESS(address, INET); - - addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr); - addr->s_addr = htonl(hostaddr); - - return wxSOCKET_NOERROR; -} - -wxSocketError GAddress_INET_SetPortName(GAddress *address, const char *port, - const char *protocol) -{ - struct servent *se; - struct sockaddr_in *addr; - - CHECK_ADDRESS(address, INET); - - if (!port) - { - address->m_error = wxSOCKET_INVPORT; - return wxSOCKET_INVPORT; - } - - se = getservbyname(port, protocol); - if (!se) - { - if (isdigit(port[0])) - { - int port_int; - - port_int = atoi(port); - addr = (struct sockaddr_in *)address->m_addr; - addr->sin_port = htons((u_short) port_int); - return wxSOCKET_NOERROR; - } - - address->m_error = wxSOCKET_INVPORT; - return wxSOCKET_INVPORT; - } - - addr = (struct sockaddr_in *)address->m_addr; - addr->sin_port = se->s_port; - - return wxSOCKET_NOERROR; -} - -wxSocketError GAddress_INET_SetPort(GAddress *address, unsigned short port) -{ - struct sockaddr_in *addr; - - CHECK_ADDRESS(address, INET); - - addr = (struct sockaddr_in *)address->m_addr; - addr->sin_port = htons(port); - - return wxSOCKET_NOERROR; -} - -wxSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, size_t sbuf) -{ - struct hostent *he; - char *addr_buf; - struct sockaddr_in *addr; - - CHECK_ADDRESS(address, INET); - - addr = (struct sockaddr_in *)address->m_addr; - addr_buf = (char *)&(addr->sin_addr); - - he = gethostbyaddr(addr_buf, sizeof(addr->sin_addr), AF_INET); - if (he == NULL) - { - address->m_error = wxSOCKET_NOHOST; - return wxSOCKET_NOHOST; - } - - strncpy(hostname, he->h_name, sbuf); - - return wxSOCKET_NOERROR; -} - -unsigned long GAddress_INET_GetHostAddress(GAddress *address) -{ - struct sockaddr_in *addr; - - CHECK_ADDRESS_RETVAL(address, INET, 0); - - addr = (struct sockaddr_in *)address->m_addr; - - return ntohl(addr->sin_addr.s_addr); -} - -unsigned short GAddress_INET_GetPort(GAddress *address) -{ - struct sockaddr_in *addr; - - CHECK_ADDRESS_RETVAL(address, INET, 0); - - addr = (struct sockaddr_in *)address->m_addr; - return ntohs(addr->sin_port); -} - - -#if wxUSE_IPV6 -/* - * ------------------------------------------------------------------------- - * Internet IPv6 address family - * ------------------------------------------------------------------------- - */ -#include "ws2tcpip.h" - -#ifdef __VISUALC__ - #pragma comment(lib,"ws2_32") -#endif // __VISUALC__ - -wxSocketError _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 = wxSOCKET_MEMERR; - return wxSOCKET_MEMERR; - } - memset(address->m_addr,0,address->m_len); - - address->m_family = wxSOCKET_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 wxSOCKET_NOERROR; -} - -wxSocketError GAddress_INET6_SetHostName(GAddress *address, const char *hostname) -{ - 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 = wxSOCKET_NOHOST; - return wxSOCKET_NOHOST; - } - - memcpy( address->m_addr, info->ai_addr, info->ai_addrlen ); - freeaddrinfo( info ); - return wxSOCKET_NOERROR; -} - -wxSocketError GAddress_INET6_SetAnyAddress(GAddress *address) -{ - CHECK_ADDRESS(address, INET6); - - struct in6_addr addr; - memset( & addr, 0, sizeof( addr ) ); - return GAddress_INET6_SetHostAddress(address, addr); -} -wxSocketError GAddress_INET6_SetHostAddress(GAddress *address, - struct in6_addr hostaddr) -{ - CHECK_ADDRESS(address, INET6); - - ((struct sockaddr_in6 *)address->m_addr)->sin6_addr = hostaddr; - - return wxSOCKET_NOERROR; -} - -wxSocketError GAddress_INET6_SetPortName(GAddress *address, const char *port, - const char *protocol) -{ - struct servent *se; - struct sockaddr_in6 *addr; - - CHECK_ADDRESS(address, INET6); - - if (!port) - { - address->m_error = wxSOCKET_INVPORT; - return wxSOCKET_INVPORT; - } - - se = getservbyname(port, protocol); - if (!se) - { - if (isdigit((unsigned char) 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 wxSOCKET_NOERROR; - } - - address->m_error = wxSOCKET_INVPORT; - return wxSOCKET_INVPORT; - } - - addr = (struct sockaddr_in6 *)address->m_addr; - addr->sin6_port = se->s_port; - - return wxSOCKET_NOERROR; -} - -wxSocketError GAddress_INET6_SetPort(GAddress *address, unsigned short port) -{ - struct sockaddr_in6 *addr; - - CHECK_ADDRESS(address, INET6); - - addr = (struct sockaddr_in6 *)address->m_addr; - addr->sin6_port = htons(port); - - return wxSOCKET_NOERROR; -} - -wxSocketError GAddress_INET6_GetHostName(GAddress *address, char *hostname, size_t sbuf) -{ - struct hostent *he; - char *addr_buf; - struct sockaddr_in6 *addr; - - 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 = wxSOCKET_NOHOST; - return wxSOCKET_NOHOST; - } - - strncpy(hostname, he->h_name, sbuf); - - return wxSOCKET_NOERROR; -} - -wxSocketError GAddress_INET6_GetHostAddress(GAddress *address,struct in6_addr *hostaddr) -{ - CHECK_ADDRESS_RETVAL(address, INET6, wxSOCKET_INVADDR); - *hostaddr = ( (struct sockaddr_in6 *)address->m_addr )->sin6_addr; - return wxSOCKET_NOERROR; -} - -unsigned short GAddress_INET6_GetPort(GAddress *address) -{ - CHECK_ADDRESS_RETVAL(address, INET6, 0); - - return ntohs( ((struct sockaddr_in6 *)address->m_addr)->sin6_port ); -} - -#endif // wxUSE_IPV6 - -/* - * ------------------------------------------------------------------------- - * Unix address family - * ------------------------------------------------------------------------- - */ - -wxSocketError _GAddress_Init_UNIX(GAddress *address) -{ - address->m_error = wxSOCKET_INVADDR; - return wxSOCKET_INVADDR; -} - -wxSocketError GAddress_UNIX_SetPath(GAddress *address, const char *WXUNUSED(path)) -{ - address->m_error = wxSOCKET_INVADDR; - return wxSOCKET_INVADDR; -} - -wxSocketError GAddress_UNIX_GetPath(GAddress *address, char *WXUNUSED(path), size_t WXUNUSED(sbuf)) -{ - address->m_error = wxSOCKET_INVADDR; - return wxSOCKET_INVADDR; -} - #endif // wxUSE_SOCKETS