X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3958ae62ba9d7dca5bec365837d8047c97b0712a..550e6c014ca85140969ab48c22c684755b4e9dce:/src/os2/gsocket.c diff --git a/src/os2/gsocket.c b/src/os2/gsocket.c index 1aa27bf411..4547bd4151 100644 --- a/src/os2/gsocket.c +++ b/src/os2/gsocket.c @@ -4,6 +4,7 @@ * Authors: Guilhem Lavaux, * Guillermo Rodriguez Garcia (maintainer) * Purpose: GSocket main Unix-style file + * Licence: The wxWindows licence * CVSID: $Id$ * ------------------------------------------------------------------------- */ @@ -28,7 +29,8 @@ #define BSD_SELECT /* use Berkley Sockets select */ #include -#include +#include + #ifdef __EMX__ #include #include @@ -38,24 +40,35 @@ #include #include #define HAVE_INET_ADDR + #else -#include -#include + +#include + +#include #include -#include +#include #include #include + #endif + #if defined(__VISAGECPP__) && __IBMCPP__ < 400 -#include + +#include #include #include #include #include + +#define EBADF SOCEBADF + #else -#include -#include -#include + +#include +#include +#include + #ifdef __EMX__ #define soclose(a) close(a) #else @@ -69,7 +82,6 @@ int _System soclose(int); #endif #endif -#include #include #if (defined(__VISAGECPP__) && __IBMCPP__ < 400) || defined(__EMX__) # ifdef min @@ -79,6 +91,7 @@ int _System soclose(int); #endif #include #include +#include #include @@ -119,6 +132,7 @@ int _System soclose(int); signal(SIGPIPE, old_handler); \ } + #ifndef __GSOCKET_STANDALONE__ # include "wx/unix/gsockunx.h" # include "wx/gsocket.h" @@ -138,7 +152,6 @@ int _System soclose(int); #endif /* wxUSE_GUI */ /* debugging helpers */ -#define __GSOCKET_DEBUG__ #ifdef __GSOCKET_DEBUG__ # define GSocket_Debug(args) printf args #else @@ -196,6 +209,13 @@ GSocket *GSocket_new(void) return socket; } +void GSocket_close(GSocket *socket) +{ + _GSocket_Disable_Events(socket); + soclose(socket->m_fd); + socket->m_fd = INVALID_SOCKET; +} + void GSocket_destroy(GSocket *socket) { assert(socket != NULL); @@ -232,8 +252,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 */ @@ -407,7 +426,7 @@ GSocketError GSocket_SetServer(GSocket *sck) return GSOCK_IOERR; } - ioctl(sck->m_fd, FIONBIO, &arg); + ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(arg)); _GSocket_Enable_Events(sck); /* Bind to the local address, @@ -420,8 +439,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; } @@ -513,7 +531,7 @@ GSocket *GSocket_WaitConnection(GSocket *socket) return NULL; } - ioctl(connection->m_fd, FIONBIO, &arg); + ioctl(connection->m_fd, FIONBIO, (char*)&arg, sizeof(arg)); _GSocket_Enable_Events(connection); return connection; @@ -582,14 +600,12 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream) return GSOCK_IOERR; } - ioctl(sck->m_fd, FIONBIO, &arg); + ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(arg)); _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; @@ -603,8 +619,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; } @@ -636,8 +651,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; } @@ -690,7 +704,7 @@ GSocketError GSocket_SetNonOriented(GSocket *sck) return GSOCK_IOERR; } - ioctl(sck->m_fd, FIONBIO, &arg); + ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(arg)); _GSocket_Enable_Events(sck); /* Bind to the local address, @@ -701,8 +715,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; } @@ -836,13 +849,25 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags) 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); + + /* 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; + + return (GSOCK_LOST_FLAG & flags); + } /* Try select now */ if (select(socket->m_fd + 1, &readfds, &writefds, &exceptfds, &tv) <= 0) - return result; + { + /* What to do here? */ + return (result & flags); + } /* Check for readability */ if (FD_ISSET(socket->m_fd, &readfds)) @@ -851,19 +876,22 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags) if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0) { - result |= (GSOCK_INPUT_FLAG & flags); + result |= GSOCK_INPUT_FLAG; } else { if (socket->m_server && socket->m_stream) { - result |= (GSOCK_CONNECTION_FLAG & flags); + result |= GSOCK_CONNECTION_FLAG; socket->m_detected |= GSOCK_CONNECTION_FLAG; } else { - result |= (GSOCK_LOST_FLAG & flags); socket->m_detected = GSOCK_LOST_FLAG; + socket->m_establishing = FALSE; + + /* LOST event: Abort any further processing */ + return (GSOCK_LOST_FLAG & flags); } } } @@ -882,30 +910,34 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags) if (error) { - result |= (GSOCK_LOST_FLAG & flags); socket->m_detected = GSOCK_LOST_FLAG; + + /* LOST event: Abort any further processing */ + return (GSOCK_LOST_FLAG & flags); } else { - result |= (GSOCK_CONNECTION_FLAG & flags); + result |= GSOCK_CONNECTION_FLAG; socket->m_detected |= GSOCK_CONNECTION_FLAG; } } else { - result |= (GSOCK_OUTPUT_FLAG & flags); + result |= GSOCK_OUTPUT_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 @@ -994,8 +1026,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; } @@ -1016,8 +1046,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; } @@ -1027,11 +1055,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]); \ - } \ } @@ -1181,10 +1206,13 @@ int _GSocket_Send_Stream(GSocket *socket, const char *buffer, int size) { int ret; +#ifdef __EMX__ MASK_SIGNAL(); ret = send(socket->m_fd, buffer, size, 0); UNMASK_SIGNAL(); - +#else + ret = send(socket->m_fd, (char *)buffer, size, 0); +#endif return ret; } @@ -1207,9 +1235,13 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size) return -1; } +#ifdef __EMX__ MASK_SIGNAL(); ret = sendto(socket->m_fd, buffer, size, 0, addr, len); UNMASK_SIGNAL(); +#else + ret = sendto(socket->m_fd, (char *)buffer, size, 0, addr, len); +#endif /* Frees memory allocated from _GAddress_translate_to */ free(addr); @@ -1221,6 +1253,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); @@ -1234,12 +1278,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; @@ -1252,6 +1309,7 @@ void _GSocket_Detected_Write(GSocket *socket) if (error) { CALL_CALLBACK(socket, GSOCK_LOST); + GSocket_Shutdown(socket); } else { @@ -1332,7 +1390,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) @@ -1471,11 +1529,13 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname) if (inet_aton(hostname, addr) == 0) { #elif defined(HAVE_INET_ADDR) - if ( (addr->s_addr = inet_addr(hostname)) == -1 ) + addr->s_addr = inet_addr(hostname); + if ( addr->s_addr == -1 ) { #else /* Use gethostbyname by default */ - if (1) + int val = 1; //VA doesn't like constants in conditional expressions at all + if (val) { #endif struct in_addr *array_addr; @@ -1532,6 +1592,8 @@ GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port, se = getservbyname(port, protocol); if (!se) { + /* the cast to int suppresses compiler warnings about subscript having the + type char */ if (isdigit((int)port[0])) { int port_int; @@ -1637,6 +1699,8 @@ 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; @@ -1646,7 +1710,8 @@ GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path) 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; }