X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a9c22462aec446d06267ac10b99f1115704b9d1..cb73e6001f891ae46b12a1e4ca39b93649cb6099:/src/msw/gsocket.c diff --git a/src/msw/gsocket.c b/src/msw/gsocket.c index eb4d669270..60f2a26d15 100644 --- a/src/msw/gsocket.c +++ b/src/msw/gsocket.c @@ -3,6 +3,7 @@ * Name: gsocket.c * Author: Guillermo Rodriguez Garcia * Purpose: GSocket main MSW file + * Licence: The wxWindows licence * CVSID: $Id$ * ------------------------------------------------------------------------- */ @@ -11,16 +12,26 @@ * PLEASE don't put C++ comments here - this is a C source file. */ -/* including rasasync.h (included from windows.h itself included from - * wx/setup.h and/or winsock.h results in this warning for - * RPCNOTIFICATION_ROUTINE - */ #ifdef _MSC_VER -# pragma warning(disable:4115) /* named type definition in parentheses */ -#endif + /* RPCNOTIFICATION_ROUTINE in rasasync.h (included from winsock.h), + * warning: conditional expression is constant. + */ +# pragma warning(disable:4115) + /* FD_SET, + * warning: named type definition in parentheses. + */ +# pragma warning(disable:4127) + /* GAddress_UNIX_GetPath, + * warning: unreferenced formal parameter. + */ +# pragma warning(disable:4100) +#endif /* _MSC_VER */ + +#include #ifndef __GSOCKET_STANDALONE__ -#include "wx/setup.h" +# include "wx/defs.h" +# include "wx/setup.h" #endif #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) @@ -33,38 +44,83 @@ # include "gsocket.h" #endif /* __GSOCKET_STANDALONE__ */ -/* redefine some GUI-only functions to do nothing in console mode */ -#if defined(wxUSE_GUI) && !wxUSE_GUI -# define _GSocket_GUI_Init(socket) 1 -# define _GSocket_GUI_Destroy(socket) -# define _GSocket_Enable_Events(socket) -# define _GSocket_Disable_Events(socket) -#endif /* wxUSE_GUI */ - - +#ifndef __WXWINCE__ #include +#else +#define assert(x) +#ifndef isdigit +#define isdigit(x) (x > 47 && x < 58) +#endif +#include "wx/msw/wince/net.h" +#endif + #include #include #include #include #include -#include - -#ifdef _MSC_VER -# pragma warning(default:4115) /* named type definition in parentheses */ -#endif - /* if we use configure for MSW SOCKLEN_T will be already defined */ #ifndef SOCKLEN_T # define SOCKLEN_T int #endif -/* using FD_SET results in this warning */ -#ifdef _MSC_VER -# pragma warning(disable:4127) /* conditional expression is constant */ -#endif +/* Table of GUI-related functions. We must call them indirectly because + * of wxBase and GUI separation: */ + +static struct GSocketGUIFunctionsTable *gs_gui_functions; + +#define USE_GUI() (gs_gui_functions != NULL) + +/* Define macros to simplify indirection: */ +#define _GSocket_GUI_Init() \ + if (gs_gui_functions) gs_gui_functions->GUI_Init() +#define _GSocket_GUI_Cleanup() \ + if (gs_gui_functions) gs_gui_functions->GUI_Cleanup() +#define _GSocket_GUI_Init_Socket(socket) \ + (gs_gui_functions ? gs_gui_functions->GUI_Init_Socket(socket) : 1) +#define _GSocket_GUI_Destroy_Socket(socket) \ + if (gs_gui_functions) gs_gui_functions->GUI_Destroy_Socket(socket) +#define _GSocket_Enable_Events(socket) \ + if (gs_gui_functions) gs_gui_functions->Enable_Events(socket) +#define _GSocket_Disable_Events(socket) \ + if (gs_gui_functions) gs_gui_functions->Disable_Events(socket) +#define _GSocket_Install_Callback(socket, event) \ + if (gs_gui_functions) gs_gui_functions->Install_Callback(socket, event) +#define _GSocket_Uninstall_Callback(socket, event) \ + if (gs_gui_functions) gs_gui_functions->Uninstall_Callback(socket, event) + +/* Global initialisers */ + +void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc) +{ + gs_gui_functions = guifunc; +} + +int GSocket_Init(void) +{ + WSADATA wsaData; + + if (gs_gui_functions) + { + if ( !gs_gui_functions->GUI_Init() ) + return 0; + } + /* Initialize WinSocket */ + return (WSAStartup((1 << 8) | 1, &wsaData) == 0); +} + +void GSocket_Cleanup(void) +{ + if (gs_gui_functions) + { + gs_gui_functions->GUI_Cleanup(); + } + + /* Cleanup WinSocket */ + WSACleanup(); +} /* Constructors / Destructors for GSocket */ @@ -82,10 +138,10 @@ GSocket *GSocket_new(void) socket->m_cbacks[i] = NULL; } socket->m_detected = 0; - socket->m_local = NULL; - socket->m_peer = NULL; + socket->m_local = NULL; + socket->m_peer = NULL; socket->m_error = GSOCK_NOERROR; - socket->m_server = FALSE; + socket->m_server = FALSE; socket->m_stream = TRUE; socket->m_non_blocking = FALSE; socket->m_timeout.tv_sec = 10 * 60; /* 10 minutes */ @@ -93,22 +149,29 @@ GSocket *GSocket_new(void) socket->m_establishing = FALSE; /* Per-socket GUI-specific initialization */ - success = _GSocket_GUI_Init(socket); + success = _GSocket_GUI_Init_Socket(socket); if (!success) { free(socket); - return NULL; + socket = NULL; } return socket; } +void GSocket_close(GSocket *socket) +{ + _GSocket_Disable_Events(socket); + closesocket(socket->m_fd); + socket->m_fd = INVALID_SOCKET; +} + void GSocket_destroy(GSocket *socket) { assert(socket != NULL); /* Per-socket GUI-specific cleanup */ - _GSocket_GUI_Destroy(socket); + _GSocket_GUI_Destroy_Socket(socket); /* Check that the socket is really shutdowned */ if (socket->m_fd != INVALID_SOCKET) @@ -139,8 +202,7 @@ void GSocket_Shutdown(GSocket *socket) if (socket->m_fd != INVALID_SOCKET) { shutdown(socket->m_fd, 2); - closesocket(socket->m_fd); - socket->m_fd = INVALID_SOCKET; + GSocket_close(socket); } /* Disable GUI callbacks */ @@ -148,7 +210,6 @@ void GSocket_Shutdown(GSocket *socket) socket->m_cbacks[evt] = NULL; socket->m_detected = GSOCK_LOST_FLAG; - _GSocket_Disable_Events(socket); } /* Address handling */ @@ -272,11 +333,11 @@ GAddress *GSocket_GetPeer(GSocket *socket) * Sets up this socket as a server. The local address must have been * set with GSocket_SetLocal() before GSocket_SetServer() is called. * Returns GSOCK_NOERROR on success, one of the following otherwise: - * + * * Error codes: * GSOCK_INVSOCK - the socket is in use. * GSOCK_INVADDR - the local address has not been set. - * GSOCK_IOERR - low-level error. + * GSOCK_IOERR - low-level error. */ GSocketError GSocket_SetServer(GSocket *sck) { @@ -325,8 +386,7 @@ GSocketError GSocket_SetServer(GSocket *sck) (SOCKLEN_T *)&sck->m_local->m_len) != 0) || (listen(sck->m_fd, 5) != 0)) { - closesocket(sck->m_fd); - sck->m_fd = INVALID_SOCKET; + GSocket_close(sck); sck->m_error = GSOCK_IOERR; return GSOCK_IOERR; } @@ -344,7 +404,7 @@ GSocketError GSocket_SetServer(GSocket *sck) * GSOCK_TIMEDOUT - timeout, no incoming connections. * GSOCK_WOULDBLOCK - the call would block and the socket is nonblocking. * GSOCK_MEMERR - couldn't allocate memory. - * GSOCK_IOERR - low-level error. + * GSOCK_IOERR - low-level error. */ GSocket *GSocket_WaitConnection(GSocket *sck) { @@ -447,7 +507,7 @@ GSocket *GSocket_WaitConnection(GSocket *sck) * GSOCK_TIMEDOUT - timeout, the connection failed. * GSOCK_WOULDBLOCK - connection in progress (nonblocking sockets only) * GSOCK_MEMERR - couldn't allocate memory. - * GSOCK_IOERR - low-level error. + * GSOCK_IOERR - low-level error. */ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream) { @@ -508,12 +568,11 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream) if (err != GSOCK_NOERROR) { - closesocket(sck->m_fd); - sck->m_fd = INVALID_SOCKET; + GSocket_close(sck); /* sck->m_error is set in _GSocket_Connect_Timeout */ } - return err; + return (GSocketError) err; } /* If connect failed with EWOULDBLOCK and the GSocket object @@ -532,8 +591,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream) /* If connect failed with an error other than EWOULDBLOCK, * then the call to GSocket_Connect() has failed. */ - closesocket(sck->m_fd); - sck->m_fd = INVALID_SOCKET; + GSocket_close(sck); sck->m_error = GSOCK_IOERR; return GSOCK_IOERR; } @@ -552,7 +610,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream) * Error codes: * GSOCK_INVSOCK - the socket is in use. * GSOCK_INVADDR - the local address has not been set. - * GSOCK_IOERR - low-level error. + * GSOCK_IOERR - low-level error. */ GSocketError GSocket_SetNonOriented(GSocket *sck) { @@ -597,8 +655,7 @@ GSocketError GSocket_SetNonOriented(GSocket *sck) sck->m_local->m_addr, (SOCKLEN_T *)&sck->m_local->m_len) != 0)) { - closesocket(sck->m_fd); - sck->m_fd = INVALID_SOCKET; + GSocket_close(sck); sck->m_error = GSOCK_IOERR; return GSOCK_IOERR; } @@ -696,70 +753,118 @@ int GSocket_Write(GSocket *socket, const char *buffer, int size) */ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags) { -#if defined(wxUSE_GUI) && !wxUSE_GUI + if (!USE_GUI()) + { + GSocketEventFlags result = 0; + fd_set readfds; + fd_set writefds; + fd_set exceptfds; + static const struct timeval tv = { 0, 0 }; - GSocketEventFlags result = 0; - fd_set readfds; - fd_set writefds; - fd_set exceptfds; - static const struct timeval tv = { 0, 0 }; + assert(socket != NULL); - assert(socket != NULL); + FD_ZERO(&readfds); + FD_ZERO(&writefds); + FD_ZERO(&exceptfds); + FD_SET(socket->m_fd, &readfds); + FD_SET(socket->m_fd, &writefds); + FD_SET(socket->m_fd, &exceptfds); - FD_ZERO(&readfds); - FD_ZERO(&writefds); - FD_ZERO(&exceptfds); - FD_SET(socket->m_fd, &readfds); - FD_SET(socket->m_fd, &writefds); - FD_SET(socket->m_fd, &exceptfds); + /* Check 'sticky' CONNECTION flag first */ + result |= (GSOCK_CONNECTION_FLAG & socket->m_detected); - /* Check known state first */ - result |= (GSOCK_CONNECTION_FLAG & socket->m_detected & flags); - result |= (GSOCK_LOST_FLAG & socket->m_detected & flags); + /* If we have already detected a LOST event, then don't try + * to do any further processing. + */ + if ((socket->m_detected & GSOCK_LOST_FLAG) != 0) + { + socket->m_establishing = FALSE; - /* Try select now */ - if (select(socket->m_fd + 1, &readfds, &writefds, &exceptfds, &tv) <= 0) - return result; + return (GSOCK_LOST_FLAG & flags); + } - /* Check for readability */ - if (FD_ISSET(socket->m_fd, &readfds)) - { - /* Assume that closure of the socket is always reported via exceptfds */ - if (socket->m_server && socket->m_stream) - result |= (GSOCK_CONNECTION_FLAG & flags); - else - result |= (GSOCK_INPUT_FLAG & flags); - } + /* Try select now */ + if (select(socket->m_fd + 1, &readfds, &writefds, &exceptfds, &tv) <= 0) + { + /* What to do here? */ + return (result & flags); + } - /* Check for writability */ - if (FD_ISSET(socket->m_fd, &writefds)) - { - if (socket->m_establishing && !socket->m_server) + /* Check for readability */ + if (FD_ISSET(socket->m_fd, &readfds)) { - result |= (GSOCK_CONNECTION_FLAG & flags); - socket->m_establishing = FALSE; - socket->m_detected |= GSOCK_CONNECTION_FLAG; + char c; + + if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0) + { + result |= GSOCK_INPUT_FLAG; + } + else + { + if (socket->m_server && socket->m_stream) + { + result |= GSOCK_CONNECTION_FLAG; + socket->m_detected |= GSOCK_CONNECTION_FLAG; + } + else + { + socket->m_detected = GSOCK_LOST_FLAG; + socket->m_establishing = FALSE; + + /* LOST event: Abort any further processing */ + return (GSOCK_LOST_FLAG & flags); + } + } } - else - result |= (GSOCK_OUTPUT_FLAG & flags); - } - /* Check for exceptions and errors */ - if (FD_ISSET(socket->m_fd, &exceptfds)) - { - result |= (GSOCK_LOST_FLAG & flags); - socket->m_establishing = FALSE; - socket->m_detected = GSOCK_LOST_FLAG; - } + /* Check for writability */ + if (FD_ISSET(socket->m_fd, &writefds)) + { + if (socket->m_establishing && !socket->m_server) + { + int error; + SOCKLEN_T len = sizeof(error); - return result; + socket->m_establishing = FALSE; -#else + getsockopt(socket->m_fd, SOL_SOCKET, SO_ERROR, (void*)&error, &len); - assert(socket != NULL); - return flags & socket->m_detected; + if (error) + { + socket->m_detected = GSOCK_LOST_FLAG; -#endif /* !wxUSE_GUI */ + /* LOST event: Abort any further processing */ + return (GSOCK_LOST_FLAG & flags); + } + else + { + result |= GSOCK_CONNECTION_FLAG; + socket->m_detected |= GSOCK_CONNECTION_FLAG; + } + } + else + { + result |= GSOCK_OUTPUT_FLAG; + } + } + + /* Check for exceptions and errors (is this useful in Unices?) */ + if (FD_ISSET(socket->m_fd, &exceptfds)) + { + socket->m_establishing = FALSE; + socket->m_detected = GSOCK_LOST_FLAG; + + /* LOST event: Abort any further processing */ + return (GSOCK_LOST_FLAG & flags); + } + + return (result & flags); + } + else /* USE_GUI() */ + { + assert(socket != NULL); + return flags & socket->m_detected; + } } /* Attributes */ @@ -768,7 +873,7 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags) * Sets the socket to non-blocking mode. All IO calls will return * immediately. */ -void GSocket_SetNonBlocking(GSocket *socket, bool non_block) +void GSocket_SetNonBlocking(GSocket *socket, int non_block) { assert(socket != NULL); @@ -806,7 +911,7 @@ GSocketError GSocket_GetError(GSocket *socket) * operation, there is still data available, the callback function will * be called again. * GSOCK_OUTPUT: - * The socket is available for writing. That is, the next write call + * The socket is available for writing. That is, the next write call * won't block. This event is generated only once, when the connection is * first established, and then only if a call failed with GSOCK_WOULDBLOCK, * when the output buffer empties again. This means that the app should @@ -1015,22 +1120,38 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size) * ------------------------------------------------------------------------- */ -/* CHECK_ADDRESS verifies that the current family is either GSOCK_NOFAMILY - * or GSOCK_*family*, and if it is GSOCK_NOFAMILY, it initalizes address - * to be a GSOCK_*family*. In other cases, it returns GSOCK_INVADDR. +/* CHECK_ADDRESS verifies that the current address family is either + * GSOCK_NOFAMILY or GSOCK_*family*, and if it is GSOCK_NOFAMILY, it + * initalizes it to be a GSOCK_*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, retval) \ +#define CHECK_ADDRESS(address, family) \ { \ if (address->m_family == GSOCK_NOFAMILY) \ if (_GAddress_Init_##family(address) != GSOCK_NOERROR) \ return address->m_error; \ if (address->m_family != GSOCK_##family) \ + { \ + address->m_error = GSOCK_INVADDR; \ + return GSOCK_INVADDR; \ + } \ +} + +#define CHECK_ADDRESS_RETVAL(address, family, retval) \ +{ \ + if (address->m_family == GSOCK_NOFAMILY) \ + if (_GAddress_Init_##family(address) != GSOCK_NOERROR) \ + return retval; \ + if (address->m_family != GSOCK_##family) \ { \ address->m_error = GSOCK_INVADDR; \ return retval; \ } \ } + GAddress *GAddress_new(void) { GAddress *address; @@ -1074,7 +1195,9 @@ void GAddress_destroy(GAddress *address) { assert(address != NULL); - free(address->m_addr); + if (address->m_addr) + free(address->m_addr); + free(address); } @@ -1184,7 +1307,7 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname) assert(address != NULL); - CHECK_ADDRESS(address, INET, GSOCK_INVADDR); + CHECK_ADDRESS(address, INET); addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr); @@ -1220,7 +1343,7 @@ GSocketError GAddress_INET_SetHostAddress(GAddress *address, assert(address != NULL); - CHECK_ADDRESS(address, INET, GSOCK_INVADDR); + CHECK_ADDRESS(address, INET); addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr); addr->s_addr = hostaddr; @@ -1235,7 +1358,7 @@ GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port, struct sockaddr_in *addr; assert(address != NULL); - CHECK_ADDRESS(address, INET, GSOCK_INVADDR); + CHECK_ADDRESS(address, INET); if (!port) { @@ -1271,7 +1394,7 @@ GSocketError GAddress_INET_SetPort(GAddress *address, unsigned short port) struct sockaddr_in *addr; assert(address != NULL); - CHECK_ADDRESS(address, INET, GSOCK_INVADDR); + CHECK_ADDRESS(address, INET); addr = (struct sockaddr_in *)address->m_addr; addr->sin_port = htons(port); @@ -1286,7 +1409,7 @@ GSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, size_t struct sockaddr_in *addr; assert(address != NULL); - CHECK_ADDRESS(address, INET, GSOCK_INVADDR); + CHECK_ADDRESS(address, INET); addr = (struct sockaddr_in *)address->m_addr; addr_buf = (char *)&(addr->sin_addr); @@ -1308,7 +1431,7 @@ unsigned long GAddress_INET_GetHostAddress(GAddress *address) struct sockaddr_in *addr; assert(address != NULL); - CHECK_ADDRESS(address, INET, 0); + CHECK_ADDRESS_RETVAL(address, INET, 0); addr = (struct sockaddr_in *)address->m_addr; @@ -1320,7 +1443,7 @@ unsigned short GAddress_INET_GetPort(GAddress *address) struct sockaddr_in *addr; assert(address != NULL); - CHECK_ADDRESS(address, INET, 0); + CHECK_ADDRESS_RETVAL(address, INET, 0); addr = (struct sockaddr_in *)address->m_addr; return ntohs(addr->sin_port); @@ -1332,10 +1455,6 @@ unsigned short GAddress_INET_GetPort(GAddress *address) * ------------------------------------------------------------------------- */ -#ifdef _MSC_VER - #pragma warning(disable:4100) /* unreferenced formal parameter */ -#endif /* Visual C++ */ - GSocketError _GAddress_Init_UNIX(GAddress *address) { assert (address != NULL); @@ -1345,6 +1464,10 @@ GSocketError _GAddress_Init_UNIX(GAddress *address) GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path) { +#if defined(__BORLANDC__) + /* prevents unused variable message in Borland */ + (void)path; +#endif assert (address != NULL); address->m_error = GSOCK_INVADDR; return GSOCK_INVADDR; @@ -1352,6 +1475,11 @@ GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path) GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf) { +#if defined(__BORLANDC__) + /* prevents unused variable message in Borland */ + (void)path; + (void)sbuf; +#endif assert (address != NULL); address->m_error = GSOCK_INVADDR; return GSOCK_INVADDR; @@ -1359,10 +1487,11 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf) #else /* !wxUSE_SOCKETS */ -/* +/* * Translation unit shouldn't be empty, so include this typedef to make the * compiler (VC++ 6.0, for example) happy */ -typedef (*wxDummy)(); +typedef void (*wxDummy)(); #endif /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */ +