X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/29d83fc1e5d41ef6adb7984127ce5dc013b09815..0966d1fe2639772efab156387f95f63ce766bf17:/src/os2/gsocket.c diff --git a/src/os2/gsocket.c b/src/os2/gsocket.c index d3078a272d..b57aa868d2 100644 --- a/src/os2/gsocket.c +++ b/src/os2/gsocket.c @@ -3,7 +3,8 @@ * Name: gsocket.c * Authors: Guilhem Lavaux, * Guillermo Rodriguez Garcia (maintainer) - * Purpose: GSocket main Unix-style file + * Purpose: GSocket main Unix and OS/2 file + * Licence: The wxWindows licence * CVSID: $Id$ * ------------------------------------------------------------------------- */ @@ -16,44 +17,50 @@ #include "wx/setup.h" #endif -#ifndef __EMX__ -/* I don't see, why this include is needed, but it seems to be necessary - sometimes. For EMX, including C++ headers into plain C source breaks - compilation, so don't do it there. */ +#if defined(__VISAGECPP__) +/* Seems to be needed by Visual Age C++, though I don't see how it manages + to not break on including a C++ header into a plain C source file */ #include "wx/defs.h" +#define BSD_SELECT /* use Berkley Sockets select */ #endif #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) -#define BSD_SELECT /* use Berkley Sockets select */ - #include -#include +#include +#ifdef __VISAGECPP__ +#include +#include +#include +#include +#endif +#include +#include -#ifdef __EMX__ +#ifdef __VMS__ +#include +struct sockaddr_un +{ + u_char sun_len; /* sockaddr len including null */ + u_char sun_family; /* AF_UNIX */ + char sun_path[108]; /* path name (gag) */ +}; +#else +#include +#include +#endif + +#ifndef __VISAGECPP__ #include #include #include -#include #include +#include #include -#include -#define HAVE_INET_ADDR - #else - -#include -#include -#include -#include -#include #include - -#endif - -#if defined(__VISAGECPP__) && __IBMCPP__ < 400 - -#include +# if __IBMCPP__ < 400 +#include #include #include #include @@ -61,15 +68,15 @@ #define EBADF SOCEBADF -#else +# ifdef min +# undef min +# endif +# else +#include +#include +#include -#include -#include -#include - -#ifdef __EMX__ -#define soclose(a) close(a) -#else +#define close(a) soclose(a) #define select(a,b,c,d,e) bsdselect(a,b,c,d,e) int _System bsdselect(int, struct fd_set *, @@ -77,33 +84,35 @@ int _System bsdselect(int, struct fd_set *, struct timeval *); int _System soclose(int); -#endif -#endif - -#include -#include -#if (defined(__VISAGECPP__) && __IBMCPP__ < 400) || defined(__EMX__) -# ifdef min -# undef min # endif -# include #endif +#include +#include #include #include - +#ifdef sun +# include +#endif +#ifdef sgi +# include +#endif #include #ifndef SOCKLEN_T -#ifdef __GLIBC__ -# if __GLIBC__ == 2 -# define SOCKLEN_T socklen_t -# endif +#ifdef VMS +# define SOCKLEN_T unsigned int #else -# define SOCKLEN_T int +# ifdef __GLIBC__ +# if __GLIBC__ == 2 +# define SOCKLEN_T socklen_t +# endif +# else +# define SOCKLEN_T int +# endif #endif -#endif +#endif /* SOCKLEN_T */ /* * MSW defines this, Unices don't. @@ -112,6 +121,11 @@ int _System soclose(int); #define INVALID_SOCKET -1 #endif +/* UnixWare reportedly needs this for FIONBIO definition */ +#ifdef __UNIXWARE__ +#include +#endif + /* * INADDR_BROADCAST is identical to INADDR_NONE which is not defined * on all systems. INADDR_BROADCAST should be fine to indicate an error. @@ -130,6 +144,7 @@ int _System soclose(int); signal(SIGPIPE, old_handler); \ } + #ifndef __GSOCKET_STANDALONE__ # include "wx/unix/gsockunx.h" # include "wx/gsocket.h" @@ -138,33 +153,67 @@ int _System soclose(int); # 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) -# define _GSocket_Install_Callback(socket, event) -# define _GSocket_Uninstall_Callback(socket, event) -#endif /* wxUSE_GUI */ - /* debugging helpers */ -#define __GSOCKET_DEBUG__ #ifdef __GSOCKET_DEBUG__ # define GSocket_Debug(args) printf args #else # define GSocket_Debug(args) #endif /* __GSOCKET_DEBUG__ */ +/* 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) + +static struct GSocketBaseFunctionsTable gs_base_functions = +{ + _GSocket_Detected_Read, + _GSocket_Detected_Write +}; + /* Global initialisers */ +void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc) +{ + gs_gui_functions = guifunc; +} + int GSocket_Init(void) { + if (gs_gui_functions) + { + if ( !gs_gui_functions->GUI_Init() ) + return 0; + } return 1; } void GSocket_Cleanup(void) { + if (gs_gui_functions) + { + gs_gui_functions->GUI_Cleanup(); + } } /* Constructors / Destructors for GSocket */ @@ -196,8 +245,10 @@ GSocket *GSocket_new(void) /* 10 minutes * 60 sec * 1000 millisec */ socket->m_establishing = FALSE; + socket->m_functions = &gs_base_functions; + /* Per-socket GUI-specific initialization */ - success = _GSocket_GUI_Init(socket); + success = _GSocket_GUI_Init_Socket(socket); if (!success) { free(socket); @@ -207,6 +258,13 @@ GSocket *GSocket_new(void) return socket; } +void GSocket_close(GSocket *socket) +{ + _GSocket_Disable_Events(socket); + close(socket->m_fd); + socket->m_fd = INVALID_SOCKET; +} + void GSocket_destroy(GSocket *socket) { assert(socket != NULL); @@ -216,7 +274,7 @@ void GSocket_destroy(GSocket *socket) GSocket_Shutdown(socket); /* Per-socket GUI-specific cleanup */ - _GSocket_GUI_Destroy(socket); + _GSocket_GUI_Destroy_Socket(socket); /* Destroy private addresses */ if (socket->m_local) @@ -243,8 +301,7 @@ void GSocket_Shutdown(GSocket *socket) if (socket->m_fd != INVALID_SOCKET) { shutdown(socket->m_fd, 2); - soclose(socket->m_fd); - socket->m_fd = INVALID_SOCKET; + GSocket_close(socket); } /* Disable GUI callbacks */ @@ -252,7 +309,6 @@ void GSocket_Shutdown(GSocket *socket) socket->m_cbacks[evt] = NULL; socket->m_detected = GSOCK_LOST_FLAG; - _GSocket_Disable_Events(socket); } /* Address handling */ @@ -378,11 +434,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) { @@ -417,8 +473,11 @@ GSocketError GSocket_SetServer(GSocket *sck) sck->m_error = GSOCK_IOERR; return GSOCK_IOERR; } - +#if defined(__EMX__) || defined(__VISAGECPP__) + ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(arg)); +#else ioctl(sck->m_fd, FIONBIO, &arg); +#endif _GSocket_Enable_Events(sck); /* Bind to the local address, @@ -431,8 +490,7 @@ GSocketError GSocket_SetServer(GSocket *sck) (SOCKLEN_T *) &sck->m_local->m_len) != 0) || (listen(sck->m_fd, 5) != 0)) { - soclose(sck->m_fd); - sck->m_fd = INVALID_SOCKET; + GSocket_close(sck); sck->m_error = GSOCK_IOERR; return GSOCK_IOERR; } @@ -450,7 +508,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 *socket) { @@ -523,8 +581,11 @@ GSocket *GSocket_WaitConnection(GSocket *socket) socket->m_error = err; return NULL; } - +#if defined(__EMX__) || defined(__VISAGECPP__) + ioctl(connection->m_fd, FIONBIO, (char*)&arg, sizeof(arg)); +#else ioctl(connection->m_fd, FIONBIO, &arg); +#endif _GSocket_Enable_Events(connection); return connection; @@ -553,7 +614,7 @@ GSocket *GSocket_WaitConnection(GSocket *socket) * 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) { @@ -592,15 +653,16 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream) sck->m_error = GSOCK_IOERR; return GSOCK_IOERR; } - +#if defined(__EMX__) || defined(__VISAGECPP__) + ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(arg)); +#else ioctl(sck->m_fd, FIONBIO, &arg); +#endif _GSocket_Enable_Events(sck); /* Connect it to the peer address, with a timeout (see below) */ ret = connect(sck->m_fd, sck->m_peer->m_addr, sck->m_peer->m_len); - printf("connect on %d to %X (%d) returned %d, errno = %d\n", - sck->m_fd, sck->m_peer->m_addr, sck->m_peer->m_len, ret, errno); if (ret == -1) { err = errno; @@ -614,8 +676,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream) { if (_GSocket_Output_Timeout(sck) == GSOCK_TIMEDOUT) { - soclose(sck->m_fd); - sck->m_fd = INVALID_SOCKET; + GSocket_close(sck); /* sck->m_error is set in _GSocket_Output_Timeout */ return GSOCK_TIMEDOUT; } @@ -647,8 +708,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream) /* If connect failed with an error other than EINPROGRESS, * then the call to GSocket_Connect has failed. */ - soclose(sck->m_fd); - sck->m_fd = INVALID_SOCKET; + GSocket_close(sck); sck->m_error = GSOCK_IOERR; return GSOCK_IOERR; } @@ -700,8 +760,11 @@ GSocketError GSocket_SetNonOriented(GSocket *sck) sck->m_error = GSOCK_IOERR; return GSOCK_IOERR; } - +#if defined(__EMX__) || defined(__VISAGECPP__) + ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(arg)); +#else ioctl(sck->m_fd, FIONBIO, &arg); +#endif _GSocket_Enable_Events(sck); /* Bind to the local address, @@ -712,8 +775,7 @@ GSocketError GSocket_SetNonOriented(GSocket *sck) sck->m_local->m_addr, (SOCKLEN_T *) &sck->m_local->m_len) != 0)) { - soclose(sck->m_fd); - sck->m_fd = INVALID_SOCKET; + GSocket_close(sck); sck->m_error = GSOCK_IOERR; return GSOCK_IOERR; } @@ -748,7 +810,7 @@ int GSocket_Read(GSocket *socket, char *buffer, int size) ret = _GSocket_Recv_Stream(socket, buffer, size); else ret = _GSocket_Recv_Dgram(socket, buffer, size); - + if (ret == -1) { if (errno == EWOULDBLOCK) @@ -756,16 +818,16 @@ int GSocket_Read(GSocket *socket, char *buffer, int size) else socket->m_error = GSOCK_IOERR; } - + return ret; } int GSocket_Write(GSocket *socket, const char *buffer, int size) -{ +{ int ret; assert(socket != NULL); - + GSocket_Debug(( "GSocket_Write #1, size %d\n", size )); if (socket->m_fd == INVALID_SOCKET || socket->m_server) @@ -787,7 +849,7 @@ int GSocket_Write(GSocket *socket, const char *buffer, int size) ret = _GSocket_Send_Stream(socket, buffer, size); else ret = _GSocket_Send_Dgram(socket, buffer, size); - + GSocket_Debug(( "GSocket_Write #4, size %d\n", size )); if (ret == -1) @@ -811,7 +873,7 @@ int GSocket_Write(GSocket *socket, const char *buffer, int size) _GSocket_Enable(socket, GSOCK_OUTPUT); return -1; } - + GSocket_Debug(( "GSocket_Write #5, size %d ret %d\n", size, ret )); return ret; @@ -826,104 +888,126 @@ 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; - struct timeval tv; + GSocketEventFlags result = 0; + fd_set readfds; + fd_set writefds; + fd_set exceptfds; + struct timeval tv; - /* Do not use a static struct, Linux can garble it */ - tv.tv_sec = 0; - tv.tv_usec = 0; + /* Do not use a static struct, Linux can garble it */ + tv.tv_sec = 0; + tv.tv_usec = 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 known state first */ - result |= (GSOCK_CONNECTION_FLAG & socket->m_detected & flags); - result |= (GSOCK_LOST_FLAG & socket->m_detected & flags); + /* Check 'sticky' CONNECTION flag first */ + result |= (GSOCK_CONNECTION_FLAG & socket->m_detected); - /* Try select now */ - if (select(socket->m_fd + 1, &readfds, &writefds, &exceptfds, &tv) <= 0) - return result; + /* 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; - /* Check for readability */ - if (FD_ISSET(socket->m_fd, &readfds)) - { - char c; + return (GSOCK_LOST_FLAG & flags); + } - if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0) + /* Try select now */ + if (select(socket->m_fd + 1, &readfds, &writefds, &exceptfds, &tv) <= 0) { - result |= (GSOCK_INPUT_FLAG & flags); + /* What to do here? */ + return (result & flags); } - else + + /* Check for readability */ + if (FD_ISSET(socket->m_fd, &readfds)) { - if (socket->m_server && socket->m_stream) + char c; + + if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0) { - result |= (GSOCK_CONNECTION_FLAG & flags); - socket->m_detected |= GSOCK_CONNECTION_FLAG; + result |= GSOCK_INPUT_FLAG; } else { - result |= (GSOCK_LOST_FLAG & flags); - socket->m_detected = GSOCK_LOST_FLAG; + 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); + } } } - } - /* Check for writability */ - if (FD_ISSET(socket->m_fd, &writefds)) - { - if (socket->m_establishing && !socket->m_server) + /* Check for writability */ + if (FD_ISSET(socket->m_fd, &writefds)) { - int error; - SOCKLEN_T len = sizeof(error); + if (socket->m_establishing && !socket->m_server) + { + int error; + SOCKLEN_T len = sizeof(error); - socket->m_establishing = FALSE; + socket->m_establishing = FALSE; - getsockopt(socket->m_fd, SOL_SOCKET, SO_ERROR, (void*)&error, &len); + getsockopt(socket->m_fd, SOL_SOCKET, SO_ERROR, (void*)&error, &len); - if (error) - { - result |= (GSOCK_LOST_FLAG & flags); - socket->m_detected = GSOCK_LOST_FLAG; + if (error) + { + socket->m_detected = GSOCK_LOST_FLAG; + + /* 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_CONNECTION_FLAG & flags); - socket->m_detected |= GSOCK_CONNECTION_FLAG; + result |= GSOCK_OUTPUT_FLAG; } } - else + + /* Check for exceptions and errors (is this useful in Unices?) */ + if (FD_ISSET(socket->m_fd, &exceptfds)) { - result |= (GSOCK_OUTPUT_FLAG & flags); - } - } + socket->m_establishing = FALSE; + socket->m_detected = GSOCK_LOST_FLAG; - /* Check for exceptions and errors (is this useful in Unices?) */ - if (FD_ISSET(socket->m_fd, &exceptfds)) - { - result |= (GSOCK_LOST_FLAG & flags); - socket->m_establishing = FALSE; - socket->m_detected = GSOCK_LOST_FLAG; - } + /* LOST event: Abort any further processing */ + return (GSOCK_LOST_FLAG & flags); + } - return result; + return (result & flags); -#else + } + else + { - assert(socket != NULL); - return flags & socket->m_detected; + assert(socket != NULL); + return flags & socket->m_detected; -#endif /* !wxUSE_GUI */ + } } /* Flags */ @@ -971,7 +1055,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 @@ -1005,8 +1089,6 @@ void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags, { if ((flags & (1 << count)) != 0) { - printf("Setting callback no %d for socket at %X to address %X,data %X\n", - count, socket, callback, cdata); socket->m_cbacks[count] = callback; socket->m_data[count] = cdata; } @@ -1027,8 +1109,6 @@ void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags) { if ((flags & (1 << count)) != 0) { - printf("Removing callback no %d for socket at %X", - count, socket); socket->m_cbacks[count] = NULL; socket->m_data[count] = NULL; } @@ -1038,11 +1118,8 @@ void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags) #define CALL_CALLBACK(socket, event) { \ _GSocket_Disable(socket, event); \ - if (socket->m_cbacks[event]){ \ - printf("Call callback for event %d, socket %X: %X, %X\n", event, \ - socket, socket->m_cbacks[event], socket->m_data[event]); \ + if (socket->m_cbacks[event]) \ socket->m_cbacks[event](socket, event, socket->m_data[event]); \ - } \ } @@ -1086,10 +1163,10 @@ GSocketError _GSocket_Input_Timeout(GSocket *socket) if (ret == -1) { GSocket_Debug(( "GSocket_Input_Timeout, select returned -1\n" )); - if (errno == EBADF) GSocket_Debug(( "Invalid file descriptor\n" )); - if (errno == EINTR) GSocket_Debug(( "A non blocked signal was caught\n" )); - if (errno == EINVAL) GSocket_Debug(( "The highest number descriptor is negative\n" )); - if (errno == ENOMEM) GSocket_Debug(( "Not enough memory\n" )); + if (errno == EBADF) { GSocket_Debug(( "Invalid file descriptor\n" )); } + if (errno == EINTR) { GSocket_Debug(( "A non blocked signal was caught\n" )); } + if (errno == EINVAL) { GSocket_Debug(( "The highest number descriptor is negative\n" )); } + if (errno == ENOMEM) { GSocket_Debug(( "Not enough memory\n" )); } socket->m_error = GSOCK_TIMEDOUT; return GSOCK_TIMEDOUT; } @@ -1127,17 +1204,19 @@ GSocketError _GSocket_Output_Timeout(GSocket *socket) if (ret == -1) { GSocket_Debug(( "GSocket_Output_Timeout, select returned -1\n" )); - if (errno == EBADF) GSocket_Debug(( "Invalid file descriptor\n" )); - if (errno == EINTR) GSocket_Debug(( "A non blocked signal was caught\n" )); - if (errno == EINVAL) GSocket_Debug(( "The highest number descriptor is negative\n" )); - if (errno == ENOMEM) GSocket_Debug(( "Not enough memory\n" )); + if (errno == EBADF) { GSocket_Debug(( "Invalid file descriptor\n" )); } + if (errno == EINTR) { GSocket_Debug(( "A non blocked signal was caught\n" )); } + if (errno == EINVAL) { GSocket_Debug(( "The highest number descriptor is negative\n" )); } + if (errno == ENOMEM) { GSocket_Debug(( "Not enough memory\n" )); } socket->m_error = GSOCK_TIMEDOUT; return GSOCK_TIMEDOUT; } - if ( ! FD_ISSET(socket->m_fd, &writefds) ) - GSocket_Debug(( "GSocket_Output_Timeout is buggy!\n" )); - else - GSocket_Debug(( "GSocket_Output_Timeout seems correct\n" )); + if ( ! FD_ISSET(socket->m_fd, &writefds) ) { + GSocket_Debug(( "GSocket_Output_Timeout is buggy!\n" )); + } + else { + GSocket_Debug(( "GSocket_Output_Timeout seems correct\n" )); + } } else { @@ -1192,13 +1271,14 @@ int _GSocket_Send_Stream(GSocket *socket, const char *buffer, int size) { int ret; -#ifdef __EMX__ +#ifndef __VISAGECPP__ MASK_SIGNAL(); ret = send(socket->m_fd, buffer, size, 0); UNMASK_SIGNAL(); #else - ret = send(socket->m_fd, buffer, size, 0); + ret = send(socket->m_fd, (char *)buffer, size, 0); #endif + return ret; } @@ -1221,12 +1301,12 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size) return -1; } -#ifdef __EMX__ +#ifndef __VISAGECPP__ MASK_SIGNAL(); ret = sendto(socket->m_fd, buffer, size, 0, addr, len); UNMASK_SIGNAL(); #else - ret = sendto(socket->m_fd, buffer, size, 0, addr, len); + ret = sendto(socket->m_fd, (char *)buffer, size, 0, addr, len); #endif /* Frees memory allocated from _GAddress_translate_to */ @@ -1239,6 +1319,18 @@ void _GSocket_Detected_Read(GSocket *socket) { char c; + /* 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; + + CALL_CALLBACK(socket, GSOCK_LOST); + GSocket_Shutdown(socket); + return; + } + if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0) { CALL_CALLBACK(socket, GSOCK_INPUT); @@ -1252,12 +1344,25 @@ void _GSocket_Detected_Read(GSocket *socket) else { CALL_CALLBACK(socket, GSOCK_LOST); + GSocket_Shutdown(socket); } } } void _GSocket_Detected_Write(GSocket *socket) { + /* 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; + + CALL_CALLBACK(socket, GSOCK_LOST); + GSocket_Shutdown(socket); + return; + } + if (socket->m_establishing && !socket->m_server) { int error; @@ -1270,6 +1375,7 @@ void _GSocket_Detected_Write(GSocket *socket) if (error) { CALL_CALLBACK(socket, GSOCK_LOST); + GSocket_Shutdown(socket); } else { @@ -1350,7 +1456,7 @@ GAddress *GAddress_copy(GAddress *address) memcpy(addr2, address, sizeof(GAddress)); - if (address->m_addr) + if (address->m_addr && address->m_len > 0) { addr2->m_addr = (struct sockaddr *)malloc(addr2->m_len); if (addr2->m_addr == NULL) @@ -1371,7 +1477,7 @@ void GAddress_destroy(GAddress *address) if (address->m_addr) free(address->m_addr); -/* free(address); */ + free(address); } void GAddress_SetFamily(GAddress *address, GAddressType type) @@ -1489,8 +1595,7 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname) if (inet_aton(hostname, addr) == 0) { #elif defined(HAVE_INET_ADDR) - addr->s_addr = inet_addr(hostname); - if ( (addr->s_addr == -1 ) + if ( (addr->s_addr = inet_addr(hostname)) == -1 ) { #else /* Use gethostbyname by default */ @@ -1548,10 +1653,12 @@ GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port, address->m_error = GSOCK_INVPORT; return GSOCK_INVPORT; } - - se = getservbyname(port, protocol); + + se = getservbyname(port, (char*)protocol); if (!se) { + /* the cast to int suppresses compiler warnings about subscript having the + type char */ if (isdigit((int)port[0])) { int port_int; @@ -1578,7 +1685,7 @@ GSocketError GAddress_INET_SetPort(GAddress *address, unsigned short port) assert(address != NULL); CHECK_ADDRESS(address, INET); - + addr = (struct sockaddr_in *)address->m_addr; addr->sin_port = htons(port); @@ -1591,7 +1698,7 @@ GSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, size_t char *addr_buf; struct sockaddr_in *addr; - assert(address != NULL); + assert(address != NULL); CHECK_ADDRESS(address, INET); addr = (struct sockaddr_in *)address->m_addr; @@ -1613,8 +1720,8 @@ unsigned long GAddress_INET_GetHostAddress(GAddress *address) { struct sockaddr_in *addr; - assert(address != NULL); - CHECK_ADDRESS_RETVAL(address, INET, 0); + assert(address != NULL); + CHECK_ADDRESS_RETVAL(address, INET, 0); addr = (struct sockaddr_in *)address->m_addr; @@ -1625,8 +1732,8 @@ unsigned short GAddress_INET_GetPort(GAddress *address) { struct sockaddr_in *addr; - assert(address != NULL); - CHECK_ADDRESS_RETVAL(address, INET, 0); + assert(address != NULL); + CHECK_ADDRESS_RETVAL(address, INET, 0); addr = (struct sockaddr_in *)address->m_addr; return ntohs(addr->sin_port); @@ -1638,7 +1745,7 @@ unsigned short GAddress_INET_GetPort(GAddress *address) * ------------------------------------------------------------------------- */ -#ifdef __EMX__ +#ifndef __VISAGECPP__ GSocketError _GAddress_Init_UNIX(GAddress *address) { address->m_len = sizeof(struct sockaddr_un); @@ -1657,16 +1764,19 @@ GSocketError _GAddress_Init_UNIX(GAddress *address) return GSOCK_NOERROR; } +#define UNIX_SOCK_PATHLEN (sizeof(addr->sun_path)/sizeof(addr->sun_path[0])) + GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path) { struct sockaddr_un *addr; - assert(address != NULL); + assert(address != NULL); - CHECK_ADDRESS(address, UNIX); + CHECK_ADDRESS(address, UNIX); addr = ((struct sockaddr_un *)address->m_addr); - memcpy(addr->sun_path, path, strlen(path)); + strncpy(addr->sun_path, path, UNIX_SOCK_PATHLEN); + addr->sun_path[UNIX_SOCK_PATHLEN - 1] = '\0'; return GSOCK_NOERROR; } @@ -1684,8 +1794,6 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf) return GSOCK_NOERROR; } -#endif - /* __EMX__ */ -#endif - /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */ +#endif /* !defined(__VISAGECPP__) */ +#endif /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */