* Name: gsocket.c
* Authors: Guilhem Lavaux,
* Guillermo Rodriguez Garcia <guille@iies.es> (maintainer)
- * Purpose: GSocket main Unix file
+ * Purpose: GSocket main Unix and OS/2 file
* Licence: The wxWindows licence
* CVSID: $Id$
* -------------------------------------------------------------------------
#include "wx/setup.h"
#endif
+#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__)
#include <assert.h>
#include <sys/types.h>
+#ifdef __VISAGECPP__
+#include <string.h>
+#include <sys/time.h>
+#include <types.h>
+#include <netinet/in.h>
+#endif
#include <netdb.h>
#include <sys/ioctl.h>
#include <sys/un.h>
#endif
+#ifndef __VISAGECPP__
#include <sys/time.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <errno.h>
#include <string.h>
#include <unistd.h>
+#else
+#include <nerrno.h>
+# if __IBMCPP__ < 400
+#include <machine/endian.h>
+#include <socket.h>
+#include <ioctl.h>
+#include <select.h>
+#include <unistd.h>
+
+#define EBADF SOCEBADF
+
+# ifdef min
+# undef min
+# endif
+# else
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <sys/select.h>
+
+#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 fd_set *,
+ struct timeval *);
+int _System soclose(int);
+# endif
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <stddef.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 */
#ifdef __GSOCKET_DEBUG__
# define GSocket_Debug(args) printf args
# 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);
void GSocket_close(GSocket *socket)
{
_GSocket_Disable_Events(socket);
+ /* gsockosx.c calls CFSocketInvalidate which closes the socket for us */
+#if !(defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__)))
close(socket->m_fd);
+#endif
socket->m_fd = INVALID_SOCKET;
}
GSocket_Shutdown(socket);
/* Per-socket GUI-specific cleanup */
- _GSocket_GUI_Destroy(socket);
+ _GSocket_GUI_Destroy_Socket(socket);
/* Destroy private addresses */
if (socket->m_local)
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);
+ /* allow a socket to re-bind if the socket is in the TIME_WAIT
+ state after being previously closed.
+ */
+ setsockopt(sck->m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(u_long));
+
/* Bind to the local address,
* retrieve the actual address bound,
* and listen up to 5 connections.
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;
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) */
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,
assert(socket != NULL);
- /* Reenable INPUT events */
- _GSocket_Enable(socket, GSOCK_INPUT);
-
if (socket->m_fd == INVALID_SOCKET || socket->m_server)
{
socket->m_error = GSOCK_INVSOCK;
return -1;
}
+ /* Disable events during query of socket status */
+ _GSocket_Disable(socket, GSOCK_INPUT);
+
/* If the socket is blocking, wait for data (with a timeout) */
if (_GSocket_Input_Timeout(socket) == GSOCK_TIMEDOUT)
- return -1;
-
- /* Read the data */
- if (socket->m_stream)
- ret = _GSocket_Recv_Stream(socket, buffer, size);
- else
- ret = _GSocket_Recv_Dgram(socket, buffer, size);
+ /* We no longer return here immediately, otherwise socket events would not be re-enabled! */
+ ret = -1;
+ else {
+ /* Read the data */
+ if (socket->m_stream)
+ ret = _GSocket_Recv_Stream(socket, buffer, size);
+ else
+ ret = _GSocket_Recv_Dgram(socket, buffer, size);
+ }
if (ret == -1)
{
socket->m_error = GSOCK_IOERR;
}
+ /* Enable events again now that we are done processing */
+ _GSocket_Enable(socket, GSOCK_INPUT);
+
return ret;
}
*/
GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
{
-#if defined(wxUSE_GUI) && !wxUSE_GUI
-
- GSocketEventFlags result = 0;
- fd_set readfds;
- fd_set writefds;
- fd_set exceptfds;
- struct timeval tv;
+ if (!USE_GUI())
+ {
- /* Do not use a static struct, Linux can garble it */
- tv.tv_sec = 0;
- tv.tv_usec = 0;
+ GSocketEventFlags result = 0;
+ fd_set readfds;
+ fd_set writefds;
+ fd_set exceptfds;
+ struct timeval tv;
- 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);
+ /* Do not use a static struct, Linux can garble it */
+ tv.tv_sec = socket->m_timeout / 1000;
+ tv.tv_usec = (socket->m_timeout % 1000) / 1000;
- /* 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;
+ FD_ZERO(&readfds);
+ FD_ZERO(&writefds);
+ FD_ZERO(&exceptfds);
+ FD_SET(socket->m_fd, &readfds);
+ if (flags & GSOCK_OUTPUT_FLAG || flags & GSOCK_CONNECTION_FLAG)
+ FD_SET(socket->m_fd, &writefds);
+ FD_SET(socket->m_fd, &exceptfds);
- return (GSOCK_LOST_FLAG & 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)
- {
- /* What to do here? */
- return (result & flags);
- }
+ /* 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;
+ /* 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;
- socket->m_detected |= GSOCK_CONNECTION_FLAG;
+ result |= GSOCK_INPUT_FLAG;
}
else
{
- socket->m_detected = GSOCK_LOST_FLAG;
- socket->m_establishing = FALSE;
-
- /* LOST event: Abort any further processing */
- return (GSOCK_LOST_FLAG & flags);
+ 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)
- {
- 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);
+ /* 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;
- 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;
+ socket->m_establishing = FALSE;
+ socket->m_detected = GSOCK_LOST_FLAG;
+
+ /* LOST event: Abort any further processing */
+ return (GSOCK_LOST_FLAG & flags);
}
- }
- /* 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;
+ return (result & flags);
- /* LOST event: Abort any further processing */
- return (GSOCK_LOST_FLAG & flags);
}
+ else
+ {
- return (result & flags);
-
-#else
-
- assert(socket != NULL);
- return flags & socket->m_detected;
+ assert(socket != NULL);
+ return flags & socket->m_detected;
-#endif /* !wxUSE_GUI */
+ }
}
/* Flags */
{
int ret;
+#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;
}
+#ifndef __VISAGECPP__
MASK_SIGNAL();
ret = sendto(socket->m_fd, buffer, size, 0, addr, len);
UNMASK_SIGNAL();
+#else
+ ret = sendto(socket->m_fd, (char *)buffer, size, 0, addr, len);
+#endif
/* Frees memory allocated from _GAddress_translate_to */
free(addr);
{
#else
/* Use gethostbyname by default */
- if (1)
+#ifndef __WXMAC__
+ int val = 1; /* VA doesn't like constants in conditional expressions */
+ if (val)
+#endif
{
#endif
struct in_addr *array_addr;
CHECK_ADDRESS(address, INET);
addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
- addr->s_addr = hostaddr;
+ addr->s_addr = htonl(hostaddr);
return GSOCK_NOERROR;
}
addr = (struct sockaddr_in *)address->m_addr;
- return addr->sin_addr.s_addr;
+ return ntohl(addr->sin_addr.s_addr);
}
unsigned short GAddress_INET_GetPort(GAddress *address)
* -------------------------------------------------------------------------
*/
+#ifndef __VISAGECPP__
GSocketError _GAddress_Init_UNIX(GAddress *address)
{
address->m_len = sizeof(struct sockaddr_un);
return GSOCK_NOERROR;
}
-
+#endif /* !defined(__VISAGECPP__) */
#endif /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
projects / wxWidgets.git / blobdiff