* Name: gsocket.c
* Authors: Guilhem Lavaux,
* Guillermo Rodriguez Garcia <guille@iies.es> (maintainer)
- * Purpose: GSocket main Unix-style file
+ * Purpose: GSocket main Unix and OS/2 file
+ * Licence: The wxWindows licence
* CVSID: $Id$
* -------------------------------------------------------------------------
*/
#include "wx/setup.h"
#endif
-#ifndef __EMX__
-/* I don't see, why this include is needed, but it seems to be necessary
- sometimes. For EMX, including C++ headers into plain C source breaks
- compilation, so don't do it there. */
+#if defined(__VISAGECPP__)
+/* Seems to be needed by Visual Age C++, though I don't see how it manages
+ to not break on including a C++ header into a plain C source file */
#include "wx/defs.h"
+#define BSD_SELECT /* use Berkley Sockets select */
#endif
#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
-#define BSD_SELECT /* use Berkley Sockets select */
-
#include <assert.h>
#include <sys/types.h>
-
-#ifdef __EMX__
+#ifdef __VISAGECPP__
+#include <string.h>
#include <sys/time.h>
+#include <types.h>
#include <netinet/in.h>
-#include <arpa/inet.h>
+#endif
#include <netdb.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/un.h>
-#define HAVE_INET_ADDR
+#include <sys/ioctl.h>
+#ifdef __VMS__
+#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>
+#include <sys/un.h>
+#endif
-#include <string.h>
-
+#ifndef __VISAGECPP__
#include <sys/time.h>
-#include <types.h>
#include <netinet/in.h>
-#include <netdb.h>
+#include <arpa/inet.h>
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+#else
#include <nerrno.h>
-
-#endif
-
-#if defined(__VISAGECPP__) && __IBMCPP__ < 400
-
+# if __IBMCPP__ < 400
#include <machine/endian.h>
#include <socket.h>
#include <ioctl.h>
#define EBADF SOCEBADF
-#else
-
+# ifdef min
+# undef min
+# endif
+# else
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/select.h>
-#ifdef __EMX__
-#define soclose(a) close(a)
-#else
+#define close(a) soclose(a)
#define select(a,b,c,d,e) bsdselect(a,b,c,d,e)
int _System bsdselect(int,
struct fd_set *,
struct fd_set *,
struct timeval *);
int _System soclose(int);
-#endif
-#endif
-
-#include <stdio.h>
-#if (defined(__VISAGECPP__) && __IBMCPP__ < 400) || defined(__EMX__)
-# ifdef min
-# undef min
# endif
-# include <stdlib.h>
#endif
+#include <stdio.h>
+#include <stdlib.h>
#include <stddef.h>
#include <ctype.h>
-#include <stdlib.h>
-
+#ifdef sun
+# include <sys/filio.h>
+#endif
+#ifdef sgi
+# include <bstring.h>
+#endif
#include <signal.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 */
/*
* MSW defines this, Unices don't.
#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 systems. INADDR_BROADCAST should be fine to indicate an error.
signal(SIGPIPE, old_handler); \
}
+
#ifndef __GSOCKET_STANDALONE__
# include "wx/unix/gsockunx.h"
# include "wx/gsocket.h"
# include "gsocket.h"
#endif /* __GSOCKET_STANDALONE__ */
-/* redefine some GUI-only functions to do nothing in console mode */
-#if defined(wxUSE_GUI) && !wxUSE_GUI
-# define _GSocket_GUI_Init(socket) (1)
-# define _GSocket_GUI_Destroy(socket)
-# define _GSocket_Enable_Events(socket)
-# define _GSocket_Disable_Events(socket)
-# define _GSocket_Install_Callback(socket, event)
-# define _GSocket_Uninstall_Callback(socket, event)
-#endif /* wxUSE_GUI */
-
/* debugging helpers */
-#define __GSOCKET_DEBUG__
#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 */
+void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc)
+{
+ 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)
{
+ if (gs_gui_functions)
+ {
+ gs_gui_functions->GUI_Cleanup();
+ }
}
/* Constructors / Destructors for GSocket */
/* 10 minutes * 60 sec * 1000 millisec */
socket->m_establishing = FALSE;
+ socket->m_functions = &gs_base_functions;
+
/* Per-socket GUI-specific initialization */
- success = _GSocket_GUI_Init(socket);
+ success = _GSocket_GUI_Init_Socket(socket);
if (!success)
{
free(socket);
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);
GSocket_Shutdown(socket);
/* Per-socket GUI-specific cleanup */
- _GSocket_GUI_Destroy(socket);
+ _GSocket_GUI_Destroy_Socket(socket);
/* Destroy private addresses */
if (socket->m_local)
if (socket->m_fd != INVALID_SOCKET)
{
shutdown(socket->m_fd, 2);
- soclose(socket->m_fd);
- socket->m_fd = INVALID_SOCKET;
+ GSocket_close(socket);
}
/* Disable GUI callbacks */
socket->m_cbacks[evt] = NULL;
socket->m_detected = GSOCK_LOST_FLAG;
- _GSocket_Disable_Events(socket);
}
/* Address handling */
* Sets up this socket as a server. The local address must have been
* set with GSocket_SetLocal() before GSocket_SetServer() is called.
* Returns GSOCK_NOERROR on success, 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.
+ * GSOCK_IOERR - low-level error.
*/
GSocketError GSocket_SetServer(GSocket *sck)
{
sck->m_error = GSOCK_IOERR;
return GSOCK_IOERR;
}
-
+#if defined(__EMX__) || defined(__VISAGECPP__)
ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(arg));
+#else
+ ioctl(sck->m_fd, FIONBIO, &arg);
+#endif
_GSocket_Enable_Events(sck);
/* Bind to the local address,
(SOCKLEN_T *) &sck->m_local->m_len) != 0) ||
(listen(sck->m_fd, 5) != 0))
{
- soclose(sck->m_fd);
- sck->m_fd = INVALID_SOCKET;
+ GSocket_close(sck);
sck->m_error = GSOCK_IOERR;
return GSOCK_IOERR;
}
* GSOCK_TIMEDOUT - timeout, no incoming connections.
* GSOCK_WOULDBLOCK - the call would block and the socket is nonblocking.
* GSOCK_MEMERR - couldn't allocate memory.
- * GSOCK_IOERR - low-level error.
+ * GSOCK_IOERR - low-level error.
*/
GSocket *GSocket_WaitConnection(GSocket *socket)
{
socket->m_error = err;
return NULL;
}
-
+#if defined(__EMX__) || defined(__VISAGECPP__)
ioctl(connection->m_fd, FIONBIO, (char*)&arg, sizeof(arg));
+#else
+ ioctl(connection->m_fd, FIONBIO, &arg);
+#endif
_GSocket_Enable_Events(connection);
return connection;
* GSOCK_TIMEDOUT - timeout, the connection failed.
* GSOCK_WOULDBLOCK - connection in progress (nonblocking sockets only)
* GSOCK_MEMERR - couldn't allocate memory.
- * GSOCK_IOERR - low-level error.
+ * GSOCK_IOERR - low-level error.
*/
GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
{
sck->m_error = GSOCK_IOERR;
return GSOCK_IOERR;
}
-
+#if defined(__EMX__) || defined(__VISAGECPP__)
ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(arg));
+#else
+ ioctl(sck->m_fd, FIONBIO, &arg);
+#endif
_GSocket_Enable_Events(sck);
/* Connect it to the peer address, with a timeout (see below) */
ret = connect(sck->m_fd, sck->m_peer->m_addr, sck->m_peer->m_len);
- printf("connect on %d to %X (%d) returned %d, errno = %d\n",
- sck->m_fd, sck->m_peer->m_addr, sck->m_peer->m_len, ret, errno);
if (ret == -1)
{
err = errno;
{
if (_GSocket_Output_Timeout(sck) == GSOCK_TIMEDOUT)
{
- soclose(sck->m_fd);
- sck->m_fd = INVALID_SOCKET;
+ 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.
*/
- soclose(sck->m_fd);
- sck->m_fd = INVALID_SOCKET;
+ GSocket_close(sck);
sck->m_error = GSOCK_IOERR;
return GSOCK_IOERR;
}
sck->m_error = GSOCK_IOERR;
return GSOCK_IOERR;
}
-
+#if defined(__EMX__) || defined(__VISAGECPP__)
ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(arg));
+#else
+ ioctl(sck->m_fd, FIONBIO, &arg);
+#endif
_GSocket_Enable_Events(sck);
/* Bind to the local address,
sck->m_local->m_addr,
(SOCKLEN_T *) &sck->m_local->m_len) != 0))
{
- soclose(sck->m_fd);
- sck->m_fd = INVALID_SOCKET;
+ GSocket_close(sck);
sck->m_error = GSOCK_IOERR;
return GSOCK_IOERR;
}
ret = _GSocket_Recv_Stream(socket, buffer, size);
else
ret = _GSocket_Recv_Dgram(socket, buffer, size);
-
+
if (ret == -1)
{
if (errno == EWOULDBLOCK)
else
socket->m_error = GSOCK_IOERR;
}
-
+
return ret;
}
int GSocket_Write(GSocket *socket, const char *buffer, int size)
-{
+{
int ret;
assert(socket != NULL);
-
+
GSocket_Debug(( "GSocket_Write #1, size %d\n", size ));
if (socket->m_fd == INVALID_SOCKET || socket->m_server)
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)
_GSocket_Enable(socket, GSOCK_OUTPUT);
return -1;
}
-
+
GSocket_Debug(( "GSocket_Write #5, size %d ret %d\n", size, ret ));
return ret;
*/
GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
{
-#if defined(wxUSE_GUI) && !wxUSE_GUI
+ if (!USE_GUI())
+ {
- GSocketEventFlags result = 0;
- fd_set readfds;
- fd_set writefds;
- fd_set exceptfds;
- struct timeval tv;
+ GSocketEventFlags result = 0;
+ fd_set readfds;
+ fd_set writefds;
+ fd_set exceptfds;
+ struct timeval tv;
- /* Do not use a static struct, Linux can garble it */
- tv.tv_sec = 0;
- tv.tv_usec = 0;
+ /* Do not use a static struct, Linux can garble it */
+ tv.tv_sec = 0;
+ tv.tv_usec = 0;
- assert(socket != NULL);
+ 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);
+ FD_ZERO(&readfds);
+ FD_ZERO(&writefds);
+ FD_ZERO(&exceptfds);
+ FD_SET(socket->m_fd, &readfds);
+ FD_SET(socket->m_fd, &writefds);
+ FD_SET(socket->m_fd, &exceptfds);
- /* Check known state first */
- result |= (GSOCK_CONNECTION_FLAG & socket->m_detected & flags);
- result |= (GSOCK_LOST_FLAG & socket->m_detected & flags);
+ /* Check 'sticky' CONNECTION flag first */
+ result |= (GSOCK_CONNECTION_FLAG & socket->m_detected);
- /* Try select now */
- if (select(socket->m_fd + 1, &readfds, &writefds, &exceptfds, &tv) <= 0)
- return result;
+ /* 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;
- /* Check for readability */
- if (FD_ISSET(socket->m_fd, &readfds))
- {
- char c;
+ return (GSOCK_LOST_FLAG & flags);
+ }
- if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0)
+ /* Try select now */
+ if (select(socket->m_fd + 1, &readfds, &writefds, &exceptfds, &tv) <= 0)
{
- result |= (GSOCK_INPUT_FLAG & flags);
+ /* What to do here? */
+ return (result & flags);
}
- else
+
+ /* Check for readability */
+ if (FD_ISSET(socket->m_fd, &readfds))
{
- if (socket->m_server && socket->m_stream)
+ char c;
+
+ if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0)
{
- result |= (GSOCK_CONNECTION_FLAG & flags);
- socket->m_detected |= GSOCK_CONNECTION_FLAG;
+ result |= GSOCK_INPUT_FLAG;
}
else
{
- result |= (GSOCK_LOST_FLAG & flags);
- socket->m_detected = GSOCK_LOST_FLAG;
+ 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)
+ /* Check for writability */
+ if (FD_ISSET(socket->m_fd, &writefds))
{
- int error;
- SOCKLEN_T len = sizeof(error);
+ if (socket->m_establishing && !socket->m_server)
+ {
+ int error;
+ SOCKLEN_T len = sizeof(error);
- socket->m_establishing = FALSE;
+ 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)
- {
- result |= (GSOCK_LOST_FLAG & flags);
- socket->m_detected = GSOCK_LOST_FLAG;
+ 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_CONNECTION_FLAG & flags);
- socket->m_detected |= GSOCK_CONNECTION_FLAG;
+ result |= GSOCK_OUTPUT_FLAG;
}
}
- else
+
+ /* Check for exceptions and errors (is this useful in Unices?) */
+ if (FD_ISSET(socket->m_fd, &exceptfds))
{
- result |= (GSOCK_OUTPUT_FLAG & flags);
- }
- }
+ socket->m_establishing = FALSE;
+ socket->m_detected = GSOCK_LOST_FLAG;
- /* Check for exceptions and errors (is this useful in Unices?) */
- if (FD_ISSET(socket->m_fd, &exceptfds))
- {
- result |= (GSOCK_LOST_FLAG & flags);
- socket->m_establishing = FALSE;
- socket->m_detected = GSOCK_LOST_FLAG;
- }
+ /* LOST event: Abort any further processing */
+ return (GSOCK_LOST_FLAG & flags);
+ }
- return result;
+ return (result & flags);
-#else
+ }
+ else
+ {
- assert(socket != NULL);
- return flags & socket->m_detected;
+ assert(socket != NULL);
+ return flags & socket->m_detected;
-#endif /* !wxUSE_GUI */
+ }
}
/* Flags */
* operation, there is still data available, the callback function will
* be called again.
* GSOCK_OUTPUT:
- * The socket is available for writing. That is, the next write call
+ * The socket is available for writing. That is, the next write call
* won't block. This event is generated only once, when the connection is
* first established, and then only if a call failed with GSOCK_WOULDBLOCK,
* when the output buffer empties again. This means that the app should
{
if ((flags & (1 << count)) != 0)
{
- printf("Setting callback no %d for socket at %X to address %X,data %X\n",
- count, socket, callback, cdata);
socket->m_cbacks[count] = callback;
socket->m_data[count] = cdata;
}
{
if ((flags & (1 << count)) != 0)
{
- printf("Removing callback no %d for socket at %X",
- count, socket);
socket->m_cbacks[count] = NULL;
socket->m_data[count] = NULL;
}
#define CALL_CALLBACK(socket, event) { \
_GSocket_Disable(socket, event); \
- if (socket->m_cbacks[event]){ \
- printf("Call callback for event %d, socket %X: %X, %X\n", event, \
- socket, socket->m_cbacks[event], socket->m_data[event]); \
+ if (socket->m_cbacks[event]) \
socket->m_cbacks[event](socket, event, socket->m_data[event]); \
- } \
}
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" ));
+ 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 (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" ));
+ 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" ));
+ 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
{
{
int ret;
-#ifdef __EMX__
+#ifndef __VISAGECPP__
MASK_SIGNAL();
ret = send(socket->m_fd, buffer, size, 0);
UNMASK_SIGNAL();
#else
ret = send(socket->m_fd, (char *)buffer, size, 0);
#endif
+
return ret;
}
return -1;
}
-#ifdef __EMX__
+#ifndef __VISAGECPP__
MASK_SIGNAL();
ret = sendto(socket->m_fd, buffer, size, 0, addr, len);
UNMASK_SIGNAL();
{
char c;
+ /* 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 (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0)
{
CALL_CALLBACK(socket, GSOCK_INPUT);
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;
if (error)
{
CALL_CALLBACK(socket, GSOCK_LOST);
+ GSocket_Shutdown(socket);
}
else
{
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)
if (address->m_addr)
free(address->m_addr);
-/* free(address); */
+ free(address);
}
void GAddress_SetFamily(GAddress *address, GAddressType type)
if (inet_aton(hostname, addr) == 0)
{
#elif defined(HAVE_INET_ADDR)
- addr->s_addr = inet_addr(hostname);
- if ( addr->s_addr == -1 )
+ if ( (addr->s_addr = inet_addr(hostname)) == -1 )
{
#else
/* Use gethostbyname by default */
address->m_error = GSOCK_INVPORT;
return GSOCK_INVPORT;
}
-
+
se = getservbyname(port, protocol);
if (!se)
{
+ /* the cast to int suppresses compiler warnings about subscript having the
+ type char */
if (isdigit((int)port[0]))
{
int port_int;
assert(address != NULL);
CHECK_ADDRESS(address, INET);
-
+
addr = (struct sockaddr_in *)address->m_addr;
addr->sin_port = htons(port);
char *addr_buf;
struct sockaddr_in *addr;
- assert(address != NULL);
+ assert(address != NULL);
CHECK_ADDRESS(address, INET);
addr = (struct sockaddr_in *)address->m_addr;
{
struct sockaddr_in *addr;
- assert(address != NULL);
- CHECK_ADDRESS_RETVAL(address, INET, 0);
+ assert(address != NULL);
+ CHECK_ADDRESS_RETVAL(address, INET, 0);
addr = (struct sockaddr_in *)address->m_addr;
{
struct sockaddr_in *addr;
- assert(address != NULL);
- CHECK_ADDRESS_RETVAL(address, INET, 0);
+ assert(address != NULL);
+ CHECK_ADDRESS_RETVAL(address, INET, 0);
addr = (struct sockaddr_in *)address->m_addr;
return ntohs(addr->sin_port);
* -------------------------------------------------------------------------
*/
-#ifdef __EMX__
+#ifndef __VISAGECPP__
GSocketError _GAddress_Init_UNIX(GAddress *address)
{
address->m_len = sizeof(struct sockaddr_un);
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);
+ assert(address != NULL);
- CHECK_ADDRESS(address, UNIX);
+ 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;
}
return GSOCK_NOERROR;
}
-#endif
- /* __EMX__ */
-#endif
- /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
+#endif /* !defined(__VISAGECPP__) */
+#endif /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
projects / wxWidgets.git / blobdiff