Updated gsocket.c to current unix version, use gsockunx.h instead of gsockos2.h

Added gsockpm.c.
Hooked socket handling into main loop.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h
index 4a5422a4df83e3b905f388b6258af85ad078de01..66504eacbe2eb13e2aa6171879c27b0e02e5c8fb 100644 (file)
--- a/include/wx/os2/app.h
+++ b/include/wx/os2/app.h
@@ -12,12 +12,16 @@
 #ifndef _WX_APP_H_
 #define _WX_APP_H_
 
 #ifndef _WX_APP_H_
 #define _WX_APP_H_
 

+#include <sys/time.h>
+#include <sys/types.h>
+#include <unistd.h>
+

 #include "wx/event.h"
 #include "wx/icon.h"
 
 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxWindow;
 #include "wx/event.h"
 #include "wx/icon.h"
 
 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxWindow;

-class WXDLLEXPORT wxApp ;
+class WXDLLEXPORT wxApp;

 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;
 
 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;
 


@@ -36,6 +40,7 @@ extern MRESULT EXPENTRY wxWndProc( HWND
                                   ,MPARAM
                                  );
 
                                   ,MPARAM
                                  );
 

+

 // Represents the application. Derive OnInit and declare
 // a new App object to start application
 class WXDLLEXPORT wxApp : public wxAppBase
 // Represents the application. Derive OnInit and declare
 // a new App object to start application
 class WXDLLEXPORT wxApp : public wxAppBase


@@ -76,6 +81,11 @@ public:
     void SetAuto3D(bool bFlag) { m_bAuto3D = bFlag; }
     bool GetAuto3D(void) const { return m_bAuto3D; }
 
     void SetAuto3D(bool bFlag) { m_bAuto3D = bFlag; }
     bool GetAuto3D(void) const { return m_bAuto3D; }
 

+    int AddSocketHandler(int handle, int mask,
+                         void (*callback)(void*), void * gsock);
+    void RemoveSocketHandler(int handle);
+    void HandleSockets();
+

 protected:
     bool                            m_bShowOnInit;
     int                             m_nPrintMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
 protected:
     bool                            m_bShowOnInit;
     int                             m_nPrintMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT


@@ -84,6 +94,13 @@ protected:
     //
     // PM-specific wxApp definitions */
     //
     //
     // PM-specific wxApp definitions */
     //

+private:
+    int m_maxSocketHandles;
+    int m_maxSocketNr;
+    int m_lastUsedHandle;
+    fd_set m_readfds, m_writefds;
+    void *m_sockCallbackInfo;
+

 public:
 
     // Implementation
 public:
 
     // Implementation


@@ -98,13 +115,12 @@ public:
 
 public:
     int                             m_nCmdShow;
 
 public:
     int                             m_nCmdShow;

+    HMQ                             m_hMq;

 
 protected:
     bool                            m_bKeepGoing ;
 
     DECLARE_EVENT_TABLE()
 
 protected:
     bool                            m_bKeepGoing ;
 
     DECLARE_EVENT_TABLE()

-private:
-    HMQ                             m_hMq;

 };
 
 int WXDLLEXPORT wxEntry( int argc, char *argv[] );
 };
 
 int WXDLLEXPORT wxEntry( int argc, char *argv[] );

diff --git a/include/wx/os2/gsockos2.h b/include/wx/os2/gsockos2.h
deleted file mode 100644 (file)
index ee941f3..0000000
--- a/include/wx/os2/gsockos2.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* -------------------------------------------------------------------------
- * Project: GSocket (Generic Socket) for WX
- * Name:    gsockos2.h
- * Purpose: GSocket OS/2 header
- * CVSID:   $Id$
- * -------------------------------------------------------------------------
- */
-
-#ifndef __GSOCK_OS2_H
-#define __GSOCK_OS2_H
-
-#ifndef __GSOCKET_STANDALONE__
-#include "wx/setup.h"
-#endif
-
-#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
-
-#ifndef __GSOCKET_STANDALONE__
-#include "wx/gsocket.h"
-#else
-#include "gsocket.h"
-#endif
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define SIGPIPE 13
-
-/* Definition of GSocket */
-struct _GSocket
-{
-  int m_fd;
-  GAddress *m_local;
-  GAddress *m_peer;
-  GSocketError m_error;
-
-  int m_non_blocking;
-  int m_server;
-  int m_stream;
-  int m_oriented;
-  int m_establishing;
-  unsigned long m_timeout;
-
-  /* Callbacks */
-  GSocketEventFlags m_detected;
-  GSocketCallback m_cbacks[GSOCK_MAX_EVENT];
-  char *m_data[GSOCK_MAX_EVENT];
-
-  char *m_gui_dependent;
-};
-
-/* Definition of GAddress */
-struct _GAddress
-{
-  struct sockaddr *m_addr;
-  size_t m_len;
-
-  GAddressType m_family;
-  int m_realfamily;
-
-  GSocketError m_error;
-};
-
-/* Input / Output */
-
-GSocketError _GSocket_Input_Timeout(GSocket *socket);
-GSocketError _GSocket_Output_Timeout(GSocket *socket);
-int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size);
-int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size);
-int _GSocket_Send_Stream(GSocket *socket, const char *buffer, int size);
-int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size);
-
-/* Callbacks */
-
-void _GSocket_Enable(GSocket *socket, GSocketEvent event);
-void _GSocket_Disable(GSocket *socket, GSocketEvent event);
-void _GSocket_Detected_Read(GSocket *socket);
-void _GSocket_Detected_Write(GSocket *socket);
-
-void _GSocket_GUI_Init(GSocket *socket);
-void _GSocket_GUI_Destroy(GSocket *socket);
-void _GSocket_Enable_Events(GSocket *socket);
-void _GSocket_Disable_Events(GSocket *socket);
-void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event);
-void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event);
-
-/* GAddress */
-
-GSocketError _GAddress_translate_from(GAddress *address,
-                                      struct sockaddr *addr, int len);
-GSocketError _GAddress_translate_to(GAddress *address,
-                                    struct sockaddr **addr, int *len);
-
-GSocketError _GAddress_Init_INET(GAddress *address);
-
-#ifdef __cplusplus
-}
-#endif  /* __cplusplus */
-
-#endif  /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
-
-#endif  /* __GSOCK_UNX_H */
-

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index 7288a6e08cc54f8d8f7bcfa3b3f601f379b1278e..8a5b65436cb4085804ed6df35c0e1d6dc21db26f 100644 (file)
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -37,6 +37,24 @@
 
 #include "wx/os2/private.h"
 
 
 #include "wx/os2/private.h"
 

+#if defined(__VISAGECPP__) && __IBMCPP__ < 400
+#include <machine\endian.h>
+#include <ioctl.h>
+#include <select.h>
+#include <unistd.h>
+#else
+#include <sys\ioctl.h>
+#include <sys\select.h>
+#ifndef __EMX__
+#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 *);
+#endif
+#endif
+

 #if wxUSE_THREADS
     #include "wx/thread.h"
 
 #if wxUSE_THREADS
     #include "wx/thread.h"
 


@@ -100,6 +118,92 @@ MRESULT EXPENTRY wxFrameWndProc( HWND hWnd,ULONG message,MPARAM mp1,MPARAM mp2);
 // implementation
 // ===========================================================================
 
 // implementation
 // ===========================================================================
 

+// ---------------------------------------------------------------------------
+// helper struct and functions for socket handling
+// ---------------------------------------------------------------------------
+
+struct GsocketCallbackInfo{
+    void (*proc)(void *);
+    int type;
+    int handle;
+    void* gsock;
+};
+
+// These defines and wrapper functions are used here and in gsockpm.c
+#define wxSockReadMask  0x01
+#define wxSockWriteMask 0x02
+
+extern "C"
+int wxAppAddSocketHandler(int handle, int mask,
+                          void (*callback)(void*), void * gsock)
+{
+    return wxTheApp->AddSocketHandler(handle, mask, callback, gsock);
+}
+
+extern "C"
+void wxAppRemoveSocketHandler(int handle)
+{
+    wxTheApp->RemoveSocketHandler(handle);
+}
+
+void wxApp::HandleSockets()
+{
+    bool pendingEvent = false;
+
+    // Check whether it's time for Gsocket operation
+    if (m_maxSocketHandles > 0 && m_maxSocketNr > 0)
+    {
+        fd_set readfds = m_readfds;
+        fd_set writefds = m_writefds;
+        struct timeval timeout;
+        int i;
+        struct GsocketCallbackInfo
+          *CallbackInfo = (struct GsocketCallbackInfo *)m_sockCallbackInfo;
+        int r = 0;
+        timeout.tv_sec = 0;
+        timeout.tv_usec = 0;
+        if ( select(m_maxSocketNr, &readfds, &writefds, 0, &timeout) > 0)
+        {
+            for (i = m_lastUsedHandle + 1; i != m_lastUsedHandle; i++)
+            {
+                if (i == m_maxSocketNr)
+                    i = 0;
+                if (FD_ISSET(i, &readfds))
+                {
+                    int r;
+                    for (r = 0; r < m_maxSocketHandles; r++){
+                        if(CallbackInfo[r].handle == i &&
+                           CallbackInfo[r].type == wxSockReadMask)
+                            break;
+                    }
+                    if (r < m_maxSocketHandles)
+                    {
+                        CallbackInfo[r].proc(CallbackInfo[r].gsock);
+                        pendingEvent = true;
+                        wxYield();
+                    }
+                }
+                if (FD_ISSET(i, &writefds))
+                {
+                    int r;
+                    for (r = 0; r < m_maxSocketHandles; r++)
+                        if(CallbackInfo[r].handle == i &&
+                           CallbackInfo[r].type == wxSockWriteMask)
+                            break;
+                    if (r < m_maxSocketHandles)
+                    {
+                        CallbackInfo[r].proc(CallbackInfo[r].gsock);
+                        pendingEvent = true;
+                        wxYield();
+                    }
+                }
+            }
+            m_lastUsedHandle = i;
+        }
+        if (pendingEvent)
+            wxYield();
+    }
+}

 // ---------------------------------------------------------------------------
 // wxApp
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // wxApp
 // ---------------------------------------------------------------------------


