X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9592b68708c0583398d0a03295a81f4e3e2b3087..07d4b94c3b5d8876d3c9a5f93048afdd6734fe78:/src/unix/gsocket.c diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c index 9ab270d19b..55a198c16a 100644 --- a/src/unix/gsocket.c +++ b/src/unix/gsocket.c @@ -43,7 +43,7 @@ #include #include "wx/gsocket.h" -#include "gsockunx.h" +#include "wx/unix/gsockunx.h" #ifndef SOCKLEN_T @@ -57,6 +57,35 @@ #endif +#define MASK_SIGNAL() \ +{ \ + void (*old_handler)(int); \ +\ + old_handler = signal(SIGPIPE, SIG_IGN); + +#define UNMASK_SIGNAL() \ + signal(SIGPIPE, old_handler); \ +} + +#define ENABLE_TIMEOUT(socket) \ +{ \ + struct itimerval old_ival, new_ival; \ + void (*old_timer_sig)(int); \ +\ + old_timer_sig = signal(SIGALRM, SIG_DFL); \ + siginterrupt(SIGALRM, 1); \ + new_ival.it_value.tv_sec = socket->m_timeout / 1000; \ + new_ival.it_value.tv_usec = (socket->m_timeout % 1000) * 1000; \ + new_ival.it_interval.tv_sec = 0; \ + new_ival.it_interval.tv_usec = 0; \ + setitimer(ITIMER_REAL, &new_ival, &old_ival); + +#define DISABLE_TIMEOUT(socket) \ + signal(SIGALRM, old_timer_sig); \ + siginterrupt(SIGALRM, 0); \ + setitimer(ITIMER_REAL, &old_ival, NULL); \ +} + /* Global initialisers */ bool GSocket_Init() @@ -77,20 +106,24 @@ GSocket *GSocket_new() socket = (GSocket *)malloc(sizeof(GSocket)); + if (socket == NULL) + return NULL; + socket->m_fd = -1; for (i=0;im_fbacks[i] = NULL; + socket->m_cbacks[i] = NULL; socket->m_iocalls[i] = FALSE; } socket->m_local = NULL; socket->m_peer = NULL; socket->m_error = GSOCK_NOERROR; - socket->m_server = FALSE; - socket->m_stream = TRUE; - socket->m_gui_dependent = NULL; - socket->m_blocking = FALSE; + socket->m_server = FALSE; + socket->m_stream = TRUE; + socket->m_gui_dependent = NULL; + socket->m_non_blocking = FALSE; socket->m_timeout = 10*60*1000; - // 10 minutes * 60 sec * 1000 millisec + /* 10 minutes * 60 sec * 1000 millisec */ + socket->m_establishing = FALSE; /* We initialize the GUI specific entries here */ _GSocket_GUI_Init(socket); @@ -184,6 +217,7 @@ GAddress *GSocket_GetLocal(GSocket *socket) GAddress *address; struct sockaddr addr; SOCKLEN_T size; + GSocketError err; assert(socket != NULL); @@ -203,7 +237,15 @@ GAddress *GSocket_GetLocal(GSocket *socket) } address = GAddress_new(); - _GAddress_translate_from(address, &addr, size); + if (address == NULL) { + socket->m_error = GSOCK_MEMERR; + return NULL; + } + socket->m_error = _GAddress_translate_from(address, &addr, size); + if (socket->m_error != GSOCK_NOERROR) { + GAddress_destroy(address); + return NULL; + } return address; } @@ -220,13 +262,13 @@ GAddress *GSocket_GetPeer(GSocket *socket) /* Server specific parts */ -/* - GSocket_SetServer() setup the socket as a server. It uses the "Local" field - of GSocket. "Local" must be set by GSocket_SetLocal() before - GSocket_SetServer() is called. GSOCK_INVSOCK if socket has been initialized. - In case, you haven't yet defined the local address, it returns GSOCK_INVADDR. - In the other cases it returns GSOCK_IOERR. -*/ +/* GSocket_SetServer: + * Sets up the socket as a server. It uses the "Local" field of GSocket. + * "Local" must be set by GSocket_SetLocal() before GSocket_SetServer() + * is called. Possible error codes are: GSOCK_INVSOCK if socket has not + * been initialized, GSOCK_INVADDR if the local address has not been + * defined and GSOCK_IOERR for other internal errors. + */ GSocketError GSocket_SetServer(GSocket *sck) { int type; @@ -245,6 +287,7 @@ GSocketError GSocket_SetServer(GSocket *sck) /* We always have a stream here */ sck->m_stream = TRUE; + sck->m_server = TRUE; /* Create the socket */ sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_STREAM, 0); @@ -270,15 +313,16 @@ GSocketError GSocket_SetServer(GSocket *sck) return GSOCK_IOERR; } - GSocket_SetNonBlocking(sck, sck->m_blocking); + _GSocket_Configure_Callbacks(sck); + GSocket_SetNonBlocking(sck, sck->m_non_blocking); GSocket_SetTimeout(sck, sck->m_timeout); return GSOCK_NOERROR; } -/* - GSocket_WaitConnection() waits for an incoming client connection. -*/ +/* GSocket_WaitConnection: + * Waits for an incoming client connection. + */ GSocket *GSocket_WaitConnection(GSocket *socket) { GSocket *connection; @@ -296,12 +340,29 @@ GSocket *GSocket_WaitConnection(GSocket *socket) /* Create a GSocket object for the new connection */ connection = GSocket_new(); + if (!connection) { + connection->m_error = GSOCK_MEMERR; + return NULL; + } /* Accept the incoming connection */ + ENABLE_TIMEOUT(connection); connection->m_fd = accept(socket->m_fd, NULL, NULL); + DISABLE_TIMEOUT(connection); if (connection->m_fd == -1) { GSocket_destroy(connection); - socket->m_error = GSOCK_IOERR; + switch(errno) { + case EINTR: + case ETIMEDOUT: + connection->m_error = GSOCK_TIMEDOUT; + break; + case EWOULDBLOCK: + connection->m_error = GSOCK_WOULDBLOCK; + break; + default: + connection->m_error = GSOCK_IOERR; + break; + } return NULL; } @@ -310,6 +371,10 @@ GSocket *GSocket_WaitConnection(GSocket *socket) connection->m_server = FALSE; connection->m_oriented = TRUE; + _GSocket_Configure_Callbacks(connection); + GSocket_SetNonBlocking(connection, connection->m_non_blocking); + GSocket_SetTimeout(connection, connection->m_timeout); + return connection; } @@ -336,6 +401,11 @@ GSocketError GSocket_SetNonOriented(GSocket *sck) /* 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; + } + /* Bind it to the LOCAL address */ if (bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) < 0) { close(sck->m_fd); @@ -344,7 +414,8 @@ GSocketError GSocket_SetNonOriented(GSocket *sck) return GSOCK_IOERR; } - GSocket_SetNonBlocking(sck, sck->m_blocking); + _GSocket_Configure_Callbacks(sck); + GSocket_SetNonBlocking(sck, sck->m_non_blocking); GSocket_SetTimeout(sck, sck->m_timeout); return GSOCK_NOERROR; @@ -352,14 +423,18 @@ GSocketError GSocket_SetNonOriented(GSocket *sck) /* Client specific parts */ -/* - GSocket_Connect() establishes a client connection to a server using the "Peer" - field of GSocket. "Peer" must be set by GSocket_SetPeer() before - GSocket_Connect() is called. In the other case, it returns GSOCK_INVADDR. -*/ +/* GSocket_Connect: + * Establishes a client connection to a server using the "Peer" + * field of GSocket. "Peer" must be set by GSocket_SetPeer() before + * GSocket_Connect() is called. Possible error codes are GSOCK_INVSOCK, + * GSOCK_INVADDR, GSOCK_TIMEDOUT, GSOCK_WOULDBLOCK and GSOCK_IOERR. + * If a socket is nonblocking and Connect() returns GSOCK_WOULDBLOCK, + * the connection request can be completed later. Use GSocket_Select() + * to check or wait for a GSOCK_CONNECTION event. + */ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream) { - int type; + int type, err; assert(sck != NULL); @@ -390,22 +465,35 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream) return GSOCK_IOERR; } + _GSocket_Configure_Callbacks(sck); + GSocket_SetNonBlocking(sck, sck->m_non_blocking); + GSocket_SetTimeout(sck, sck->m_timeout); + /* Connect it to the PEER address */ - if (connect(sck->m_fd, sck->m_peer->m_addr, - sck->m_peer->m_len) != 0) { + ENABLE_TIMEOUT(sck); + err = connect(sck->m_fd, sck->m_peer->m_addr, sck->m_peer->m_len); + DISABLE_TIMEOUT(sck); + + if (err != 0 && errno != EINPROGRESS) { close(sck->m_fd); sck->m_fd = -1; - sck->m_error = GSOCK_IOERR; + switch (errno) { + case EINTR: + case ETIMEDOUT: + sck->m_error = GSOCK_TIMEDOUT; + break; + default: + sck->m_error = GSOCK_IOERR; + break; + } return GSOCK_IOERR; } /* It is not a server */ - sck->m_server = FALSE; - - GSocket_SetNonBlocking(sck, sck->m_blocking); - GSocket_SetTimeout(sck, sck->m_timeout); + sck->m_server = FALSE; + sck->m_establishing = (errno == EINPROGRESS); - return GSOCK_NOERROR; + return (sck->m_establishing) ? GSOCK_WOULDBLOCK : GSOCK_NOERROR; } /* Generic IO */ @@ -447,67 +535,103 @@ int GSocket_Write(GSocket *socket, const char *buffer, return _GSocket_Send_Dgram(socket, buffer, size); } -bool GSocket_DataAvailable(GSocket *socket) +/* GSocket_Select: + * Polls the socket to determine its status. This function will + * check for the events specified in the 'flags' parameter, and + * it will return a mask indicating which operations can be + * performed. This function won't block, regardless of the + * mode (blocking|nonblocking) of the socket. + */ +GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags) { - fd_set read_set; + fd_set readfds, writefds, exceptfds; struct timeval tv; + GSocketEventFlags mask; + int error, len; assert(socket != NULL); - if (socket->m_fd == -1 || socket->m_server) { + if (socket->m_fd == -1) + { socket->m_error = GSOCK_INVSOCK; return FALSE; } - FD_ZERO(&read_set); - FD_SET(socket->m_fd, &read_set); + 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); tv.tv_sec = 0; tv.tv_usec = 0; + select(socket->m_fd + 1, &readfds, &writefds, &exceptfds, &tv); + + mask = 0; + + /* If select() says that the socket is readable, then we have + * no way to distinguish if that means 'data available' (to + * recv) or 'incoming connection' (to accept). The same goes + * for writability: we cannot distinguish between 'you can + * send data' and 'connection request completed'. So we will + * assume the following: if the flag was set upon entry, + * that means that the event was possible. + */ + if (FD_ISSET(socket->m_fd, &readfds)) + { + mask |= (flags & GSOCK_CONNECTION_FLAG); + mask |= (flags & GSOCK_INPUT_FLAG); + } + if (FD_ISSET(socket->m_fd, &writefds)) + { + if (socket->m_establishing) + { + getsockopt(socket->m_fd, SOL_SOCKET, SO_ERROR, &error, &len); - select(socket->m_fd+1, &read_set, NULL, NULL, &tv); + if (error) + mask |= (flags & GSOCK_LOST_FLAG); + else + mask |= (flags & GSOCK_CONNECTION_FLAG); + } + mask |= (flags & GSOCK_OUTPUT_FLAG); + } + if (FD_ISSET(socket->m_fd, &exceptfds)) + mask |= (flags & GSOCK_LOST_FLAG); - return FD_ISSET(socket->m_fd, &read_set); + return mask; } /* Flags */ -/* - GSocket_SetNonBlocking() puts the socket in non-blocking mode. This is useful - if we don't want to wait. -*/ -void GSocket_SetNonBlocking(GSocket *socket, bool block) +/* GSocket_SetNonBlocking: + * Sets the socket to non-blocking mode. This is useful if + * we don't want to wait. + */ +void GSocket_SetNonBlocking(GSocket *socket, bool non_block) { assert(socket != NULL); - socket->m_blocking = block; + socket->m_non_blocking = non_block; if (socket->m_fd != -1) - ioctl(socket->m_fd, FIONBIO, &block); + ioctl(socket->m_fd, FIONBIO, &non_block); } -/* - * GSocket_SetTimeout() +/* GSocket_SetTimeout: + * Sets the timeout for blocking calls. Time is + * expressed in milliseconds. */ void GSocket_SetTimeout(GSocket *socket, unsigned long millisec) { assert(socket != NULL); socket->m_timeout = millisec; - if (socket->m_fd != -1) { - struct timeval tval; - - tval.tv_sec = millisec / 1000; - tval.tv_usec = (millisec % 1000) * 1000; - setsockopt(socket->m_fd, SOL_SOCKET, SO_SNDTIMEO, &tval, sizeof(tval)); - setsockopt(socket->m_fd, SOL_SOCKET, SO_RCVTIMEO, &tval, sizeof(tval)); - } } -/* - GSocket_GetError() returns the last error occured on the socket stream. -*/ - +/* GSocket_GetError: + * Returns the last error occured for this socket. + */ GSocketError GSocket_GetError(GSocket *socket) { assert(socket != NULL); @@ -517,27 +641,32 @@ GSocketError GSocket_GetError(GSocket *socket) /* Callbacks */ -/* - Only one fallback is possible for each event (INPUT, OUTPUT, CONNECTION) - INPUT: The function is called when there is at least a byte in the - input buffer - OUTPUT: The function is called when the system is sure the next write call - will not block - CONNECTION: Two cases is possible: - Client socket -> the connection is established - Server socket -> a client request a connection - LOST: the connection is lost - - SetCallback accepts a combination of these flags so a same callback can - receive different events. - - An event is generated only once and its state is reseted when the relative - IO call is requested. - For example: INPUT -> GSocket_Read() - CONNECTION -> GSocket_Accept() -*/ -void GSocket_SetCallback(GSocket *socket, GSocketEventFlags event, - GSocketCallback fallback, char *cdata) +/* Only one callback is possible for each event (INPUT, OUTPUT, CONNECTION + * and LOST). The callbacks are called in the following situations: + * + * INPUT: There is at least one byte in the input buffer + * OUTPUT: The system is sure that the next write call will not block + * CONNECTION: Two cases are possible: + * Client socket -> the connection is established + * Server socket -> a client requests a connection + * LOST: The connection is lost + * + * An event is generated only once and its state is reseted when the + * relative IO call is requested. + * For example: INPUT -> GSocket_Read() + * CONNECTION -> GSocket_Accept() + */ + +/* GSocket_SetCallback: + * Enables the callbacks specified by 'flags'. Note that 'flags' + * may be a combination of flags OR'ed toghether, so the same + * callback function can be made to accept different events. + * The callback function must have the following prototype: + * + * void function(GSocket *socket, GSocketEvent event, char *cdata) + */ +void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags, + GSocketCallback callback, char *cdata) { int count; @@ -546,80 +675,85 @@ void GSocket_SetCallback(GSocket *socket, GSocketEventFlags event, for (count=0;countm_fbacks[count] = fallback; + if ((flags & (1 << count)) != 0) { + socket->m_cbacks[count] = callback; socket->m_data[count] = cdata; - - _GSocket_Install_Callback(socket, count); - _GSocket_Enable(socket, count); } } + _GSocket_Configure_Callbacks(socket); } -/* - UnsetCallback will disables all fallbacks specified by "event". - NOTE: event may be a combination of flags -*/ -void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags event) +/* GSocket_UnsetCallback: + * Disables all callbacks specified by 'flags', which may be a + * combination of flags OR'ed toghether. + */ +void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags) { - int count = 0; + int count; assert(socket != NULL); for (count=0;countm_fbacks[count] = NULL; - _GSocket_Uninstall_Callback(socket, count); + if ((flags & (1 << count)) != 0) { + socket->m_cbacks[count] = NULL; } } + _GSocket_Configure_Callbacks(socket); } -#define CALL_FALLBACK(socket, event) \ -if (socket->m_iocalls[event] && \ - socket->m_fbacks[event]) {\ - _GSocket_Disable(socket, event); \ - socket->m_fbacks[event](socket, event, \ - socket->m_data[event]); \ -} - -#define MASK_SIGNAL() \ -{ \ - void (*old_handler)(int); \ -\ - old_handler = signal(SIGPIPE, SIG_IGN); - -#define UNMASK_SIGNAL() \ - signal(SIGPIPE, old_handler); \ +#define CALL_CALLBACK(socket, event) \ +if (socket->m_iocalls[event] && socket->m_cbacks[event]) { \ + _GSocket_Disable(socket, event); \ + socket->m_cbacks[event](socket, event, socket->m_data[event]); \ } void _GSocket_Enable(GSocket *socket, GSocketEvent event) { socket->m_iocalls[event] = TRUE; - if (socket->m_fbacks[event]) + if (socket->m_cbacks[event]) _GSocket_Install_Callback(socket, event); } void _GSocket_Disable(GSocket *socket, GSocketEvent event) { socket->m_iocalls[event] = FALSE; - if (socket->m_fbacks[event]) + if (socket->m_cbacks[event]) _GSocket_Uninstall_Callback(socket, event); } +void _GSocket_Configure_Callbacks(GSocket *socket) +{ + int count; + for (count=0;countm_cbacks[count]) != NULL) { + _GSocket_Enable(socket, count); + } else { + _GSocket_Disable(socket, count); + } + } +} + int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size) { int ret; MASK_SIGNAL(); + ENABLE_TIMEOUT(socket); ret = recv(socket->m_fd, buffer, size, 0); + DISABLE_TIMEOUT(socket); UNMASK_SIGNAL(); - if (ret == -1 && errno != EAGAIN) { - socket->m_error = GSOCK_IOERR; + + if (ret == -1 && + errno != ETIMEDOUT && errno != EWOULDBLOCK && errno != EINTR) { + socket->m_error = GSOCK_IOERR; + return -1; + } + if (errno == EWOULDBLOCK) { + socket->m_error = GSOCK_WOULDBLOCK; return -1; } - if (errno == EAGAIN) { - socket->m_error = GSOCK_TRYAGAIN; + if (errno == ETIMEDOUT || errno == EINTR) { + socket->m_error = GSOCK_TIMEDOUT; return -1; } return ret; @@ -630,25 +764,43 @@ int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size) struct sockaddr from; SOCKLEN_T fromlen; int ret; + GSocketError err; fromlen = sizeof(from); MASK_SIGNAL(); + ENABLE_TIMEOUT(socket); ret = recvfrom(socket->m_fd, buffer, size, 0, &from, &fromlen); + DISABLE_TIMEOUT(socket); UNMASK_SIGNAL(); - if (ret == -1 && errno != EAGAIN) { + if (ret == -1 && errno != EWOULDBLOCK && errno != EINTR && errno != ETIMEDOUT) { socket->m_error = GSOCK_IOERR; return -1; } - if (errno == EAGAIN) { - socket->m_error = GSOCK_TRYAGAIN; + if (errno == EWOULDBLOCK) { + socket->m_error = GSOCK_WOULDBLOCK; + return -1; + } + if (errno == ETIMEDOUT || errno == EINTR) { + socket->m_error = GSOCK_TIMEDOUT; return -1; } /* Translate a system address into a GSocket address */ - if (!socket->m_peer) + if (!socket->m_peer) { socket->m_peer = GAddress_new(); - _GAddress_translate_from(socket->m_peer, &from, fromlen); + if (!socket->m_peer) { + socket->m_error = GSOCK_MEMERR; + return -1; + } + } + err = _GAddress_translate_from(socket->m_peer, &from, fromlen); + if (err != GSOCK_NOERROR) { + GAddress_destroy(socket->m_peer); + socket->m_peer = NULL; + socket->m_error = err; + return -1; + } return ret; } @@ -656,16 +808,23 @@ int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size) int _GSocket_Send_Stream(GSocket *socket, const char *buffer, int size) { int ret; + GSocketError err; MASK_SIGNAL(); + ENABLE_TIMEOUT(socket); ret = send(socket->m_fd, buffer, size, 0); + DISABLE_TIMEOUT(socket); UNMASK_SIGNAL(); - if (ret == -1 && errno != EAGAIN) { + if (ret == -1 && errno != EWOULDBLOCK && errno != ETIMEDOUT && errno != EINTR) { socket->m_error = GSOCK_IOERR; return -1; } - if (errno == EAGAIN) { - socket->m_error = GSOCK_TRYAGAIN; + if (errno == EWOULDBLOCK) { + socket->m_error = GSOCK_WOULDBLOCK; + return -1; + } + if (errno == ETIMEDOUT || errno == EINTR) { + socket->m_error = GSOCK_TIMEDOUT; return -1; } return ret; @@ -675,27 +834,34 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size) { struct sockaddr *addr; int len, ret; + GSocketError err; if (!socket->m_peer) { socket->m_error = GSOCK_INVADDR; return -1; } - _GAddress_translate_to(socket->m_peer, &addr, &len); + err = _GAddress_translate_to(socket->m_peer, &addr, &len); + if (err != GSOCK_NOERROR) { + socket->m_error = err; + return -1; + } MASK_SIGNAL(); + ENABLE_TIMEOUT(socket); ret = sendto(socket->m_fd, buffer, size, 0, addr, len); + DISABLE_TIMEOUT(socket); UNMASK_SIGNAL(); /* Frees memory allocated from _GAddress_translate_to */ free(addr); - if (ret == -1 && errno != EAGAIN) { + if (ret == -1 && errno != EWOULDBLOCK) { socket->m_error = GSOCK_IOERR; return -1; } - if (errno == EAGAIN) { - socket->m_error = GSOCK_TRYAGAIN; + if (errno == EWOULDBLOCK) { + socket->m_error = GSOCK_WOULDBLOCK; return -1; } @@ -711,26 +877,38 @@ void _GSocket_Detected_Read(GSocket *socket) ret = recv(socket->m_fd, &c, 1, MSG_PEEK); if (ret < 0 && socket->m_server) { - CALL_FALLBACK(socket, GSOCK_CONNECTION); + CALL_CALLBACK(socket, GSOCK_CONNECTION); return; } if (ret > 0) { - CALL_FALLBACK(socket, GSOCK_INPUT); + CALL_CALLBACK(socket, GSOCK_INPUT); } else { - CALL_FALLBACK(socket, GSOCK_LOST); + CALL_CALLBACK(socket, GSOCK_LOST); } } } void _GSocket_Detected_Write(GSocket *socket) { - CALL_FALLBACK(socket, GSOCK_OUTPUT); -} + if (socket->m_establishing) { + int error, len; + + len = sizeof(error); -#undef CALL_FALLBACK -#undef MASK_SIGNAL -#undef UNMASK_SIGNAL + socket->m_establishing = FALSE; + getsockopt(socket->m_fd, SOL_SOCKET, SO_ERROR, &error, &len); + + if (error) { + socket->m_error = GSOCK_IOERR; + GSocket_Shutdown(socket); + } else + socket->m_error = GSOCK_NOERROR; + + CALL_CALLBACK(socket, GSOCK_CONNECTION); + } else + CALL_CALLBACK(socket, GSOCK_OUTPUT); +} /* * ------------------------------------------------------------------------- @@ -745,7 +923,9 @@ void _GSocket_Detected_Write(GSocket *socket) #define CHECK_ADDRESS(address, family, retval) \ { \ if (address->m_family == GSOCK_NOFAMILY) \ - _GAddress_Init_##family(address); \ + if (_GAddress_Init_##family(address) != GSOCK_NOERROR) {\ + return address->m_error; \ + }\ if (address->m_family != GSOCK_##family) {\ address->m_error = GSOCK_INVADDR; \ return retval; \ @@ -758,6 +938,9 @@ GAddress *GAddress_new() address = (GAddress *)malloc(sizeof(GAddress)); + if (address == NULL) + return NULL; + address->m_family = GSOCK_NOFAMILY; address->m_addr = NULL; address->m_len = 0; @@ -772,10 +955,18 @@ GAddress *GAddress_copy(GAddress *address) assert(address != NULL); addr2 = (GAddress *)malloc(sizeof(GAddress)); + + if (addr2 == NULL) + return NULL; + memcpy(addr2, address, sizeof(GAddress)); if (address->m_addr) { addr2->m_addr = (struct sockaddr *)malloc(addr2->m_len); + if (addr2->m_addr == NULL) { + free(addr2); + return NULL; + } memcpy(addr2->m_addr, address->m_addr, addr2->m_len); } @@ -803,7 +994,7 @@ GAddressType GAddress_GetFamily(GAddress *address) return address->m_family; } -void _GAddress_translate_from(GAddress *address, struct sockaddr *addr, int len){ +GSocketError _GAddress_translate_from(GAddress *address, struct sockaddr *addr, int len){ address->m_realfamily = addr->sa_family; switch (addr->sa_family) { case AF_INET: @@ -819,7 +1010,8 @@ void _GAddress_translate_from(GAddress *address, struct sockaddr *addr, int len) #endif default: { - /* TODO error */ + address->m_error = GSOCK_INVOP; + return GSOCK_INVOP; } } @@ -828,20 +1020,32 @@ void _GAddress_translate_from(GAddress *address, struct sockaddr *addr, int len) address->m_len = len; address->m_addr = (struct sockaddr *)malloc(len); + if (address->m_addr == NULL) { + address->m_error = GSOCK_MEMERR; + return GSOCK_MEMERR; + } memcpy(address->m_addr, addr, len); + + return GSOCK_NOERROR; } -void _GAddress_translate_to(GAddress *address, - struct sockaddr **addr, int *len) +GSocketError _GAddress_translate_to(GAddress *address, + struct sockaddr **addr, int *len) { if (!address->m_addr) { - /* TODO error */ - return; + address->m_error = GSOCK_INVADDR; + return GSOCK_INVADDR; } *len = address->m_len; *addr = (struct sockaddr *)malloc(address->m_len); + if (*addr == NULL) { + address->m_error = GSOCK_MEMERR; + return GSOCK_MEMERR; + } + memcpy(*addr, address->m_addr, address->m_len); + return GSOCK_NOERROR; } /* @@ -850,14 +1054,22 @@ void _GAddress_translate_to(GAddress *address, * ------------------------------------------------------------------------- */ -void _GAddress_Init_INET(GAddress *address) +GSocketError _GAddress_Init_INET(GAddress *address) { + address->m_addr = (struct sockaddr *)malloc(sizeof(struct sockaddr_in)); + if (address->m_addr == NULL) { + address->m_error = GSOCK_MEMERR; + return GSOCK_MEMERR; + } + address->m_len = sizeof(struct sockaddr_in); - address->m_addr = (struct sockaddr *)malloc(address->m_len); + address->m_family = GSOCK_INET; address->m_realfamily = PF_INET; ((struct sockaddr_in *)address->m_addr)->sin_family = AF_INET; ((struct sockaddr_in *)address->m_addr)->sin_addr.s_addr = INADDR_ANY; + + return GSOCK_NOERROR; } GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname) @@ -872,7 +1084,15 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname) addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr); /* If it is a numeric host name, convert it now */ +#if defined(HAVE_INET_ATON) if (inet_aton(hostname, addr) == 0) { +#elif defined(HAVE_INET_ADDR) + /* Fix from Guillermo Rodriguez Garcia */ + if ( (addr->s_addr = inet_addr(hostname)) == -1 ) { +#else + /* Use gethostbyname by default */ + if (1) { +#endif struct in_addr *array_addr; /* It is a real name, we solve it */ @@ -912,7 +1132,7 @@ GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port, if (!port) { address->m_error = GSOCK_INVPORT; - return GSOCK_INVOP; + return GSOCK_INVPORT; } se = getservbyname(port, protocol); @@ -1001,14 +1221,21 @@ unsigned short GAddress_INET_GetPort(GAddress *address) * ------------------------------------------------------------------------- */ -void _GAddress_Init_UNIX(GAddress *address) +GSocketError _GAddress_Init_UNIX(GAddress *address) { - address->m_len = sizeof(struct sockaddr_un); address->m_addr = (struct sockaddr *)malloc(address->m_len); + if (address->m_addr == NULL) { + address->m_error = GSOCK_MEMERR; + return GSOCK_MEMERR; + } + + address->m_len = sizeof(struct sockaddr_un); address->m_family = GSOCK_UNIX; address->m_realfamily = PF_UNIX; ((struct sockaddr_un *)address->m_addr)->sun_family = AF_UNIX; ((struct sockaddr_un *)address->m_addr)->sun_path[0] = 0; + + return TRUE; } GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path) @@ -1039,4 +1266,5 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf) return GSOCK_NOERROR; } -#endif // wxUSE_SOCKETS +#endif + /* wxUSE_SOCKETS */