* Authors: Guilhem Lavaux,
* Guillermo Rodriguez Garcia <guille@iies.es> (maintainer)
* Purpose: GSocket main Unix file
+ * Licence: The wxWindows licence
* CVSID: $Id$
* -------------------------------------------------------------------------
*/
#ifdef __VMS__
#include <socket.h>
-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) */
#endif
#include <signal.h>
-
#ifndef SOCKLEN_T
#ifdef VMS
#else
# ifdef __GLIBC__
# if __GLIBC__ == 2
-# define SOCKLEN_T socklen_t
+# define SOCKLEN_T socklen_t
# endif
# else
# define SOCKLEN_T int
#endif /* SOCKLEN_T */
+/*
+ * MSW defines this, Unices don't.
+ */
+#ifndef INVALID_SOCKET
+#define INVALID_SOCKET -1
+#endif
+
+/* UnixWare reportedly needs this for FIONBIO definition */
+#ifdef __UNIXWARE__
+#include <sys/filio.h>
+#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
#ifndef __GSOCKET_STANDALONE__
-
-#include "wx/unix/gsockunx.h"
-#include "wx/gsocket.h"
-
+# include "wx/unix/gsockunx.h"
+# include "wx/gsocket.h"
#else
-
-#include "gsockunx.h"
-#include "gsocket.h"
-
+# include "gsockunx.h"
+# include "gsocket.h"
#endif /* __GSOCKET_STANDALONE__ */
+/* debugging helpers */
+#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 */
-bool GSocket_Init()
+void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc)
{
- return TRUE;
+ 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 GSocket_Cleanup(void)
{
+ if (gs_gui_functions)
+ {
+ gs_gui_functions->GUI_Cleanup();
+ }
}
/* Constructors / Destructors for GSocket */
-GSocket *GSocket_new()
+GSocket *GSocket_new(void)
{
- int i;
+ int i, success;
GSocket *socket;
socket = (GSocket *)malloc(sizeof(GSocket));
if (socket == NULL)
return NULL;
- socket->m_fd = -1;
+ socket->m_fd = INVALID_SOCKET;
for (i=0;i<GSOCK_MAX_EVENT;i++)
{
socket->m_cbacks[i] = NULL;
/* 10 minutes * 60 sec * 1000 millisec */
socket->m_establishing = FALSE;
- /* We initialize the GUI specific entries here */
- _GSocket_GUI_Init(socket);
+ socket->m_functions = &gs_base_functions;
+
+ /* Per-socket GUI-specific initialization */
+ success = _GSocket_GUI_Init_Socket(socket);
+ if (!success)
+ {
+ free(socket);
+ return NULL;
+ }
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);
/* 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 */
- _GSocket_GUI_Destroy(socket);
+ /* Per-socket GUI-specific cleanup */
+ _GSocket_GUI_Destroy_Socket(socket);
/* Destroy private addresses */
if (socket->m_local)
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;
+ GSocket_close(socket);
}
/* Disable GUI callbacks */
for (evt = 0; evt < GSOCK_MAX_EVENT; evt++)
socket->m_cbacks[evt] = NULL;
- socket->m_detected = 0;
- _GSocket_Disable_Events(socket);
+ socket->m_detected = GSOCK_LOST_FLAG;
}
/* Address handling */
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;
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;
*/
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;
/* 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;
(SOCKLEN_T *) &sck->m_local->m_len) != 0) ||
(listen(sck->m_fd, 5) != 0))
{
- close(sck->m_fd);
- sck->m_fd = -1;
+ GSocket_close(sck);
sck->m_error = GSOCK_IOERR;
return GSOCK_IOERR;
}
_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;
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;
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:
/* 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;
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;
{
if (_GSocket_Output_Timeout(sck) == GSOCK_TIMEDOUT)
{
- close(sck->m_fd);
- sck->m_fd = -1;
+ GSocket_close(sck);
/* sck->m_error is set in _GSocket_Output_Timeout */
return GSOCK_TIMEDOUT;
}
/* 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;
+ GSocket_close(sck);
+ 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))
+ {
+ GSocket_close(sck);
sck->m_error = GSOCK_IOERR;
return GSOCK_IOERR;
}
/* 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;
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
return -1;
}
+ GSocket_Debug(( "GSocket_Write #5, size %d ret %d\n", size, ret ));
+
return ret;
}
*/
GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
{
- GSocketEventFlags result = 0;
- char c;
+ if (!USE_GUI())
+ {
- assert(socket != NULL);
+ GSocketEventFlags result = 0;
+ fd_set readfds;
+ fd_set writefds;
+ fd_set exceptfds;
+ struct timeval tv;
- result = flags & socket->m_detected;
+ /* Do not use a static struct, Linux can garble it */
+ tv.tv_sec = 0;
+ tv.tv_usec = 0;
+
+ 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);
+
+ /* 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)
+ {
+ /* What to do here? */
+ return (result & flags);
+ }
+
+ /* 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;
+ }
+ else
+ {
+ 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)
+ {
+ int error;
+ SOCKLEN_T len = sizeof(error);
+
+ socket->m_establishing = FALSE;
+
+ getsockopt(socket->m_fd, SOL_SOCKET, SO_ERROR, (void*)&error, &len);
+
+ 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_OUTPUT_FLAG;
+ }
+ }
+
+ /* Check for exceptions and errors (is this useful in Unices?) */
+ if (FD_ISSET(socket->m_fd, &exceptfds))
+ {
+ socket->m_establishing = FALSE;
+ socket->m_detected = GSOCK_LOST_FLAG;
+
+ /* LOST event: Abort any further processing */
+ return (GSOCK_LOST_FLAG & flags);
+ }
+
+ return (result & flags);
- if ((flags & GSOCK_INPUT_FLAG) &&
- (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0))
- {
- result |= GSOCK_INPUT_FLAG;
}
+ else
+ {
- return result;
+ assert(socket != NULL);
+ return flags & socket->m_detected;
+
+ }
}
/* 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;
}
{
struct timeval tv;
fd_set readfds;
+ int ret;
/* Linux select() will overwrite the struct on return */
tv.tv_sec = (socket->m_timeout / 1000);
{
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;
}
{
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;
}
void _GSocket_Detected_Read(GSocket *socket)
{
char c;
- int ret;
- ret = recv(socket->m_fd, &c, 1, MSG_PEEK);
-
- if (socket->m_stream)
+ /* 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)
{
- if (ret < 0 && socket->m_server)
- {
- CALL_CALLBACK(socket, GSOCK_CONNECTION);
- return;
- }
+ socket->m_establishing = FALSE;
+
+ CALL_CALLBACK(socket, GSOCK_LOST);
+ GSocket_Shutdown(socket);
+ 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);
+ 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;
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)
{
CALL_CALLBACK(socket, GSOCK_LOST);
+ GSocket_Shutdown(socket);
}
else
{
* -------------------------------------------------------------------------
*/
-/* 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;
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)
{
assert(address != NULL);
+ if (address->m_addr)
+ free(address->m_addr);
+
free(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;
}
assert(address != NULL);
- CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
+ CHECK_ADDRESS(address, INET);
addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
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;
struct sockaddr_in *addr;
assert(address != NULL);
- CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
+ CHECK_ADDRESS(address, INET);
if (!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;
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);
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);
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;
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);
((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;
}
+#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);
- CHECK_ADDRESS(address, UNIX, GSOCK_INVADDR);
+ 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;
}
struct sockaddr_un *addr;
assert(address != NULL);
- CHECK_ADDRESS(address, UNIX, GSOCK_INVADDR);
+ CHECK_ADDRESS(address, UNIX);
addr = (struct sockaddr_un *)address->m_addr;
projects / wxWidgets.git / blobdiff