@@ -560,6 +664,9 @@ wxApp::wxApp()
     m_exitOnFrameDelete = TRUE;
     m_bAuto3D = TRUE;
     m_hMq = 0;
     m_exitOnFrameDelete = TRUE;
     m_bAuto3D = TRUE;
     m_hMq = 0;

+    m_maxSocketHandles = 0;
+    m_maxSocketNr = 0;
+    m_sockCallbackInfo = 0;

 } // end of wxApp::wxApp
 
 wxApp::~wxApp()
 } // end of wxApp::wxApp
 
 wxApp::~wxApp()


@@ -590,6 +697,7 @@ bool wxApp::Initialized()
 // Get and process a message, returning FALSE if WM_QUIT
 // received (and also set the flag telling the app to exit the main loop)
 //
 // Get and process a message, returning FALSE if WM_QUIT
 // received (and also set the flag telling the app to exit the main loop)
 //

+

 bool wxApp::DoMessage()
 {
     BOOL                            bRc = ::WinGetMsg(vHabmain, &svCurrentMsg, HWND(NULL), 0, 0);
 bool wxApp::DoMessage()
 {
     BOOL                            bRc = ::WinGetMsg(vHabmain, &svCurrentMsg, HWND(NULL), 0, 0);


@@ -694,11 +802,17 @@ int wxApp::MainLoop()
 #if wxUSE_THREADS
         wxMutexGuiLeaveOrEnter();
 #endif // wxUSE_THREADS
 #if wxUSE_THREADS
         wxMutexGuiLeaveOrEnter();
 #endif // wxUSE_THREADS

-        while (/*Pending() &&*/ ProcessIdle())
+        while (!Pending() && ProcessIdle())

         {
         {

-//          wxUsleep(10000);
+            HandleSockets();
+            wxUsleep(10000);

         }
         }

-        DoMessage();
+        HandleSockets();
+        if (Pending())
+            DoMessage();
+        else
+            wxUsleep(10000);
+

     }
     return (int)svCurrentMsg.mp1;
 } // end of wxApp::MainLoop
     }
     return (int)svCurrentMsg.mp1;
 } // end of wxApp::MainLoop


@@ -1041,6 +1155,54 @@ wxIcon wxApp::GetStdIcon(
     return wxIcon("wxICON_ERROR");
 } // end of wxApp::GetStdIcon
 
     return wxIcon("wxICON_ERROR");
 } // end of wxApp::GetStdIcon
 

+int wxApp::AddSocketHandler(int handle, int mask,
+                            void (*callback)(void*), void * gsock)
+{
+    int find;
+    struct GsocketCallbackInfo
+        *CallbackInfo = (struct GsocketCallbackInfo *)m_sockCallbackInfo;
+
+    for (find = 0; find < m_maxSocketHandles; find++)
+        if (CallbackInfo[find].handle == -1)
+            break;
+    if (find == m_maxSocketHandles)
+    {
+        // Allocate new memory
+        m_sockCallbackInfo = realloc(m_sockCallbackInfo,
+                                     (m_maxSocketHandles+=10)*
+                                     sizeof(struct GsocketCallbackInfo));
+        CallbackInfo = (struct GsocketCallbackInfo *)m_sockCallbackInfo;
+        for (find = m_maxSocketHandles - 10; find < m_maxSocketHandles; find++)
+            CallbackInfo[find].handle = -1;
+        find = m_maxSocketHandles - 10;
+    }
+    CallbackInfo[find].proc = callback;
+    CallbackInfo[find].type = mask;
+    CallbackInfo[find].handle = handle;
+    CallbackInfo[find].gsock = gsock;
+    if (mask & wxSockReadMask)
+        FD_SET(handle, &m_readfds);
+    if (mask & wxSockWriteMask)
+        FD_SET(handle, &m_writefds);
+    if (handle >= m_maxSocketNr)
+        m_maxSocketNr = handle + 1;
+    return find;
+}
+
+void wxApp::RemoveSocketHandler(int handle)
+{
+    struct GsocketCallbackInfo
+        *CallbackInfo = (struct GsocketCallbackInfo *)m_sockCallbackInfo;
+    if (handle < m_maxSocketHandles)
+    {
+        if (CallbackInfo[handle].type & wxSockReadMask)
+            FD_CLR(CallbackInfo[handle].handle, &m_readfds);
+        if (CallbackInfo[handle].type & wxSockWriteMask)
+            FD_CLR(CallbackInfo[handle].handle, &m_writefds);
+        CallbackInfo[handle].handle = -1;
+    }
+}
+

 //-----------------------------------------------------------------------------
 // wxWakeUpIdle
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxWakeUpIdle
 //-----------------------------------------------------------------------------

diff --git a/src/os2/gsocket.c b/src/os2/gsocket.c
index 98ef0f6a041bdb2e106cd1b34e3bc8731ad3341e..1aa27bf4115dd5456b93d522dea99ba50df8ee63 100644 (file)
--- a/src/os2/gsocket.c
+++ b/src/os2/gsocket.c
@@ -1,12 +1,21 @@
 /* -------------------------------------------------------------------------
  * Project: GSocket (Generic Socket) for WX
  * Name:    gsocket.c
 /* -------------------------------------------------------------------------
  * Project: GSocket (Generic Socket) for WX
  * Name:    gsocket.c

+ * Authors: Guilhem Lavaux,
+ *          Guillermo Rodriguez Garcia <guille@iies.es> (maintainer)

  * Purpose: GSocket main Unix-style file
  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */
 
  * Purpose: GSocket main Unix-style file
  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */
 

+/*
+ * PLEASE don't put C++ comments here - this is a C source file.
+ */
+
+#ifndef __GSOCKET_STANDALONE__

 #include "wx/setup.h"
 #include "wx/setup.h"

+#endif
+

 #ifndef __EMX__
 /* I don't see, why this include is needed, but it seems to be necessary
    sometimes. For EMX, including C++ headers into plain C source breaks
 #ifndef __EMX__
 /* I don't see, why this include is needed, but it seems to be necessary
    sometimes. For EMX, including C++ headers into plain C source breaks


@@ -14,7 +23,7 @@
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"
 #endif
 

-#if wxUSE_SOCKETS
+#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)

 
 #define BSD_SELECT /* use Berkley Sockets select */
 
 
 #define BSD_SELECT /* use Berkley Sockets select */
 


@@ -26,6 +35,8 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <errno.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <errno.h>

+#include <unistd.h>
+#include <sys/un.h>

 #define HAVE_INET_ADDR
 #else
 #include <utils.h>
 #define HAVE_INET_ADDR
 #else
 #include <utils.h>


@@ -60,7 +71,7 @@ int _System soclose(int);
 
 #include <string.h>
 #include <stdio.h>
 
 #include <string.h>
 #include <stdio.h>

-#if defined(__VISAGECPP__) && __IBMCPP__ < 400
+#if (defined(__VISAGECPP__) && __IBMCPP__ < 400) || defined(__EMX__)

 #  ifdef min
 #  undef min
 #  endif
 #  ifdef min
 #  undef min
 #  endif


@@ -71,9 +82,6 @@ int _System soclose(int);
 
 #include <signal.h>
 
 
 #include <signal.h>
 

-#include "wx/gsocket.h"
-#include "wx/os2/gsockos2.h"
-

 #ifndef SOCKLEN_T
 
 #ifdef __GLIBC__
 #ifndef SOCKLEN_T
 
 #ifdef __GLIBC__


@@ -86,22 +94,73 @@ int _System soclose(int);
 
 #endif
 
 
 #endif
 

