From: David Elliott Date: Thu, 5 Aug 2004 20:05:17 +0000 (+0000) Subject: Removed unneeded GSocket files X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e219748f2ca2fc482eb3cc291b92c5f086ed1775 Removed unneeded GSocket files git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/gtk/gsockgtk.c b/src/gtk/gsockgtk.c deleted file mode 100644 index d7f4657741..0000000000 --- a/src/gtk/gsockgtk.c +++ /dev/null @@ -1,128 +0,0 @@ -/* ------------------------------------------------------------------------- - * Project: GSocket (Generic Socket) for WX - * Name: gsockgtk.c - * Purpose: GSocket: GTK part - * Licence: The wxWidgets licence - * CVSID: $Id$ - * ------------------------------------------------------------------------- - */ -#include "wx/setup.h" - -#if wxUSE_SOCKETS - -#include -#include -#include - -#include -#include - -#include "wx/gsocket.h" -#include "wx/unix/gsockunx.h" - - -void _GSocket_GDK_Input(gpointer data, - gint source, - GdkInputCondition condition) -{ - GSocket *socket = (GSocket *)data; - - if (condition & GDK_INPUT_READ) - socket->m_functions->Detected_Read(socket); - if (condition & GDK_INPUT_WRITE) - socket->m_functions->Detected_Write(socket); -} - -int _GSocket_GUI_Init(void) -{ - return 1; -} - -void _GSocket_GUI_Cleanup(void) -{ -} - -int _GSocket_GUI_Init_Socket(GSocket *socket) -{ - gint *m_id; - - socket->m_gui_dependent = (char *)malloc(sizeof(gint)*2); - m_id = (gint *)(socket->m_gui_dependent); - - m_id[0] = -1; - m_id[1] = -1; - - return TRUE; -} - -void _GSocket_GUI_Destroy_Socket(GSocket *socket) -{ - free(socket->m_gui_dependent); -} - -void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event) -{ - gint *m_id = (gint *)(socket->m_gui_dependent); - int c; - - if (socket->m_fd == -1) - return; - - switch (event) - { - case GSOCK_LOST: /* fall-through */ - case GSOCK_INPUT: c = 0; break; - case GSOCK_OUTPUT: c = 1; break; - case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break; - default: return; - } - - if (m_id[c] != -1) - gdk_input_remove(m_id[c]); - - m_id[c] = gdk_input_add(socket->m_fd, - (c ? GDK_INPUT_WRITE : GDK_INPUT_READ), - _GSocket_GDK_Input, - (gpointer)socket); -} - -void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event) -{ - gint *m_id = (gint *)(socket->m_gui_dependent); - int c; - - assert( m_id != NULL ); - - switch (event) - { - case GSOCK_LOST: /* fall-through */ - case GSOCK_INPUT: c = 0; break; - case GSOCK_OUTPUT: c = 1; break; - case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break; - default: return; - } - - if (m_id[c] != -1) - gdk_input_remove(m_id[c]); - - m_id[c] = -1; -} - -void _GSocket_Enable_Events(GSocket *socket) -{ - _GSocket_Install_Callback(socket, GSOCK_INPUT); - _GSocket_Install_Callback(socket, GSOCK_OUTPUT); -} - -void _GSocket_Disable_Events(GSocket *socket) -{ - _GSocket_Uninstall_Callback(socket, GSOCK_INPUT); - _GSocket_Uninstall_Callback(socket, GSOCK_OUTPUT); -} - -#else /* !wxUSE_SOCKETS */ - -/* some compilers don't like having empty source files */ -static int wxDummyGsockVar = 0; - -#endif /* wxUSE_SOCKETS/!wxUSE_SOCKETS */ diff --git a/src/gtk1/gsockgtk.c b/src/gtk1/gsockgtk.c deleted file mode 100644 index d7f4657741..0000000000 --- a/src/gtk1/gsockgtk.c +++ /dev/null @@ -1,128 +0,0 @@ -/* ------------------------------------------------------------------------- - * Project: GSocket (Generic Socket) for WX - * Name: gsockgtk.c - * Purpose: GSocket: GTK part - * Licence: The wxWidgets licence - * CVSID: $Id$ - * ------------------------------------------------------------------------- - */ -#include "wx/setup.h" - -#if wxUSE_SOCKETS - -#include -#include -#include - -#include -#include - -#include "wx/gsocket.h" -#include "wx/unix/gsockunx.h" - - -void _GSocket_GDK_Input(gpointer data, - gint source, - GdkInputCondition condition) -{ - GSocket *socket = (GSocket *)data; - - if (condition & GDK_INPUT_READ) - socket->m_functions->Detected_Read(socket); - if (condition & GDK_INPUT_WRITE) - socket->m_functions->Detected_Write(socket); -} - -int _GSocket_GUI_Init(void) -{ - return 1; -} - -void _GSocket_GUI_Cleanup(void) -{ -} - -int _GSocket_GUI_Init_Socket(GSocket *socket) -{ - gint *m_id; - - socket->m_gui_dependent = (char *)malloc(sizeof(gint)*2); - m_id = (gint *)(socket->m_gui_dependent); - - m_id[0] = -1; - m_id[1] = -1; - - return TRUE; -} - -void _GSocket_GUI_Destroy_Socket(GSocket *socket) -{ - free(socket->m_gui_dependent); -} - -void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event) -{ - gint *m_id = (gint *)(socket->m_gui_dependent); - int c; - - if (socket->m_fd == -1) - return; - - switch (event) - { - case GSOCK_LOST: /* fall-through */ - case GSOCK_INPUT: c = 0; break; - case GSOCK_OUTPUT: c = 1; break; - case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break; - default: return; - } - - if (m_id[c] != -1) - gdk_input_remove(m_id[c]); - - m_id[c] = gdk_input_add(socket->m_fd, - (c ? GDK_INPUT_WRITE : GDK_INPUT_READ), - _GSocket_GDK_Input, - (gpointer)socket); -} - -void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event) -{ - gint *m_id = (gint *)(socket->m_gui_dependent); - int c; - - assert( m_id != NULL ); - - switch (event) - { - case GSOCK_LOST: /* fall-through */ - case GSOCK_INPUT: c = 0; break; - case GSOCK_OUTPUT: c = 1; break; - case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break; - default: return; - } - - if (m_id[c] != -1) - gdk_input_remove(m_id[c]); - - m_id[c] = -1; -} - -void _GSocket_Enable_Events(GSocket *socket) -{ - _GSocket_Install_Callback(socket, GSOCK_INPUT); - _GSocket_Install_Callback(socket, GSOCK_OUTPUT); -} - -void _GSocket_Disable_Events(GSocket *socket) -{ - _GSocket_Uninstall_Callback(socket, GSOCK_INPUT); - _GSocket_Uninstall_Callback(socket, GSOCK_OUTPUT); -} - -#else /* !wxUSE_SOCKETS */ - -/* some compilers don't like having empty source files */ -static int wxDummyGsockVar = 0; - -#endif /* wxUSE_SOCKETS/!wxUSE_SOCKETS */ diff --git a/src/mac/carbon/gsockosx.c b/src/mac/carbon/gsockosx.c deleted file mode 100644 index bb3756c7fd..0000000000 --- a/src/mac/carbon/gsockosx.c +++ /dev/null @@ -1,184 +0,0 @@ -/* ------------------------------------------------------------------------- - * Project: GSocket (Generic Socket) for WX - * Name: gsockosx.c - * Purpose: GSocket: Mac OS X mach-o part - * CVSID: $Id$ - * Mac code by Brian Victor, February 2002. Email comments to bhv1@psu.edu - * ------------------------------------------------------------------------- */ - -#include "wx/setup.h" - -#if wxUSE_SOCKETS - -#include -#include "wx/gsocket.h" -#include "wx/unix/gsockunx.h" - -#include - -#define ALL_CALLBACK_TYPES (kCFSocketReadCallBack | kCFSocketWriteCallBack | kCFSocketConnectCallBack) - -struct MacGSocketData -{ - CFSocketRef socket; - CFRunLoopSourceRef source; -}; - -void Mac_Socket_Callback(CFSocketRef s, CFSocketCallBackType callbackType, - CFDataRef address, const void* data, void* info) -{ - GSocket* socket = (GSocket*)info; - struct MacGSocketData* macdata; - macdata = (struct MacGSocketData*)socket->m_gui_dependent; - if (!macdata) return; - switch (callbackType) - { - case kCFSocketConnectCallBack: - assert(!socket->m_server); - socket->m_functions->Detected_Write(socket); - break; - case kCFSocketReadCallBack: - socket->m_functions->Detected_Read(socket); - break; - case kCFSocketWriteCallBack: - socket->m_functions->Detected_Write(socket); - break; - default: - break; /* We shouldn't get here. */ - } -} - -struct MacGSocketData* _GSocket_Get_Mac_Socket(GSocket *socket) -{ - /* If socket is already created, returns a pointer to the data */ - /* Otherwise, creates socket and returns the pointer */ - CFSocketContext cont; - CFSocketRef cf; - CFRunLoopSourceRef source; - - struct MacGSocketData* data = (struct MacGSocketData*)socket->m_gui_dependent; - - if (data && data->source) return data; - - /* CFSocket has not been created, create it: */ - if (socket->m_fd < 0 || !data) return NULL; - cont.version = 0; cont.retain = NULL; - cont.release = NULL; cont.copyDescription = NULL; - cont.info = socket; - - cf = CFSocketCreateWithNative(NULL, socket->m_fd, - ALL_CALLBACK_TYPES, Mac_Socket_Callback, &cont); - source = CFSocketCreateRunLoopSource(NULL, cf, 0); - assert(source); - socket->m_gui_dependent = (char*)data; - - /* Keep the source and the socket around. */ - data->source = source; - data->socket = cf; - - return data; -} - -int _GSocket_GUI_Init(void) -{ - return 1; -} - -void _GSocket_GUI_Cleanup(void) -{ -} - -int _GSocket_GUI_Init_Socket(GSocket *socket) -{ - struct MacGSocketData *data = malloc(sizeof(struct MacGSocketData)); - if (data) - { - socket->m_gui_dependent = (char*)data; - data->socket = NULL; - data->source = NULL; - return 1; - } - return 0; -} - -void _GSocket_GUI_Destroy_Socket(GSocket *socket) -{ - struct MacGSocketData *data = (struct MacGSocketData*)(socket->m_gui_dependent); - if (data) - { - CFRelease(data->socket); - free(data); - } -} - -void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event) -{ - int c; - struct MacGSocketData* data = _GSocket_Get_Mac_Socket(socket); - if (!data) return; - switch (event) - { - case GSOCK_CONNECTION: - if(socket->m_server) - c = kCFSocketReadCallBack; - else - c = kCFSocketConnectCallBack; - break; - case GSOCK_LOST: - case GSOCK_INPUT: - c = kCFSocketReadCallBack; - break; - case GSOCK_OUTPUT: - c = kCFSocketWriteCallBack; - break; - default: - c = 0; - } - CFSocketEnableCallBacks(data->socket, c); -} - -void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event) -{ - int c; - struct MacGSocketData* data = _GSocket_Get_Mac_Socket(socket); - if (!data) return; - switch (event) - { - case GSOCK_CONNECTION: - if(socket->m_server) - c = kCFSocketReadCallBack; - else - c = kCFSocketConnectCallBack; - break; - case GSOCK_LOST: - case GSOCK_INPUT: - c = kCFSocketReadCallBack; - break; - case GSOCK_OUTPUT: - c = kCFSocketWriteCallBack; - break; - default: - c = 0; - } - CFSocketDisableCallBacks(data->socket, c); -} - -void _GSocket_Enable_Events(GSocket *socket) -{ - struct MacGSocketData* data = _GSocket_Get_Mac_Socket(socket); - if (!data) return; - - CFRunLoopAddSource(CFRunLoopGetCurrent(), data->source, kCFRunLoopDefaultMode); -} - -void _GSocket_Disable_Events(GSocket *socket) -{ - struct MacGSocketData* data = _GSocket_Get_Mac_Socket(socket); - if (!data) return; - - /* CFSocketInvalidate does CFRunLoopRemoveSource anyway */ - CFRunLoopRemoveSource(CFRunLoopGetCurrent(), data->source, kCFRunLoopCommonModes); - CFSocketInvalidate(data->socket); -} - -#endif // wxUSE_SOCKETS diff --git a/src/mac/classic/gsockosx.c b/src/mac/classic/gsockosx.c deleted file mode 100644 index 614ed425c8..0000000000 --- a/src/mac/classic/gsockosx.c +++ /dev/null @@ -1,181 +0,0 @@ -/* ------------------------------------------------------------------------- - * Project: GSocket (Generic Socket) for WX - * Name: gsockosx.c - * Purpose: GSocket: Mac OS X mach-o part - * CVSID: $Id$ - * Mac code by Brian Victor, February 2002. Email comments to bhv1@psu.edu - * ------------------------------------------------------------------------- */ - -#include "wx/setup.h" - -#if wxUSE_SOCKETS - -#include -#include "wx/gsocket.h" -#include "wx/unix/gsockunx.h" - -#include - -#define ALL_CALLBACK_TYPES (kCFSocketReadCallBack | kCFSocketWriteCallBack | kCFSocketConnectCallBack) - -struct MacGSocketData -{ - CFSocketRef socket; - CFRunLoopSourceRef source; -}; - -void Mac_Socket_Callback(CFSocketRef s, CFSocketCallBackType callbackType, - CFDataRef address, const void* data, void* info) -{ - GSocket* socket = (GSocket*)info; - struct MacGSocketData* macdata; - macdata = (struct MacGSocketData*)socket->m_gui_dependent; - if (!macdata) return; - switch (callbackType) - { - case kCFSocketConnectCallBack: - assert(!socket->m_server); - socket->m_functions->Detected_Write(socket); - break; - case kCFSocketReadCallBack: - socket->m_functions->Detected_Read(socket); - break; - case kCFSocketWriteCallBack: - socket->m_functions->Detected_Write(socket); - break; - default: - break; /* We shouldn't get here. */ - } -} - -struct MacGSocketData* _GSocket_Get_Mac_Socket(GSocket *socket) -{ - /* If socket is already created, returns a pointer to the data */ - /* Otherwise, creates socket and returns the pointer */ - CFSocketContext cont; - struct MacGSocketData* data = (struct MacGSocketData*)socket->m_gui_dependent; - - if (data && data->source) return data; - - /* CFSocket has not been created, create it: */ - if (socket->m_fd < 0 || !data) return NULL; - cont.version = 0; cont.retain = NULL; - cont.release = NULL; cont.copyDescription = NULL; - cont.info = socket; - - CFSocketRef cf = CFSocketCreateWithNative(NULL, socket->m_fd, - ALL_CALLBACK_TYPES, Mac_Socket_Callback, &cont); - CFRunLoopSourceRef source = CFSocketCreateRunLoopSource(NULL, cf, 0); - assert(source); - socket->m_gui_dependent = (char*)data; - - /* Keep the source and the socket around. */ - data->source = source; - data->socket = cf; - - return data; -} - -int _GSocket_GUI_Init(void) -{ - return 1; -} - -void _GSocket_GUI_Cleanup(void) -{ -} - -int _GSocket_GUI_Init_Socket(GSocket *socket) -{ - struct MacGSocketData *data = malloc(sizeof(struct MacGSocketData)); - if (data) - { - socket->m_gui_dependent = (char*)data; - data->socket = NULL; - data->source = NULL; - return 1; - } - return 0; -} - -void _GSocket_GUI_Destroy_Socket(GSocket *socket) -{ - struct MacGSocketData *data = (struct MacGSocketData*)(socket->m_gui_dependent); - if (data) - { - CFRelease(data->socket); - free(data); - } -} - -void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event) -{ - int c; - struct MacGSocketData* data = _GSocket_Get_Mac_Socket(socket); - if (!data) return; - switch (event) - { - case GSOCK_CONNECTION: - if(socket->m_server) - c = kCFSocketReadCallBack; - else - c = kCFSocketConnectCallBack; - break; - case GSOCK_LOST: - case GSOCK_INPUT: - c = kCFSocketReadCallBack; - break; - case GSOCK_OUTPUT: - c = kCFSocketWriteCallBack; - break; - default: - c = 0; - } - CFSocketEnableCallBacks(data->socket, c); -} - -void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event) -{ - int c; - struct MacGSocketData* data = _GSocket_Get_Mac_Socket(socket); - if (!data) return; - switch (event) - { - case GSOCK_CONNECTION: - if(socket->m_server) - c = kCFSocketReadCallBack; - else - c = kCFSocketConnectCallBack; - break; - case GSOCK_LOST: - case GSOCK_INPUT: - c = kCFSocketReadCallBack; - break; - case GSOCK_OUTPUT: - c = kCFSocketWriteCallBack; - break; - default: - c = 0; - } - CFSocketDisableCallBacks(data->socket, c); -} - -void _GSocket_Enable_Events(GSocket *socket) -{ - struct MacGSocketData* data = _GSocket_Get_Mac_Socket(socket); - if (!data) return; - - CFRunLoopAddSource(CFRunLoopGetCurrent(), data->source, kCFRunLoopDefaultMode); -} - -void _GSocket_Disable_Events(GSocket *socket) -{ - struct MacGSocketData* data = _GSocket_Get_Mac_Socket(socket); - if (!data) return; - - /* CFSocketInvalidate does CFRunLoopRemoveSource anyway */ - CFRunLoopRemoveSource(CFRunLoopGetCurrent(), data->source, kCFRunLoopCommonModes); - CFSocketInvalidate(data->socket); -} - -#endif // wxUSE_SOCKETS diff --git a/src/mac/classic/gsockosx.cpp b/src/mac/classic/gsockosx.cpp deleted file mode 100644 index 614ed425c8..0000000000 --- a/src/mac/classic/gsockosx.cpp +++ /dev/null @@ -1,181 +0,0 @@ -/* ------------------------------------------------------------------------- - * Project: GSocket (Generic Socket) for WX - * Name: gsockosx.c - * Purpose: GSocket: Mac OS X mach-o part - * CVSID: $Id$ - * Mac code by Brian Victor, February 2002. Email comments to bhv1@psu.edu - * ------------------------------------------------------------------------- */ - -#include "wx/setup.h" - -#if wxUSE_SOCKETS - -#include -#include "wx/gsocket.h" -#include "wx/unix/gsockunx.h" - -#include - -#define ALL_CALLBACK_TYPES (kCFSocketReadCallBack | kCFSocketWriteCallBack | kCFSocketConnectCallBack) - -struct MacGSocketData -{ - CFSocketRef socket; - CFRunLoopSourceRef source; -}; - -void Mac_Socket_Callback(CFSocketRef s, CFSocketCallBackType callbackType, - CFDataRef address, const void* data, void* info) -{ - GSocket* socket = (GSocket*)info; - struct MacGSocketData* macdata; - macdata = (struct MacGSocketData*)socket->m_gui_dependent; - if (!macdata) return; - switch (callbackType) - { - case kCFSocketConnectCallBack: - assert(!socket->m_server); - socket->m_functions->Detected_Write(socket); - break; - case kCFSocketReadCallBack: - socket->m_functions->Detected_Read(socket); - break; - case kCFSocketWriteCallBack: - socket->m_functions->Detected_Write(socket); - break; - default: - break; /* We shouldn't get here. */ - } -} - -struct MacGSocketData* _GSocket_Get_Mac_Socket(GSocket *socket) -{ - /* If socket is already created, returns a pointer to the data */ - /* Otherwise, creates socket and returns the pointer */ - CFSocketContext cont; - struct MacGSocketData* data = (struct MacGSocketData*)socket->m_gui_dependent; - - if (data && data->source) return data; - - /* CFSocket has not been created, create it: */ - if (socket->m_fd < 0 || !data) return NULL; - cont.version = 0; cont.retain = NULL; - cont.release = NULL; cont.copyDescription = NULL; - cont.info = socket; - - CFSocketRef cf = CFSocketCreateWithNative(NULL, socket->m_fd, - ALL_CALLBACK_TYPES, Mac_Socket_Callback, &cont); - CFRunLoopSourceRef source = CFSocketCreateRunLoopSource(NULL, cf, 0); - assert(source); - socket->m_gui_dependent = (char*)data; - - /* Keep the source and the socket around. */ - data->source = source; - data->socket = cf; - - return data; -} - -int _GSocket_GUI_Init(void) -{ - return 1; -} - -void _GSocket_GUI_Cleanup(void) -{ -} - -int _GSocket_GUI_Init_Socket(GSocket *socket) -{ - struct MacGSocketData *data = malloc(sizeof(struct MacGSocketData)); - if (data) - { - socket->m_gui_dependent = (char*)data; - data->socket = NULL; - data->source = NULL; - return 1; - } - return 0; -} - -void _GSocket_GUI_Destroy_Socket(GSocket *socket) -{ - struct MacGSocketData *data = (struct MacGSocketData*)(socket->m_gui_dependent); - if (data) - { - CFRelease(data->socket); - free(data); - } -} - -void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event) -{ - int c; - struct MacGSocketData* data = _GSocket_Get_Mac_Socket(socket); - if (!data) return; - switch (event) - { - case GSOCK_CONNECTION: - if(socket->m_server) - c = kCFSocketReadCallBack; - else - c = kCFSocketConnectCallBack; - break; - case GSOCK_LOST: - case GSOCK_INPUT: - c = kCFSocketReadCallBack; - break; - case GSOCK_OUTPUT: - c = kCFSocketWriteCallBack; - break; - default: - c = 0; - } - CFSocketEnableCallBacks(data->socket, c); -} - -void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event) -{ - int c; - struct MacGSocketData* data = _GSocket_Get_Mac_Socket(socket); - if (!data) return; - switch (event) - { - case GSOCK_CONNECTION: - if(socket->m_server) - c = kCFSocketReadCallBack; - else - c = kCFSocketConnectCallBack; - break; - case GSOCK_LOST: - case GSOCK_INPUT: - c = kCFSocketReadCallBack; - break; - case GSOCK_OUTPUT: - c = kCFSocketWriteCallBack; - break; - default: - c = 0; - } - CFSocketDisableCallBacks(data->socket, c); -} - -void _GSocket_Enable_Events(GSocket *socket) -{ - struct MacGSocketData* data = _GSocket_Get_Mac_Socket(socket); - if (!data) return; - - CFRunLoopAddSource(CFRunLoopGetCurrent(), data->source, kCFRunLoopDefaultMode); -} - -void _GSocket_Disable_Events(GSocket *socket) -{ - struct MacGSocketData* data = _GSocket_Get_Mac_Socket(socket); - if (!data) return; - - /* CFSocketInvalidate does CFRunLoopRemoveSource anyway */ - CFRunLoopRemoveSource(CFRunLoopGetCurrent(), data->source, kCFRunLoopCommonModes); - CFSocketInvalidate(data->socket); -} - -#endif // wxUSE_SOCKETS diff --git a/src/motif/gsockmot.c b/src/motif/gsockmot.c deleted file mode 100644 index f4669c63d1..0000000000 --- a/src/motif/gsockmot.c +++ /dev/null @@ -1,136 +0,0 @@ -/* ------------------------------------------------------------------------- - * Project: GSocket (Generic Socket) for WX - * Name: gsockmot.c - * Purpose: GSocket: Motif part - * CVSID: $Id$ - * Licence: The wxWidgets licence - * ------------------------------------------------------------------------- */ - -#include "wx/setup.h" - -#if wxUSE_SOCKETS - -#include -#include -#include "wx/gsocket.h" -#include "wx/unix/gsockunx.h" - -extern XtAppContext wxGetAppContext(); - -static void _GSocket_Motif_Input(XtPointer data, int *fid, - XtInputId *id) -{ - GSocket *socket = (GSocket *)data; - - socket->m_functions->Detected_Read(socket); -} - -static void _GSocket_Motif_Output(XtPointer data, int *fid, - XtInputId *id) -{ - GSocket *socket = (GSocket *)data; - - socket->m_functions->Detected_Write(socket); -} - -int _GSocket_GUI_Init(void) -{ - return 1; -} - -void _GSocket_GUI_Cleanup(void) -{ -} - -int _GSocket_GUI_Init_Socket(GSocket *socket) -{ - int *m_id; - - socket->m_gui_dependent = (char *)malloc(sizeof(int)*2); - m_id = (int *)(socket->m_gui_dependent); - - m_id[0] = -1; - m_id[1] = -1; - - return TRUE; -} - -void _GSocket_GUI_Destroy_Socket(GSocket *socket) -{ - free(socket->m_gui_dependent); -} - -void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event) -{ - int *m_id = (int *)(socket->m_gui_dependent); - int c; - - if (socket->m_fd == -1) - return; - - switch (event) - { - case GSOCK_LOST: /* fall-through */ - case GSOCK_INPUT: c = 0; break; - case GSOCK_OUTPUT: c = 1; break; - case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break; - default: return; - } - - if (m_id[c] != -1) - XtRemoveInput(m_id[c]); - - if (c == 0) - { - m_id[0] = XtAppAddInput(wxGetAppContext(), socket->m_fd, - (XtPointer *)XtInputReadMask, - (XtInputCallbackProc) _GSocket_Motif_Input, - (XtPointer) socket); - } - else - { - m_id[1] = XtAppAddInput(wxGetAppContext(), socket->m_fd, - (XtPointer *)XtInputWriteMask, - (XtInputCallbackProc) _GSocket_Motif_Output, - (XtPointer) socket); - } -} - -void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event) -{ - int *m_id = (int *)(socket->m_gui_dependent); - int c; - - switch (event) - { - case GSOCK_LOST: /* fall-through */ - case GSOCK_INPUT: c = 0; break; - case GSOCK_OUTPUT: c = 1; break; - case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break; - default: return; - } - - if (m_id[c] != -1) - XtRemoveInput(m_id[c]); - - m_id[c] = -1; -} - -void _GSocket_Enable_Events(GSocket *socket) -{ - _GSocket_Install_Callback(socket, GSOCK_INPUT); - _GSocket_Install_Callback(socket, GSOCK_OUTPUT); -} - -void _GSocket_Disable_Events(GSocket *socket) -{ - _GSocket_Uninstall_Callback(socket, GSOCK_INPUT); - _GSocket_Uninstall_Callback(socket, GSOCK_OUTPUT); -} - -#else /* !wxUSE_SOCKETS */ - -/* some compilers don't like having empty source files */ -static int wxDummyGsockVar = 0; - -#endif /* wxUSE_SOCKETS/!wxUSE_SOCKETS */ diff --git a/src/msw/gsocket.c b/src/msw/gsocket.c deleted file mode 100644 index 74783e0b1b..0000000000 --- a/src/msw/gsocket.c +++ /dev/null @@ -1,1553 +0,0 @@ -/* ------------------------------------------------------------------------- - * Project: GSocket (Generic Socket) - * Name: gsocket.c - * Author: Guillermo Rodriguez Garcia - * Purpose: GSocket main MSW file - * Licence: The wxWidgets licence - * CVSID: $Id$ - * ------------------------------------------------------------------------- - */ - -/* - * PLEASE don't put C++ comments here - this is a C source file. - */ - -#ifdef _MSC_VER - /* RPCNOTIFICATION_ROUTINE in rasasync.h (included from winsock.h), - * warning: conditional expression is constant. - */ -# pragma warning(disable:4115) - /* FD_SET, - * warning: named type definition in parentheses. - */ -# pragma warning(disable:4127) - /* GAddress_UNIX_GetPath, - * warning: unreferenced formal parameter. - */ -# pragma warning(disable:4100) - -#ifdef __WXWINCE__ - /* windows.h results in tons of warnings at max warning level */ -# ifdef _MSC_VER -# pragma warning(push, 1) -# endif -# include -# ifdef _MSC_VER -# pragma warning(pop) -# pragma warning(disable:4514) -# endif -#endif - -#endif /* _MSC_VER */ - -#include - -#ifndef __GSOCKET_STANDALONE__ -# include "wx/platform.h" -# include "wx/setup.h" -#endif - -#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) - -#ifndef __GSOCKET_STANDALONE__ -# include "wx/msw/gsockmsw.h" -# include "wx/gsocket.h" -#else -# include "gsockmsw.h" -# include "gsocket.h" -#endif /* __GSOCKET_STANDALONE__ */ - -#ifndef __WXWINCE__ -#include -#else -#define assert(x) -#ifndef isdigit -#define isdigit(x) (x > 47 && x < 58) -#endif -#include "wx/msw/wince/net.h" -#endif - -#include -#include -#include -#include -#include - -/* if we use configure for MSW SOCKLEN_T will be already defined */ -#ifndef SOCKLEN_T -# define SOCKLEN_T int -#endif - -/* 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) - -/* Global initialisers */ - -void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc) -{ - gs_gui_functions = guifunc; -} - -int GSocket_Init(void) -{ - WSADATA wsaData; - - if (gs_gui_functions) - { - if ( !gs_gui_functions->GUI_Init() ) - return 0; - } - - /* Initialize WinSocket */ - return (WSAStartup((1 << 8) | 1, &wsaData) == 0); -} - -void GSocket_Cleanup(void) -{ - if (gs_gui_functions) - { - gs_gui_functions->GUI_Cleanup(); - } - - /* Cleanup WinSocket */ - WSACleanup(); -} - -/* Constructors / Destructors for GSocket */ - -GSocket *GSocket_new(void) -{ - int i, success; - GSocket *socket; - - if ((socket = (GSocket *) malloc(sizeof(GSocket))) == NULL) - return NULL; - - socket->m_fd = INVALID_SOCKET; - 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_non_blocking = FALSE; - socket->m_timeout.tv_sec = 10 * 60; /* 10 minutes */ - socket->m_timeout.tv_usec = 0; - socket->m_establishing = FALSE; - socket->m_reusable = FALSE; - - /* Per-socket GUI-specific initialization */ - success = _GSocket_GUI_Init_Socket(socket); - if (!success) - { - free(socket); - socket = NULL; - } - - return socket; -} - -void GSocket_close(GSocket *socket) -{ - _GSocket_Disable_Events(socket); - closesocket(socket->m_fd); - socket->m_fd = INVALID_SOCKET; -} - -void GSocket_destroy(GSocket *socket) -{ - assert(socket != NULL); - - /* Per-socket GUI-specific cleanup */ - _GSocket_GUI_Destroy_Socket(socket); - - /* Check that the socket is really shutdowned */ - if (socket->m_fd != INVALID_SOCKET) - GSocket_Shutdown(socket); - - /* Destroy private addresses */ - if (socket->m_local) - GAddress_destroy(socket->m_local); - - if (socket->m_peer) - GAddress_destroy(socket->m_peer); - - /* Destroy the socket itself */ - free(socket); -} - -/* GSocket_Shutdown: - * Disallow further read/write operations on this socket, close - * the fd and disable all callbacks. - */ -void GSocket_Shutdown(GSocket *socket) -{ - int evt; - - assert(socket != NULL); - - /* If socket has been created, shutdown it */ - if (socket->m_fd != INVALID_SOCKET) - { - shutdown(socket->m_fd, 2); - GSocket_close(socket); - } - - /* Disable GUI callbacks */ - for (evt = 0; evt < GSOCK_MAX_EVENT; evt++) - socket->m_cbacks[evt] = NULL; - - socket->m_detected = GSOCK_LOST_FLAG; -} - -/* Address handling */ - -/* GSocket_SetLocal: - * GSocket_GetLocal: - * GSocket_SetPeer: - * GSocket_GetPeer: - * Set or get the local or peer address for this socket. The 'set' - * functions return GSOCK_NOERROR on success, an error code otherwise. - * The 'get' functions return a pointer to a GAddress object on success, - * or NULL otherwise, in which case they set the error code of the - * corresponding GSocket. - * - * Error codes: - * GSOCK_INVSOCK - the socket is not valid. - * GSOCK_INVADDR - the address is not valid. - */ -GSocketError GSocket_SetLocal(GSocket *socket, GAddress *address) -{ - assert(socket != NULL); - - /* the socket must be initialized, or it must be a server */ - if (socket->m_fd != INVALID_SOCKET && !socket->m_server) - { - socket->m_error = GSOCK_INVSOCK; - return GSOCK_INVSOCK; - } - - /* check address */ - if (address == NULL || address->m_family == GSOCK_NOFAMILY) - { - socket->m_error = GSOCK_INVADDR; - return GSOCK_INVADDR; - } - - if (socket->m_local) - GAddress_destroy(socket->m_local); - - socket->m_local = GAddress_copy(address); - - return GSOCK_NOERROR; -} - -GSocketError GSocket_SetPeer(GSocket *socket, GAddress *address) -{ - assert(socket != NULL); - - /* check address */ - if (address == NULL || address->m_family == GSOCK_NOFAMILY) - { - socket->m_error = GSOCK_INVADDR; - return GSOCK_INVADDR; - } - - if (socket->m_peer) - GAddress_destroy(socket->m_peer); - - socket->m_peer = GAddress_copy(address); - - return GSOCK_NOERROR; -} - -GAddress *GSocket_GetLocal(GSocket *socket) -{ - GAddress *address; - struct sockaddr addr; - SOCKLEN_T size = sizeof(addr); - GSocketError err; - - assert(socket != NULL); - - /* try to get it from the m_local var first */ - if (socket->m_local) - return GAddress_copy(socket->m_local); - - /* else, if the socket is initialized, try getsockname */ - if (socket->m_fd == INVALID_SOCKET) - { - socket->m_error = GSOCK_INVSOCK; - return NULL; - } - - if (getsockname(socket->m_fd, &addr, &size) == SOCKET_ERROR) - { - socket->m_error = GSOCK_IOERR; - return NULL; - } - - /* got a valid address from getsockname, create a GAddress object */ - if ((address = GAddress_new()) == NULL) - { - socket->m_error = GSOCK_MEMERR; - return NULL; - } - - if ((err = _GAddress_translate_from(address, &addr, size)) != GSOCK_NOERROR) - { - GAddress_destroy(address); - socket->m_error = err; - return NULL; - } - - return address; -} - -GAddress *GSocket_GetPeer(GSocket *socket) -{ - assert(socket != NULL); - - /* try to get it from the m_peer var */ - if (socket->m_peer) - return GAddress_copy(socket->m_peer); - - return NULL; -} - -/* Server specific parts */ - -/* GSocket_SetServer: - * 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. - */ -GSocketError GSocket_SetServer(GSocket *sck) -{ - u_long arg = 1; - - assert(sck != NULL); - - /* must not be in use */ - if (sck->m_fd != INVALID_SOCKET) - { - sck->m_error = GSOCK_INVSOCK; - return GSOCK_INVSOCK; - } - - /* the local addr must have been set */ - if (!sck->m_local) - { - sck->m_error = GSOCK_INVADDR; - return GSOCK_INVADDR; - } - - /* Initialize all fields */ - sck->m_server = TRUE; - sck->m_stream = TRUE; - - /* Create the socket */ - sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_STREAM, 0); - - if (sck->m_fd == INVALID_SOCKET) - { - sck->m_error = GSOCK_IOERR; - return GSOCK_IOERR; - } - - ioctlsocket(sck->m_fd, FIONBIO, (u_long FAR *) &arg); - _GSocket_Enable_Events(sck); - - /* allow a socket to re-bind if the socket is in the TIME_WAIT - state after being previously closed. - */ - if (sck->m_reusable) { - 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. - */ - 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) || - (listen(sck->m_fd, 5) != 0)) - { - GSocket_close(sck); - sck->m_error = GSOCK_IOERR; - return GSOCK_IOERR; - } - - return GSOCK_NOERROR; -} - -/* GSocket_WaitConnection: - * Waits for an incoming client connection. Returns a pointer to - * a GSocket object, or NULL if there was an error, in which case - * the last error field will be updated for the calling GSocket. - * - * Error codes (set in the calling GSocket) - * GSOCK_INVSOCK - the socket is not valid or not a server. - * 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. - */ -GSocket *GSocket_WaitConnection(GSocket *sck) -{ - GSocket *connection; - struct sockaddr from; - SOCKLEN_T fromlen = sizeof(from); - GSocketError err; - u_long arg = 1; - - assert(sck != NULL); - - /* Reenable CONNECTION events */ - sck->m_detected &= ~GSOCK_CONNECTION_FLAG; - - /* If the socket has already been created, we exit immediately */ - if (sck->m_fd == INVALID_SOCKET || !sck->m_server) - { - sck->m_error = GSOCK_INVSOCK; - return NULL; - } - - /* Create a GSocket object for the new connection */ - connection = GSocket_new(); - - if (!connection) - { - sck->m_error = GSOCK_MEMERR; - return NULL; - } - - /* Wait for a connection (with timeout) */ - if (_GSocket_Input_Timeout(sck) == GSOCK_TIMEDOUT) - { - GSocket_destroy(connection); - /* sck->m_error set by _GSocket_Input_Timeout */ - return NULL; - } - - connection->m_fd = accept(sck->m_fd, &from, &fromlen); - - if (connection->m_fd == INVALID_SOCKET) - { - if (WSAGetLastError() == WSAEWOULDBLOCK) - sck->m_error = GSOCK_WOULDBLOCK; - else - sck->m_error = GSOCK_IOERR; - - GSocket_destroy(connection); - return NULL; - } - - /* Initialize all fields */ - connection->m_server = FALSE; - connection->m_stream = TRUE; - - /* Setup the peer address field */ - connection->m_peer = GAddress_new(); - if (!connection->m_peer) - { - GSocket_destroy(connection); - sck->m_error = GSOCK_MEMERR; - return NULL; - } - err = _GAddress_translate_from(connection->m_peer, &from, fromlen); - if (err != GSOCK_NOERROR) - { - GAddress_destroy(connection->m_peer); - GSocket_destroy(connection); - sck->m_error = err; - return NULL; - } - - ioctlsocket(connection->m_fd, FIONBIO, (u_long FAR *) &arg); - _GSocket_Enable_Events(connection); - - return connection; -} - -/* GSocket_SetReusable: -* Simply sets the m_resuable flag on the socket. GSocket_SetServer will -* make the appropriate setsockopt() call. -* Implemented as a GSocket function because clients (ie, wxSocketServer) -* don't have access to the GSocket struct information. -* Returns TRUE if the flag was set correctly, FALSE if an error occured -* (ie, if the parameter was NULL) -*/ -int GSocket_SetReusable(GSocket *socket) -{ - /* socket must not be null, and must not be in use/already bound */ - if (NULL != socket && socket->m_fd == INVALID_SOCKET) { - socket->m_reusable = TRUE; - return TRUE; - } - return FALSE; -} - -/* Client specific parts */ - -/* GSocket_Connect: - * 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 - * 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() - * to poll for GSOCK_CONNECTION | GSOCK_LOST, or wait for the - * corresponding asynchronous events. - * - * For datagram (non connection oriented) sockets, GSocket_Connect() - * just sets the peer address established with GSocket_SetPeer() as - * default destination. - * - * Error codes: - * GSOCK_INVSOCK - the socket is in use or not valid. - * GSOCK_INVADDR - the peer address has not been established. - * 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. - */ -GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream) -{ - int ret, err; - u_long arg = 1; - - assert(sck != NULL); - - /* Enable CONNECTION events (needed for nonblocking connections) */ - sck->m_detected &= ~GSOCK_CONNECTION_FLAG; - - if (sck->m_fd != INVALID_SOCKET) - { - sck->m_error = GSOCK_INVSOCK; - return GSOCK_INVSOCK; - } - - if (!sck->m_peer) - { - sck->m_error = GSOCK_INVADDR; - return GSOCK_INVADDR; - } - - /* Streamed or dgram socket? */ - sck->m_stream = (stream == GSOCK_STREAMED); - sck->m_server = FALSE; - sck->m_establishing = FALSE; - - /* Create the socket */ - sck->m_fd = socket(sck->m_peer->m_realfamily, - sck->m_stream? SOCK_STREAM : SOCK_DGRAM, 0); - - if (sck->m_fd == INVALID_SOCKET) - { - sck->m_error = GSOCK_IOERR; - return GSOCK_IOERR; - } - - ioctlsocket(sck->m_fd, FIONBIO, (u_long FAR *) &arg); - _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); - - if (ret == SOCKET_ERROR) - { - err = WSAGetLastError(); - - /* If connect failed with EWOULDBLOCK 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 == WSAEWOULDBLOCK) && (!sck->m_non_blocking)) - { - err = _GSocket_Connect_Timeout(sck); - - if (err != GSOCK_NOERROR) - { - GSocket_close(sck); - /* sck->m_error is set in _GSocket_Connect_Timeout */ - } - - return (GSocketError) err; - } - - /* If connect failed with EWOULDBLOCK 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 == WSAEWOULDBLOCK) && (sck->m_non_blocking)) - { - sck->m_establishing = TRUE; - sck->m_error = GSOCK_WOULDBLOCK; - return GSOCK_WOULDBLOCK; - } - - /* If connect failed with an error other than EWOULDBLOCK, - * then the call to GSocket_Connect() has failed. - */ - 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) -{ - u_long 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; - - /* 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; - } - - ioctlsocket(sck->m_fd, FIONBIO, (u_long FAR *) &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; - } - - return GSOCK_NOERROR; -} - -/* Generic IO */ - -/* Like recv(), send(), ... */ -int GSocket_Read(GSocket *socket, char *buffer, int size) -{ - int ret; - - assert(socket != NULL); - - /* Reenable INPUT events */ - socket->m_detected &= ~GSOCK_INPUT_FLAG; - - if (socket->m_fd == INVALID_SOCKET || socket->m_server) - { - socket->m_error = GSOCK_INVSOCK; - return -1; - } - - /* 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); - - if (ret == SOCKET_ERROR) - { - if (WSAGetLastError() != WSAEWOULDBLOCK) - socket->m_error = GSOCK_IOERR; - else - socket->m_error = GSOCK_WOULDBLOCK; - return -1; - } - - return ret; -} - -int GSocket_Write(GSocket *socket, const char *buffer, int size) -{ - int ret; - - assert(socket != NULL); - - if (socket->m_fd == INVALID_SOCKET || socket->m_server) - { - socket->m_error = GSOCK_INVSOCK; - return -1; - } - - /* If the socket is blocking, wait for writability (with a timeout) */ - if (_GSocket_Output_Timeout(socket) == GSOCK_TIMEDOUT) - return -1; - - /* Write the data */ - if (socket->m_stream) - ret = _GSocket_Send_Stream(socket, buffer, size); - else - ret = _GSocket_Send_Dgram(socket, buffer, size); - - if (ret == SOCKET_ERROR) - { - if (WSAGetLastError() != WSAEWOULDBLOCK) - socket->m_error = GSOCK_IOERR; - else - socket->m_error = GSOCK_WOULDBLOCK; - - /* Only reenable OUTPUT events after an error (just like WSAAsyncSelect - * does). 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. - */ - socket->m_detected &= ~GSOCK_OUTPUT_FLAG; - return -1; - } - - return ret; -} - -/* 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) -{ - if (!USE_GUI()) - { - GSocketEventFlags result = 0; - fd_set readfds; - fd_set writefds; - fd_set exceptfds; - - assert(socket != NULL); - - 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); - - /* 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, - &socket->m_timeout) <= 0) - { - /* What to do here? */ - return (result & flags); - } - - /* Check for readability */ - if (FD_ISSET(socket->m_fd, &readfds)) - { - char c; - - if (!socket->m_stream || 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); - } - else /* USE_GUI() */ - { - assert(socket != NULL); - return flags & socket->m_detected; - } -} - -/* Attributes */ - -/* GSocket_SetNonBlocking: - * Sets the socket to non-blocking mode. All IO calls will return - * immediately. - */ -void GSocket_SetNonBlocking(GSocket *socket, int non_block) -{ - assert(socket != NULL); - - socket->m_non_blocking = non_block; -} - -/* GSocket_SetTimeout: - * Sets the timeout for blocking calls. Time is expressed in - * milliseconds. - */ -void GSocket_SetTimeout(GSocket *socket, unsigned long millis) -{ - assert(socket != NULL); - - socket->m_timeout.tv_sec = (millis / 1000); - socket->m_timeout.tv_usec = (millis % 1000) * 1000; -} - -/* GSocket_GetError: - * Returns the last error occured for this socket. Note that successful - * operations do not clear this back to GSOCK_NOERROR, so use it only - * after an error. - */ -GSocketError GSocket_GetError(GSocket *socket) -{ - assert(socket != NULL); - - return socket->m_error; -} - -/* Callbacks */ - -/* GSOCK_INPUT: - * There is data to be read in the input buffer. If, after a read - * 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 - * 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 - * 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 - * 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: - * The connection is lost (or a connection request failed); this could - * be due to a failure, or due to the peer closing it gracefully. - */ - -/* 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); - - for (count = 0; count < GSOCK_MAX_EVENT; count++) - { - if ((flags & (1 << count)) != 0) - { - socket->m_cbacks[count] = callback; - socket->m_data[count] = cdata; - } - } -} - -/* 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; - - assert(socket != NULL); - - for (count = 0; count < GSOCK_MAX_EVENT; count++) - { - if ((flags & (1 << count)) != 0) - { - socket->m_cbacks[count] = NULL; - socket->m_data[count] = NULL; - } - } -} - -GSocketError GSocket_GetSockOpt(GSocket *socket, int level, int optname, - void *optval, int *optlen) -{ - if (getsockopt(socket->m_fd, level, optname, optval, optlen) == 0) - { - return GSOCK_NOERROR; - } - return GSOCK_OPTERR; -} - -GSocketError GSocket_SetSockOpt(GSocket *socket, int level, int optname, - const void *optval, int optlen) -{ - if (setsockopt(socket->m_fd, level, optname, optval, optlen) == 0) - { - return GSOCK_NOERROR; - } - return GSOCK_OPTERR; -} - -/* Internals (IO) */ - -/* _GSocket_Input_Timeout: - * For blocking sockets, wait until data is available or - * until timeout ellapses. - */ -GSocketError _GSocket_Input_Timeout(GSocket *socket) -{ - fd_set readfds; - - if (!socket->m_non_blocking) - { - FD_ZERO(&readfds); - FD_SET(socket->m_fd, &readfds); - if (select(0, &readfds, NULL, NULL, &socket->m_timeout) == 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) -{ - fd_set writefds; - - if (!socket->m_non_blocking) - { - FD_ZERO(&writefds); - FD_SET(socket->m_fd, &writefds); - if (select(0, NULL, &writefds, NULL, &socket->m_timeout) == 0) - { - socket->m_error = GSOCK_TIMEDOUT; - return GSOCK_TIMEDOUT; - } - } - return GSOCK_NOERROR; -} - -/* _GSocket_Connect_Timeout: - * For blocking sockets, wait until the connection is - * established or fails, or until timeout ellapses. - */ -GSocketError _GSocket_Connect_Timeout(GSocket *socket) -{ - fd_set writefds; - fd_set exceptfds; - - FD_ZERO(&writefds); - FD_ZERO(&exceptfds); - FD_SET(socket->m_fd, &writefds); - FD_SET(socket->m_fd, &exceptfds); - if (select(0, NULL, &writefds, &exceptfds, &socket->m_timeout) == 0) - { - socket->m_error = GSOCK_TIMEDOUT; - return GSOCK_TIMEDOUT; - } - if (!FD_ISSET(socket->m_fd, &writefds)) - { - socket->m_error = GSOCK_IOERR; - return GSOCK_IOERR; - } - - return GSOCK_NOERROR; -} - -int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size) -{ - return recv(socket->m_fd, buffer, size, 0); -} - -int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size) -{ - struct sockaddr from; - SOCKLEN_T fromlen = sizeof(from); - int ret; - GSocketError err; - - ret = recvfrom(socket->m_fd, buffer, size, 0, &from, &fromlen); - - if (ret == SOCKET_ERROR) - return SOCKET_ERROR; - - /* Translate a system address into a GSocket address */ - if (!socket->m_peer) - { - socket->m_peer = GAddress_new(); - 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) -{ - return send(socket->m_fd, buffer, size, 0); -} - -int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size) -{ - struct sockaddr *addr; - int len, ret; - GSocketError err; - - if (!socket->m_peer) - { - socket->m_error = GSOCK_INVADDR; - return -1; - } - - err = _GAddress_translate_to(socket->m_peer, &addr, &len); - if (err != GSOCK_NOERROR) - { - socket->m_error = err; - return -1; - } - - ret = sendto(socket->m_fd, buffer, size, 0, addr, len); - - /* Frees memory allocated by _GAddress_translate_to */ - free(addr); - - return ret; -} - - -/* - * ------------------------------------------------------------------------- - * GAddress - * ------------------------------------------------------------------------- - */ - -/* 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) \ -{ \ - 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(void) -{ - GAddress *address; - - if ((address = (GAddress *) malloc(sizeof(GAddress))) == NULL) - return NULL; - - address->m_family = GSOCK_NOFAMILY; - address->m_addr = NULL; - address->m_len = 0; - - return address; -} - -GAddress *GAddress_copy(GAddress *address) -{ - GAddress *addr2; - - assert(address != NULL); - - if ((addr2 = (GAddress *) malloc(sizeof(GAddress))) == 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 addr2; -} - -void GAddress_destroy(GAddress *address) -{ - assert(address != NULL); - - if (address->m_addr) - free(address->m_addr); - - free(address); -} - -void GAddress_SetFamily(GAddress *address, GAddressType type) -{ - assert(address != NULL); - - address->m_family = type; -} - -GAddressType GAddress_GetFamily(GAddress *address) -{ - assert(address != NULL); - - return address->m_family; -} - -GSocketError _GAddress_translate_from(GAddress *address, - struct sockaddr *addr, int len) -{ - address->m_realfamily = addr->sa_family; - switch (addr->sa_family) - { - case AF_INET: - address->m_family = GSOCK_INET; - break; - case AF_UNIX: - address->m_family = GSOCK_UNIX; - break; -#ifdef AF_INET6 - case AF_INET6: - address->m_family = GSOCK_INET6; - break; -#endif - default: - { - address->m_error = GSOCK_INVOP; - return GSOCK_INVOP; - } - } - - if (address->m_addr) - free(address->m_addr); - - 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; -} - -GSocketError _GAddress_translate_to(GAddress *address, - struct sockaddr **addr, int *len) -{ - if (!address->m_addr) - { - 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; -} - -/* - * ------------------------------------------------------------------------- - * Internet address family - * ------------------------------------------------------------------------- - */ - -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 = AF_INET; - ((struct sockaddr_in *)address->m_addr)->sin_family = AF_INET; - ((struct sockaddr_in *)address->m_addr)->sin_addr.s_addr = INADDR_ANY; - - return GSOCK_NOERROR; -} - -GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname) -{ - struct hostent *he; - struct in_addr *addr; - - assert(address != NULL); - - CHECK_ADDRESS(address, INET); - - addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr); - - addr->s_addr = inet_addr(hostname); - - /* If it is a numeric host name, convert it now */ - if (addr->s_addr == INADDR_NONE) - { - struct in_addr *array_addr; - - /* It is a real name, we solve it */ - if ((he = gethostbyname(hostname)) == NULL) - { - /* addr->s_addr = INADDR_NONE just done by inet_addr() above */ - address->m_error = GSOCK_NOHOST; - return GSOCK_NOHOST; - } - array_addr = (struct in_addr *) *(he->h_addr_list); - addr->s_addr = array_addr[0].s_addr; - } - return GSOCK_NOERROR; -} - -GSocketError GAddress_INET_SetAnyAddress(GAddress *address) -{ - return GAddress_INET_SetHostAddress(address, INADDR_ANY); -} - -GSocketError GAddress_INET_SetHostAddress(GAddress *address, - unsigned long hostaddr) -{ - struct in_addr *addr; - - assert(address != NULL); - - CHECK_ADDRESS(address, INET); - - addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr); - addr->s_addr = htonl(hostaddr);; - - return GSOCK_NOERROR; -} - -GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port, - const char *protocol) -{ - struct servent *se; - struct sockaddr_in *addr; - - assert(address != NULL); - CHECK_ADDRESS(address, INET); - - if (!port) - { - address->m_error = GSOCK_INVPORT; - return GSOCK_INVPORT; - } - - se = getservbyname(port, protocol); - if (!se) - { - if (isdigit(port[0])) - { - int port_int; - - port_int = atoi(port); - addr = (struct sockaddr_in *)address->m_addr; - addr->sin_port = htons((u_short) port_int); - return GSOCK_NOERROR; - } - - address->m_error = GSOCK_INVPORT; - return GSOCK_INVPORT; - } - - addr = (struct sockaddr_in *)address->m_addr; - addr->sin_port = se->s_port; - - return GSOCK_NOERROR; -} - -GSocketError GAddress_INET_SetPort(GAddress *address, unsigned short port) -{ - struct sockaddr_in *addr; - - assert(address != NULL); - CHECK_ADDRESS(address, INET); - - addr = (struct sockaddr_in *)address->m_addr; - addr->sin_port = htons(port); - - return GSOCK_NOERROR; -} - -GSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, size_t sbuf) -{ - struct hostent *he; - char *addr_buf; - struct sockaddr_in *addr; - - assert(address != NULL); - CHECK_ADDRESS(address, INET); - - 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) - { - address->m_error = GSOCK_NOHOST; - return GSOCK_NOHOST; - } - - strncpy(hostname, he->h_name, sbuf); - - return GSOCK_NOERROR; -} - -unsigned long GAddress_INET_GetHostAddress(GAddress *address) -{ - struct sockaddr_in *addr; - - assert(address != NULL); - CHECK_ADDRESS_RETVAL(address, INET, 0); - - addr = (struct sockaddr_in *)address->m_addr; - - return ntohl(addr->sin_addr.s_addr); -} - -unsigned short GAddress_INET_GetPort(GAddress *address) -{ - struct sockaddr_in *addr; - - assert(address != NULL); - CHECK_ADDRESS_RETVAL(address, INET, 0); - - addr = (struct sockaddr_in *)address->m_addr; - return ntohs(addr->sin_port); -} - -/* - * ------------------------------------------------------------------------- - * Unix address family - * ------------------------------------------------------------------------- - */ - -GSocketError _GAddress_Init_UNIX(GAddress *address) -{ - assert (address != NULL); - address->m_error = GSOCK_INVADDR; - return GSOCK_INVADDR; -} - -GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path) -{ -#if defined(__BORLANDC__) - /* prevents unused variable message in Borland */ - (void)path; -#endif - assert (address != NULL); - address->m_error = GSOCK_INVADDR; - return GSOCK_INVADDR; -} - -GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf) -{ -#if defined(__BORLANDC__) - /* prevents unused variable message in Borland */ - (void)path; - (void)sbuf; -#endif - assert (address != NULL); - address->m_error = GSOCK_INVADDR; - return GSOCK_INVADDR; -} - -#else /* !wxUSE_SOCKETS */ - -/* - * Translation unit shouldn't be empty, so include this typedef to make the - * compiler (VC++ 6.0, for example) happy - */ -typedef void (*wxDummy)(); - -#endif /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */ - diff --git a/src/msw/gsockmsw.c b/src/msw/gsockmsw.c deleted file mode 100644 index 8e75239ea5..0000000000 --- a/src/msw/gsockmsw.c +++ /dev/null @@ -1,324 +0,0 @@ -/* ------------------------------------------------------------------------- - * Project: GSocket (Generic Socket) - * Name: gsockmsw.c - * Author: Guillermo Rodriguez Garcia - * Purpose: GSocket GUI-specific MSW code - * CVSID: $Id$ - * ------------------------------------------------------------------------- - */ - -/* - * TODO: for WinCE we need to replace WSAAsyncSelect - * (Windows message-based notification of network events for a socket) - * with another mechanism. - * We may need to have a separate thread that polls for socket events - * using select() and sends a message to the main thread. - */ - -/* - * PLEASE don't put C++ comments here - this is a C source file. - */ - -/* including rasasync.h (included from windows.h itself included from - * wx/setup.h and/or winsock.h results in this warning for - * RPCNOTIFICATION_ROUTINE - */ -#ifdef _MSC_VER -# pragma warning(disable:4115) /* named type definition in parentheses */ -#endif - -/* This needs to be before the wx/defs/h inclusion - * for some reason - */ - -#ifdef __WXWINCE__ - /* windows.h results in tons of warnings at max warning level */ -# ifdef _MSC_VER -# pragma warning(push, 1) -# endif -# include -# ifdef _MSC_VER -# pragma warning(pop) -# pragma warning(disable:4514) -# endif -#endif - -#ifndef __GSOCKET_STANDALONE__ -# include "wx/platform.h" -# include "wx/setup.h" -#endif - -#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) - -#ifndef __GSOCKET_STANDALONE__ - -#include "wx/msw/gsockmsw.h" -#include "wx/gsocket.h" - -HINSTANCE wxGetInstance(void); -#define INSTANCE wxGetInstance() - -#else - -#include "gsockmsw.h" -#include "gsocket.h" - -/* If not using wxWidgets, a global var called hInst must - * be available and it must contain the app's instance - * handle. - */ -#define INSTANCE hInst - -#endif /* __GSOCKET_STANDALONE__ */ - -#ifndef __WXWINCE__ -#include -#else -#define assert(x) -#include -#include "wx/msw/wince/net.h" -#endif - -#include -#include -#include -#include -#include - -#include - -#ifdef _MSC_VER -# pragma warning(default:4115) /* named type definition in parentheses */ -#endif - -#define CLASSNAME TEXT("_GSocket_Internal_Window_Class") - -/* implemented in utils.cpp */ -extern WXDLLIMPEXP_BASE HWND -wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc); - -/* Maximum number of different GSocket objects at a given time. - * This value can be modified at will, but it CANNOT be greater - * than (0x7FFF - WM_USER + 1) - */ -#define MAXSOCKETS 1024 - -#if (MAXSOCKETS > (0x7FFF - WM_USER + 1)) -#error "MAXSOCKETS is too big!" -#endif - -typedef int (PASCAL *WSAAsyncSelectFunc)(SOCKET,HWND,u_int,long); - -/* Global variables */ - -extern HINSTANCE INSTANCE; -static HWND hWin; -static CRITICAL_SECTION critical; -static GSocket* socketList[MAXSOCKETS]; -static int firstAvailable; -static WSAAsyncSelectFunc gs_WSAAsyncSelect = NULL; -static HMODULE gs_wsock32dll = 0; - -/* Global initializers */ - -int _GSocket_GUI_Init(void) -{ - static LPCTSTR pclassname = NULL; - int i; - - /* Create internal window for event notifications */ - hWin = wxCreateHiddenWindow(&pclassname, CLASSNAME, _GSocket_Internal_WinProc); - if (!hWin) - return FALSE; - - /* Initialize socket list */ - InitializeCriticalSection(&critical); - - for (i = 0; i < MAXSOCKETS; i++) - { - socketList[i] = NULL; - } - firstAvailable = 0; - - /* Load WSAAsyncSelect from wsock32.dll (we don't link against it - statically to avoid dependency on wsock32.dll for apps that don't use - sockets): */ - gs_wsock32dll = LoadLibraryA("wsock32.dll"); - if (!gs_wsock32dll) - return FALSE; - gs_WSAAsyncSelect =(WSAAsyncSelectFunc)GetProcAddress(gs_wsock32dll, - "WSAAsyncSelect"); - if (!gs_WSAAsyncSelect) - return FALSE; - - return TRUE; -} - -void _GSocket_GUI_Cleanup(void) -{ - /* Destroy internal window */ - DestroyWindow(hWin); - UnregisterClass(CLASSNAME, INSTANCE); - - /* Unlock wsock32.dll */ - if (gs_wsock32dll) - { - FreeLibrary(gs_wsock32dll); - gs_wsock32dll = 0; - } - - /* Delete critical section */ - DeleteCriticalSection(&critical); -} - -/* Per-socket GUI initialization / cleanup */ - -int _GSocket_GUI_Init_Socket(GSocket *socket) -{ - int i; - - /* Allocate a new message number for this socket */ - EnterCriticalSection(&critical); - - i = firstAvailable; - while (socketList[i] != NULL) - { - i = (i + 1) % MAXSOCKETS; - - if (i == firstAvailable) /* abort! */ - { - LeaveCriticalSection(&critical); - return FALSE; - } - } - socketList[i] = socket; - firstAvailable = (i + 1) % MAXSOCKETS; - socket->m_msgnumber = (i + WM_USER); - - LeaveCriticalSection(&critical); - - return TRUE; -} - -void _GSocket_GUI_Destroy_Socket(GSocket *socket) -{ - /* Remove the socket from the list */ - EnterCriticalSection(&critical); - socketList[(socket->m_msgnumber - WM_USER)] = NULL; - LeaveCriticalSection(&critical); -} - -/* Windows proc for asynchronous event handling */ - -LRESULT CALLBACK _GSocket_Internal_WinProc(HWND hWnd, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - GSocket *socket; - GSocketEvent event; - GSocketCallback cback; - char *data; - - if (uMsg >= WM_USER && uMsg <= (WM_USER + MAXSOCKETS - 1)) - { - EnterCriticalSection(&critical); - socket = socketList[(uMsg - WM_USER)]; - event = (GSocketEvent) -1; - cback = NULL; - data = NULL; - - /* Check that the socket still exists (it has not been - * destroyed) and for safety, check that the m_fd field - * is what we expect it to be. - */ - if ((socket != NULL) && (socket->m_fd == wParam)) - { - switch WSAGETSELECTEVENT(lParam) - { - case FD_READ: event = GSOCK_INPUT; break; - case FD_WRITE: event = GSOCK_OUTPUT; break; - case FD_ACCEPT: event = GSOCK_CONNECTION; break; - case FD_CONNECT: - { - if (WSAGETSELECTERROR(lParam) != 0) - event = GSOCK_LOST; - else - event = GSOCK_CONNECTION; - break; - } - case FD_CLOSE: event = GSOCK_LOST; break; - } - - if (event != -1) - { - cback = socket->m_cbacks[event]; - data = socket->m_data[event]; - - if (event == GSOCK_LOST) - socket->m_detected = GSOCK_LOST_FLAG; - else - socket->m_detected |= (1 << event); - } - } - - /* OK, we can now leave the critical section because we have - * already obtained the callback address (we make no further - * accesses to socket->whatever). However, the app should - * be prepared to handle events from a socket that has just - * been closed! - */ - LeaveCriticalSection(&critical); - - if (cback != NULL) - (cback)(socket, event, data); - - return (LRESULT) 0; - } - else - return DefWindowProc(hWnd, uMsg, wParam, lParam); -} - -/* _GSocket_Enable_Events: - * Enable all event notifications; we need to be notified of all - * events for internal processing, but we will only notify users - * when an appropiate callback function has been installed. - */ -void _GSocket_Enable_Events(GSocket *socket) -{ - assert (socket != NULL); - - if (socket->m_fd != INVALID_SOCKET) - { - /* We could probably just subscribe to all events regardless - * of the socket type, but MS recommends to do it this way. - */ - long lEvent = socket->m_server? - FD_ACCEPT : (FD_READ | FD_WRITE | FD_CONNECT | FD_CLOSE); - - gs_WSAAsyncSelect(socket->m_fd, hWin, socket->m_msgnumber, lEvent); - } -} - -/* _GSocket_Disable_Events: - * Disable event notifications (when shutdowning the socket) - */ -void _GSocket_Disable_Events(GSocket *socket) -{ - assert (socket != NULL); - - if (socket->m_fd != INVALID_SOCKET) - { - gs_WSAAsyncSelect(socket->m_fd, hWin, socket->m_msgnumber, 0); - } -} - -#else /* !wxUSE_SOCKETS */ - -/* - * Translation unit shouldn't be empty, so include this typedef to make the - * compiler (VC++ 6.0, for example) happy - */ -typedef void (*wxDummy)(); - -#endif /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */ diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c deleted file mode 100644 index fd8824ce95..0000000000 --- a/src/unix/gsocket.c +++ /dev/null @@ -1,1841 +0,0 @@ -/* ------------------------------------------------------------------------- - * Project: GSocket (Generic Socket) for WX - * Name: gsocket.c - * Authors: Guilhem Lavaux, - * Guillermo Rodriguez Garcia (maintainer) - * Purpose: GSocket main Unix and OS/2 file - * Licence: The wxWidgets licence - * CVSID: $Id$ - * ------------------------------------------------------------------------- - */ - -/* - * PLEASE don't put C++ comments here - this is a C source file. - */ - -#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 - 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 -#include -#ifdef __VISAGECPP__ -#include -#include -#include -#include -#endif -#include -#include - -#ifdef __VMS__ -#include -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 -#include -#endif - -#ifndef __VISAGECPP__ -#include -#include -#include -#include -#include -#include -#else -#include -# if __IBMCPP__ < 400 -#include -#include -#include -#include -#include - -#define EBADF SOCEBADF - -# ifdef min -# undef min -# endif -# else -#include -#include -#include - -#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 -#include -#include -#include -#ifdef sun -# include -#endif -#ifdef sgi -# include -#endif -#include - -#ifndef SOCKLEN_T - -#ifdef VMS -# define SOCKLEN_T unsigned int -#else -# ifdef __GLIBC__ -# if __GLIBC__ == 2 -# define SOCKLEN_T socklen_t -# endif -# else -# define SOCKLEN_T int -# endif -#endif - -#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 -#endif - -/* - * INADDR_BROADCAST is identical to INADDR_NONE which is not defined - * on all systems. INADDR_BROADCAST should be fine to indicate an error. - */ -#ifndef INADDR_NONE -#define INADDR_NONE INADDR_BROADCAST -#endif - -#define MASK_SIGNAL() \ -{ \ - void (*old_handler)(int); \ - \ - old_handler = signal(SIGPIPE, SIG_IGN); - -#define UNMASK_SIGNAL() \ - signal(SIGPIPE, old_handler); \ -} - - -#ifndef __GSOCKET_STANDALONE__ -# include "wx/unix/gsockunx.h" -# include "wx/gsocket.h" -#else -# 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 */ - -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 */ - -GSocket *GSocket_new(void) -{ - int i, success; - GSocket *socket; - - socket = (GSocket *)malloc(sizeof(GSocket)); - - if (socket == NULL) - return NULL; - - socket->m_fd = INVALID_SOCKET; - for (i=0;im_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_non_blocking = FALSE; - socket->m_timeout = 10*60*1000; - /* 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(socket); - if (!success) - { - free(socket); - return NULL; - } - - return 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; -} - -void GSocket_destroy(GSocket *socket) -{ - assert(socket != NULL); - - /* Check that the socket is really shutdowned */ - if (socket->m_fd != INVALID_SOCKET) - GSocket_Shutdown(socket); - - /* Per-socket GUI-specific cleanup */ - _GSocket_GUI_Destroy_Socket(socket); - - /* Destroy private addresses */ - if (socket->m_local) - GAddress_destroy(socket->m_local); - - if (socket->m_peer) - GAddress_destroy(socket->m_peer); - - /* Destroy the socket itself */ - free(socket); -} - -/* GSocket_Shutdown: - * Disallow further read/write operations on this socket, close - * the fd and disable all callbacks. - */ -void GSocket_Shutdown(GSocket *socket) -{ - int evt; - - assert(socket != NULL); - - /* If socket has been created, shutdown it */ - if (socket->m_fd != INVALID_SOCKET) - { - shutdown(socket->m_fd, 2); - GSocket_close(socket); - } - - /* Disable GUI callbacks */ - for (evt = 0; evt < GSOCK_MAX_EVENT; evt++) - socket->m_cbacks[evt] = NULL; - - socket->m_detected = GSOCK_LOST_FLAG; -} - -/* Address handling */ - -/* GSocket_SetLocal: - * GSocket_GetLocal: - * GSocket_SetPeer: - * GSocket_GetPeer: - * Set or get the local or peer address for this socket. The 'set' - * functions return GSOCK_NOERROR on success, an error code otherwise. - * The 'get' functions return a pointer to a GAddress object on success, - * or NULL otherwise, in which case they set the error code of the - * corresponding GSocket. - * - * Error codes: - * GSOCK_INVSOCK - the socket is not valid. - * GSOCK_INVADDR - the address is not valid. - */ -GSocketError GSocket_SetLocal(GSocket *socket, GAddress *address) -{ - assert(socket != NULL); - - /* the socket must be initialized, or it must be a server */ - if ((socket->m_fd != INVALID_SOCKET && !socket->m_server)) - { - socket->m_error = GSOCK_INVSOCK; - return GSOCK_INVSOCK; - } - - /* check address */ - if (address == NULL || address->m_family == GSOCK_NOFAMILY) - { - socket->m_error = GSOCK_INVADDR; - return GSOCK_INVADDR; - } - - if (socket->m_local) - GAddress_destroy(socket->m_local); - - socket->m_local = GAddress_copy(address); - - return GSOCK_NOERROR; -} - -GSocketError GSocket_SetPeer(GSocket *socket, GAddress *address) -{ - assert(socket != NULL); - - /* check address */ - if (address == NULL || address->m_family == GSOCK_NOFAMILY) - { - socket->m_error = GSOCK_INVADDR; - return GSOCK_INVADDR; - } - - if (socket->m_peer) - GAddress_destroy(socket->m_peer); - - socket->m_peer = GAddress_copy(address); - - return GSOCK_NOERROR; -} - -GAddress *GSocket_GetLocal(GSocket *socket) -{ - GAddress *address; - struct sockaddr addr; - SOCKLEN_T size = sizeof(addr); - GSocketError err; - - assert(socket != NULL); - - /* try to get it from the m_local var first */ - if (socket->m_local) - return GAddress_copy(socket->m_local); - - /* else, if the socket is initialized, try getsockname */ - if (socket->m_fd == INVALID_SOCKET) - { - socket->m_error = GSOCK_INVSOCK; - return NULL; - } - - if (getsockname(socket->m_fd, &addr, (SOCKLEN_T *) &size) < 0) - { - socket->m_error = GSOCK_IOERR; - return NULL; - } - - /* got a valid address from getsockname, create a GAddress object */ - address = GAddress_new(); - if (address == NULL) - { - socket->m_error = GSOCK_MEMERR; - return NULL; - } - - err = _GAddress_translate_from(address, &addr, size); - if (err != GSOCK_NOERROR) - { - GAddress_destroy(address); - socket->m_error = err; - return NULL; - } - - return address; -} - -GAddress *GSocket_GetPeer(GSocket *socket) -{ - assert(socket != NULL); - - /* try to get it from the m_peer var */ - if (socket->m_peer) - return GAddress_copy(socket->m_peer); - - return NULL; -} - -/* Server specific parts */ - -/* GSocket_SetServer: - * 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. - */ -GSocketError GSocket_SetServer(GSocket *sck) -{ - int arg = 1; - - assert(sck != NULL); - - /* must not be in use */ - if (sck->m_fd != INVALID_SOCKET) - { - sck->m_error = GSOCK_INVSOCK; - return GSOCK_INVSOCK; - } - - /* the local addr must have been set */ - if (!sck->m_local) - { - sck->m_error = GSOCK_INVADDR; - return GSOCK_INVADDR; - } - - /* Initialize all fields */ - sck->m_stream = TRUE; - sck->m_server = TRUE; - - /* Create the socket */ - sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_STREAM, 0); - - if (sck->m_fd == INVALID_SOCKET) - { - 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. - */ - if (sck->m_reusable) - 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. - */ - 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) || - (listen(sck->m_fd, 5) != 0)) - { - GSocket_close(sck); - sck->m_error = GSOCK_IOERR; - return GSOCK_IOERR; - } - - return GSOCK_NOERROR; -} - -/* GSocket_WaitConnection: - * Waits for an incoming client connection. Returns a pointer to - * a GSocket object, or NULL if there was an error, in which case - * the last error field will be updated for the calling GSocket. - * - * Error codes (set in the calling GSocket) - * GSOCK_INVSOCK - the socket is not valid or not a server. - * 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. - */ -GSocket *GSocket_WaitConnection(GSocket *socket) -{ - struct sockaddr from; - SOCKLEN_T fromlen = sizeof(from); - GSocket *connection; - GSocketError err; - 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 == INVALID_SOCKET || !socket->m_server) - { - socket->m_error = GSOCK_INVSOCK; - return NULL; - } - - /* Create a GSocket object for the new connection */ - connection = GSocket_new(); - - if (!connection) - { - socket->m_error = GSOCK_MEMERR; - return NULL; - } - - /* Wait for a connection (with timeout) */ - 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, &from, (SOCKLEN_T *) &fromlen); - - if (connection->m_fd == INVALID_SOCKET) - { - if (errno == EWOULDBLOCK) - socket->m_error = GSOCK_WOULDBLOCK; - else - socket->m_error = GSOCK_IOERR; - - GSocket_destroy(connection); - return NULL; - } - - /* Initialize all fields */ - connection->m_server = FALSE; - connection->m_stream = TRUE; - - /* Setup the peer address field */ - connection->m_peer = GAddress_new(); - if (!connection->m_peer) - { - GSocket_destroy(connection); - socket->m_error = GSOCK_MEMERR; - return NULL; - } - err = _GAddress_translate_from(connection->m_peer, &from, fromlen); - if (err != GSOCK_NOERROR) - { - GAddress_destroy(connection->m_peer); - GSocket_destroy(connection); - 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; -} - -int GSocket_SetReusable(GSocket *socket) -{ - /* socket must not be null, and must not be in use/already bound */ - if (NULL != socket && socket->m_fd == INVALID_SOCKET) { - socket->m_reusable = TRUE; - return TRUE; - } - return FALSE; -} - -/* Client specific parts */ - -/* GSocket_Connect: - * 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 - * 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() - * to poll for GSOCK_CONNECTION | GSOCK_LOST, or wait for the - * corresponding asynchronous events. - * - * For datagram (non connection oriented) sockets, GSocket_Connect() - * just sets the peer address established with GSocket_SetPeer() as - * default destination. - * - * Error codes: - * GSOCK_INVSOCK - the socket is in use or not valid. - * GSOCK_INVADDR - the peer address has not been established. - * 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. - */ -GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream) -{ - int err, ret; - int arg = 1; - - assert(sck != NULL); - - /* Enable CONNECTION events (needed for nonblocking connections) */ - _GSocket_Enable(sck, GSOCK_CONNECTION); - - if (sck->m_fd != INVALID_SOCKET) - { - sck->m_error = GSOCK_INVSOCK; - return GSOCK_INVSOCK; - } - - if (!sck->m_peer) - { - sck->m_error = GSOCK_INVADDR; - return GSOCK_INVADDR; - } - - /* Streamed or dgram socket? */ - sck->m_stream = (stream == GSOCK_STREAMED); - sck->m_server = FALSE; - sck->m_establishing = FALSE; - - /* Create the socket */ - sck->m_fd = socket(sck->m_peer->m_realfamily, - sck->m_stream? SOCK_STREAM : SOCK_DGRAM, 0); - - if (sck->m_fd == INVALID_SOCKET) - { - 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); - - 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) - { - GSocket_close(sck); - /* sck->m_error is set in _GSocket_Output_Timeout */ - return GSOCK_TIMEDOUT; - } - else - { - int error; - SOCKLEN_T len = sizeof(error); - - getsockopt(sck->m_fd, SOL_SOCKET, SO_ERROR, (void*) &error, &len); - - if (!error) - 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_establishing = TRUE; - sck->m_error = GSOCK_WOULDBLOCK; - return GSOCK_WOULDBLOCK; - } - - /* If connect failed with an error other than EINPROGRESS, - * then the call to GSocket_Connect has failed. - */ - 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; - - /* 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; - } -#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, - * 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; - } - - return GSOCK_NOERROR; -} - -/* Generic IO */ - -/* Like recv(), send(), ... */ -int GSocket_Read(GSocket *socket, char *buffer, int size) -{ - int ret; - - assert(socket != NULL); - - 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) - /* 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) - { - if (errno == EWOULDBLOCK) - socket->m_error = GSOCK_WOULDBLOCK; - else - socket->m_error = GSOCK_IOERR; - } - - /* Enable events again now that we are done processing */ - _GSocket_Enable(socket, GSOCK_INPUT); - - 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) - { - 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 - * that the socket is writable until a read operation fails. Only then - * will further OUTPUT events be posted. - */ - _GSocket_Enable(socket, GSOCK_OUTPUT); - return -1; - } - - GSocket_Debug(( "GSocket_Write #5, size %d ret %d\n", size, ret )); - - return ret; -} - -/* 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) -{ - if (!USE_GUI()) - { - - GSocketEventFlags result = 0; - fd_set readfds; - fd_set writefds; - fd_set exceptfds; - struct timeval tv; - - assert(socket != NULL); - - /* 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; - - 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); - - /* 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); - - } - else - { - - assert(socket != NULL); - return flags & socket->m_detected; - - } -} - -/* Flags */ - -/* GSocket_SetNonBlocking: - * Sets the socket to non-blocking mode. All IO calls will return - * immediately. - */ -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; -} - -/* 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. Note that successful - * operations do not clear this back to GSOCK_NOERROR, so use it only - * after an error. - */ -GSocketError GSocket_GetError(GSocket *socket) -{ - assert(socket != NULL); - - return socket->m_error; -} - -/* Callbacks */ - -/* GSOCK_INPUT: - * There is data to be read in the input buffer. If, after a read - * 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 - * 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 - * 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 - * 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: - * The connection is lost (or a connection request failed); this could - * be due to a failure, or due to the peer closing it gracefully. - */ - -/* 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); - - for (count = 0; count < GSOCK_MAX_EVENT; count++) - { - if ((flags & (1 << count)) != 0) - { - socket->m_cbacks[count] = callback; - socket->m_data[count] = cdata; - } - } -} - -/* 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; - - assert(socket != NULL); - - for (count = 0; count < GSOCK_MAX_EVENT; count++) - { - if ((flags & (1 << count)) != 0) - { - socket->m_cbacks[count] = NULL; - socket->m_data[count] = NULL; - } - } -} - -GSocketError GSocket_GetSockOpt(GSocket *socket, int level, int optname, - void *optval, int *optlen) -{ - if (getsockopt(socket->m_fd, level, optname, optval, optlen) == 0) - { - return GSOCK_NOERROR; - } - return GSOCK_OPTERR; -} - -GSocketError GSocket_SetSockOpt(GSocket *socket, int level, int optname, - const void *optval, int optlen) -{ - if (setsockopt(socket->m_fd, level, optname, optval, optlen) == 0) - { - return GSOCK_NOERROR; - } - return GSOCK_OPTERR; -} - -#define CALL_CALLBACK(socket, event) { \ - _GSocket_Disable(socket, event); \ - if (socket->m_cbacks[event]) \ - socket->m_cbacks[event](socket, event, socket->m_data[event]); \ -} - - -void _GSocket_Enable(GSocket *socket, GSocketEvent event) -{ - socket->m_detected &= ~(1 << event); - _GSocket_Install_Callback(socket, event); -} - -void _GSocket_Disable(GSocket *socket, GSocketEvent 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; - 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; - - if (!socket->m_non_blocking) - { - FD_ZERO(&readfds); - FD_SET(socket->m_fd, &readfds); - 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; - } - } - 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; - 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); - 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; -} - -int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size) -{ - return recv(socket->m_fd, buffer, size, 0); -} - -int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size) -{ - struct sockaddr from; - SOCKLEN_T fromlen = sizeof(from); - int ret; - GSocketError err; - - fromlen = sizeof(from); - - ret = recvfrom(socket->m_fd, buffer, size, 0, &from, (SOCKLEN_T *) &fromlen); - - if (ret == -1) - return -1; - - /* Translate a system address into a GSocket address */ - if (!socket->m_peer) - { - socket->m_peer = GAddress_new(); - 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; - -#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; -} - -int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size) -{ - struct sockaddr *addr; - int len, ret; - GSocketError err; - - if (!socket->m_peer) - { - socket->m_error = GSOCK_INVADDR; - return -1; - } - - err = _GAddress_translate_to(socket->m_peer, &addr, &len); - if (err != GSOCK_NOERROR) - { - socket->m_error = err; - 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); - - return ret; -} - -void _GSocket_Detected_Read(GSocket *socket) -{ - 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 - { - 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; - SOCKLEN_T len = sizeof(error); - - socket->m_establishing = FALSE; - - getsockopt(socket->m_fd, SOL_SOCKET, SO_ERROR, (void*)&error, &len); - - if (error) - { - CALL_CALLBACK(socket, GSOCK_LOST); - GSocket_Shutdown(socket); - } - 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); - } -} - -/* - * ------------------------------------------------------------------------- - * GAddress - * ------------------------------------------------------------------------- - */ - -/* 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) \ -{ \ - 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(void) -{ - GAddress *address; - - if ((address = (GAddress *) malloc(sizeof(GAddress))) == NULL) - return NULL; - - address->m_family = GSOCK_NOFAMILY; - address->m_addr = NULL; - address->m_len = 0; - - return address; -} - -GAddress *GAddress_copy(GAddress *address) -{ - GAddress *addr2; - - assert(address != NULL); - - if ((addr2 = (GAddress *) malloc(sizeof(GAddress))) == NULL) - return NULL; - - memcpy(addr2, address, sizeof(GAddress)); - - if (address->m_addr && address->m_len > 0) - { - 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 addr2; -} - -void GAddress_destroy(GAddress *address) -{ - assert(address != NULL); - - if (address->m_addr) - free(address->m_addr); - - free(address); -} - -void GAddress_SetFamily(GAddress *address, GAddressType type) -{ - assert(address != NULL); - - address->m_family = type; -} - -GAddressType GAddress_GetFamily(GAddress *address) -{ - assert(address != NULL); - - return address->m_family; -} - -GSocketError _GAddress_translate_from(GAddress *address, - struct sockaddr *addr, int len) -{ - address->m_realfamily = addr->sa_family; - switch (addr->sa_family) - { - case AF_INET: - address->m_family = GSOCK_INET; - break; - case AF_UNIX: - address->m_family = GSOCK_UNIX; - break; -#ifdef AF_INET6 - case AF_INET6: - address->m_family = GSOCK_INET6; - break; -#endif - default: - { - address->m_error = GSOCK_INVOP; - return GSOCK_INVOP; - } - } - - if (address->m_addr) - free(address->m_addr); - - 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; -} - -GSocketError _GAddress_translate_to(GAddress *address, - struct sockaddr **addr, int *len) -{ - if (!address->m_addr) - { - 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; -} - -/* - * ------------------------------------------------------------------------- - * Internet address family - * ------------------------------------------------------------------------- - */ - -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; - - return GSOCK_NOERROR; -} - -GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname) -{ - struct hostent *he; - struct in_addr *addr; - - assert(address != NULL); - - CHECK_ADDRESS(address, INET); - - addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr); - - /* If it is a numeric host name, convert it now */ -#if defined(HAVE_INET_ATON) - if (inet_aton(hostname, addr) == 0) - { -#elif defined(HAVE_INET_ADDR) - if ( (addr->s_addr = inet_addr(hostname)) == -1 ) - { -#else - /* Use gethostbyname by default */ -#ifndef __WXMAC__ - int val = 1; /* VA doesn't like constants in conditional expressions */ - if (val) -#endif - { -#endif - struct in_addr *array_addr; - - /* It is a real name, we solve it */ - if ((he = gethostbyname(hostname)) == NULL) - { - /* Reset to invalid address */ - addr->s_addr = INADDR_NONE; - address->m_error = GSOCK_NOHOST; - return GSOCK_NOHOST; - } - array_addr = (struct in_addr *) *(he->h_addr_list); - addr->s_addr = array_addr[0].s_addr; - } - return GSOCK_NOERROR; -} - -GSocketError GAddress_INET_SetAnyAddress(GAddress *address) -{ - return GAddress_INET_SetHostAddress(address, INADDR_ANY); -} - -GSocketError GAddress_INET_SetHostAddress(GAddress *address, - unsigned long hostaddr) -{ - struct in_addr *addr; - - assert(address != NULL); - - CHECK_ADDRESS(address, INET); - - addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr); - addr->s_addr = htonl(hostaddr); - - return GSOCK_NOERROR; -} - -GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port, - const char *protocol) -{ - struct servent *se; - struct sockaddr_in *addr; - - assert(address != NULL); - CHECK_ADDRESS(address, INET); - - if (!port) - { - 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; - - port_int = atoi(port); - addr = (struct sockaddr_in *)address->m_addr; - addr->sin_port = htons(port_int); - return GSOCK_NOERROR; - } - - address->m_error = GSOCK_INVPORT; - return GSOCK_INVPORT; - } - - addr = (struct sockaddr_in *)address->m_addr; - addr->sin_port = se->s_port; - - return GSOCK_NOERROR; -} - -GSocketError GAddress_INET_SetPort(GAddress *address, unsigned short port) -{ - struct sockaddr_in *addr; - - assert(address != NULL); - CHECK_ADDRESS(address, INET); - - addr = (struct sockaddr_in *)address->m_addr; - addr->sin_port = htons(port); - - return GSOCK_NOERROR; -} - -GSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, size_t sbuf) -{ - struct hostent *he; - char *addr_buf; - struct sockaddr_in *addr; - - assert(address != NULL); - CHECK_ADDRESS(address, INET); - - 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) - { - address->m_error = GSOCK_NOHOST; - return GSOCK_NOHOST; - } - - strncpy(hostname, he->h_name, sbuf); - - return GSOCK_NOERROR; -} - -unsigned long GAddress_INET_GetHostAddress(GAddress *address) -{ - struct sockaddr_in *addr; - - assert(address != NULL); - CHECK_ADDRESS_RETVAL(address, INET, 0); - - addr = (struct sockaddr_in *)address->m_addr; - - return ntohl(addr->sin_addr.s_addr); -} - -unsigned short GAddress_INET_GetPort(GAddress *address) -{ - struct sockaddr_in *addr; - - assert(address != NULL); - CHECK_ADDRESS_RETVAL(address, INET, 0); - - addr = (struct sockaddr_in *)address->m_addr; - return ntohs(addr->sin_port); -} - -/* - * ------------------------------------------------------------------------- - * Unix address family - * ------------------------------------------------------------------------- - */ - -#ifndef __VISAGECPP__ -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 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); - - addr = ((struct sockaddr_un *)address->m_addr); - strncpy(addr->sun_path, path, UNIX_SOCK_PATHLEN); - addr->sun_path[UNIX_SOCK_PATHLEN - 1] = '\0'; - - return GSOCK_NOERROR; -} - -GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf) -{ - struct sockaddr_un *addr; - - assert(address != NULL); - CHECK_ADDRESS(address, UNIX); - - addr = (struct sockaddr_un *)address->m_addr; - - strncpy(path, addr->sun_path, sbuf); - - return GSOCK_NOERROR; -} -#endif /* !defined(__VISAGECPP__) */ -#endif /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */ - diff --git a/src/x11/gsockx11.c b/src/x11/gsockx11.c deleted file mode 100644 index 0cbe4f1763..0000000000 --- a/src/x11/gsockx11.c +++ /dev/null @@ -1,152 +0,0 @@ -/* ------------------------------------------------------------------------- - * Project: GSocket (Generic Socket) for WX - * Name: gsockmot.c - * Purpose: GSocket: X11 part - * Licence: The wxWidgets licence - * CVSID: $Id$ - * ------------------------------------------------------------------------- */ - -#include "wx/setup.h" - -#if wxUSE_SOCKETS - -#include -#include "wx/gsocket.h" -#include "wx/unix/gsockunx.h" - -/* - * FIXME: have these in a common header instead of being repeated - * in evtloop.cpp and gsockx11.c - */ - -typedef void (*wxSocketCallback) (int fd, void* data); - -typedef enum -{ wxSocketTableInput, wxSocketTableOutput } wxSocketTableType ; - -void wxRegisterSocketCallback(int fd, wxSocketTableType socketType, wxSocketCallback cback, void* data); -void wxUnregisterSocketCallback(int fd, wxSocketTableType socketType); - - -static void _GSocket_X11_Input(int *fid, void* data) -{ - GSocket *socket = (GSocket *)data; - - socket->m_functions->Detected_Read(socket); -} - -static void _GSocket_X11_Output(int *fid, void* data) -{ - GSocket *socket = (GSocket *)data; - - socket->m_functions->Detected_Write(socket); -} - -int _GSocket_GUI_Init(void) -{ - return 1; -} - -void _GSocket_GUI_Cleanup(void) -{ -} - -int _GSocket_GUI_Init_Socket(GSocket *socket) -{ - int *m_id; - - socket->m_gui_dependent = (char *)malloc(sizeof(int)*2); - m_id = (int *)(socket->m_gui_dependent); - - m_id[0] = -1; - m_id[1] = -1; - - return TRUE; -} - -void _GSocket_GUI_Destroy_Socket(GSocket *socket) -{ - free(socket->m_gui_dependent); -} - -void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event) -{ - int *m_id = (int *)(socket->m_gui_dependent); - int c; - - if (socket->m_fd == -1) - return; - - switch (event) - { - case GSOCK_LOST: /* fall-through */ - case GSOCK_INPUT: c = 0; break; - case GSOCK_OUTPUT: c = 1; break; - case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break; - default: return; - } - -#if 0 - if (m_id[c] != -1) - XtRemoveInput(m_id[c]); -#endif /* 0 */ - - if (c == 0) - { - m_id[0] = socket->m_fd; - - wxRegisterSocketCallback(socket->m_fd, wxSocketTableInput, - (wxSocketCallback) _GSocket_X11_Input, (void*) socket); - } - else - { - m_id[1] = socket->m_fd; - - wxRegisterSocketCallback(socket->m_fd, wxSocketTableOutput, - (wxSocketCallback) _GSocket_X11_Output, (void*) socket); - } -} - -void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event) -{ - int *m_id = (int *)(socket->m_gui_dependent); - int c; - - switch (event) - { - case GSOCK_LOST: /* fall-through */ - case GSOCK_INPUT: c = 0; break; - case GSOCK_OUTPUT: c = 1; break; - case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break; - default: return; - } - - if (m_id[c] != -1) - { - if (c == 0) - wxUnregisterSocketCallback(m_id[c], wxSocketTableInput); - else - wxUnregisterSocketCallback(m_id[c], wxSocketTableOutput); - } - - m_id[c] = -1; -} - -void _GSocket_Enable_Events(GSocket *socket) -{ - _GSocket_Install_Callback(socket, GSOCK_INPUT); - _GSocket_Install_Callback(socket, GSOCK_OUTPUT); -} - -void _GSocket_Disable_Events(GSocket *socket) -{ - _GSocket_Uninstall_Callback(socket, GSOCK_INPUT); - _GSocket_Uninstall_Callback(socket, GSOCK_OUTPUT); -} - -#else /* !wxUSE_SOCKETS */ - -/* some compilers don't like having empty source files */ -static int wxDummyGsockVar = 0; - -#endif /* wxUSE_SOCKETS/!wxUSE_SOCKETS */