X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9bf10d6bd3df0d5ad9d9849f162b17a62c3ac51f..f538710f0b798b21365fd614ba531055b225b115:/src/unix/gsocket.c diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c index b95eda0462..0da32b61eb 100644 --- a/src/unix/gsocket.c +++ b/src/unix/gsocket.c @@ -25,7 +25,8 @@ #ifdef __VMS__ #include -struct sockaddr_un { +struct sockaddr_un +{ u_char sun_len; /* sockaddr len including null */ u_char sun_family; /* AF_UNIX */ char sun_path[108]; /* path name (gag) */ @@ -53,7 +54,6 @@ struct sockaddr_un { #endif #include - #ifndef SOCKLEN_T #ifdef VMS @@ -61,7 +61,7 @@ struct sockaddr_un { #else # ifdef __GLIBC__ # if __GLIBC__ == 2 -# define SOCKLEN_T socklen_t +# define SOCKLEN_T socklen_t # endif # else # define SOCKLEN_T int @@ -70,10 +70,16 @@ struct sockaddr_un { #endif /* SOCKLEN_T */ +/* + * MSW defines this, Unices don't. + */ +#ifndef INVALID_SOCKET +#define INVALID_SOCKET -1 +#endif /* * INADDR_BROADCAST is identical to INADDR_NONE which is not defined - * on all unices. INADDR_BROADCAST should be fine to indicate an error. + * on all systems. INADDR_BROADCAST should be fine to indicate an error. */ #ifndef INADDR_NONE #define INADDR_NONE INADDR_BROADCAST @@ -91,34 +97,46 @@ struct sockaddr_un { #ifndef __GSOCKET_STANDALONE__ - -#include "wx/gsocket.h" -#include "wx/unix/gsockunx.h" - +# include "wx/unix/gsockunx.h" +# include "wx/gsocket.h" #else - -#include "gsocket.h" -#include "gsockunx.h" - +# include "gsockunx.h" +# 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 */ +#ifdef __GSOCKET_DEBUG__ +# define GSocket_Debug(args) printf args +#else +# define GSocket_Debug(args) +#endif /* __GSOCKET_DEBUG__ */ /* Global initialisers */ -bool GSocket_Init() +int GSocket_Init(void) { - return TRUE; + return 1; } -void GSocket_Cleanup() +void GSocket_Cleanup(void) { } /* Constructors / Destructors for GSocket */ -GSocket *GSocket_new() +GSocket *GSocket_new(void) { - int i; + int i, success; GSocket *socket; socket = (GSocket *)malloc(sizeof(GSocket)); @@ -126,7 +144,7 @@ GSocket *GSocket_new() if (socket == NULL) return NULL; - socket->m_fd = -1; + socket->m_fd = INVALID_SOCKET; for (i=0;im_cbacks[i] = NULL; @@ -143,8 +161,13 @@ GSocket *GSocket_new() /* 10 minutes * 60 sec * 1000 millisec */ socket->m_establishing = FALSE; - /* We initialize the GUI specific entries here */ - _GSocket_GUI_Init(socket); + /* Per-socket GUI-specific initialization */ + success = _GSocket_GUI_Init(socket); + if (!success) + { + free(socket); + return NULL; + } return socket; } @@ -154,10 +177,10 @@ void GSocket_destroy(GSocket *socket) assert(socket != NULL); /* Check that the socket is really shutdowned */ - if (socket->m_fd != -1) + if (socket->m_fd != INVALID_SOCKET) GSocket_Shutdown(socket); - /* We destroy GUI specific variables */ + /* Per-socket GUI-specific cleanup */ _GSocket_GUI_Destroy(socket); /* Destroy private addresses */ @@ -182,18 +205,18 @@ void GSocket_Shutdown(GSocket *socket) assert(socket != NULL); /* If socket has been created, shutdown it */ - if (socket->m_fd != -1) + if (socket->m_fd != INVALID_SOCKET) { shutdown(socket->m_fd, 2); close(socket->m_fd); - socket->m_fd = -1; + socket->m_fd = INVALID_SOCKET; } /* Disable GUI callbacks */ for (evt = 0; evt < GSOCK_MAX_EVENT; evt++) socket->m_cbacks[evt] = NULL; - socket->m_detected = 0; + socket->m_detected = GSOCK_LOST_FLAG; _GSocket_Disable_Events(socket); } @@ -218,7 +241,7 @@ GSocketError GSocket_SetLocal(GSocket *socket, GAddress *address) assert(socket != NULL); /* the socket must be initialized, or it must be a server */ - if ((socket->m_fd != -1 && !socket->m_server)) + if ((socket->m_fd != INVALID_SOCKET && !socket->m_server)) { socket->m_error = GSOCK_INVSOCK; return GSOCK_INVSOCK; @@ -272,7 +295,7 @@ GAddress *GSocket_GetLocal(GSocket *socket) return GAddress_copy(socket->m_local); /* else, if the socket is initialized, try getsockname */ - if (socket->m_fd == -1) + if (socket->m_fd == INVALID_SOCKET) { socket->m_error = GSOCK_INVSOCK; return NULL; @@ -328,13 +351,12 @@ GAddress *GSocket_GetPeer(GSocket *socket) */ GSocketError GSocket_SetServer(GSocket *sck) { - int type; int arg = 1; assert(sck != NULL); /* must not be in use */ - if (sck->m_fd != -1) + if (sck->m_fd != INVALID_SOCKET) { sck->m_error = GSOCK_INVSOCK; return GSOCK_INVSOCK; @@ -355,7 +377,7 @@ GSocketError GSocket_SetServer(GSocket *sck) /* Create the socket */ sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_STREAM, 0); - if (sck->m_fd == -1) + if (sck->m_fd == INVALID_SOCKET) { sck->m_error = GSOCK_IOERR; return GSOCK_IOERR; @@ -375,7 +397,7 @@ GSocketError GSocket_SetServer(GSocket *sck) (listen(sck->m_fd, 5) != 0)) { close(sck->m_fd); - sck->m_fd = -1; + sck->m_fd = INVALID_SOCKET; sck->m_error = GSOCK_IOERR; return GSOCK_IOERR; } @@ -409,7 +431,7 @@ GSocket *GSocket_WaitConnection(GSocket *socket) _GSocket_Enable(socket, GSOCK_CONNECTION); /* If the socket has already been created, we exit immediately */ - if (socket->m_fd == -1 || !socket->m_server) + if (socket->m_fd == INVALID_SOCKET || !socket->m_server) { socket->m_error = GSOCK_INVSOCK; return NULL; @@ -434,7 +456,7 @@ GSocket *GSocket_WaitConnection(GSocket *socket) connection->m_fd = accept(socket->m_fd, &from, (SOCKLEN_T *) &fromlen); - if (connection->m_fd == -1) + if (connection->m_fd == INVALID_SOCKET) { if (errno == EWOULDBLOCK) socket->m_error = GSOCK_WOULDBLOCK; @@ -473,71 +495,6 @@ GSocket *GSocket_WaitConnection(GSocket *socket) return connection; } -/* Datagram sockets */ - -/* GSocket_SetNonOriented: - * Sets up this socket as a non-connection oriented (datagram) socket. - * Before using this function, the local address must have been set - * with GSocket_SetLocal(), or the call will fail. Returns GSOCK_NOERROR - * on success, or 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. - */ -GSocketError GSocket_SetNonOriented(GSocket *sck) -{ - int arg = 1; - - assert(sck != NULL); - - if (sck->m_fd != -1) - { - sck->m_error = GSOCK_INVSOCK; - return GSOCK_INVSOCK; - } - - if (!sck->m_local) - { - sck->m_error = GSOCK_INVADDR; - return GSOCK_INVADDR; - } - - /* Initialize all fields */ - sck->m_stream = FALSE; - sck->m_server = FALSE; - sck->m_oriented = FALSE; - - /* Create the socket */ - sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_DGRAM, 0); - - if (sck->m_fd < 0) - { - sck->m_error = GSOCK_IOERR; - return GSOCK_IOERR; - } - - ioctl(sck->m_fd, FIONBIO, &arg); - _GSocket_Enable_Events(sck); - - /* Bind to the local address, - * and retrieve the actual address bound. - */ - if ((bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) != 0) || - (getsockname(sck->m_fd, - sck->m_local->m_addr, - (SOCKLEN_T *) &sck->m_local->m_len) != 0)) - { - close(sck->m_fd); - sck->m_fd = -1; - sck->m_error = GSOCK_IOERR; - return GSOCK_IOERR; - } - - return GSOCK_NOERROR; -} - /* Client specific parts */ /* GSocket_Connect: @@ -573,7 +530,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream) /* Enable CONNECTION events (needed for nonblocking connections) */ _GSocket_Enable(sck, GSOCK_CONNECTION); - if (sck->m_fd != -1) + if (sck->m_fd != INVALID_SOCKET) { sck->m_error = GSOCK_INVSOCK; return GSOCK_INVSOCK; @@ -595,7 +552,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream) sck->m_fd = socket(sck->m_peer->m_realfamily, sck->m_stream? SOCK_STREAM : SOCK_DGRAM, 0); - if (sck->m_fd == -1) + if (sck->m_fd == INVALID_SOCKET) { sck->m_error = GSOCK_IOERR; return GSOCK_IOERR; @@ -621,7 +578,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream) if (_GSocket_Output_Timeout(sck) == GSOCK_TIMEDOUT) { close(sck->m_fd); - sck->m_fd = -1; + sck->m_fd = INVALID_SOCKET; /* sck->m_error is set in _GSocket_Output_Timeout */ return GSOCK_TIMEDOUT; } @@ -654,7 +611,72 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream) * then the call to GSocket_Connect has failed. */ close(sck->m_fd); - sck->m_fd = -1; + sck->m_fd = INVALID_SOCKET; + sck->m_error = GSOCK_IOERR; + return GSOCK_IOERR; + } + + return GSOCK_NOERROR; +} + +/* Datagram sockets */ + +/* GSocket_SetNonOriented: + * Sets up this socket as a non-connection oriented (datagram) socket. + * Before using this function, the local address must have been set + * with GSocket_SetLocal(), or the call will fail. Returns GSOCK_NOERROR + * on success, or 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. + */ +GSocketError GSocket_SetNonOriented(GSocket *sck) +{ + int arg = 1; + + assert(sck != NULL); + + if (sck->m_fd != INVALID_SOCKET) + { + sck->m_error = GSOCK_INVSOCK; + return GSOCK_INVSOCK; + } + + if (!sck->m_local) + { + sck->m_error = GSOCK_INVADDR; + return GSOCK_INVADDR; + } + + /* Initialize all fields */ + sck->m_stream = FALSE; + sck->m_server = FALSE; + sck->m_oriented = FALSE; + + /* Create the socket */ + sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_DGRAM, 0); + + if (sck->m_fd == INVALID_SOCKET) + { + sck->m_error = GSOCK_IOERR; + return GSOCK_IOERR; + } + + ioctl(sck->m_fd, FIONBIO, &arg); + _GSocket_Enable_Events(sck); + + /* Bind to the local address, + * and retrieve the actual address bound. + */ + if ((bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) != 0) || + (getsockname(sck->m_fd, + sck->m_local->m_addr, + (SOCKLEN_T *) &sck->m_local->m_len) != 0)) + { + close(sck->m_fd); + sck->m_fd = INVALID_SOCKET; sck->m_error = GSOCK_IOERR; return GSOCK_IOERR; } @@ -674,7 +696,7 @@ int GSocket_Read(GSocket *socket, char *buffer, int size) /* Reenable INPUT events */ _GSocket_Enable(socket, GSOCK_INPUT); - if (socket->m_fd == -1 || socket->m_server) + if (socket->m_fd == INVALID_SOCKET || socket->m_server) { socket->m_error = GSOCK_INVSOCK; return -1; @@ -706,29 +728,43 @@ 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 == -1 || socket->m_server) + if (socket->m_fd == INVALID_SOCKET || socket->m_server) { socket->m_error = GSOCK_INVSOCK; return -1; } + GSocket_Debug(( "GSocket_Write #2, size %d\n", size )); + /* If the socket is blocking, wait for writability (with a timeout) */ if (_GSocket_Output_Timeout(socket) == GSOCK_TIMEDOUT) return -1; + GSocket_Debug(( "GSocket_Write #3, size %d\n", size )); + /* Write the data */ if (socket->m_stream) 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) { if (errno == EWOULDBLOCK) + { socket->m_error = GSOCK_WOULDBLOCK; + GSocket_Debug(( "GSocket_Write error WOULDBLOCK\n" )); + } else + { socket->m_error = GSOCK_IOERR; + GSocket_Debug(( "GSocket_Write error IOERR\n" )); + } /* Only reenable OUTPUT events after an error (just like WSAAsyncSelect * in MSW). Once the first OUTPUT event is received, users can assume @@ -739,6 +775,8 @@ int GSocket_Write(GSocket *socket, const char *buffer, int size) return -1; } + GSocket_Debug(( "GSocket_Write #5, size %d ret %d\n", size, ret )); + return ret; } @@ -751,9 +789,104 @@ int GSocket_Write(GSocket *socket, const char *buffer, int size) */ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags) { +#if defined(wxUSE_GUI) && !wxUSE_GUI + + 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; + assert(socket != NULL); - return (flags & socket->m_detected); + 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); + + /* Try select now */ + if (select(socket->m_fd + 1, &readfds, &writefds, &exceptfds, &tv) <= 0) + return result; + + /* Check for readability */ + if (FD_ISSET(socket->m_fd, &readfds)) + { + char c; + + if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0) + { + result |= (GSOCK_INPUT_FLAG & flags); + } + else + { + if (socket->m_server && socket->m_stream) + { + result |= (GSOCK_CONNECTION_FLAG & flags); + socket->m_detected |= GSOCK_CONNECTION_FLAG; + } + else + { + result |= (GSOCK_LOST_FLAG & flags); + 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); + + socket->m_establishing = FALSE; + + getsockopt(socket->m_fd, SOL_SOCKET, SO_ERROR, (void*)&error, &len); + + if (error) + { + result |= (GSOCK_LOST_FLAG & flags); + socket->m_detected = GSOCK_LOST_FLAG; + } + else + { + result |= (GSOCK_CONNECTION_FLAG & flags); + socket->m_detected |= GSOCK_CONNECTION_FLAG; + } + } + else + { + result |= (GSOCK_OUTPUT_FLAG & flags); + } + } + + /* 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; + } + + return result; + +#else + + assert(socket != NULL); + return flags & socket->m_detected; + +#endif /* !wxUSE_GUI */ } /* Flags */ @@ -762,10 +895,12 @@ 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); + GSocket_Debug( ("GSocket_SetNonBlocking: %d\n", (int)non_block) ); + socket->m_non_blocking = non_block; } @@ -887,6 +1022,7 @@ GSocketError _GSocket_Input_Timeout(GSocket *socket) { struct timeval tv; fd_set readfds; + int ret; /* Linux select() will overwrite the struct on return */ tv.tv_sec = (socket->m_timeout / 1000); @@ -896,8 +1032,20 @@ GSocketError _GSocket_Input_Timeout(GSocket *socket) { FD_ZERO(&readfds); FD_SET(socket->m_fd, &readfds); - if (select(socket->m_fd + 1, &readfds, NULL, NULL, &tv) == 0) + ret = select(socket->m_fd + 1, &readfds, NULL, NULL, &tv); + if (ret == 0) + { + GSocket_Debug(( "GSocket_Input_Timeout, select returned 0\n" )); + socket->m_error = GSOCK_TIMEDOUT; + return GSOCK_TIMEDOUT; + } + 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" )); socket->m_error = GSOCK_TIMEDOUT; return GSOCK_TIMEDOUT; } @@ -913,33 +1061,51 @@ GSocketError _GSocket_Output_Timeout(GSocket *socket) { struct timeval tv; fd_set writefds; + int ret; /* Linux select() will overwrite the struct on return */ tv.tv_sec = (socket->m_timeout / 1000); tv.tv_usec = (socket->m_timeout % 1000) * 1000; + GSocket_Debug( ("m_non_blocking has: %d\n", (int)socket->m_non_blocking) ); + if (!socket->m_non_blocking) { FD_ZERO(&writefds); FD_SET(socket->m_fd, &writefds); - if (select(socket->m_fd + 1, NULL, &writefds, NULL, &tv) == 0) + ret = select(socket->m_fd + 1, NULL, &writefds, NULL, &tv); + if (ret == 0) { + GSocket_Debug(( "GSocket_Output_Timeout, select returned 0\n" )); socket->m_error = GSOCK_TIMEDOUT; return GSOCK_TIMEDOUT; } + 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" )); + 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" )); + } + else + { + GSocket_Debug(( "GSocket_Output_Timeout, didn't try select!\n" )); } + return GSOCK_NOERROR; } int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size) { - int ret; - - MASK_SIGNAL(); - ret = recv(socket->m_fd, buffer, size, 0); - UNMASK_SIGNAL(); - - return ret; + return recv(socket->m_fd, buffer, size, 0); } int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size) @@ -951,9 +1117,7 @@ int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size) fromlen = sizeof(from); - MASK_SIGNAL(); ret = recvfrom(socket->m_fd, buffer, size, 0, &from, (SOCKLEN_T *) &fromlen); - UNMASK_SIGNAL(); if (ret == -1) return -1; @@ -1023,26 +1187,21 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size) void _GSocket_Detected_Read(GSocket *socket) { char c; - int ret; - ret = recv(socket->m_fd, &c, 1, MSG_PEEK); - - if (socket->m_stream) - { - if (ret < 0 && socket->m_server) - { - CALL_CALLBACK(socket, GSOCK_CONNECTION); - return; - } - } - - if (ret > 0) + if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0) { CALL_CALLBACK(socket, GSOCK_INPUT); } else { - CALL_CALLBACK(socket, GSOCK_LOST); + if (socket->m_server && socket->m_stream) + { + CALL_CALLBACK(socket, GSOCK_CONNECTION); + } + else + { + CALL_CALLBACK(socket, GSOCK_LOST); + } } } @@ -1055,7 +1214,7 @@ void _GSocket_Detected_Write(GSocket *socket) 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) { @@ -1083,23 +1242,39 @@ void _GSocket_Detected_Write(GSocket *socket) * ------------------------------------------------------------------------- */ -/* 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() + +GAddress *GAddress_new(void) { GAddress *address; @@ -1142,6 +1317,9 @@ void GAddress_destroy(GAddress *address) { assert(address != NULL); + if (address->m_addr) + free(address->m_addr); + free(address); } @@ -1210,7 +1388,8 @@ GSocketError _GAddress_translate_to(GAddress *address, *len = address->m_len; *addr = (struct sockaddr *)malloc(address->m_len); - if (*addr == NULL) { + if (*addr == NULL) + { address->m_error = GSOCK_MEMERR; return GSOCK_MEMERR; } @@ -1250,7 +1429,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); @@ -1294,7 +1473,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; @@ -1309,7 +1488,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) { @@ -1320,7 +1499,9 @@ GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port, se = getservbyname(port, protocol); if (!se) { - if (isdigit(port[0])) + /* the cast to int suppresses compiler warnings about subscript having the + type char */ + if (isdigit((int)port[0])) { int port_int; @@ -1345,7 +1526,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); @@ -1360,7 +1541,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); @@ -1382,7 +1563,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; @@ -1394,7 +1575,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); @@ -1421,7 +1602,7 @@ GSocketError _GAddress_Init_UNIX(GAddress *address) ((struct sockaddr_un *)address->m_addr)->sun_family = AF_UNIX; ((struct sockaddr_un *)address->m_addr)->sun_path[0] = 0; - return TRUE; + return GSOCK_NOERROR; } GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path) @@ -1430,7 +1611,7 @@ GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path) assert(address != NULL); - CHECK_ADDRESS(address, UNIX, GSOCK_INVADDR); + CHECK_ADDRESS(address, UNIX); addr = ((struct sockaddr_un *)address->m_addr); memcpy(addr->sun_path, path, strlen(path)); @@ -1443,7 +1624,7 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf) struct sockaddr_un *addr; assert(address != NULL); - CHECK_ADDRESS(address, UNIX, GSOCK_INVADDR); + CHECK_ADDRESS(address, UNIX); addr = (struct sockaddr_un *)address->m_addr;