+/*
+ * MSW defines this, Unices don't.
+ */
+#ifndef INVALID_SOCKET
+#define INVALID_SOCKET -1
+#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__ */
+
+/* redefine some GUI-only functions to do nothing in console mode */
+#if defined(wxUSE_GUI) && !wxUSE_GUI
+#  define _GSocket_GUI_Init(socket) (1)
+#  define _GSocket_GUI_Destroy(socket)
+#  define _GSocket_Enable_Events(socket)
+#  define _GSocket_Disable_Events(socket)
+#  define _GSocket_Install_Callback(socket, event)
+#  define _GSocket_Uninstall_Callback(socket, event)
+#endif /* wxUSE_GUI */
+
+/* debugging helpers */
+#define  __GSOCKET_DEBUG__
+#ifdef __GSOCKET_DEBUG__
+#  define GSocket_Debug(args) printf args
+#else
+#  define GSocket_Debug(args)
+#endif /* __GSOCKET_DEBUG__ */
+

 /* Global initialisers */
 
 /* Global initialisers */
 

-int GSocket_Init()
+int GSocket_Init(void)

 {
   return 1;
 }
 
 {
   return 1;
 }
 

-void GSocket_Cleanup()
+void GSocket_Cleanup(void)

 {
 }
 
 {
 }
 

-/* Constructors / Destructors */
+/* Constructors / Destructors for GSocket */

 
 

-GSocket *GSocket_new()
+GSocket *GSocket_new(void)

 {
 {

-  int i;
+  int i, success;

   GSocket *socket;
 
   socket = (GSocket *)malloc(sizeof(GSocket));
   GSocket *socket;
 
   socket = (GSocket *)malloc(sizeof(GSocket));


@@ -109,7 +168,7 @@ GSocket *GSocket_new()
   if (socket == NULL)
     return NULL;
 
   if (socket == NULL)
     return NULL;
 

-  socket->m_fd                  = -1;
+  socket->m_fd                  = INVALID_SOCKET;

   for (i=0;i<GSOCK_MAX_EVENT;i++)
   {
     socket->m_cbacks[i]         = NULL;
   for (i=0;i<GSOCK_MAX_EVENT;i++)
   {
     socket->m_cbacks[i]         = NULL;


@@ -118,13 +177,21 @@ GSocket *GSocket_new()
   socket->m_local               = NULL;
   socket->m_peer                = NULL;
   socket->m_error               = GSOCK_NOERROR;
   socket->m_local               = NULL;
   socket->m_peer                = NULL;
   socket->m_error               = GSOCK_NOERROR;

-  socket->m_server              = 0;
-  socket->m_stream              = 1;
+  socket->m_server              = FALSE;
+  socket->m_stream              = TRUE;

   socket->m_gui_dependent       = NULL;
   socket->m_gui_dependent       = NULL;

-  socket->m_non_blocking        = 0;
+  socket->m_non_blocking        = FALSE;

   socket->m_timeout             = 10*60*1000;
                                 /* 10 minutes * 60 sec * 1000 millisec */
   socket->m_timeout             = 10*60*1000;
                                 /* 10 minutes * 60 sec * 1000 millisec */

-  socket->m_establishing        = 0;
+  socket->m_establishing        = FALSE;
+
+  /* Per-socket GUI-specific initialization */
+  success = _GSocket_GUI_Init(socket);
+  if (!success)
+  {
+    free(socket);
+    return NULL;
+  }

 
   return socket;
 }
 
   return socket;
 }


@@ -133,55 +200,80 @@ void GSocket_destroy(GSocket *socket)
 {
   assert(socket != NULL);
 
 {
   assert(socket != NULL);
 

-  /* First, we check that the socket is really shutdowned */
-  if (socket->m_fd != -1)
+  /* Check that the socket is really shutdowned */
+  if (socket->m_fd != INVALID_SOCKET)

     GSocket_Shutdown(socket);
 
     GSocket_Shutdown(socket);
 

-  /* We destroy private addresses */
+  /* Per-socket GUI-specific cleanup */
+  _GSocket_GUI_Destroy(socket);
+
+  /* Destroy private addresses */

   if (socket->m_local)
     GAddress_destroy(socket->m_local);
 
   if (socket->m_peer)
     GAddress_destroy(socket->m_peer);
 
   if (socket->m_local)
     GAddress_destroy(socket->m_local);
 
   if (socket->m_peer)
     GAddress_destroy(socket->m_peer);
 

-  /* We destroy socket itself */
+  /* Destroy the socket itself */

   free(socket);
 }
 
   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);
 
 void GSocket_Shutdown(GSocket *socket)
 {
   int evt;
 
   assert(socket != NULL);
 

-  /* If socket has been created, we shutdown it */
-  if (socket->m_fd != -1)
+  /* If socket has been created, shutdown it */
+  if (socket->m_fd != INVALID_SOCKET)

   {
     shutdown(socket->m_fd, 2);
     soclose(socket->m_fd);
   {
     shutdown(socket->m_fd, 2);
     soclose(socket->m_fd);

-    socket->m_fd = -1;
+    socket->m_fd = INVALID_SOCKET;

   }
 
   }
 

-  /* We also disable GUI callbacks */
+  /* Disable GUI callbacks */

   for (evt = 0; evt < GSOCK_MAX_EVENT; evt++)
     socket->m_cbacks[evt] = NULL;
 
   for (evt = 0; evt < GSOCK_MAX_EVENT; evt++)
     socket->m_cbacks[evt] = NULL;
 

-  socket->m_detected = 0;
-  (socket);
+  socket->m_detected = GSOCK_LOST_FLAG;
+  _GSocket_Disable_Events(socket);

 }
 
 /* Address handling */
 
 }
 
 /* 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);
 
 GSocketError GSocket_SetLocal(GSocket *socket, GAddress *address)
 {
   assert(socket != NULL);
 

-  if ((socket->m_fd != -1 && !socket->m_server)) {
+  /* 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;
   }
 
     socket->m_error = GSOCK_INVSOCK;
     return GSOCK_INVSOCK;
   }
 

-  if (address == NULL || address->m_family == GSOCK_NOFAMILY) {
+  /* check address */
+  if (address == NULL || address->m_family == GSOCK_NOFAMILY)
+  {

     socket->m_error = GSOCK_INVADDR;
     return GSOCK_INVADDR;
   }
     socket->m_error = GSOCK_INVADDR;
     return GSOCK_INVADDR;
   }


