#if wxUSE_SOCKETS
#include <assert.h>
-#include <sys/ioctl.h>
#include <sys/types.h>
-#ifdef vms
+#include <netdb.h>
+#include <sys/ioctl.h>
+#ifdef __VMS__
+#define SOCK_LEN_TYP (unsigned int*)
#include <socket.h>
+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 <sys/socket.h>
-#endif
#include <sys/un.h>
+#define SOCK_LEN_TYP (int*)
+#endif
#include <sys/time.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <netdb.h>
+#include <errno.h>
#include <string.h>
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
+#include <stddef.h>
+#include <ctype.h>
#ifdef sun
# include <sys/filio.h>
#include <signal.h>
#include "wx/gsocket.h"
-#include "gsockunx.h"
+#include "wx/unix/gsockunx.h"
#ifndef SOCKLEN_T
#endif
+#define MASK_SIGNAL() \
+{ \
+ void (*old_handler)(int); \
+ \
+ old_handler = signal(SIGPIPE, SIG_IGN);
+
+#define UNMASK_SIGNAL() \
+ signal(SIGPIPE, old_handler); \
+}
+
+
/* Global initialisers */
bool GSocket_Init()
socket = (GSocket *)malloc(sizeof(GSocket));
+ if (socket == NULL)
+ return NULL;
+
socket->m_fd = -1;
- for (i=0;i<GSOCK_MAX_EVENT;i++) {
- socket->m_fbacks[i] = NULL;
- socket->m_iocalls[i] = FALSE;
+ for (i=0;i<GSOCK_MAX_EVENT;i++)
+ {
+ socket->m_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 */
+ socket->m_establishing = FALSE;
/* We initialize the GUI specific entries here */
_GSocket_GUI_Init(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;evt<GSOCK_MAX_EVENT;evt++)
- _GSocket_Uninstall_Fallback(socket, evt);
+ for (evt = 0; evt < GSOCK_MAX_EVENT; evt++)
+ socket->m_cbacks[evt] = NULL;
+
+ socket->m_detected = 0;
+ _GSocket_Disable_Events(socket);
}
/* Address handling */
GAddress *address;
struct sockaddr addr;
SOCKLEN_T size;
+ GSocketError err;
assert(socket != NULL);
size = sizeof(addr);
- if (getsockname(socket->m_fd, &addr, &size) < 0) {
+ if (getsockname(socket->m_fd, &addr, SOCK_LEN_TYP &size) < 0) {
socket->m_error = GSOCK_IOERR;
return NULL;
}
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;
}
/* 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);
/* 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);
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);
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;
+ 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)
+ {
+ connection->m_error = GSOCK_MEMERR;
+ return NULL;
+ }
/* Accept the incoming connection */
+ 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, NULL, NULL);
- if (connection->m_fd == -1) {
+
+ 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;
+ ioctl(connection->m_fd, FIONBIO, &arg);
+ _GSocket_Enable_Events(connection);
+
return connection;
}
GSocketError GSocket_SetNonOriented(GSocket *sck)
{
+ int arg = 1;
+
assert(sck != NULL);
if (sck->m_fd != -1) {
/* 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);
/* 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;
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;
return GSOCK_NOERROR;
}
/* 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_SetBlocking() puts the socket in non-blocking mode. This is useful
- if we don't want to wait.
-*/
-void GSocket_SetBlocking(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;
-
- if (socket->m_fd != -1)
- ioctl(socket->m_fd, FIONBIO, &block);
+ socket->m_non_blocking = non_block;
}
-/*
- GSocket_GetError() returns the last error occured on the socket stream.
-*/
+/* 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;
+}
+
+/* GSocket_GetError:
+ * Returns the last error occured for this socket.
+ */
GSocketError GSocket_GetError(GSocket *socket)
{
assert(socket != NULL);
/* 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
-
- SetFallback 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_SetFallback(GSocket *socket, GSocketEventFlags event,
- GSocketFallback 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;count<GSOCK_MAX_EVENT;count++) {
- /* We test each flag and, if it is enabled, we enable the corresponding
- event */
- if ((event & (1 << count)) != 0) {
- socket->m_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_Install_Fallback(socket, count);
- _GSocket_Enable(socket, count);
}
}
}
-/*
- UnsetFallback will disables all fallbacks specified by "event".
- NOTE: event may be a combination of flags
-*/
-void GSocket_UnsetFallback(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;count<GSOCK_MAX_EVENT;count++) {
- if ((event & (1 << count)) != 0) {
- _GSocket_Disable(socket, count);
- socket->m_fbacks[count] = NULL;
- _GSocket_Uninstall_Fallback(socket, count);
+ 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_Fallback(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_Fallback(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)
MASK_SIGNAL();
ret = recv(socket->m_fd, buffer, size, 0);
UNMASK_SIGNAL();
- if (ret == -1) {
- socket->m_error = GSOCK_IOERR;
- return -1;
- }
+
return ret;
}
struct sockaddr from;
SOCKLEN_T fromlen;
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,
+ SOCK_LEN_TYP &fromlen);
UNMASK_SIGNAL();
- if (ret == -1) {
- socket->m_error = GSOCK_IOERR;
+
+ if (ret == -1)
return -1;
- }
/* Translate a system address into a GSocket address */
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;
}
int _GSocket_Send_Stream(GSocket *socket, const char *buffer, int size)
{
int ret;
+ GSocketError err;
MASK_SIGNAL();
ret = send(socket->m_fd, buffer, size, 0);
UNMASK_SIGNAL();
- if (ret == -1) {
- socket->m_error = GSOCK_IOERR;
- return -1;
- }
+
return ret;
}
{
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();
ret = sendto(socket->m_fd, buffer, size, 0, addr, len);
UNMASK_SIGNAL();
- if (ret == -1) {
- socket->m_error = GSOCK_IOERR;
- return -1;
- }
/* Frees memory allocated from _GAddress_translate_to */
free(addr);
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;
+
+ socket->m_establishing = FALSE;
-#undef CALL_FALLBACK
-#undef MASK_SIGNAL
-#undef UNMASK_SIGNAL
+ len = sizeof(error);
+ getsockopt(socket->m_fd, SOL_SOCKET, SO_ERROR, (void*) &error,
+ SOCK_LEN_TYP &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);
+ }
+}
/*
* -------------------------------------------------------------------------
#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; \
address = (GAddress *)malloc(sizeof(GAddress));
+ if (address == NULL)
+ return NULL;
+
address->m_family = GSOCK_NOFAMILY;
address->m_addr = NULL;
address->m_len = 0;
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);
}
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:
#endif
default:
{
- /* TODO error */
+ address->m_error = GSOCK_INVOP;
+ return GSOCK_INVOP;
}
}
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;
}
/*
* -------------------------------------------------------------------------
*/
-void _GAddress_Init_INET(GAddress *address)
+GSocketError _GAddress_Init_INET(GAddress *address)
{
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;
+ ((struct sockaddr_in *)address->m_addr)->sin_addr.s_addr = INADDR_ANY;
+
+ return GSOCK_NOERROR;
}
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 <guille@iies.es> */
+ 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;
}
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);
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;
}
* -------------------------------------------------------------------------
*/
-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_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)
return GSOCK_NOERROR;
}
-#endif // wxUSE_SOCKETS
+#endif
+ /* wxUSE_SOCKETS */
projects / wxWidgets.git / blobdiff