X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8c029a5b0278cfae98a2ffa15a09e103900cd27b..dd9f8b6bb6935360a8271dc3e8749fb026b601a8:/src/msw/gsocket.cpp?ds=inline diff --git a/src/msw/gsocket.cpp b/src/msw/gsocket.cpp index 393d15c29c..2830549071 100644 --- a/src/msw/gsocket.cpp +++ b/src/msw/gsocket.cpp @@ -53,24 +53,16 @@ #include -#ifndef __GSOCKET_STANDALONE__ -# include "wx/platform.h" -#endif +#include "wx/platform.h" -#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) +#if wxUSE_SOCKETS -#ifndef __GSOCKET_STANDALONE__ -# include "wx/msw/gsockmsw.h" -# include "wx/gsocket.h" -#else -# include "gsockmsw.h" -# include "gsocket.h" -#endif /* __GSOCKET_STANDALONE__ */ +#include "wx/gsocket.h" +#include "wx/link.h" -#ifndef __WXWINCE__ -#include -#else -#define assert(x) +wxFORCE_LINK_MODULE(gsockmsw) + +#ifdef __WXWINCE__ #ifndef isdigit #define isdigit(x) (x > 47 && x < 58) #endif @@ -88,68 +80,29 @@ # define WX_SOCKLEN_T int #endif -/* Table of GUI-related functions. We must call them indirectly because - * of wxBase and GUI separation: */ - -static GSocketGUIFunctionsTable *gs_gui_functions; - -class GSocketGUIFunctionsTableNull: public GSocketGUIFunctionsTable -{ -public: - virtual bool OnInit(); - virtual void OnExit(); - virtual bool CanUseEventLoop(); - virtual bool Init_Socket(GSocket *socket); - virtual void Destroy_Socket(GSocket *socket); - virtual void Enable_Events(GSocket *socket); - virtual void Disable_Events(GSocket *socket); -}; - -bool GSocketGUIFunctionsTableNull::OnInit() -{ return true; } -void GSocketGUIFunctionsTableNull::OnExit() -{} -bool GSocketGUIFunctionsTableNull::CanUseEventLoop() -{ return false; } -bool GSocketGUIFunctionsTableNull::Init_Socket(GSocket *WXUNUSED(socket)) -{ return true; } -void GSocketGUIFunctionsTableNull::Destroy_Socket(GSocket *WXUNUSED(socket)) -{} -void GSocketGUIFunctionsTableNull::Enable_Events(GSocket *WXUNUSED(socket)) -{} -void GSocketGUIFunctionsTableNull::Disable_Events(GSocket *WXUNUSED(socket)) -{} -/* Global initialisers */ - -void GSocket_SetGUIFunctions(GSocketGUIFunctionsTable *guifunc) -{ - gs_gui_functions = guifunc; -} +#if wxUSE_IPV6 +typedef struct sockaddr_storage wxSockAddr; +#else +typedef struct sockaddr wxSockAddr; +#endif -int GSocket_Init(void) +bool GSocket_Init() { WSADATA wsaData; - if (!gs_gui_functions) - { - static GSocketGUIFunctionsTableNull table; - gs_gui_functions = &table; - } - if ( !gs_gui_functions->OnInit() ) - { - return 0; - } + GSocketManager * const manager = GSocketManager::Get(); + if ( !manager || !manager->OnInit() ) + return false; /* Initialize WinSocket */ - return (WSAStartup((1 << 8) | 1, &wsaData) == 0); + return WSAStartup((1 << 8) | 1, &wsaData) == 0; } -void GSocket_Cleanup(void) +void GSocket_Cleanup() { - if (gs_gui_functions) - { - gs_gui_functions->OnExit(); - } + GSocketManager * const manager = GSocketManager::Get(); + if ( manager ) + manager->OnExit(); /* Cleanup WinSocket */ WSACleanup(); @@ -177,29 +130,24 @@ GSocket::GSocket() m_timeout.tv_usec = 0; m_establishing = false; m_reusable = false; - m_broadcast = false; + m_broadcast = false; m_dobind = true; 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() { - gs_gui_functions->Disable_Events(this); + GSocketManager::Get()->Disable_Events(this); closesocket(m_fd); m_fd = INVALID_SOCKET; } GSocket::~GSocket() { - assert(this); - - /* Per-socket GUI-specific cleanup */ - gs_gui_functions->Destroy_Socket(this); + GSocketManager::Get()->Destroy_Socket(this); /* Check that the socket is really shutdowned */ if (m_fd != INVALID_SOCKET) @@ -221,8 +169,6 @@ void GSocket::Shutdown() { int evt; - assert(this); - /* If socket has been created, shutdown it */ if (m_fd != INVALID_SOCKET) { @@ -255,8 +201,6 @@ void GSocket::Shutdown() */ GSocketError GSocket::SetLocal(GAddress *address) { - assert(this); - /* the socket must be initialized, or it must be a server */ if (m_fd != INVALID_SOCKET && !m_server) { @@ -281,8 +225,6 @@ GSocketError GSocket::SetLocal(GAddress *address) GSocketError GSocket::SetPeer(GAddress *address) { - assert(this); - /* check address */ if (address == NULL || address->m_family == GSOCK_NOFAMILY) { @@ -301,12 +243,10 @@ GSocketError GSocket::SetPeer(GAddress *address) GAddress *GSocket::GetLocal() { GAddress *address; - struct sockaddr addr; + wxSockAddr addr; WX_SOCKLEN_T size = sizeof(addr); GSocketError err; - assert(this); - /* try to get it from the m_local var first */ if (m_local) return GAddress_copy(m_local); @@ -318,7 +258,7 @@ GAddress *GSocket::GetLocal() return NULL; } - if (getsockname(m_fd, &addr, &size) == SOCKET_ERROR) + if (getsockname(m_fd, (sockaddr*)&addr, &size) == SOCKET_ERROR) { m_error = GSOCK_IOERR; return NULL; @@ -331,7 +271,7 @@ GAddress *GSocket::GetLocal() return NULL; } - if ((err = _GAddress_translate_from(address, &addr, size)) != GSOCK_NOERROR) + if ((err = _GAddress_translate_from(address, (sockaddr*)&addr, size)) != GSOCK_NOERROR) { GAddress_destroy(address); m_error = err; @@ -343,8 +283,6 @@ GAddress *GSocket::GetLocal() GAddress *GSocket::GetPeer() { - assert(this); - /* try to get it from the m_peer var */ if (m_peer) return GAddress_copy(m_peer); @@ -368,8 +306,6 @@ GSocketError GSocket::SetServer() { u_long arg = 1; - assert(this); - /* must not be in use */ if (m_fd != INVALID_SOCKET) { @@ -398,7 +334,7 @@ GSocketError GSocket::SetServer() } ioctlsocket(m_fd, FIONBIO, (u_long FAR *) &arg); - gs_gui_functions->Enable_Events(this); + GSocketManager::Get()->Enable_Events(this); /* allow a socket to re-bind if the socket is in the TIME_WAIT state after being previously closed. @@ -441,13 +377,11 @@ GSocketError GSocket::SetServer() GSocket *GSocket::WaitConnection() { GSocket *connection; - struct sockaddr from; + wxSockAddr from; WX_SOCKLEN_T fromlen = sizeof(from); GSocketError err; u_long arg = 1; - assert(this); - /* Reenable CONNECTION events */ m_detected &= ~GSOCK_CONNECTION_FLAG; @@ -475,7 +409,7 @@ GSocket *GSocket::WaitConnection() return NULL; } - connection->m_fd = accept(m_fd, &from, &fromlen); + connection->m_fd = accept(m_fd, (sockaddr*)&from, &fromlen); if (connection->m_fd == INVALID_SOCKET) { @@ -500,7 +434,7 @@ GSocket *GSocket::WaitConnection() m_error = GSOCK_MEMERR; 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) { GAddress_destroy(connection->m_peer); @@ -510,7 +444,7 @@ GSocket *GSocket::WaitConnection() } ioctlsocket(connection->m_fd, FIONBIO, (u_long FAR *) &arg); - gs_gui_functions->Enable_Events(connection); + GSocketManager::Get()->Enable_Events(connection); return connection; } @@ -591,8 +525,6 @@ GSocketError GSocket::Connect(GSocketStream stream) int ret, err; u_long arg = 1; - assert(this); - /* Enable CONNECTION events (needed for nonblocking connections) */ m_detected &= ~GSOCK_CONNECTION_FLAG; @@ -624,7 +556,7 @@ GSocketError GSocket::Connect(GSocketStream stream) } ioctlsocket(m_fd, FIONBIO, (u_long FAR *) &arg); - gs_gui_functions->Enable_Events(this); + GSocketManager::Get()->Enable_Events(this); // If the reuse flag is set, use the applicable socket reuse flag if (m_reusable) @@ -709,8 +641,6 @@ GSocketError GSocket::SetNonOriented() { u_long arg = 1; - assert(this); - if (m_fd != INVALID_SOCKET) { m_error = GSOCK_INVSOCK; @@ -737,7 +667,7 @@ GSocketError GSocket::SetNonOriented() } ioctlsocket(m_fd, FIONBIO, (u_long FAR *) &arg); - gs_gui_functions->Enable_Events(this); + GSocketManager::Get()->Enable_Events(this); if (m_reusable) { @@ -773,8 +703,6 @@ int GSocket::Read(char *buffer, int size) { int ret; - assert(this); - /* Reenable INPUT events */ m_detected &= ~GSOCK_INPUT_FLAG; @@ -813,8 +741,6 @@ int GSocket::Write(const char *buffer, int size) { int ret; - assert(this); - if (m_fd == INVALID_SOCKET || m_server) { m_error = GSOCK_INVSOCK; @@ -859,107 +785,7 @@ 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; - - assert(this); - - FD_ZERO(&readfds); - FD_ZERO(&writefds); - FD_ZERO(&exceptfds); - FD_SET(m_fd, &readfds); - if (flags & GSOCK_OUTPUT_FLAG || flags & GSOCK_CONNECTION_FLAG) - FD_SET(m_fd, &writefds); - FD_SET(m_fd, &exceptfds); - - /* 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; - - return (GSOCK_LOST_FLAG & flags); - } - - /* Try select now */ - if (select(m_fd + 1, &readfds, &writefds, &exceptfds, - &m_timeout) <= 0) - { - /* What to do here? */ - return (result & flags); - } - - /* Check for exceptions and errors */ - if (FD_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 (FD_ISSET(m_fd, &readfds)) - { - 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; - } - } - - /* Check for writability */ - if (FD_ISSET(m_fd, &writefds)) - { - if (m_establishing && !m_server) - { - int error; - WX_SOCKLEN_T len = sizeof(error); - - m_establishing = false; - - getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (char*)&error, &len); - - 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; - } - } - else - { - result |= GSOCK_OUTPUT_FLAG; - } - } - - return (result & flags); - } - else /* USE_GUI() */ - { - assert(this); - return flags & m_detected; - } + return flags & m_detected; } /* Attributes */ @@ -970,8 +796,6 @@ GSocketEventFlags GSocket::Select(GSocketEventFlags flags) */ void GSocket::SetNonBlocking(bool non_block) { - assert(this); - m_non_blocking = non_block; } @@ -981,8 +805,6 @@ void GSocket::SetNonBlocking(bool non_block) */ void GSocket::SetTimeout(unsigned long millis) { - assert(this); - m_timeout.tv_sec = (millis / 1000); m_timeout.tv_usec = (millis % 1000) * 1000; } @@ -994,8 +816,6 @@ void GSocket::SetTimeout(unsigned long millis) */ GSocketError WXDLLIMPEXP_NET GSocket::GetError() { - assert(this); - return m_error; } @@ -1034,8 +854,6 @@ void GSocket::SetCallback(GSocketEventFlags flags, { int count; - assert(this); - for (count = 0; count < GSOCK_MAX_EVENT; count++) { if ((flags & (1 << count)) != 0) @@ -1054,8 +872,6 @@ void GSocket::UnsetCallback(GSocketEventFlags flags) { int count; - assert(this); - for (count = 0; count < GSOCK_MAX_EVENT; count++) { if ((flags & (1 << count)) != 0) @@ -1164,12 +980,12 @@ 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; - ret = recvfrom(m_fd, buffer, size, 0, &from, &fromlen); + ret = recvfrom(m_fd, buffer, size, 0, (sockaddr*)&from, &fromlen); if (ret == SOCKET_ERROR) return SOCKET_ERROR; @@ -1184,7 +1000,7 @@ int GSocket::Recv_Dgram(char *buffer, int size) return -1; } } - 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); @@ -1229,7 +1045,7 @@ int GSocket::Send_Dgram(const char *buffer, int size) } /* Compatibility functions for GSocket */ -GSocket *GSocket_new(void) +GSocket *GSocket_new() { GSocket *newsocket = new GSocket(); if(newsocket->IsOk()) @@ -1277,7 +1093,7 @@ GSocket *GSocket_new(void) } -GAddress *GAddress_new(void) +GAddress *GAddress_new() { GAddress *address; @@ -1295,8 +1111,6 @@ GAddress *GAddress_copy(GAddress *address) { GAddress *addr2; - assert(address != NULL); - if ((addr2 = (GAddress *) malloc(sizeof(GAddress))) == NULL) return NULL; @@ -1318,8 +1132,6 @@ GAddress *GAddress_copy(GAddress *address) void GAddress_destroy(GAddress *address) { - assert(address != NULL); - if (address->m_addr) free(address->m_addr); @@ -1328,15 +1140,11 @@ void GAddress_destroy(GAddress *address) void GAddress_SetFamily(GAddress *address, GAddressType type) { - assert(address != NULL); - address->m_family = type; } GAddressType GAddress_GetFamily(GAddress *address) { - assert(address != NULL); - return address->m_family; } @@ -1352,7 +1160,7 @@ 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; @@ -1430,8 +1238,6 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname) struct hostent *he; struct in_addr *addr; - assert(address != NULL); - CHECK_ADDRESS(address, INET); addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr); @@ -1471,8 +1277,6 @@ GSocketError GAddress_INET_SetHostAddress(GAddress *address, { struct in_addr *addr; - assert(address != NULL); - CHECK_ADDRESS(address, INET); addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr); @@ -1487,7 +1291,6 @@ GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port, struct servent *se; struct sockaddr_in *addr; - assert(address != NULL); CHECK_ADDRESS(address, INET); if (!port) @@ -1523,7 +1326,6 @@ GSocketError GAddress_INET_SetPort(GAddress *address, unsigned short port) { struct sockaddr_in *addr; - assert(address != NULL); CHECK_ADDRESS(address, INET); addr = (struct sockaddr_in *)address->m_addr; @@ -1538,7 +1340,6 @@ GSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, size_t char *addr_buf; struct sockaddr_in *addr; - assert(address != NULL); CHECK_ADDRESS(address, INET); addr = (struct sockaddr_in *)address->m_addr; @@ -1560,7 +1361,6 @@ unsigned long GAddress_INET_GetHostAddress(GAddress *address) { struct sockaddr_in *addr; - assert(address != NULL); CHECK_ADDRESS_RETVAL(address, INET, 0); addr = (struct sockaddr_in *)address->m_addr; @@ -1572,13 +1372,170 @@ unsigned short GAddress_INET_GetPort(GAddress *address) { struct sockaddr_in *addr; - assert(address != NULL); 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__ + +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) +{ + 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) +{ + 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) +{ + 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; + + 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; + + 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; + + 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) +{ + 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) +{ + CHECK_ADDRESS_RETVAL(address, INET6, 0); + + return ntohs( ((struct sockaddr_in6 *)address->m_addr)->sin6_port ); +} + +#endif // wxUSE_IPV6 + /* * ------------------------------------------------------------------------- * Unix address family @@ -1587,31 +1544,20 @@ unsigned short GAddress_INET_GetPort(GAddress *address) GSocketError _GAddress_Init_UNIX(GAddress *address) { - assert (address != NULL); address->m_error = GSOCK_INVADDR; return GSOCK_INVADDR; } GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *WXUNUSED(path)) { - assert (address != NULL); address->m_error = GSOCK_INVADDR; return GSOCK_INVADDR; } GSocketError GAddress_UNIX_GetPath(GAddress *address, char *WXUNUSED(path), size_t WXUNUSED(sbuf)) { - assert (address != NULL); address->m_error = GSOCK_INVADDR; return GSOCK_INVADDR; } -#else /* !wxUSE_SOCKETS */ - -/* - * Translation unit shouldn't be empty, so include this typedef to make the - * compiler (VC++ 6.0, for example) happy - */ -typedef void (*wxDummy)(); - -#endif /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */ +#endif // wxUSE_SOCKETS