@@ -198,7 +290,9 @@ GSocketError GSocket_SetPeer(GSocket *socket, GAddress *address)
 {
   assert(socket != NULL);
 
 {
   assert(socket != NULL);
 

-  if (address == NULL || address->m_family == GSOCK_NOFAMILY) {
+  /* check address */
+  if (address == NULL || address->m_family == GSOCK_NOFAMILY)
+  {

     socket->m_error = GSOCK_INVADDR;
     return GSOCK_INVADDR;
   }
     socket->m_error = GSOCK_INVADDR;
     return GSOCK_INVADDR;
   }


@@ -215,34 +309,41 @@ GAddress *GSocket_GetLocal(GSocket *socket)
 {
   GAddress *address;
   struct sockaddr addr;
 {
   GAddress *address;
   struct sockaddr addr;

-  SOCKLEN_T size;
+  SOCKLEN_T size = sizeof(addr);

   GSocketError err;
 
   assert(socket != NULL);
 
   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);
 
   if (socket->m_local)
     return GAddress_copy(socket->m_local);
 

-  if (socket->m_fd == -1) {
+  /* else, if the socket is initialized, try getsockname */
+  if (socket->m_fd == INVALID_SOCKET)
+  {

     socket->m_error = GSOCK_INVSOCK;
     return NULL;
   }
 
     socket->m_error = GSOCK_INVSOCK;
     return NULL;
   }
 

-  size = sizeof(addr);
-
-  if (getsockname(socket->m_fd, &addr, &size) < 0) {
+  if (getsockname(socket->m_fd, &addr, (SOCKLEN_T *) &size) < 0)
+  {

     socket->m_error = GSOCK_IOERR;
     return NULL;
   }
 
     socket->m_error = GSOCK_IOERR;
     return NULL;
   }
 

+  /* got a valid address from getsockname, create a GAddress object */

   address = GAddress_new();
   address = GAddress_new();

-  if (address == NULL) {
+  if (address == NULL)
+  {

     socket->m_error = GSOCK_MEMERR;
     return NULL;
   }
     socket->m_error = GSOCK_MEMERR;
     return NULL;
   }

-  socket->m_error = _GAddress_translate_from(address, &addr, size);
-  if (socket->m_error != GSOCK_NOERROR) {
+
+  err = _GAddress_translate_from(address, &addr, size);
+  if (err != GSOCK_NOERROR)
+  {

     GAddress_destroy(address);
     GAddress_destroy(address);

+    socket->m_error = err;

     return NULL;
   }
 
     return NULL;
   }
 


@@ -253,6 +354,7 @@ GAddress *GSocket_GetPeer(GSocket *socket)
 {
   assert(socket != NULL);
 
 {
   assert(socket != NULL);
 

+  /* try to get it from the m_peer var */

   if (socket->m_peer)
     return GAddress_copy(socket->m_peer);
 
   if (socket->m_peer)
     return GAddress_copy(socket->m_peer);
 


@@ -262,55 +364,64 @@ GAddress *GSocket_GetPeer(GSocket *socket)
 /* Server specific parts */
 
 /* GSocket_SetServer:
 /* Server specific parts */
 
 /* GSocket_SetServer:

- *  Sets up the socket as a server. It uses the "Local" field of GSocket.
- *  "Local" must be set by GSocket_SetLocal() before GSocket_SetServer()
- *  is called. Possible error codes are: GSOCK_INVSOCK if socket has not
- *  been initialized, GSOCK_INVADDR if the local address has not been
- *  defined and GSOCK_IOERR for other internal errors.
+ *  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)
 {
  */
 GSocketError GSocket_SetServer(GSocket *sck)
 {

-  int type;

   int arg = 1;
 
   assert(sck != NULL);
 
   int arg = 1;
 
   assert(sck != NULL);
 

-  if (sck->m_fd != -1) {
+  /* must not be in use */
+  if (sck->m_fd != INVALID_SOCKET)
+  {

     sck->m_error = GSOCK_INVSOCK;
     return GSOCK_INVSOCK;
   }
 
     sck->m_error = GSOCK_INVSOCK;
     return GSOCK_INVSOCK;
   }
 

-  if (!sck->m_local) {
+  /* the local addr must have been set */
+  if (!sck->m_local)
+  {

     sck->m_error = GSOCK_INVADDR;
     return GSOCK_INVADDR;
   }
 
     sck->m_error = GSOCK_INVADDR;
     return GSOCK_INVADDR;
   }
 

-  /* We always have a stream here  */
-  sck->m_stream = 1;
-  sck->m_server = 1;
+  /* Initialize all fields */
+  sck->m_stream   = TRUE;
+  sck->m_server   = TRUE;
+  sck->m_oriented = TRUE;

 
   /* Create the socket */
   sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_STREAM, 0);
 
 
   /* Create the socket */
   sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_STREAM, 0);
 

-  if (sck->m_fd == -1) {
-    sck->m_error = GSOCK_IOERR;
-    return GSOCK_IOERR;
-  }
-
-  ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(int));
-
-  /* Bind the socket to the LOCAL address */
-  if (bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) < 0) {
-    soclose(sck->m_fd);
-    sck->m_fd = -1;
+  if (sck->m_fd == INVALID_SOCKET)
+  {

     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }
 
     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }
 

-  /* Enable listening up to 5 connections */
-  if (listen(sck->m_fd, 5) < 0) {
+  ioctl(sck->m_fd, FIONBIO, &arg);
+  _GSocket_Enable_Events(sck);
+
+  /* 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))
+  {

     soclose(sck->m_fd);
     soclose(sck->m_fd);

-    sck->m_fd = -1;
+    sck->m_fd = INVALID_SOCKET;

     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }
     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }


@@ -319,11 +430,23 @@ GSocketError GSocket_SetServer(GSocket *sck)
 }
 
 /* GSocket_WaitConnection:
 }
 
 /* GSocket_WaitConnection:

- *  Waits for an incoming client connection.
+ *  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)
 {
  */
 GSocket *GSocket_WaitConnection(GSocket *socket)
 {

+  struct sockaddr from;
+  SOCKLEN_T fromlen = sizeof(from);

   GSocket *connection;
   GSocket *connection;

+  GSocketError err;

   int arg = 1;
 
   assert(socket != NULL);
   int arg = 1;
 
   assert(socket != NULL);


@@ -332,7 +455,7 @@ GSocket *GSocket_WaitConnection(GSocket *socket)
   _GSocket_Enable(socket, GSOCK_CONNECTION);
 
   /* If the socket has already been created, we exit immediately */
   _GSocket_Enable(socket, GSOCK_CONNECTION);
 
   /* If the socket has already been created, we exit immediately */

-  if (socket->m_fd == -1 || !socket->m_server)
+  if (socket->m_fd == INVALID_SOCKET || !socket->m_server)

   {
     socket->m_error = GSOCK_INVSOCK;
     return NULL;
   {
     socket->m_error = GSOCK_INVSOCK;
     return NULL;


@@ -340,13 +463,14 @@ GSocket *GSocket_WaitConnection(GSocket *socket)
 
   /* Create a GSocket object for the new connection */
   connection = GSocket_new();
 
   /* Create a GSocket object for the new connection */
   connection = GSocket_new();

+

   if (!connection)
   {
   if (!connection)
   {

-    connection->m_error = GSOCK_MEMERR;
+    socket->m_error = GSOCK_MEMERR;

     return NULL;
   }
 
     return NULL;
   }
 

-  /* Accept the incoming connection */
+  /* Wait for a connection (with timeout) */

   if (_GSocket_Input_Timeout(socket) == GSOCK_TIMEDOUT)
   {
     GSocket_destroy(connection);
   if (_GSocket_Input_Timeout(socket) == GSOCK_TIMEDOUT)
   {
     GSocket_destroy(connection);


@@ -354,9 +478,9 @@ GSocket *GSocket_WaitConnection(GSocket *socket)
     return NULL;
   }
 
     return NULL;
   }
 

-  connection->m_fd = accept(socket->m_fd, NULL, NULL);
+  connection->m_fd = accept(socket->m_fd, &from, (SOCKLEN_T *) &fromlen);

 
 

-  if (connection->m_fd == -1)
+  if (connection->m_fd == INVALID_SOCKET)

   {
     if (errno == EWOULDBLOCK)
       socket->m_error = GSOCK_WOULDBLOCK;
   {
     if (errno == EWOULDBLOCK)
       socket->m_error = GSOCK_WOULDBLOCK;


@@ -368,71 +492,61 @@ GSocket *GSocket_WaitConnection(GSocket *socket)
   }
 
   /* Initialize all fields */
   }
 
   /* Initialize all fields */

-  connection->m_server   = 0;
-  connection->m_stream   = 1;
-  connection->m_oriented = 1;
-
-  ioctl(connection->m_fd, FIONBIO, (char*)&arg, sizeof(int));
-  return connection;
-}
-
-/* Non oriented connections */
-
-GSocketError GSocket_SetNonOriented(GSocket *sck)
-{
-  int arg = 1;
+  connection->m_server   = FALSE;
+  connection->m_stream   = TRUE;
+  connection->m_oriented = TRUE;

 
 

-  assert(sck != NULL);
-
-  if (sck->m_fd != -1) {
-    sck->m_error = GSOCK_INVSOCK;
-    return GSOCK_INVSOCK;
-  }
-
-  if (!sck->m_local) {
-    sck->m_error = GSOCK_INVADDR;
-    return GSOCK_INVADDR;
+  /* Setup the peer address field */
+  connection->m_peer = GAddress_new();
+  if (!connection->m_peer)
+  {
+    GSocket_destroy(connection);
+    socket->m_error = GSOCK_MEMERR;
+    return NULL;

   }
   }

-
-  sck->m_stream   = 0;
-  sck->m_server   = 0;
-  sck->m_oriented = 0;
-
-  /* Create the socket */
-  sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_DGRAM, 0);
-
-  if (sck->m_fd < 0) {
-    sck->m_error = GSOCK_IOERR;
-    return GSOCK_IOERR;
+  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;

   }
 
   }
 

-  ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(int));
-
-  /* Bind it to the LOCAL address */
-  if (bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) < 0) {
-    soclose(sck->m_fd);
-    sck->m_fd    = -1;
-    sck->m_error = GSOCK_IOERR;
-    return GSOCK_IOERR;
-  }
+  ioctl(connection->m_fd, FIONBIO, &arg);
+  _GSocket_Enable_Events(connection);

 
 

-  return GSOCK_NOERROR;
+  return connection;

 }
 
 /* Client specific parts */
 
 /* GSocket_Connect:
 }
 
 /* Client specific parts */
 
 /* GSocket_Connect:

- *  Establishes a client connection to a server using the "Peer"
- *  field of GSocket. "Peer" must be set by GSocket_SetPeer() before
- *  GSocket_Connect() is called. Possible error codes are GSOCK_INVSOCK,
- *  GSOCK_INVADDR, GSOCK_TIMEDOUT, GSOCK_WOULDBLOCK and GSOCK_IOERR.
- *  If a socket is nonblocking and Connect() returns GSOCK_WOULDBLOCK,
- *  the connection request can be completed later. Use GSocket_Select()
- *  to check or wait for a GSOCK_CONNECTION event.
+ *  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)
 {
  */
 GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
 {

-  int type, err, ret;
+  int err, ret;

   int arg = 1;
 
   assert(sck != NULL);
   int arg = 1;
 
   assert(sck != NULL);


@@ -440,7 +554,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
   /* Enable CONNECTION events (needed for nonblocking connections) */
   _GSocket_Enable(sck, GSOCK_CONNECTION);
 
   /* Enable CONNECTION events (needed for nonblocking connections) */
   _GSocket_Enable(sck, GSOCK_CONNECTION);
 

-  if (sck->m_fd != -1)
+  if (sck->m_fd != INVALID_SOCKET)

   {
     sck->m_error = GSOCK_INVSOCK;
     return GSOCK_INVSOCK;
   {
     sck->m_error = GSOCK_INVSOCK;
     return GSOCK_INVSOCK;


@@ -452,30 +566,30 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
     return GSOCK_INVADDR;
   }
 
     return GSOCK_INVADDR;
   }
 

-  /* Test whether we want the socket to be a stream (e.g. TCP) */
+  /* Streamed or dgram socket? */

   sck->m_stream   = (stream == GSOCK_STREAMED);
   sck->m_stream   = (stream == GSOCK_STREAMED);

-  sck->m_oriented = 1;
-  sck->m_server   = 0;
-  sck->m_establishing = 0;
-
-  if (sck->m_stream)
-    type = SOCK_STREAM;
-  else
-    type = SOCK_DGRAM;
+  sck->m_oriented = TRUE;
+  sck->m_server   = FALSE;
+  sck->m_establishing = FALSE;

 
   /* Create the socket */
 
   /* Create the socket */

-  sck->m_fd = socket(sck->m_peer->m_realfamily, type, 0);
+  sck->m_fd = socket(sck->m_peer->m_realfamily,
+                     sck->m_stream? SOCK_STREAM : SOCK_DGRAM, 0);

 
 

-  if (sck->m_fd == -1) {
+  if (sck->m_fd == INVALID_SOCKET)
+  {

     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }
 
     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }
 

-  ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(int));
+  ioctl(sck->m_fd, FIONBIO, &arg);
+  _GSocket_Enable_Events(sck);

 
 

-  /* Connect it to the PEER address */
+  /* 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);
 
   ret = connect(sck->m_fd, sck->m_peer->m_addr, sck->m_peer->m_len);
 

+  printf("connect on %d to %X (%d) returned %d, errno = %d\n",
+        sck->m_fd, sck->m_peer->m_addr, sck->m_peer->m_len, ret, errno);

   if (ret == -1)
   {
     err = errno;
   if (ret == -1)
   {
     err = errno;


@@ -490,15 +604,19 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
       if (_GSocket_Output_Timeout(sck) == GSOCK_TIMEDOUT)
       {
         soclose(sck->m_fd);
       if (_GSocket_Output_Timeout(sck) == GSOCK_TIMEDOUT)
       {
         soclose(sck->m_fd);

-        sck->m_fd = -1;
+        sck->m_fd = INVALID_SOCKET;

         /* sck->m_error is set in _GSocket_Output_Timeout */
         /* sck->m_error is set in _GSocket_Output_Timeout */

-        fprintf(stderr, "Blocking connect timeouts\n");

         return GSOCK_TIMEDOUT;
       }
       else
       {
         return GSOCK_TIMEDOUT;
       }
       else
       {

-        fprintf(stderr, "Blocking connect OK\n");
-        return GSOCK_NOERROR;
+        int error;
+        SOCKLEN_T len = sizeof(error);
+
+        getsockopt(sck->m_fd, SOL_SOCKET, SO_ERROR, (void*) &error, &len);
+
+        if (!error)
+          return GSOCK_NOERROR;

       }
     }
 
       }
     }
 


