/* -------------------------------------------------------------------------
- * Project: GSocket (Generic Socket) for WX
- * Name: gsocket.c
- * Authors: David Elliott (C++ conversion, maintainer)
- * Guilhem Lavaux,
- * Guillermo Rodriguez Garcia <guille@iies.es>
- * Purpose: GSocket main Unix and OS/2 file
- * Licence: The wxWindows licence
- * CVSID: $Id$
+ * Project: GSocket (Generic Socket) for WX
+ * Name: gsocket.c
+ * Copyright: (c) Guilhem Lavaux
+ * Licence: wxWindows Licence
+ * Authors: David Elliott (C++ conversion, maintainer)
+ * Guilhem Lavaux,
+ * Guillermo Rodriguez Garcia <guille@iies.es>
+ * Purpose: GSocket main Unix and OS/2 file
+ * Licence: The wxWindows licence
+ * CVSID: $Id$
* -------------------------------------------------------------------------
*/
+/*
+ * PLEASE don't put C++ comments here - this is a C source file.
+ */
+
+#if defined(__WATCOMC__)
#include "wx/wxprec.h"
-#ifndef WX_PRECOMP
- #include "wx/app.h"
- #include "wx/apptrait.h"
-#endif //ndef WX_PRECOMP
+#include <errno.h>
+#include <nerrno.h>
+#endif
+
+#ifndef __GSOCKET_STANDALONE__
+#include "wx/setup.h"
+#endif
#if defined(__VISAGECPP__)
/* Seems to be needed by Visual Age C++, though I don't see how it manages
int _System soclose(int);
# endif
#endif
+#ifdef __EMX__
+#include <sys/select.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
#ifdef sgi
# include <bstring.h>
#endif
+#ifdef _AIX
+# include <strings.h>
+#endif
#include <signal.h>
-#ifndef SOCKLEN_T
+#ifndef WX_SOCKLEN_T
#ifdef VMS
-# define SOCKLEN_T unsigned int
+# define WX_SOCKLEN_T unsigned int
#else
# ifdef __GLIBC__
# if __GLIBC__ == 2
-# define SOCKLEN_T socklen_t
+# define WX_SOCKLEN_T socklen_t
# endif
+# elif defined(__WXMAC__)
+# define WX_SOCKLEN_T socklen_t
# else
-# define SOCKLEN_T int
+# define WX_SOCKLEN_T int
# endif
#endif
#endif /* SOCKLEN_T */
+#ifndef SOCKOPTLEN_T
+#define SOCKOPTLEN_T WX_SOCKLEN_T
+#endif
+
/*
* MSW defines this, Unices don't.
*/
#define INADDR_NONE INADDR_BROADCAST
#endif
-#define MASK_SIGNAL() \
-{ \
- void (*old_handler)(int); \
- \
- old_handler = signal(SIGPIPE, SIG_IGN);
+#if defined(__VISAGECPP__) || defined(__WATCOMC__)
-#define UNMASK_SIGNAL() \
- signal(SIGPIPE, old_handler); \
-}
+ #define MASK_SIGNAL() {
+ #define UNMASK_SIGNAL() }
+#else
+
+ #define MASK_SIGNAL() \
+ { \
+ void (*old_handler)(int); \
+ \
+ old_handler = signal(SIGPIPE, SIG_IGN);
+
+ #define UNMASK_SIGNAL() \
+ signal(SIGPIPE, old_handler); \
+ }
+
+#endif
+
+/* If a SIGPIPE is issued by a socket call on a remotely closed socket,
+ the program will "crash" unless it explicitly handles the SIGPIPE.
+ By using MSG_NOSIGNAL, the SIGPIPE is suppressed. Later, we will
+ use SO_NOSIGPIPE (if available), the BSD equivalent. */
+#ifdef MSG_NOSIGNAL
+# define GSOCKET_MSG_NOSIGNAL MSG_NOSIGNAL
+#else /* MSG_NOSIGNAL not available (FreeBSD including OS X) */
+# define GSOCKET_MSG_NOSIGNAL 0
+#endif /* MSG_NOSIGNAL */
#ifndef __GSOCKET_STANDALONE__
# include "wx/unix/gsockunx.h"
#else
# include "gsockunx.h"
# include "gsocket.h"
+# ifndef WXUNUSED
+# define WXUNUSED(x)
+# endif
#endif /* __GSOCKET_STANDALONE__ */
/* debugging helpers */
# define GSocket_Debug(args)
#endif /* __GSOCKET_DEBUG__ */
-///////////////////////////////////////////////////////////////////////////
-// GSocketBSDGUIShim
-struct GSocketGUIFunctionsTable *GSocketBSDGUIShim::ms_gui_functions = NULL;
-
-void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc)
-{
- GSocketBSDGUIShim::ms_gui_functions = guifunc;
-}
-
-inline bool GSocketBSDGUIShim::UseGUI()
-{
- return ms_gui_functions;
-}
-
-inline bool GSocketBSDGUIShim::GUI_Init()
-{
- return (ms_gui_functions)?ms_gui_functions->GUI_Init():true;
-}
-
-inline void GSocketBSDGUIShim::GUI_Cleanup()
-{
- if (ms_gui_functions) ms_gui_functions->GUI_Cleanup();
-}
+/* Table of GUI-related functions. We must call them indirectly because
+ * of wxBase and GUI separation: */
-GSocketBSDGUIShim::GSocketBSDGUIShim()
-{
- m_ok = (ms_gui_functions ? ms_gui_functions->GUI_Init_Socket(this) : true);
-}
+static GSocketGUIFunctionsTable *gs_gui_functions;
-GSocketBSDGUIShim::~GSocketBSDGUIShim()
+class GSocketGUIFunctionsTableNull: public GSocketGUIFunctionsTable
{
- if (ms_gui_functions) ms_gui_functions->GUI_Destroy_Socket(this);
-}
-
-void GSocketBSDGUIShim::EventLoop_Enable_Events()
-{
- if (ms_gui_functions) ms_gui_functions->Enable_Events(this);
-}
-
-void GSocketBSDGUIShim::EventLoop_Disable_Events()
-{
- if (ms_gui_functions) ms_gui_functions->Disable_Events(this);
-}
+public:
+ virtual bool OnInit();
+ virtual void OnExit();
+ virtual bool CanUseEventLoop();
+ virtual bool Init_Socket(GSocket *socket);
+ virtual void Destroy_Socket(GSocket *socket);
+ virtual void Install_Callback(GSocket *socket, GSocketEvent event);
+ virtual void Uninstall_Callback(GSocket *socket, GSocketEvent event);
+ virtual void Enable_Events(GSocket *socket);
+ virtual void Disable_Events(GSocket *socket);
+};
-void GSocketBSDGUIShim::EventLoop_Install_Callback(GSocketEvent event)
-{
- if (ms_gui_functions) ms_gui_functions->Install_Callback(this, event);
-}
+bool GSocketGUIFunctionsTableNull::OnInit()
+{ return true; }
+void GSocketGUIFunctionsTableNull::OnExit()
+{}
+bool GSocketGUIFunctionsTableNull::CanUseEventLoop()
+{ return false; }
+bool GSocketGUIFunctionsTableNull::Init_Socket(GSocket *WXUNUSED(socket))
+{ return true; }
+void GSocketGUIFunctionsTableNull::Destroy_Socket(GSocket *WXUNUSED(socket))
+{}
+void GSocketGUIFunctionsTableNull::Install_Callback(GSocket *WXUNUSED(socket), GSocketEvent WXUNUSED(event))
+{}
+void GSocketGUIFunctionsTableNull::Uninstall_Callback(GSocket *WXUNUSED(socket), GSocketEvent WXUNUSED(event))
+{}
+void GSocketGUIFunctionsTableNull::Enable_Events(GSocket *WXUNUSED(socket))
+{}
+void GSocketGUIFunctionsTableNull::Disable_Events(GSocket *WXUNUSED(socket))
+{}
+/* Global initialisers */
-void GSocketBSDGUIShim::EventLoop_Uninstall_Callback(GSocketEvent event)
+void GSocket_SetGUIFunctions(GSocketGUIFunctionsTable *guifunc)
{
- if (ms_gui_functions) ms_gui_functions->Uninstall_Callback(this, event);
+ gs_gui_functions = guifunc;
}
-///////////////////////////////////////////////////////////////////////////
-// GSocketBSD
-
-static struct GSocketBaseFunctionsTable gs_base_functions =
-{
- GSocketBSD::_GSocket_Detected_Read,
- GSocketBSD::_GSocket_Detected_Write
-};
-
-/* Global initialisers */
-
int GSocket_Init(void)
{
- return GSocketBSDGUIShim::GUI_Init();
+ if (!gs_gui_functions)
+ {
+ static GSocketGUIFunctionsTableNull table;
+ gs_gui_functions = &table;
+ }
+ if ( !gs_gui_functions->OnInit() )
+ return 0;
+ return 1;
}
void GSocket_Cleanup(void)
{
- GSocketBSDGUIShim::GUI_Cleanup();
+ if (gs_gui_functions)
+ {
+ gs_gui_functions->OnExit();
+ }
}
-GSocketBSD::GSocketBSD()
+/* Constructors / Destructors for GSocket */
+
+GSocket::GSocket()
{
int i;
m_local = NULL;
m_peer = NULL;
m_error = GSOCK_NOERROR;
- m_server = FALSE;
- m_stream = TRUE;
+ m_server = false;
+ m_stream = true;
m_gui_dependent = NULL;
- m_non_blocking = FALSE;
+ m_non_blocking = false;
+ m_reusable = false;
m_timeout = 10*60*1000;
/* 10 minutes * 60 sec * 1000 millisec */
- m_establishing = FALSE;
+ m_establishing = false;
- m_functions = &gs_base_functions;
-
- m_ok = true;
+ assert(gs_gui_functions);
+ /* Per-socket GUI-specific initialization */
+ m_ok = gs_gui_functions->Init_Socket(this);
}
-void GSocketBSD::Close()
+void GSocket::Close()
{
- EventLoop_Disable_Events();
-// gsockosx.c calls CFSocketInvalidate which closes the socket for us
+ gs_gui_functions->Disable_Events(this);
+ /* gsockosx.c calls CFSocketInvalidate which closes the socket for us */
#if !(defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__)))
close(m_fd);
#endif
m_fd = INVALID_SOCKET;
}
-GSocketBSD::~GSocketBSD()
+GSocket::~GSocket()
{
+ assert(this);
+
+ /* Check that the socket is really shutdowned */
+ if (m_fd != INVALID_SOCKET)
+ Shutdown();
+
+ /* Per-socket GUI-specific cleanup */
+ gs_gui_functions->Destroy_Socket(this);
+
/* Destroy private addresses */
if (m_local)
GAddress_destroy(m_local);
* Disallow further read/write operations on this socket, close
* the fd and disable all callbacks.
*/
-void GSocketBSD::Shutdown()
+void GSocket::Shutdown()
{
int evt;
* GSOCK_INVSOCK - the socket is not valid.
* GSOCK_INVADDR - the address is not valid.
*/
-GSocketError GSocketBSD::SetLocal(GAddress *address)
+GSocketError GSocket::SetLocal(GAddress *address)
{
assert(this);
return GSOCK_NOERROR;
}
-GSocketError GSocketBSD::SetPeer(GAddress *address)
+GSocketError GSocket::SetPeer(GAddress *address)
{
assert(this);
return GSOCK_NOERROR;
}
-GAddress *GSocketBSD::GetLocal()
+GAddress *GSocket::GetLocal()
{
GAddress *address;
struct sockaddr addr;
- SOCKLEN_T size = sizeof(addr);
+ WX_SOCKLEN_T size = sizeof(addr);
GSocketError err;
assert(this);
return NULL;
}
- if (getsockname(m_fd, &addr, (SOCKLEN_T *) &size) < 0)
+ if (getsockname(m_fd, &addr, (WX_SOCKLEN_T *) &size) < 0)
{
m_error = GSOCK_IOERR;
return NULL;
return address;
}
-GAddress *GSocketBSD::GetPeer()
+GAddress *GSocket::GetPeer()
{
assert(this);
* GSOCK_INVADDR - the local address has not been set.
* GSOCK_IOERR - low-level error.
*/
-GSocketError GSocketBSD::SetServer()
+GSocketError GSocket::SetServer()
{
int arg = 1;
}
/* Initialize all fields */
- m_stream = TRUE;
- m_server = TRUE;
+ m_stream = true;
+ m_server = true;
/* Create the socket */
m_fd = socket(m_local->m_realfamily, SOCK_STREAM, 0);
m_error = GSOCK_IOERR;
return GSOCK_IOERR;
}
-#if defined(__EMX__) || defined(__VISAGECPP__)
- ioctl(m_fd, FIONBIO, (char*)&arg, sizeof(arg));
-#else
- ioctl(m_fd, FIONBIO, &arg);
+
+ /* FreeBSD variants can't use MSG_NOSIGNAL, and instead use a socket option */
+#ifdef SO_NOSIGPIPE
+ setsockopt(m_fd, SOL_SOCKET, SO_NOSIGPIPE, (const char*)&arg, sizeof(u_long));
#endif
- EventLoop_Enable_Events();
+
+ ioctl(m_fd, FIONBIO, &arg);
+ gs_gui_functions->Enable_Events(this);
/* allow a socket to re-bind if the socket is in the TIME_WAIT
state after being previously closed.
*/
- if(m_reusable)
+ if (m_reusable)
setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(u_long));
/* Bind to the local address,
if ((bind(m_fd, m_local->m_addr, m_local->m_len) != 0) ||
(getsockname(m_fd,
m_local->m_addr,
- (SOCKLEN_T *) &m_local->m_len) != 0) ||
+ (WX_SOCKLEN_T *) &m_local->m_len) != 0) ||
(listen(m_fd, 5) != 0))
{
Close();
* GSOCK_MEMERR - couldn't allocate memory.
* GSOCK_IOERR - low-level error.
*/
-GSocket *GSocketBSD::WaitConnection()
+GSocket *GSocket::WaitConnection()
{
struct sockaddr from;
- SOCKLEN_T fromlen = sizeof(from);
+ WX_SOCKLEN_T fromlen = sizeof(from);
GSocket *connection;
GSocketError err;
int arg = 1;
assert(this);
- /* Reenable CONNECTION events */
- Enable(GSOCK_CONNECTION);
-
/* If the socket has already been created, we exit immediately */
if (m_fd == INVALID_SOCKET || !m_server)
{
if (!connection)
{
- delete connection;
m_error = GSOCK_MEMERR;
return NULL;
}
return NULL;
}
- connection->m_fd = accept(m_fd, &from, (SOCKLEN_T *) &fromlen);
+ connection->m_fd = accept(m_fd, &from, (WX_SOCKLEN_T *) &fromlen);
+
+ /* Reenable CONNECTION events */
+ Enable(GSOCK_CONNECTION);
if (connection->m_fd == INVALID_SOCKET)
{
}
/* Initialize all fields */
- connection->m_server = FALSE;
- connection->m_stream = TRUE;
+ connection->m_server = false;
+ connection->m_stream = true;
/* Setup the peer address field */
connection->m_peer = GAddress_new();
err = _GAddress_translate_from(connection->m_peer, &from, fromlen);
if (err != GSOCK_NOERROR)
{
- GAddress_destroy(connection->m_peer);
delete connection;
m_error = err;
return NULL;
#else
ioctl(connection->m_fd, FIONBIO, &arg);
#endif
- connection->EventLoop_Enable_Events();
+ gs_gui_functions->Enable_Events(connection);
return connection;
}
-int GSocketBSD::SetReusable()
+bool GSocket::SetReusable()
{
/* socket must not be null, and must not be in use/already bound */
- if (NULL != this && m_fd == INVALID_SOCKET) {
- m_reusable = TRUE;
- return TRUE;
+ if (this && m_fd == INVALID_SOCKET) {
+ m_reusable = true;
+ return true;
}
- return FALSE;
+ return false;
}
/* Client specific parts */
* For stream (connection oriented) sockets, GSocket_Connect() tries
* to establish a client connection to a server using the peer address
* as established with GSocket_SetPeer(). Returns GSOCK_NOERROR if the
- * connection has been succesfully established, or one of the error
+ * connection has been successfully established, or one of the error
* codes listed below. Note that for nonblocking sockets, a return
* value of GSOCK_WOULDBLOCK doesn't mean a failure. The connection
* request can be completed later; you should use GSocket_Select()
* GSOCK_MEMERR - couldn't allocate memory.
* GSOCK_IOERR - low-level error.
*/
-GSocketError GSocketBSD::Connect(GSocketStream stream)
+GSocketError GSocket::Connect(GSocketStream stream)
{
int err, ret;
int arg = 1;
/* Streamed or dgram socket? */
m_stream = (stream == GSOCK_STREAMED);
- m_server = FALSE;
- m_establishing = FALSE;
+ m_server = false;
+ m_establishing = false;
/* Create the socket */
m_fd = socket(m_peer->m_realfamily,
m_error = GSOCK_IOERR;
return GSOCK_IOERR;
}
+
+ /* FreeBSD variants can't use MSG_NOSIGNAL, and instead use a socket option */
+#ifdef SO_NOSIGPIPE
+ setsockopt(m_fd, SOL_SOCKET, SO_NOSIGPIPE, (const char*)&arg, sizeof(u_long));
+#endif
+
#if defined(__EMX__) || defined(__VISAGECPP__)
ioctl(m_fd, FIONBIO, (char*)&arg, sizeof(arg));
#else
ioctl(m_fd, FIONBIO, &arg);
#endif
- EventLoop_Enable_Events();
/* Connect it to the peer address, with a timeout (see below) */
ret = connect(m_fd, m_peer->m_addr, m_peer->m_len);
+ /* We only call Enable_Events if we know e aren't shutting down the socket */
+
+ if (m_non_blocking)
+ {
+ gs_gui_functions->Enable_Events(this);
+ }
+
if (ret == -1)
{
err = errno;
else
{
int error;
- SOCKLEN_T len = sizeof(error);
+ SOCKOPTLEN_T len = sizeof(error);
+
+ getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (char*) &error, &len);
- getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (void*) &error, &len);
+ gs_gui_functions->Enable_Events(this);
if (!error)
return GSOCK_NOERROR;
*/
if ((err == EINPROGRESS) && (m_non_blocking))
{
- m_establishing = TRUE;
+ m_establishing = true;
m_error = GSOCK_WOULDBLOCK;
return GSOCK_WOULDBLOCK;
}
* GSOCK_INVADDR - the local address has not been set.
* GSOCK_IOERR - low-level error.
*/
-GSocketError GSocketBSD::SetNonOriented()
+GSocketError GSocket::SetNonOriented()
{
int arg = 1;
}
/* Initialize all fields */
- m_stream = FALSE;
- m_server = FALSE;
+ m_stream = false;
+ m_server = false;
/* Create the socket */
m_fd = socket(m_local->m_realfamily, SOCK_DGRAM, 0);
#else
ioctl(m_fd, FIONBIO, &arg);
#endif
- EventLoop_Enable_Events();
+ gs_gui_functions->Enable_Events(this);
/* Bind to the local address,
* and retrieve the actual address bound.
if ((bind(m_fd, m_local->m_addr, m_local->m_len) != 0) ||
(getsockname(m_fd,
m_local->m_addr,
- (SOCKLEN_T *) &m_local->m_len) != 0))
+ (WX_SOCKLEN_T *) &m_local->m_len) != 0))
{
Close();
m_error = GSOCK_IOERR;
/* Generic IO */
/* Like recv(), send(), ... */
-int GSocketBSD::Read(char *buffer, int size)
+int GSocket::Read(char *buffer, int size)
{
int ret;
if (ret == -1)
{
- if (errno == EWOULDBLOCK)
+ if ((errno == EWOULDBLOCK) || (errno == EAGAIN))
m_error = GSOCK_WOULDBLOCK;
else
m_error = GSOCK_IOERR;
return ret;
}
-int GSocketBSD::Write(const char *buffer, int size)
+int GSocket::Write(const char *buffer, int size)
{
int ret;
if (ret == -1)
{
- if (errno == EWOULDBLOCK)
+ if ((errno == EWOULDBLOCK) || (errno == EAGAIN))
{
m_error = GSOCK_WOULDBLOCK;
GSocket_Debug(( "GSocket_Write error WOULDBLOCK\n" ));
* performed. This function won't block, regardless of the
* mode (blocking | nonblocking) of the socket.
*/
-GSocketEventFlags GSocketBSD::Select(GSocketEventFlags flags)
+GSocketEventFlags GSocket::Select(GSocketEventFlags flags)
{
- if (!GSocketBSDGUIShim::UseGUI())
+ if (!gs_gui_functions->CanUseEventLoop())
{
GSocketEventFlags result = 0;
/* Do not use a static struct, Linux can garble it */
tv.tv_sec = m_timeout / 1000;
- tv.tv_usec = (m_timeout % 1000) / 1000;
+ tv.tv_usec = (m_timeout % 1000) * 1000;
FD_ZERO(&readfds);
FD_ZERO(&writefds);
*/
if ((m_detected & GSOCK_LOST_FLAG) != 0)
{
- m_establishing = FALSE;
+ m_establishing = false;
return (GSOCK_LOST_FLAG & flags);
}
{
char c;
- if (recv(m_fd, &c, 1, MSG_PEEK) > 0)
+ int num = recv(m_fd, &c, 1, MSG_PEEK | GSOCKET_MSG_NOSIGNAL);
+
+ if (num > 0)
{
result |= GSOCK_INPUT_FLAG;
}
result |= GSOCK_CONNECTION_FLAG;
m_detected |= GSOCK_CONNECTION_FLAG;
}
- else
+ else if ((errno != EWOULDBLOCK) && (errno != EAGAIN) && (errno != EINTR))
{
m_detected = GSOCK_LOST_FLAG;
- m_establishing = FALSE;
+ m_establishing = false;
/* LOST event: Abort any further processing */
return (GSOCK_LOST_FLAG & flags);
if (m_establishing && !m_server)
{
int error;
- SOCKLEN_T len = sizeof(error);
+ SOCKOPTLEN_T len = sizeof(error);
- m_establishing = FALSE;
+ m_establishing = false;
- getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (void*)&error, &len);
+ getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (char*)&error, &len);
if (error)
{
/* Check for exceptions and errors (is this useful in Unices?) */
if (FD_ISSET(m_fd, &exceptfds))
{
- m_establishing = FALSE;
+ m_establishing = false;
m_detected = GSOCK_LOST_FLAG;
/* LOST event: Abort any further processing */
* Sets the socket to non-blocking mode. All IO calls will return
* immediately.
*/
-void GSocketBSD::SetNonBlocking(int non_block)
+void GSocket::SetNonBlocking(bool non_block)
{
assert(this);
* Sets the timeout for blocking calls. Time is expressed in
* milliseconds.
*/
-void GSocketBSD::SetTimeout(unsigned long millisec)
+void GSocket::SetTimeout(unsigned long millisec)
{
assert(this);
}
/* GSocket_GetError:
- * Returns the last error occured for this socket. Note that successful
+ * Returns the last error occurred for this socket. Note that successful
* operations do not clear this back to GSOCK_NOERROR, so use it only
* after an error.
*/
-GSocketError GSocketBSD::GetError()
+GSocketError WXDLLIMPEXP_NET GSocket::GetError()
{
assert(this);
* assume that it can write since the first OUTPUT event, and no more
* OUTPUT events will be generated unless an error occurs.
* GSOCK_CONNECTION:
- * Connection succesfully established, for client sockets, or incoming
+ * Connection successfully established, for client sockets, or incoming
* client connection, for server sockets. Wait for this event (also watch
* out for GSOCK_LOST) after you issue a nonblocking GSocket_Connect() call.
* GSOCK_LOST:
*
* void function(GSocket *socket, GSocketEvent event, char *cdata)
*/
-void GSocketBSD::SetCallback(GSocketEventFlags flags,
+void GSocket::SetCallback(GSocketEventFlags flags,
GSocketCallback callback, char *cdata)
{
int count;
* Disables all callbacks specified by 'flags', which may be a
* combination of flags OR'ed toghether.
*/
-void GSocketBSD::UnsetCallback(GSocketEventFlags flags)
+void GSocket::UnsetCallback(GSocketEventFlags flags)
{
int count;
}
}
-
-GSocketError GSocketBSD::GetSockOpt(int level, int optname,
+GSocketError GSocket::GetSockOpt(int level, int optname,
void *optval, int *optlen)
{
- if (getsockopt(m_fd, level, optname, optval, optlen) == 0)
+ if (getsockopt(m_fd, level, optname, (char*)optval, (SOCKOPTLEN_T*)optlen) == 0)
{
return GSOCK_NOERROR;
}
return GSOCK_OPTERR;
}
-GSocketError GSocketBSD::SetSockOpt(int level, int optname,
+GSocketError GSocket::SetSockOpt(int level, int optname,
const void *optval, int optlen)
{
- if (setsockopt(m_fd, level, optname, optval, optlen) == 0)
+ if (setsockopt(m_fd, level, optname, (const char*)optval, optlen) == 0)
{
return GSOCK_NOERROR;
}
return GSOCK_OPTERR;
}
-#define CALL_CALLBACK(event) { \
- Disable(event); \
- if (m_cbacks[event]) \
- m_cbacks[event](this, event, m_data[event]); \
+#define CALL_CALLBACK(socket, event) { \
+ socket->Disable(event); \
+ if (socket->m_cbacks[event]) \
+ socket->m_cbacks[event](socket, event, socket->m_data[event]); \
}
-void GSocketBSD::Enable(GSocketEvent event)
+void GSocket::Enable(GSocketEvent event)
{
m_detected &= ~(1 << event);
- EventLoop_Install_Callback(event);
+ gs_gui_functions->Install_Callback(this, event);
}
-void GSocketBSD::Disable(GSocketEvent event)
+void GSocket::Disable(GSocketEvent event)
{
m_detected |= (1 << event);
- EventLoop_Uninstall_Callback(event);
+ gs_gui_functions->Uninstall_Callback(this, event);
}
/* _GSocket_Input_Timeout:
* For blocking sockets, wait until data is available or
* until timeout ellapses.
*/
-GSocketError GSocketBSD::Input_Timeout()
+GSocketError GSocket::Input_Timeout()
{
struct timeval tv;
fd_set readfds;
* For blocking sockets, wait until data can be sent without
* blocking or until timeout ellapses.
*/
-GSocketError GSocketBSD::Output_Timeout()
+GSocketError GSocket::Output_Timeout()
{
struct timeval tv;
fd_set writefds;
return GSOCK_NOERROR;
}
-int GSocketBSD::Recv_Stream(char *buffer, int size)
+int GSocket::Recv_Stream(char *buffer, int size)
{
- return recv(m_fd, buffer, size, 0);
+ int ret;
+ do
+ {
+ ret = recv(m_fd, buffer, size, GSOCKET_MSG_NOSIGNAL);
+ } while (ret == -1 && errno == EINTR); /* Loop until not interrupted */
+ return ret;
}
-int GSocketBSD::Recv_Dgram(char *buffer, int size)
+int GSocket::Recv_Dgram(char *buffer, int size)
{
struct sockaddr from;
- SOCKLEN_T fromlen = sizeof(from);
+ WX_SOCKLEN_T fromlen = sizeof(from);
int ret;
GSocketError err;
fromlen = sizeof(from);
- ret = recvfrom(m_fd, buffer, size, 0, &from, (SOCKLEN_T *) &fromlen);
+ do
+ {
+ ret = recvfrom(m_fd, buffer, size, 0, &from, (WX_SOCKLEN_T *) &fromlen);
+ } while (ret == -1 && errno == EINTR); /* Loop until not interrupted */
if (ret == -1)
return -1;
return ret;
}
-int GSocketBSD::Send_Stream(const char *buffer, int size)
+int GSocket::Send_Stream(const char *buffer, int size)
{
int ret;
-#ifndef __VISAGECPP__
MASK_SIGNAL();
- ret = send(m_fd, buffer, size, 0);
+
+ do
+ {
+ ret = send(m_fd, (char *)buffer, size, GSOCKET_MSG_NOSIGNAL);
+ } while (ret == -1 && errno == EINTR); /* Loop until not interrupted */
+
UNMASK_SIGNAL();
-#else
- ret = send(m_fd, (char *)buffer, size, 0);
-#endif
return ret;
}
-int GSocketBSD::Send_Dgram(const char *buffer, int size)
+int GSocket::Send_Dgram(const char *buffer, int size)
{
struct sockaddr *addr;
int len, ret;
return -1;
}
-#ifndef __VISAGECPP__
MASK_SIGNAL();
- ret = sendto(m_fd, buffer, size, 0, addr, len);
+
+ do
+ {
+ ret = sendto(m_fd, (char *)buffer, size, 0, addr, len);
+ } while (ret == -1 && errno == EINTR); /* Loop until not interrupted */
+
UNMASK_SIGNAL();
-#else
- ret = sendto(m_fd, (char *)buffer, size, 0, addr, len);
-#endif
/* Frees memory allocated from _GAddress_translate_to */
free(addr);
return ret;
}
-void GSocketBSD::Detected_Read()
+void GSocket::Detected_Read()
{
char c;
+ /* Safeguard against straggling call to Detected_Read */
+ if (m_fd == INVALID_SOCKET)
+ {
+ return;
+ }
+
/* If we have already detected a LOST event, then don't try
* to do any further processing.
*/
if ((m_detected & GSOCK_LOST_FLAG) != 0)
{
- m_establishing = FALSE;
+ m_establishing = false;
- CALL_CALLBACK(GSOCK_LOST);
+ CALL_CALLBACK(this, GSOCK_LOST);
Shutdown();
return;
}
- if (recv(m_fd, &c, 1, MSG_PEEK) > 0)
+ int num = recv(m_fd, &c, 1, MSG_PEEK | GSOCKET_MSG_NOSIGNAL);
+
+ if (num > 0)
{
- CALL_CALLBACK(GSOCK_INPUT);
+ CALL_CALLBACK(this, GSOCK_INPUT);
}
else
{
if (m_server && m_stream)
{
- CALL_CALLBACK(GSOCK_CONNECTION);
+ CALL_CALLBACK(this, GSOCK_CONNECTION);
}
else
{
- CALL_CALLBACK(GSOCK_LOST);
- Shutdown();
+ /* Do not throw a lost event in cases where the socket isn't really lost */
+ if ((errno == EWOULDBLOCK) || (errno == EAGAIN) || (errno == EINTR))
+ {
+ CALL_CALLBACK(this, GSOCK_INPUT);
+ }
+ else
+ {
+ CALL_CALLBACK(this, GSOCK_LOST);
+ Shutdown();
+ }
}
}
}
-void GSocketBSD::Detected_Write()
+void GSocket::Detected_Write()
{
/* If we have already detected a LOST event, then don't try
* to do any further processing.
*/
if ((m_detected & GSOCK_LOST_FLAG) != 0)
{
- m_establishing = FALSE;
+ m_establishing = false;
- CALL_CALLBACK(GSOCK_LOST);
+ CALL_CALLBACK(this, GSOCK_LOST);
Shutdown();
return;
}
if (m_establishing && !m_server)
{
int error;
- SOCKLEN_T len = sizeof(error);
+ SOCKOPTLEN_T len = sizeof(error);
- m_establishing = FALSE;
+ m_establishing = false;
- getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (void*)&error, &len);
+ getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (char*)&error, &len);
if (error)
{
- CALL_CALLBACK(GSOCK_LOST);
+ CALL_CALLBACK(this, GSOCK_LOST);
Shutdown();
}
else
{
- CALL_CALLBACK(GSOCK_CONNECTION);
+ CALL_CALLBACK(this, 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(GSOCK_OUTPUT);
+ CALL_CALLBACK(this, GSOCK_OUTPUT);
}
}
else
{
- CALL_CALLBACK(GSOCK_OUTPUT);
+ CALL_CALLBACK(this, GSOCK_OUTPUT);
}
}
/* Compatibility functions for GSocket */
GSocket *GSocket_new(void)
{
- GSocket *newsocket = new GSocketBSDGUIShim();
+ GSocket *newsocket = new GSocket();
if(newsocket->IsOk())
return newsocket;
delete newsocket;
return NULL;
}
-void GSocket_destroy(GSocket *socket)
-{
- assert(socket);
-
- /* Check that the socket is really shutdowned */
- if (socket->m_fd != INVALID_SOCKET)
- socket->Shutdown();
-
- delete socket;
-}
-
-void GSocketBSD::_GSocket_Detected_Read(GSocket *socket)
-{ socket->Detected_Read(); }
-
-void GSocketBSD::_GSocket_Detected_Write(GSocket *socket)
-{ socket->Detected_Write(); }
-
/*
* -------------------------------------------------------------------------
* GAddress
if (inet_aton(hostname, addr) == 0)
{
#elif defined(HAVE_INET_ADDR)
- if ( (addr->s_addr = inet_addr(hostname)) == -1 )
+ if ( (addr->s_addr = inet_addr(hostname)) == (unsigned)-1 )
{
#else
/* Use gethostbyname by default */
#ifndef __WXMAC__
- int val = 1; //VA doesn't like constants in conditional expressions at all
+ int val = 1; /* VA doesn't like constants in conditional expressions */
if (val)
#endif
{
return GSOCK_INVPORT;
}
+#if defined(__WXPM__) && defined(__EMX__)
+ se = getservbyname(port, (char*)protocol);
+#else
se = getservbyname(port, protocol);
+#endif
if (!se)
{
/* the cast to int suppresses compiler warnings about subscript having the
}
#endif /* !defined(__VISAGECPP__) */
#endif /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
-
projects / wxWidgets.git / blobdiff