X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9bb2eb9fd64a4ef7462757c6d27db0e491c6afb9..ddb56b384de2123bc1f82312039f66c7b1004fde:/src/unix/gsocket.c diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c index aa3f28ae85..ad6dc22ce6 100644 --- a/src/unix/gsocket.c +++ b/src/unix/gsocket.c @@ -11,18 +11,23 @@ #if wxUSE_SOCKETS #include -#include #include -#ifdef vms +#include +#include +#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 -#endif #include +#endif #include #include #include -#include #include #include @@ -43,19 +48,34 @@ #include #include "wx/gsocket.h" -#include "gsockunx.h" +#include "wx/unix/gsockunx.h" #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 */ + +#define MASK_SIGNAL() \ +{ \ + void (*old_handler)(int); \ + \ + old_handler = signal(SIGPIPE, SIG_IGN); + +#define UNMASK_SIGNAL() \ + signal(SIGPIPE, old_handler); \ +} + /* Global initialisers */ @@ -81,19 +101,21 @@ GSocket *GSocket_new() return NULL; socket->m_fd = -1; - for (i=0;im_fbacks[i] = NULL; - socket->m_iocalls[i] = FALSE; + for (i=0;im_cbacks[i] = NULL; } + socket->m_detected = 0; 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); @@ -130,15 +152,19 @@ void GSocket_Shutdown(GSocket *socket) assert(socket != NULL); /* If socket has been created, we shutdown it */ - if (socket->m_fd != -1) { + if (socket->m_fd != -1) + { shutdown(socket->m_fd, 2); close(socket->m_fd); socket->m_fd = -1; } /* We also disable GUI callbacks */ - for (evt=0;evtm_cbacks[evt] = NULL; + + socket->m_detected = 0; + _GSocket_Disable_Events(socket); } /* Address handling */ @@ -186,7 +212,8 @@ GAddress *GSocket_GetLocal(GSocket *socket) { GAddress *address; struct sockaddr addr; - SOCKLEN_T size; + SOCKLEN_T size = sizeof(addr); + GSocketError err; assert(socket != NULL); @@ -200,7 +227,7 @@ GAddress *GSocket_GetLocal(GSocket *socket) size = sizeof(addr); - if (getsockname(socket->m_fd, &addr, &size) < 0) { + if (getsockname(socket->m_fd, &addr, (SOCKLEN_T *) &size) < 0) { socket->m_error = GSOCK_IOERR; return NULL; } @@ -210,9 +237,10 @@ GAddress *GSocket_GetLocal(GSocket *socket) socket->m_error = GSOCK_MEMERR; return NULL; } - if (!_GAddress_translate_from(address, &addr, size)) { - socket->m_error = GSOCK_MEMERR; + err = _GAddress_translate_from(address, &addr, size); /*xxx*/ + if (err != GSOCK_NOERROR) { GAddress_destroy(address); + socket->m_error = err; return NULL; } @@ -231,16 +259,17 @@ 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; + int arg = 1; assert(sck != NULL); @@ -256,6 +285,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); @@ -265,6 +295,9 @@ GSocketError GSocket_SetServer(GSocket *sck) return GSOCK_IOERR; } + ioctl(sck->m_fd, FIONBIO, &arg); + _GSocket_Enable_Events(sck); + /* Bind the socket to the LOCAL address */ if (bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) < 0) { close(sck->m_fd); @@ -281,46 +314,86 @@ GSocketError GSocket_SetServer(GSocket *sck) return GSOCK_IOERR; } - GSocket_SetNonBlocking(sck, sck->m_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) { + struct sockaddr from; + SOCKLEN_T fromlen = sizeof(from); GSocket *connection; + GSocketError err; + int arg = 1; assert(socket != NULL); + /* Reenable CONNECTION events */ + _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 == -1 || !socket->m_server) + { socket->m_error = GSOCK_INVSOCK; return NULL; } - /* Reenable GSOCK_CONNECTION event */ - _GSocket_Enable(socket, GSOCK_CONNECTION); - /* Create a GSocket object for the new connection */ connection = GSocket_new(); + if (!connection) + { + socket->m_error = GSOCK_MEMERR; + return NULL; + } /* Accept the incoming connection */ - connection->m_fd = accept(socket->m_fd, NULL, NULL); - if (connection->m_fd == -1) { + if (_GSocket_Input_Timeout(socket) == GSOCK_TIMEDOUT) + { + GSocket_destroy(connection); + /* socket->m_error set by _GSocket_Input_Timeout */ + return NULL; + } + + connection->m_fd = accept(socket->m_fd, &from, (SOCKLEN_T *) &fromlen); + + if (connection->m_fd == -1) + { + if (errno == EWOULDBLOCK) + socket->m_error = GSOCK_WOULDBLOCK; + else + socket->m_error = GSOCK_IOERR; + GSocket_destroy(connection); - socket->m_error = GSOCK_IOERR; return NULL; } /* Initialize all fields */ - connection->m_stream = TRUE; connection->m_server = FALSE; + connection->m_stream = TRUE; connection->m_oriented = TRUE; + /* Setup the peer address field */ /*xxx*/ + connection->m_peer = GAddress_new(); + if (!connection->m_peer) + { + GSocket_destroy(connection); + socket->m_error = GSOCK_MEMERR; + return NULL; + } + err = _GAddress_translate_from(connection->m_peer, &from, fromlen); + if (err != GSOCK_NOERROR) + { + GAddress_destroy(connection->m_peer); + GSocket_destroy(connection); + socket->m_error = err; + return NULL; + } + + ioctl(connection->m_fd, FIONBIO, &arg); + _GSocket_Enable_Events(connection); + return connection; } @@ -328,6 +401,8 @@ GSocket *GSocket_WaitConnection(GSocket *socket) GSocketError GSocket_SetNonOriented(GSocket *sck) { + int arg = 1; + assert(sck != NULL); if (sck->m_fd != -1) { @@ -347,6 +422,14 @@ 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; + } + + ioctl(sck->m_fd, FIONBIO, &arg); + _GSocket_Enable_Events(sck); + /* 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); @@ -355,38 +438,47 @@ GSocketError GSocket_SetNonOriented(GSocket *sck) return GSOCK_IOERR; } - GSocket_SetNonBlocking(sck, sck->m_blocking); - GSocket_SetTimeout(sck, sck->m_timeout); - return GSOCK_NOERROR; } /* 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, ret; + int arg = 1; assert(sck != NULL); - if (sck->m_fd != -1) { + /* Enable CONNECTION events (needed for nonblocking connections) */ + _GSocket_Enable(sck, GSOCK_CONNECTION); + + if (sck->m_fd != -1) + { sck->m_error = GSOCK_INVSOCK; return GSOCK_INVSOCK; } - if (!sck->m_peer) { + if (!sck->m_peer) + { sck->m_error = GSOCK_INVADDR; return GSOCK_INVADDR; } /* Test whether we want the socket to be a stream (e.g. TCP) */ - sck->m_stream = (stream == GSOCK_STREAMED); + sck->m_stream = (stream == GSOCK_STREAMED); sck->m_oriented = TRUE; + sck->m_server = FALSE; + sck->m_establishing = FALSE; if (sck->m_stream) type = SOCK_STREAM; @@ -401,20 +493,59 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream) return GSOCK_IOERR; } + ioctl(sck->m_fd, FIONBIO, &arg); + _GSocket_Enable_Events(sck); + /* Connect it to the PEER address */ - if (connect(sck->m_fd, sck->m_peer->m_addr, - sck->m_peer->m_len) != 0) { + ret = connect(sck->m_fd, sck->m_peer->m_addr, sck->m_peer->m_len); + + if (ret == -1) + { + err = errno; + + /* If connect failed with EINPROGRESS and the GSocket object + * is in blocking mode, we select() for the specified timeout + * checking for writability to see if the connection request + * completes. + */ + if ((err == EINPROGRESS) && (!sck->m_non_blocking)) + { + if (_GSocket_Output_Timeout(sck) == GSOCK_TIMEDOUT) + { + close(sck->m_fd); + sck->m_fd = -1; + /* sck->m_error is set in _GSocket_Output_Timeout */ + return GSOCK_TIMEDOUT; + } + else + { + return GSOCK_NOERROR; + } + } + + /* If connect failed with EINPROGRESS and the GSocket object + * is set to nonblocking, we set m_error to GSOCK_WOULDBLOCK + * (and return GSOCK_WOULDBLOCK) but we don't close the socket; + * this way if the connection completes, a GSOCK_CONNECTION + * event will be generated, if enabled. + */ + if ((err == EINPROGRESS) && (sck->m_non_blocking)) + { + sck->m_error = GSOCK_WOULDBLOCK; + sck->m_establishing = TRUE; + + return GSOCK_WOULDBLOCK; + } + + /* If connect failed with an error other than EINPROGRESS, + * then the call to GSocket_Connect has failed. + */ close(sck->m_fd); sck->m_fd = -1; sck->m_error = GSOCK_IOERR; + return GSOCK_IOERR; } - - /* It is not a server */ - sck->m_server = FALSE; - - GSocket_SetNonBlocking(sck, sck->m_blocking); - GSocket_SetTimeout(sck, sck->m_timeout); return GSOCK_NOERROR; } @@ -424,116 +555,118 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream) /* Like recv(), send(), ... */ int GSocket_Read(GSocket *socket, char *buffer, int size) { + int ret; + assert(socket != NULL); - if (socket->m_fd == -1 || socket->m_server) { + /* Reenable INPUT events */ + _GSocket_Enable(socket, GSOCK_INPUT); + + if (socket->m_fd == -1 || socket->m_server) + { socket->m_error = GSOCK_INVSOCK; return -1; } - /* Reenable GSOCK_INPUT event */ - _GSocket_Enable(socket, GSOCK_INPUT); + if (_GSocket_Input_Timeout(socket) == GSOCK_TIMEDOUT) + return -1; if (socket->m_stream) - return _GSocket_Recv_Stream(socket, buffer, size); + ret = _GSocket_Recv_Stream(socket, buffer, size); else - return _GSocket_Recv_Dgram(socket, buffer, size); + ret = _GSocket_Recv_Dgram(socket, buffer, size); + + if (ret == -1) + { + if (errno == EWOULDBLOCK) + socket->m_error = GSOCK_WOULDBLOCK; + else + socket->m_error = GSOCK_IOERR; + } + + return ret; } int GSocket_Write(GSocket *socket, const char *buffer, int size) { + int ret; + assert(socket != NULL); - if (socket->m_fd == -1 || socket->m_server) { + if (socket->m_fd == -1 || socket->m_server) + { socket->m_error = GSOCK_INVSOCK; return -1; } - _GSocket_Enable(socket, GSOCK_OUTPUT); + if (_GSocket_Output_Timeout(socket) == GSOCK_TIMEDOUT) + return -1; if (socket->m_stream) - return _GSocket_Send_Stream(socket, buffer, size); + ret = _GSocket_Send_Stream(socket, buffer, size); else - return _GSocket_Send_Dgram(socket, buffer, size); + ret = _GSocket_Send_Dgram(socket, buffer, size); + + if (ret == -1) + { + if (errno == EWOULDBLOCK) + socket->m_error = GSOCK_WOULDBLOCK; + else + socket->m_error = GSOCK_IOERR; + + /* Only reenable OUTPUT events after an error (just like WSAAsyncSelect + * in MSW). Once the first OUTPUT event is received, users can assume + * that the socket is writable until a read operation fails. Only then + * will further OUTPUT events be posted. + */ + _GSocket_Enable(socket, GSOCK_OUTPUT); + } + + return ret; } -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; - struct timeval tv; - assert(socket != NULL); - if (socket->m_fd == -1 || socket->m_server) { - socket->m_error = GSOCK_INVSOCK; - return FALSE; - } - - FD_ZERO(&read_set); - FD_SET(socket->m_fd, &read_set); - - tv.tv_sec = 0; - tv.tv_usec = 0; - - select(socket->m_fd+1, &read_set, NULL, NULL, &tv); - - return FD_ISSET(socket->m_fd, &read_set); + return (flags & socket->m_detected); } /* Flags */ -/* - GSocket_SetNonBlocking() puts the socket in non-blocking mode. This is useful - if we don't want to wait. -*/ +/* 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; - - if (socket->m_fd != -1) - ioctl(socket->m_fd, FIONBIO, &block); + socket->m_non_blocking = non_block; } -/* - * GSocket_SetTimeout() +/* GSocket_SetTimeout: + * Sets the timeout for blocking calls. Time is + * expressed in milliseconds. */ - -#ifndef LINUX -# define CAN_USE_TIMEOUT -#elif defined(__GLIBC__) && defined(__GLIBC_MINOR__) -# if (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 1) -# define CAN_USE_TIMEOUT -# endif -#endif - void GSocket_SetTimeout(GSocket *socket, unsigned long millisec) { assert(socket != NULL); - /* Neither GLIBC 2.0 nor the kernel 2.0.36 define SO_SNDTIMEO or - SO_RCVTIMEO. The man pages, that these flags should exist but - are read only. RR. */ - /* OK, restrict this to GLIBC 2.1. GL. */ -#ifdef CAN_USE_TIMEOUT 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)); - } -#endif } -/* - 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); @@ -543,91 +676,136 @@ 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; - assert (socket != NULL); + assert(socket != NULL); - for (count=0;countm_fbacks[count] = fallback; + for (count = 0; count < GSOCK_MAX_EVENT; count++) + { + if ((flags & (1 << count)) != 0) + { + socket->m_cbacks[count] = callback; socket->m_data[count] = cdata; - _GSocket_Enable(socket, count); } } } -/* - 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; + for (count = 0; count < GSOCK_MAX_EVENT; count++) + { + if ((flags & (1 << count)) != 0) + { + socket->m_cbacks[count] = NULL; + socket->m_data[count] = NULL; } } } -#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 CALL_CALLBACK(socket, event) { \ + _GSocket_Disable(socket, event); \ + if (socket->m_cbacks[event]) \ + socket->m_cbacks[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); \ -} void _GSocket_Enable(GSocket *socket, GSocketEvent event) { - socket->m_iocalls[event] = TRUE; - if (socket->m_fbacks[event]) - _GSocket_Install_Callback(socket, event); + socket->m_detected &= ~(1 << event); + _GSocket_Install_Callback(socket, event); } void _GSocket_Disable(GSocket *socket, GSocketEvent event) { - socket->m_iocalls[event] = FALSE; - if (socket->m_fbacks[event]) - _GSocket_Uninstall_Callback(socket, event); + socket->m_detected |= (1 << event); + _GSocket_Uninstall_Callback(socket, event); +} + +/* _GSocket_Input_Timeout: + * For blocking sockets, wait until data is available or + * until timeout ellapses. + */ +GSocketError _GSocket_Input_Timeout(GSocket *socket) +{ + struct timeval tv; + fd_set readfds; + + /* Linux select() will overwrite the struct on return */ + tv.tv_sec = (socket->m_timeout / 1000); + tv.tv_usec = (socket->m_timeout % 1000) * 1000; + + if (!socket->m_non_blocking) + { + FD_ZERO(&readfds); + FD_SET(socket->m_fd, &readfds); + if (select(socket->m_fd + 1, &readfds, NULL, NULL, &tv) == 0) + { + socket->m_error = GSOCK_TIMEDOUT; + return GSOCK_TIMEDOUT; + } + } + return GSOCK_NOERROR; +} + +/* _GSocket_Output_Timeout: + * For blocking sockets, wait until data can be sent without + * blocking or until timeout ellapses. + */ +GSocketError _GSocket_Output_Timeout(GSocket *socket) +{ + struct timeval tv; + fd_set writefds; + + /* Linux select() will overwrite the struct on return */ + tv.tv_sec = (socket->m_timeout / 1000); + tv.tv_usec = (socket->m_timeout % 1000) * 1000; + + 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) + { + socket->m_error = GSOCK_TIMEDOUT; + return GSOCK_TIMEDOUT; + } + } + return GSOCK_NOERROR; } int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size) @@ -637,47 +815,42 @@ int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size) MASK_SIGNAL(); ret = recv(socket->m_fd, buffer, size, 0); UNMASK_SIGNAL(); - if (ret == -1 && errno != EAGAIN) { - socket->m_error = GSOCK_IOERR; - return -1; - } - if (errno == EAGAIN) { - socket->m_error = GSOCK_TRYAGAIN; - return -1; - } + return ret; } int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size) { struct sockaddr from; - SOCKLEN_T fromlen; + SOCKLEN_T fromlen = sizeof(from); int ret; + GSocketError err; fromlen = sizeof(from); MASK_SIGNAL(); - ret = recvfrom(socket->m_fd, buffer, size, 0, &from, &fromlen); + ret = recvfrom(socket->m_fd, buffer, size, 0, &from, (SOCKLEN_T *) &fromlen); UNMASK_SIGNAL(); - if (ret == -1 && errno != EAGAIN) { - socket->m_error = GSOCK_IOERR; - return -1; - } - if (errno == EAGAIN) { - socket->m_error = GSOCK_TRYAGAIN; + + if (ret == -1) return -1; - } /* Translate a system address into a GSocket address */ - if (!socket->m_peer) { + if (!socket->m_peer) + { socket->m_peer = GAddress_new(); - if (!socket->m_peer) { + if (!socket->m_peer) + { socket->m_error = GSOCK_MEMERR; return -1; } } - if (!_GAddress_translate_from(socket->m_peer, &from, fromlen)) { - socket->m_error = GSOCK_MEMERR; + 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; } @@ -691,14 +864,7 @@ int _GSocket_Send_Stream(GSocket *socket, const char *buffer, int size) MASK_SIGNAL(); ret = send(socket->m_fd, buffer, size, 0); UNMASK_SIGNAL(); - if (ret == -1 && errno != EAGAIN) { - socket->m_error = GSOCK_IOERR; - return -1; - } - if (errno == EAGAIN) { - socket->m_error = GSOCK_TRYAGAIN; - return -1; - } + return ret; } @@ -706,14 +872,16 @@ 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; } - if (!_GAddress_translate_to(socket->m_peer, &addr, &len)) { - socket->m_error = GSOCK_MEMERR; + err = _GAddress_translate_to(socket->m_peer, &addr, &len); + if (err != GSOCK_NOERROR) { + socket->m_error = err; return -1; } @@ -724,15 +892,6 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size) /* Frees memory allocated from _GAddress_translate_to */ free(addr); - if (ret == -1 && errno != EAGAIN) { - socket->m_error = GSOCK_IOERR; - return -1; - } - if (errno == EAGAIN) { - socket->m_error = GSOCK_TRYAGAIN; - return -1; - } - return ret; } @@ -741,30 +900,58 @@ void _GSocket_Detected_Read(GSocket *socket) char c; int ret; - if (socket->m_stream) { + if (socket->m_stream) + { ret = recv(socket->m_fd, &c, 1, MSG_PEEK); - if (ret < 0 && socket->m_server) { - CALL_FALLBACK(socket, GSOCK_CONNECTION); + if (ret < 0 && socket->m_server) + { + CALL_CALLBACK(socket, GSOCK_CONNECTION); return; } - if (ret > 0) { - CALL_FALLBACK(socket, GSOCK_INPUT); - } else { - CALL_FALLBACK(socket, GSOCK_LOST); + if (ret > 0) + { + CALL_CALLBACK(socket, GSOCK_INPUT); + } + else + { + CALL_CALLBACK(socket, GSOCK_LOST); } } } void _GSocket_Detected_Write(GSocket *socket) { - CALL_FALLBACK(socket, GSOCK_OUTPUT); -} + if (socket->m_establishing && !socket->m_server) + { + int error, len; -#undef CALL_FALLBACK -#undef MASK_SIGNAL -#undef UNMASK_SIGNAL + socket->m_establishing = FALSE; + + len = sizeof(error); + getsockopt(socket->m_fd, SOL_SOCKET, SO_ERROR, (void*) &error, + (SOCKLEN_T *) &len); + + if (error) + { + CALL_CALLBACK(socket, GSOCK_LOST); + } + else + { + CALL_CALLBACK(socket, GSOCK_CONNECTION); + /* We have to fire this event by hand because CONNECTION (for clients) + * and OUTPUT are internally the same and we just disabled CONNECTION + * events with the above macro. + */ + CALL_CALLBACK(socket, GSOCK_OUTPUT); + } + } + else + { + CALL_CALLBACK(socket, GSOCK_OUTPUT); + } +} /* * ------------------------------------------------------------------------- @@ -779,9 +966,8 @@ void _GSocket_Detected_Write(GSocket *socket) #define CHECK_ADDRESS(address, family, retval) \ { \ if (address->m_family == GSOCK_NOFAMILY) \ - if (!_GAddress_Init_##family(address)) {\ - address->m_error = GSOCK_MEMERR; \ - return retval; \ + if (_GAddress_Init_##family(address) != GSOCK_NOERROR) {\ + return address->m_error; \ }\ if (address->m_family != GSOCK_##family) {\ address->m_error = GSOCK_INVADDR; \ @@ -851,7 +1037,7 @@ GAddressType GAddress_GetFamily(GAddress *address) return address->m_family; } -bool _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: @@ -867,7 +1053,8 @@ bool _GAddress_translate_from(GAddress *address, struct sockaddr *addr, int len) #endif default: { - /* TODO error */ + address->m_error = GSOCK_INVOP; + return GSOCK_INVOP; } } @@ -876,28 +1063,32 @@ bool _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) - return FALSE; + if (address->m_addr == NULL) { + address->m_error = GSOCK_MEMERR; + return GSOCK_MEMERR; + } memcpy(address->m_addr, addr, len); - return TRUE; + return GSOCK_NOERROR; } -bool _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) - return FALSE; + if (*addr == NULL) { + address->m_error = GSOCK_MEMERR; + return GSOCK_MEMERR; + } memcpy(*addr, address->m_addr, address->m_len); - return TRUE; + return GSOCK_NOERROR; } /* @@ -906,20 +1097,26 @@ bool _GAddress_translate_to(GAddress *address, * ------------------------------------------------------------------------- */ -bool _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) - return FALSE; - address->m_len = sizeof(struct sockaddr_in); + address->m_addr = (struct sockaddr *)malloc(address->m_len); + if (address->m_addr == NULL) + { + address->m_error = GSOCK_MEMERR; + return GSOCK_MEMERR; + } 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; + /* + INADDR_BROADCAST is identical to INADDR_NONE which is not defined + on all unices. INADDR_BROADCAST should be fine to indicate an error. + */ + ((struct sockaddr_in *)address->m_addr)->sin_addr.s_addr = INADDR_BROADCAST; - return TRUE; + return GSOCK_NOERROR; } GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname) @@ -934,11 +1131,23 @@ 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 (inet_aton(hostname, addr) == 0) { +#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 */ - if ((he = gethostbyname(hostname)) == NULL) { + if ((he = gethostbyname(hostname)) == NULL) + { address->m_error = GSOCK_NOHOST; return GSOCK_NOHOST; } @@ -972,14 +1181,16 @@ GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port, assert(address != NULL); CHECK_ADDRESS(address, INET, GSOCK_INVADDR); - if (!port) { + if (!port) + { address->m_error = GSOCK_INVPORT; - return GSOCK_INVOP; + return GSOCK_INVPORT; } se = getservbyname(port, protocol); if (!se) { - if (isdigit(port[0])) { + if (isdigit(port[0])) + { int port_int; port_int = atoi(port); @@ -1023,8 +1234,9 @@ GSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, size_t addr = (struct sockaddr_in *)address->m_addr; addr_buf = (char *)&(addr->sin_addr); - he = gethostbyaddr(addr_buf, sizeof(addr->sin_addr), AF_INET); - if (he == NULL) { + he = gethostbyaddr(addr_buf, sizeof(addr->sin_addr), AF_INET); + if (he == NULL) + { address->m_error = GSOCK_NOHOST; return GSOCK_NOHOST; } @@ -1063,13 +1275,16 @@ unsigned short GAddress_INET_GetPort(GAddress *address) * ------------------------------------------------------------------------- */ -bool _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) - return FALSE; + { + 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; @@ -1106,4 +1321,6 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf) return GSOCK_NOERROR; } -#endif // wxUSE_SOCKETS +#endif + /* wxUSE_SOCKETS */ +