@@ -510,10 +628,8 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
      */
     if ((err == EINPROGRESS) && (sck->m_non_blocking))
     {
      */
     if ((err == EINPROGRESS) && (sck->m_non_blocking))
     {

+      sck->m_establishing = TRUE;

       sck->m_error = GSOCK_WOULDBLOCK;
       sck->m_error = GSOCK_WOULDBLOCK;

-      sck->m_establishing = 1;
-      fprintf(stderr, "Nonblocking connect in progress\n");
-

       return GSOCK_WOULDBLOCK;
     }
 
       return GSOCK_WOULDBLOCK;
     }
 


@@ -521,14 +637,76 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
      * then the call to GSocket_Connect has failed.
      */
     soclose(sck->m_fd);
      * then the call to GSocket_Connect has failed.
      */
     soclose(sck->m_fd);

-    sck->m_fd = -1;
+    sck->m_fd = INVALID_SOCKET;

     sck->m_error = GSOCK_IOERR;
     sck->m_error = GSOCK_IOERR;

+    return GSOCK_IOERR;
+  }

 
 

-    fprintf(stderr, "Connect failed (generic err)\n");
+  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;
+  sck->m_oriented = 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;
+  }
+
+  ioctl(sck->m_fd, FIONBIO, &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))
+  {
+    soclose(sck->m_fd);
+    sck->m_fd    = INVALID_SOCKET;
+    sck->m_error = GSOCK_IOERR;

     return GSOCK_IOERR;
   }
 
     return GSOCK_IOERR;
   }
 

-  fprintf(stderr, "Connect OK\n");

   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }
 


@@ -544,20 +722,22 @@ int GSocket_Read(GSocket *socket, char *buffer, int size)
   /* Reenable INPUT events */
   _GSocket_Enable(socket, GSOCK_INPUT);
 
   /* Reenable INPUT events */
   _GSocket_Enable(socket, GSOCK_INPUT);
 

-  if (socket->m_fd == -1 || socket->m_server)
+  if (socket->m_fd == INVALID_SOCKET || socket->m_server)

   {
     socket->m_error = GSOCK_INVSOCK;
     return -1;
   }
 
   {
     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;
 
   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 (socket->m_stream)
     ret = _GSocket_Recv_Stream(socket, buffer, size);
   else
     ret = _GSocket_Recv_Dgram(socket, buffer, size);

-
+    

   if (ret == -1)
   {
     if (errno == EWOULDBLOCK)
   if (ret == -1)
   {
     if (errno == EWOULDBLOCK)


@@ -565,37 +745,52 @@ int GSocket_Read(GSocket *socket, char *buffer, int size)
     else
       socket->m_error = GSOCK_IOERR;
   }
     else
       socket->m_error = GSOCK_IOERR;
   }

-
+  

   return ret;
 }
 
   return ret;
 }
 

-int GSocket_Write(GSocket *socket, const char *buffer,
-                 int size)
-{
+int GSocket_Write(GSocket *socket, const char *buffer, int size)
+{                        

   int ret;
 
   assert(socket != NULL);
   int ret;
 
   assert(socket != NULL);

+  
+  GSocket_Debug(( "GSocket_Write #1, size %d\n", size ));

 
 

-  if (socket->m_fd == -1 || socket->m_server)
+  if (socket->m_fd == INVALID_SOCKET || socket->m_server)

   {
     socket->m_error = GSOCK_INVSOCK;
     return -1;
   }
 
   {
     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;
 
   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);
   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)
 
   if (ret == -1)
   {
     if (errno == EWOULDBLOCK)

+    {

       socket->m_error = GSOCK_WOULDBLOCK;
       socket->m_error = GSOCK_WOULDBLOCK;

+      GSocket_Debug(( "GSocket_Write error WOULDBLOCK\n" ));
+    }

     else
     else

+    {

       socket->m_error = GSOCK_IOERR;
       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
 
     /* Only reenable OUTPUT events after an error (just like WSAAsyncSelect
      * in MSW). Once the first OUTPUT event is received, users can assume


@@ -603,7 +798,10 @@ int GSocket_Write(GSocket *socket, const char *buffer,
      * will further OUTPUT events be posted.
      */
     _GSocket_Enable(socket, GSOCK_OUTPUT);
      * 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;
 }
 
   return ret;
 }


@@ -613,31 +811,128 @@ int GSocket_Write(GSocket *socket, const char *buffer,
  *  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
  *  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.
+ *  mode (blocking | nonblocking) of the socket.

  */
 GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
 {
  */
 GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
 {

+#if defined(wxUSE_GUI) && !wxUSE_GUI
+
+  GSocketEventFlags result = 0;
+  fd_set readfds;
+  fd_set writefds;
+  fd_set exceptfds;
+  struct timeval tv;
+
+  /* Do not use a static struct, Linux can garble it */
+  tv.tv_sec = 0;
+  tv.tv_usec = 0;
+

   assert(socket != NULL);
 
   assert(socket != NULL);
 

-  return (flags & socket->m_detected);
+  FD_ZERO(&readfds);
+  FD_ZERO(&writefds);
+  FD_ZERO(&exceptfds);
+  FD_SET(socket->m_fd, &readfds);
+  FD_SET(socket->m_fd, &writefds);
+  FD_SET(socket->m_fd, &exceptfds);
+
+  /* Check known state first */
+  result |= (GSOCK_CONNECTION_FLAG & socket->m_detected & flags);
+  result |= (GSOCK_LOST_FLAG       & socket->m_detected & flags);
+
+  /* Try select now */
+  if (select(socket->m_fd + 1, &readfds, &writefds, &exceptfds, &tv) <= 0)
+    return result;
+
+  /* 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 & flags);
+    }
+    else
+    {
+      if (socket->m_server && socket->m_stream)
+      {
+        result |= (GSOCK_CONNECTION_FLAG & flags);
+        socket->m_detected |= GSOCK_CONNECTION_FLAG;
+      }
+      else
+      {
+        result |= (GSOCK_LOST_FLAG & flags);
+        socket->m_detected = GSOCK_LOST_FLAG;
+      }
+    }
+  }
+
+  /* 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)
+      {
+        result |= (GSOCK_LOST_FLAG & flags);
+        socket->m_detected = GSOCK_LOST_FLAG;
+      }
+      else
+      {
+        result |= (GSOCK_CONNECTION_FLAG & flags);
+        socket->m_detected |= GSOCK_CONNECTION_FLAG;
+      }
+    }
+    else
+    {
+      result |= (GSOCK_OUTPUT_FLAG & flags);
+    }
+  }
+
+  /* Check for exceptions and errors (is this useful in Unices?) */
+  if (FD_ISSET(socket->m_fd, &exceptfds))
+  {
+    result |= (GSOCK_LOST_FLAG & flags);
+    socket->m_establishing = FALSE;
+    socket->m_detected = GSOCK_LOST_FLAG;
+  }
+
+  return result;
+
+#else 
+
+  assert(socket != NULL);
+  return flags & socket->m_detected;
+
+#endif /* !wxUSE_GUI */

 }
 
 /* Flags */
 
 /* GSocket_SetNonBlocking:
 }
 
 /* Flags */
 
 /* GSocket_SetNonBlocking:

- *  Sets the socket to non-blocking mode. This is useful if
- *  we don't want to wait.
+ *  Sets the socket to non-blocking mode. All IO calls will return
+ *  immediately.

  */
 void GSocket_SetNonBlocking(GSocket *socket, int non_block)
 {
   assert(socket != NULL);
 
  */
 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:
   socket->m_non_blocking = non_block;
 }
 
 /* GSocket_SetTimeout:

- *  Sets the timeout for blocking calls. Time is
- *  expressed in milliseconds.
+ *  Sets the timeout for blocking calls. Time is expressed in
+ *  milliseconds.

  */
 void GSocket_SetTimeout(GSocket *socket, unsigned long millisec)
 {
  */
 void GSocket_SetTimeout(GSocket *socket, unsigned long millisec)
 {


@@ -647,7 +942,9 @@ void GSocket_SetTimeout(GSocket *socket, unsigned long millisec)
 }
 
 /* GSocket_GetError:
 }
 
 /* GSocket_GetError:

- *  Returns the last error occured for this socket.
+ *  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)
 {
  */
 GSocketError GSocket_GetError(GSocket *socket)
 {


@@ -658,20 +955,24 @@ GSocketError GSocket_GetError(GSocket *socket)
 
 /* Callbacks */
 
 
 /* Callbacks */
 

-/* Only one callback is possible for each event (INPUT, OUTPUT, CONNECTION
- * and LOST). The callbacks are called in the following situations:
- *
- * INPUT: There is at least one byte in the input buffer
- * OUTPUT: The system is sure that the next write call will not block
- * CONNECTION: Two cases are possible:
- *           Client socket -> the connection is established
- *           Server socket -> a client requests a connection
- * LOST: The connection is lost
- *
- * An event is generated only once and its state is reseted when the
- * relative IO call is requested.
- * For example: INPUT -> GSocket_Read()
- *              CONNECTION -> GSocket_Accept()
+/* 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:
  */
 
 /* GSocket_SetCallback:


@@ -683,7 +984,7 @@ GSocketError GSocket_GetError(GSocket *socket)
  *  void function(GSocket *socket, GSocketEvent event, char *cdata)
  */
 void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags,
  *  void function(GSocket *socket, GSocketEvent event, char *cdata)
  */
 void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags,

-                        GSocketCallback callback, char *cdata)
+                         GSocketCallback callback, char *cdata)

 {
   int count;
 
 {
   int count;
 


@@ -693,6 +994,8 @@ void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags,
   {
     if ((flags & (1 << count)) != 0)
     {
   {
     if ((flags & (1 << count)) != 0)
     {

+      printf("Setting callback no %d for socket at %X to address %X,data %X\n",
+            count, socket, callback, cdata);

       socket->m_cbacks[count] = callback;
       socket->m_data[count] = cdata;
     }
       socket->m_cbacks[count] = callback;
       socket->m_data[count] = cdata;
     }


@@ -713,28 +1016,35 @@ void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags)
   {
     if ((flags & (1 << count)) != 0)
     {
   {
     if ((flags & (1 << count)) != 0)
     {

+      printf("Removing callback no %d for socket at %X",
+            count, socket);

       socket->m_cbacks[count] = NULL;
       socket->m_data[count] = NULL;
     }
   }
 }
 
       socket->m_cbacks[count] = NULL;
       socket->m_data[count] = NULL;
     }
   }
 }
 

+

 #define CALL_CALLBACK(socket, event) {                                  \
   _GSocket_Disable(socket, event);                                      \
 #define CALL_CALLBACK(socket, event) {                                  \
   _GSocket_Disable(socket, event);                                      \

-  if (socket->m_cbacks[event])                                          \
+  if (socket->m_cbacks[event]){                                         \
+    printf("Call callback for event %d, socket %X: %X, %X\n", event,    \
+            socket, socket->m_cbacks[event], socket->m_data[event]);    \

     socket->m_cbacks[event](socket, event, socket->m_data[event]);      \
     socket->m_cbacks[event](socket, event, socket->m_data[event]);      \

+  }                                                                     \

 }
 
 
 void _GSocket_Enable(GSocket *socket, GSocketEvent event)
 {
   socket->m_detected &= ~(1 << event);
 }
 
 
 void _GSocket_Enable(GSocket *socket, GSocketEvent event)
 {
   socket->m_detected &= ~(1 << event);

-  (socket, event);
+  _GSocket_Install_Callback(socket, event);

 }
 
 void _GSocket_Disable(GSocket *socket, GSocketEvent event)
 {
   socket->m_detected |= (1 << event);
 }
 
 void _GSocket_Disable(GSocket *socket, GSocketEvent event)
 {
   socket->m_detected |= (1 << event);

+  _GSocket_Uninstall_Callback(socket, event);

 }
 
 /* _GSocket_Input_Timeout:
 }
 
 /* _GSocket_Input_Timeout:


@@ -745,7 +1055,9 @@ GSocketError _GSocket_Input_Timeout(GSocket *socket)
 {
   struct timeval tv;
   fd_set readfds;
 {
   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;
 
   tv.tv_sec  = (socket->m_timeout / 1000);
   tv.tv_usec = (socket->m_timeout % 1000) * 1000;
 


@@ -753,8 +1065,20 @@ GSocketError _GSocket_Input_Timeout(GSocket *socket)
   {
     FD_ZERO(&readfds);
     FD_SET(socket->m_fd, &readfds);
   {
     FD_ZERO(&readfds);
     FD_SET(socket->m_fd, &readfds);

-    if (select(socket->m_fd + 1, &readfds, NULL, NULL, &tv) == 0)
+    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;
     }
       socket->m_error = GSOCK_TIMEDOUT;
       return GSOCK_TIMEDOUT;
     }


@@ -770,42 +1094,63 @@ GSocketError _GSocket_Output_Timeout(GSocket *socket)
 {
   struct timeval tv;
   fd_set writefds;
 {
   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;
 
   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);
   if (!socket->m_non_blocking)
   {
     FD_ZERO(&writefds);
     FD_SET(socket->m_fd, &writefds);

-    if (select(socket->m_fd + 1, NULL, &writefds, NULL, &tv) == 0)
+    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;
     }
       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 GSOCK_NOERROR;
 }
 
 int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size)
 {

-  int ret;
-
-  ret = recv(socket->m_fd, buffer, size, 0);
-
-  return ret;
+  return recv(socket->m_fd, buffer, size, 0);

 }
 
 int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size)
 {
   struct sockaddr from;
 }
 
 int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size)
 {
   struct sockaddr from;

-  SOCKLEN_T fromlen;
+  SOCKLEN_T fromlen = sizeof(from);

   int ret;
   GSocketError err;
 
   fromlen = sizeof(from);
 
   int ret;
   GSocketError err;
 
   fromlen = sizeof(from);
 

-  ret = recvfrom(socket->m_fd, buffer, size, 0, &from, &fromlen);
+  ret = recvfrom(socket->m_fd, buffer, size, 0, &from, (SOCKLEN_T *) &fromlen);

 
   if (ret == -1)
     return -1;
 
   if (ret == -1)
     return -1;


@@ -835,9 +1180,10 @@ int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size)
 int _GSocket_Send_Stream(GSocket *socket, const char *buffer, int size)
 {
   int ret;
 int _GSocket_Send_Stream(GSocket *socket, const char *buffer, int size)
 {
   int ret;

-  GSocketError err;

 
 

-  ret = send(socket->m_fd, (char*)buffer, size, 0);
+  MASK_SIGNAL();
+  ret = send(socket->m_fd, buffer, size, 0);
+  UNMASK_SIGNAL();

 
   return ret;
 }
 
   return ret;
 }


@@ -848,18 +1194,22 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size)
   int len, ret;
   GSocketError err;
 
   int len, ret;
   GSocketError err;
 

-  if (!socket->m_peer) {
+  if (!socket->m_peer)
+  {

     socket->m_error = GSOCK_INVADDR;
     return -1;
   }
 
   err = _GAddress_translate_to(socket->m_peer, &addr, &len);
     socket->m_error = GSOCK_INVADDR;
     return -1;
   }
 
   err = _GAddress_translate_to(socket->m_peer, &addr, &len);

-  if (err != GSOCK_NOERROR) {
+  if (err != GSOCK_NOERROR)
+  {

     socket->m_error = err;
     return -1;
   }
 
     socket->m_error = err;
     return -1;
   }
 

-  ret = sendto(socket->m_fd, (char*)buffer, size, 0, addr, len);
+  MASK_SIGNAL();
+  ret = sendto(socket->m_fd, buffer, size, 0, addr, len);
+  UNMASK_SIGNAL();

 
   /* Frees memory allocated from _GAddress_translate_to */
   free(addr);
 
   /* Frees memory allocated from _GAddress_translate_to */
   free(addr);


@@ -870,21 +1220,16 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size)
 void _GSocket_Detected_Read(GSocket *socket)
 {
   char c;
 void _GSocket_Detected_Read(GSocket *socket)
 {
   char c;

-  int ret;

 
 

-  if (socket->m_stream)
+  if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0)

   {
   {

-    ret = recv(socket->m_fd, &c, 1, MSG_PEEK);
-
-    if (ret < 0 && socket->m_server)
+    CALL_CALLBACK(socket, GSOCK_INPUT);
+  }
+  else
+  {
+    if (socket->m_server && socket->m_stream)

     {
       CALL_CALLBACK(socket, GSOCK_CONNECTION);
     {
       CALL_CALLBACK(socket, GSOCK_CONNECTION);

-      return;
-    }
-
-    if (ret > 0)
-    {
-      CALL_CALLBACK(socket, GSOCK_INPUT);

     }
     else
     {
     }
     else
     {


@@ -897,12 +1242,12 @@ void _GSocket_Detected_Write(GSocket *socket)
 {
   if (socket->m_establishing && !socket->m_server)
   {
 {
   if (socket->m_establishing && !socket->m_server)
   {

-    int error, len;
+    int error;
+    SOCKLEN_T len = sizeof(error);

 
 

-    socket->m_establishing = 0;
+    socket->m_establishing = FALSE;

 
 

-    len = sizeof(error);
-    getsockopt(socket->m_fd, SOL_SOCKET, SO_ERROR, (char*)&error, &len);
+    getsockopt(socket->m_fd, SOL_SOCKET, SO_ERROR, (void*)&error, &len);

 
     if (error)
     {
 
     if (error)
     {


@@ -930,29 +1275,43 @@ void _GSocket_Detected_Write(GSocket *socket)
  * -------------------------------------------------------------------------
  */
 
  * -------------------------------------------------------------------------
  */
 

-/* CHECK_ADDRESS verifies that the current family is either GSOCK_NOFAMILY or
- * GSOCK_*family*. In case it is GSOCK_NOFAMILY, it initializes address to be
- * a GSOCK_*family*. In other cases, it returns GSOCK_INVADDR.
+/* 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, retval) \
-{ \
-  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 retval; \
-  } \
+#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()
+
+GAddress *GAddress_new(void)

 {
   GAddress *address;
 
 {
   GAddress *address;
 

-  address = (GAddress *)malloc(sizeof(GAddress));
-
-  if (address == NULL)
+  if ((address = (GAddress *) malloc(sizeof(GAddress))) == NULL)

     return NULL;
 
   address->m_family  = GSOCK_NOFAMILY;
     return NULL;
 
   address->m_family  = GSOCK_NOFAMILY;


@@ -968,16 +1327,16 @@ GAddress *GAddress_copy(GAddress *address)
 
   assert(address != NULL);
 
 
   assert(address != NULL);
 

-  addr2 = (GAddress *)malloc(sizeof(GAddress));
-
-  if (addr2 == NULL)
+  if ((addr2 = (GAddress *) malloc(sizeof(GAddress))) == NULL)

     return NULL;
 
   memcpy(addr2, address, sizeof(GAddress));
 
     return NULL;
 
   memcpy(addr2, address, sizeof(GAddress));
 

-  if (address->m_addr) {
+  if (address->m_addr)
+  {

     addr2->m_addr = (struct sockaddr *)malloc(addr2->m_len);
     addr2->m_addr = (struct sockaddr *)malloc(addr2->m_len);

-    if (addr2->m_addr == NULL) {
+    if (addr2->m_addr == NULL)
+    {

       free(addr2);
       return NULL;
     }
       free(addr2);
       return NULL;
     }


@@ -991,7 +1350,10 @@ void GAddress_destroy(GAddress *address)
 {
   assert(address != NULL);
 
 {
   assert(address != NULL);
 

-  free(address);
+  if (address->m_addr)
+    free(address->m_addr);
+
+/*    free(address); */

 }
 
 void GAddress_SetFamily(GAddress *address, GAddressType type)
 }
 
 void GAddress_SetFamily(GAddress *address, GAddressType type)


@@ -1008,24 +1370,27 @@ GAddressType GAddress_GetFamily(GAddress *address)
   return address->m_family;
 }
 
   return address->m_family;
 }
 

-GSocketError _GAddress_translate_from(GAddress *address, struct sockaddr *addr, int len){
+GSocketError _GAddress_translate_from(GAddress *address,
+                                      struct sockaddr *addr, int len)
+{

   address->m_realfamily = addr->sa_family;
   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;
+  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
 #ifdef AF_INET6

-  case AF_INET6:
-    address->m_family = GSOCK_INET6;
-    break;
+    case AF_INET6:
+      address->m_family = GSOCK_INET6;
+      break;

 #endif
 #endif

-  default:
+    default:

     {
     {

-    address->m_error = GSOCK_INVOP;
-    return GSOCK_INVOP;
+      address->m_error = GSOCK_INVOP;
+      return GSOCK_INVOP;

     }
   }
 
     }
   }
 


@@ -1034,7 +1399,9 @@ GSocketError _GAddress_translate_from(GAddress *address, struct sockaddr *addr,
 
   address->m_len  = len;
   address->m_addr = (struct sockaddr *)malloc(len);
 
   address->m_len  = len;
   address->m_addr = (struct sockaddr *)malloc(len);

-  if (address->m_addr == NULL) {
+
+  if (address->m_addr == NULL)
+  {

     address->m_error = GSOCK_MEMERR;
     return GSOCK_MEMERR;
   }
     address->m_error = GSOCK_MEMERR;
     return GSOCK_MEMERR;
   }


@@ -1046,14 +1413,16 @@ GSocketError _GAddress_translate_from(GAddress *address, struct sockaddr *addr,
 GSocketError _GAddress_translate_to(GAddress *address,
                                     struct sockaddr **addr, int *len)
 {
 GSocketError _GAddress_translate_to(GAddress *address,
                                     struct sockaddr **addr, int *len)
 {

-  if (!address->m_addr) {
+  if (!address->m_addr)
+  {

     address->m_error = GSOCK_INVADDR;
     return GSOCK_INVADDR;
   }
 
   *len = address->m_len;
   *addr = (struct sockaddr *)malloc(address->m_len);
     address->m_error = GSOCK_INVADDR;
     return GSOCK_INVADDR;
   }
 
   *len = address->m_len;
   *addr = (struct sockaddr *)malloc(address->m_len);

-  if (*addr == NULL) {
+  if (*addr == NULL)
+  {

     address->m_error = GSOCK_MEMERR;
     return GSOCK_MEMERR;
   }
     address->m_error = GSOCK_MEMERR;
     return GSOCK_MEMERR;
   }


@@ -1070,18 +1439,18 @@ GSocketError _GAddress_translate_to(GAddress *address,
 
 GSocketError _GAddress_Init_INET(GAddress *address)
 {
 
 GSocketError _GAddress_Init_INET(GAddress *address)
 {

-  address->m_addr = (struct sockaddr *)malloc(sizeof(struct sockaddr_in));
-  if (address->m_addr == NULL) {
+  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_error = GSOCK_MEMERR;
     return GSOCK_MEMERR;
   }
 

-  address->m_len  = sizeof(struct sockaddr_in);
-

   address->m_family = GSOCK_INET;
   address->m_realfamily = PF_INET;
   ((struct sockaddr_in *)address->m_addr)->sin_family = AF_INET;
   address->m_family = GSOCK_INET;
   address->m_realfamily = PF_INET;
   ((struct sockaddr_in *)address->m_addr)->sin_family = AF_INET;

-  ((struct sockaddr_in *)address->m_addr)->sin_addr.s_addr   = INADDR_ANY;
+  ((struct sockaddr_in *)address->m_addr)->sin_addr.s_addr = INADDR_ANY;

 
   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }


@@ -1093,32 +1462,35 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
 
   assert(address != NULL);
 
 
   assert(address != NULL);
 

-  CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
+  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)
 
   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) {
+  if (inet_aton(hostname, addr) == 0)
+  {

 #elif defined(HAVE_INET_ADDR)
 #elif defined(HAVE_INET_ADDR)

-  /* Fix from Guillermo Rodriguez Garcia <guille@iies.es> */
-  if ( (addr->s_addr = inet_addr(hostname)) == -1 ) {
+  if ( (addr->s_addr = inet_addr(hostname)) == -1 )
+  {
+#else
+  /* Use gethostbyname by default */
+  if (1)
+  {

 #endif
     struct in_addr *array_addr;
 
     /* It is a real name, we solve it */
 #endif
     struct in_addr *array_addr;
 
     /* It is a real name, we solve it */

-    he = gethostbyname((char*)hostname);
-    if (he == NULL) {
+    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;
       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;

-#if defined(HAVE_INET_ATON)
-  }
-#elif defined(HAVE_INET_ADDR)

   }
   }

-#endif

   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }
 


@@ -1134,7 +1506,7 @@ GSocketError GAddress_INET_SetHostAddress(GAddress *address,
 
   assert(address != NULL);
 
 
   assert(address != NULL);
 

-  CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
+  CHECK_ADDRESS(address, INET);

 
   addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
   addr->s_addr = hostaddr;
 
   addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
   addr->s_addr = hostaddr;


@@ -1149,21 +1521,24 @@ GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
   struct sockaddr_in *addr;
 
   assert(address != NULL);
   struct sockaddr_in *addr;
 
   assert(address != NULL);

-  CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
+  CHECK_ADDRESS(address, INET);

 
 

-  if (!port) {
+  if (!port)
+  {

     address->m_error = GSOCK_INVPORT;
     return GSOCK_INVPORT;
   }
     address->m_error = GSOCK_INVPORT;
     return GSOCK_INVPORT;
   }

-
-  se = getservbyname((char*)port, (char*)protocol);
-  if (!se) {
-    if (isdigit(port[0])) {
+ 
+  se = getservbyname(port, protocol);
+  if (!se)
+  {
+    if (isdigit((int)port[0]))
+    {

       int port_int;
 
       port_int = atoi(port);
       addr = (struct sockaddr_in *)address->m_addr;
       int port_int;
 
       port_int = atoi(port);
       addr = (struct sockaddr_in *)address->m_addr;

-//      addr->sin_port = htons(port_int);
+      addr->sin_port = htons(port_int);

       return GSOCK_NOERROR;
     }
 
       return GSOCK_NOERROR;
     }
 


@@ -1182,10 +1557,10 @@ GSocketError GAddress_INET_SetPort(GAddress *address, unsigned short port)
   struct sockaddr_in *addr;
 
   assert(address != NULL);
   struct sockaddr_in *addr;
 
   assert(address != NULL);

-  CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
-
+  CHECK_ADDRESS(address, INET);
+ 

   addr = (struct sockaddr_in *)address->m_addr;
   addr = (struct sockaddr_in *)address->m_addr;

-//  addr->sin_port = htons(port);
+  addr->sin_port = htons(port);

 
   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }


@@ -1196,14 +1571,15 @@ GSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, size_t
   char *addr_buf;
   struct sockaddr_in *addr;
 
   char *addr_buf;
   struct sockaddr_in *addr;
 

-  assert(address != NULL);
-  CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
+  assert(address != NULL); 
+  CHECK_ADDRESS(address, INET);

 
   addr = (struct sockaddr_in *)address->m_addr;
   addr_buf = (char *)&(addr->sin_addr);
 
 
   addr = (struct sockaddr_in *)address->m_addr;
   addr_buf = (char *)&(addr->sin_addr);
 

-  he       = gethostbyaddr(addr_buf, sizeof(addr->sin_addr), AF_INET);
-  if (he == NULL) {
+  he = gethostbyaddr(addr_buf, sizeof(addr->sin_addr), AF_INET);
+  if (he == NULL)
+  {

     address->m_error = GSOCK_NOHOST;
     return GSOCK_NOHOST;
   }
     address->m_error = GSOCK_NOHOST;
     return GSOCK_NOHOST;
   }


@@ -1217,8 +1593,8 @@ unsigned long GAddress_INET_GetHostAddress(GAddress *address)
 {
   struct sockaddr_in *addr;
 
 {
   struct sockaddr_in *addr;
 

-  assert(address != NULL);
-  CHECK_ADDRESS(address, INET, 0);
+  assert(address != NULL); 
+  CHECK_ADDRESS_RETVAL(address, INET, 0); 

 
   addr = (struct sockaddr_in *)address->m_addr;
 
 
   addr = (struct sockaddr_in *)address->m_addr;
 


@@ -1229,11 +1605,11 @@ unsigned short GAddress_INET_GetPort(GAddress *address)
 {
   struct sockaddr_in *addr;
 
 {
   struct sockaddr_in *addr;
 

-  assert(address != NULL);
-  CHECK_ADDRESS(address, INET, 0);
+  assert(address != NULL); 
+  CHECK_ADDRESS_RETVAL(address, INET, 0); 

 
   addr = (struct sockaddr_in *)address->m_addr;
 
   addr = (struct sockaddr_in *)address->m_addr;

-  return /*ntohs*/(addr->sin_port);
+  return ntohs(addr->sin_port);

 }
 
 /*
 }
 
 /*


@@ -1242,26 +1618,54 @@ unsigned short GAddress_INET_GetPort(GAddress *address)
  * -------------------------------------------------------------------------
  */
 
  * -------------------------------------------------------------------------
  */
 

+#ifdef __EMX__

 GSocketError _GAddress_Init_UNIX(GAddress *address)
 {
 GSocketError _GAddress_Init_UNIX(GAddress *address)
 {

-  assert (address != NULL);
-  address->m_error = GSOCK_INVADDR;
-  return GSOCK_INVADDR;
+  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;

 }
 
 GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path)
 {
 }
 
 GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path)
 {

-  assert (address != NULL);
-  address->m_error = GSOCK_INVADDR;
-  return GSOCK_INVADDR;
+  struct sockaddr_un *addr;
+
+  assert(address != NULL); 
+
+  CHECK_ADDRESS(address, UNIX); 
+
+  addr = ((struct sockaddr_un *)address->m_addr);
+  memcpy(addr->sun_path, path, strlen(path));
+
+  return GSOCK_NOERROR;

 }
 
 GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf)
 {
 }
 
 GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf)
 {

-  assert (address != NULL);
-  address->m_error = GSOCK_INVADDR;
-  return GSOCK_INVADDR;
-}
+  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
 #endif

-  /* wxUSE_SOCKETS */
+  /* __EMX__ */
+#endif
+  /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
+

diff --git a/src/os2/gsockpm.c b/src/os2/gsockpm.c
new file mode 100644 (file)
index 0000000..a1996b8
--- /dev/null
+++ b/src/os2/gsockpm.c
@@ -0,0 +1,119 @@
+/* -------------------------------------------------------------------------
+ * Project: GSocket (Generic Socket) for WX
+ * Name:    gsockpm.c
+ * Purpose: GSocket: PM part
+ * CVSID:   $Id$
+ * ------------------------------------------------------------------------- */
+
+#include "wx/setup.h"
+
+#if wxUSE_SOCKETS
+
+#include <stdlib.h>
+#include "wx/unix/gsockunx.h"
+#include "wx/gsocket.h"
+
+extern int wxAppAddSocketHandler(int handle, int mask,
+                                void (*callback)(void*), void * gsock);
+
+extern void wxAppRemoveSocketHandler(int handle);
+
+#define wxSockReadMask  0x01
+#define wxSockWriteMask 0x02
+
+static void _GSocket_PM_Input(void *data)
+{
+    GSocket *socket = (GSocket *) data;
+    _GSocket_Detected_Read(socket);
+}
+
+static void _GSocket_PM_Output(void *data)
+{
+    GSocket *socket = (GSocket *) data;
+    _GSocket_Detected_Write(socket);
+}
+
+int _GSocket_GUI_Init(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(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)
+        wxAppRemoveSocketHandler(m_id[c]);
+
+    if (c == 0)
+    {
+       m_id[0] = wxAppAddSocketHandler(socket->m_fd, wxSockReadMask,
+                                       _GSocket_PM_Input, (void *)socket);
+    }
+    else
+    {
+       m_id[1] = wxAppAddSocketHandler(socket->m_fd, wxSockWriteMask,
+                                       _GSocket_PM_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)
+        wxAppRemoveSocketHandler(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 */