Added DoSetSize and DoMoveWindow to generic wxStaticLine.

[wxWidgets.git] / src / msw / gsocket.c

diff --git a/src/msw/gsocket.c b/src/msw/gsocket.c
index 2274a39fe84fb04a3a55bf42fde1a354f53d5ae2..4490c43ada30305c9d7d9a9d9ad50393b83a30e3 100644 (file)
--- a/src/msw/gsocket.c
+++ b/src/msw/gsocket.c
@@ -11,23 +11,45 @@
  * PLEASE don't put C++ comments here - this is a C source file.
  */
 
  * 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)
+#endif /* _MSC_VER */
+
+

 #ifndef __GSOCKET_STANDALONE__
 #ifndef __GSOCKET_STANDALONE__

-#include "wx/setup.h"
+#  include "wx/defs.h"
+#  include "wx/setup.h"

 #endif
 
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 
 #ifndef __GSOCKET_STANDALONE__
 #endif
 
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 
 #ifndef __GSOCKET_STANDALONE__

-
-#include "wx/msw/gsockmsw.h"
-#include "wx/gsocket.h"
-
+#  include "wx/msw/gsockmsw.h"
+#  include "wx/gsocket.h"

 #else
 #else

+#  include "gsockmsw.h"
+#  include "gsocket.h"
+#endif /* __GSOCKET_STANDALONE__ */

 
 

-#include "gsockmsw.h"
-#include "gsocket.h"
+/* 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)
+#endif /* wxUSE_GUI */

 
 

-#endif /* __GSOCKET_STANDALONE__ */

 
 #include <assert.h>
 #include <string.h>
 
 #include <assert.h>
 #include <string.h>


@@ -35,24 +57,20 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <ctype.h>

+

 #include <winsock.h>
 
 /* if we use configure for MSW SOCKLEN_T will be already defined */
 #ifndef SOCKLEN_T
 #include <winsock.h>
 
 /* if we use configure for MSW SOCKLEN_T will be already defined */
 #ifndef SOCKLEN_T

-#define SOCKLEN_T  int
+#  define SOCKLEN_T int

 #endif
 
 #endif
 

-#ifdef _MSC_VER
-    /* using FD_SET results in this warning */
-    #pragma warning(disable:4127) /* conditional expression is constant */
-#endif /* Visual C++ */
-

 
 /* Constructors / Destructors for GSocket */
 
 GSocket *GSocket_new(void)
 {
 
 /* Constructors / Destructors for GSocket */
 
 GSocket *GSocket_new(void)
 {

-  int i;
+  int i, success;

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


@@ -63,21 +81,23 @@ GSocket *GSocket_new(void)
   {
     socket->m_cbacks[i]     = NULL;
   }
   {
     socket->m_cbacks[i]     = NULL;
   }

-  socket->m_local           = NULL;     
-  socket->m_peer            = NULL;     
+  socket->m_detected        = 0;
+  socket->m_local           = NULL;
+  socket->m_peer            = NULL;

   socket->m_error           = GSOCK_NOERROR;
   socket->m_error           = GSOCK_NOERROR;

-  socket->m_server          = FALSE;            
+  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_stream          = TRUE;
   socket->m_non_blocking    = FALSE;
   socket->m_timeout.tv_sec  = 10 * 60;  /* 10 minutes */
   socket->m_timeout.tv_usec = 0;

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

 
   /* Per-socket GUI-specific initialization */
 
   /* Per-socket GUI-specific initialization */

-  if (!_GSocket_GUI_Init(socket))
+  success = _GSocket_GUI_Init(socket);
+  if (!success)

   {
     free(socket);
   {
     free(socket);

-    return NULL;
+    socket = NULL;

   }
 
   return socket;
   }
 
   return socket;


@@ -252,11 +272,11 @@ GAddress *GSocket_GetPeer(GSocket *socket)
  *  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:
  *  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.
  *  Error codes:
  *    GSOCK_INVSOCK - the socket is in use.
  *    GSOCK_INVADDR - the local address has not been set.

- *    GSOCK_IOERR   - low-level error. 
+ *    GSOCK_IOERR   - low-level error.

  */
 GSocketError GSocket_SetServer(GSocket *sck)
 {
  */
 GSocketError GSocket_SetServer(GSocket *sck)
 {


@@ -324,7 +344,7 @@ GSocketError GSocket_SetServer(GSocket *sck)
  *    GSOCK_TIMEDOUT   - timeout, no incoming connections.
  *    GSOCK_WOULDBLOCK - the call would block and the socket is nonblocking.
  *    GSOCK_MEMERR     - couldn't allocate memory.
  *    GSOCK_TIMEDOUT   - timeout, no incoming connections.
  *    GSOCK_WOULDBLOCK - the call would block and the socket is nonblocking.
  *    GSOCK_MEMERR     - couldn't allocate memory.

- *    GSOCK_IOERR      - low-level error. 
+ *    GSOCK_IOERR      - low-level error.

  */
 GSocket *GSocket_WaitConnection(GSocket *sck)
 {
  */
 GSocket *GSocket_WaitConnection(GSocket *sck)
 {


@@ -427,7 +447,7 @@ GSocket *GSocket_WaitConnection(GSocket *sck)
  *    GSOCK_TIMEDOUT   - timeout, the connection failed.
  *    GSOCK_WOULDBLOCK - connection in progress (nonblocking sockets only)
  *    GSOCK_MEMERR     - couldn't allocate memory.
  *    GSOCK_TIMEDOUT   - timeout, the connection failed.
  *    GSOCK_WOULDBLOCK - connection in progress (nonblocking sockets only)
  *    GSOCK_MEMERR     - couldn't allocate memory.

- *    GSOCK_IOERR      - low-level error. 
+ *    GSOCK_IOERR      - low-level error.

  */
 GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
 {
  */
 GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
 {


@@ -455,6 +475,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
   sck->m_stream   = (stream == GSOCK_STREAMED);
   sck->m_oriented = TRUE;
   sck->m_server   = FALSE;
   sck->m_stream   = (stream == GSOCK_STREAMED);
   sck->m_oriented = TRUE;
   sck->m_server   = FALSE;

+  sck->m_establishing = FALSE;

 
   /* Create the socket */
   sck->m_fd = socket(sck->m_peer->m_realfamily,
 
   /* Create the socket */
   sck->m_fd = socket(sck->m_peer->m_realfamily,


@@ -492,7 +513,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
         /* sck->m_error is set in _GSocket_Connect_Timeout */
       }
 
         /* sck->m_error is set in _GSocket_Connect_Timeout */
       }
 

-      return err;
+      return (GSocketError) err;

     }
 
     /* If connect failed with EWOULDBLOCK and the GSocket object
     }
 
     /* If connect failed with EWOULDBLOCK and the GSocket object


@@ -503,6 +524,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
      */
     if ((err == WSAEWOULDBLOCK) && (sck->m_non_blocking))
     {
      */
     if ((err == WSAEWOULDBLOCK) && (sck->m_non_blocking))
     {

+      sck->m_establishing = TRUE;

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


@@ -530,7 +552,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
  *  Error codes:
  *    GSOCK_INVSOCK - the socket is in use.
  *    GSOCK_INVADDR - the local address has not been set.
  *  Error codes:
  *    GSOCK_INVSOCK - the socket is in use.
  *    GSOCK_INVADDR - the local address has not been set.

- *    GSOCK_IOERR   - low-level error. 
+ *    GSOCK_IOERR   - low-level error.

  */
 GSocketError GSocket_SetNonOriented(GSocket *sck)
 {
  */
 GSocketError GSocket_SetNonOriented(GSocket *sck)
 {


@@ -674,9 +696,70 @@ int GSocket_Write(GSocket *socket, const char *buffer, int size)
  */
 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;
+  static const struct timeval tv = { 0, 0 };
+

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

+  FD_ZERO(&readfds);
+  FD_ZERO(&writefds);
+  FD_ZERO(&exceptfds);
+  FD_SET(socket->m_fd, &readfds);
+  FD_SET(socket->m_fd, &writefds);
+  FD_SET(socket->m_fd, &exceptfds);
+
+  /* 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))
+  {
+    /* Assume that closure of the socket is always reported via exceptfds */
+    if (socket->m_server && socket->m_stream)
+      result |= (GSOCK_CONNECTION_FLAG & flags);
+    else
+      result |= (GSOCK_INPUT_FLAG & flags);
+  }
+
+  /* Check for writability */
+  if (FD_ISSET(socket->m_fd, &writefds))
+  {
+    if (socket->m_establishing && !socket->m_server)
+    {
+      result |= (GSOCK_CONNECTION_FLAG & flags);
+      socket->m_establishing = FALSE;
+      socket->m_detected |= GSOCK_CONNECTION_FLAG;
+    }
+    else
+      result |= (GSOCK_OUTPUT_FLAG & flags);
+  }
+
+  /* Check for exceptions and errors */
+  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;
   return flags & socket->m_detected;

+
+#endif /* !wxUSE_GUI */

 }
 
 /* Attributes */
 }
 
 /* Attributes */


@@ -685,7 +768,7 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
  *  Sets the socket to non-blocking mode. All IO calls will return
  *  immediately.
  */
  *  Sets the socket to non-blocking mode. All IO calls will return
  *  immediately.
  */

-void GSocket_SetNonBlocking(GSocket *socket, bool non_block)
+void GSocket_SetNonBlocking(GSocket *socket, int non_block)

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


@@ -723,7 +806,7 @@ GSocketError GSocket_GetError(GSocket *socket)
  *   operation, there is still data available, the callback function will
  *   be called again.
  * GSOCK_OUTPUT:
  *   operation, there is still data available, the callback function will
  *   be called again.
  * GSOCK_OUTPUT:

- *   The socket is available for writing. That is, the next write call 
+ *   The socket is available for writing. That is, the next write call

  *   won't block. This event is generated only once, when the connection is
  *   first established, and then only if a call failed with GSOCK_WOULDBLOCK,
  *   when the output buffer empties again. This means that the app should
  *   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


@@ -932,22 +1015,38 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size)
  * -------------------------------------------------------------------------
  */
 
  * -------------------------------------------------------------------------
  */
 

-/* CHECK_ADDRESS verifies that the current family is either GSOCK_NOFAMILY
- * or GSOCK_*family*, and if it is GSOCK_NOFAMILY, it initalizes 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)                      \
+#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)                          \
 {                                                                   \
   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;                                                  \
   }                                                                 \
 }
 
   {                                                                 \
     address->m_error = GSOCK_INVADDR;                               \
     return retval;                                                  \
   }                                                                 \
 }
 

+

 GAddress *GAddress_new(void)
 {
   GAddress *address;
 GAddress *GAddress_new(void)
 {
   GAddress *address;


@@ -991,6 +1090,9 @@ void GAddress_destroy(GAddress *address)
 {
   assert(address != NULL);
 
 {
   assert(address != NULL);
 

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

   free(address);
 }
 
   free(address);
 }
 


@@ -1100,7 +1202,7 @@ 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);
 
 
   addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
 


@@ -1136,7 +1238,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;


@@ -1151,7 +1253,7 @@ 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)
   {


@@ -1187,7 +1289,7 @@ 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->sin_port = htons(port);
 
   addr = (struct sockaddr_in *)address->m_addr;
   addr->sin_port = htons(port);


@@ -1202,7 +1304,7 @@ GSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, size_t
   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_buf = (char *)&(addr->sin_addr);
 
   addr = (struct sockaddr_in *)address->m_addr;
   addr_buf = (char *)&(addr->sin_addr);


@@ -1224,7 +1326,7 @@ unsigned long GAddress_INET_GetHostAddress(GAddress *address)
   struct sockaddr_in *addr;
 
   assert(address != NULL);
   struct sockaddr_in *addr;
 
   assert(address != NULL);

-  CHECK_ADDRESS(address, INET, 0);
+  CHECK_ADDRESS_RETVAL(address, INET, 0);

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


@@ -1236,7 +1338,7 @@ unsigned short GAddress_INET_GetPort(GAddress *address)
   struct sockaddr_in *addr;
 
   assert(address != NULL);
   struct sockaddr_in *addr;
 
   assert(address != NULL);

-  CHECK_ADDRESS(address, INET, 0);
+  CHECK_ADDRESS_RETVAL(address, INET, 0);

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


@@ -1248,10 +1350,6 @@ unsigned short GAddress_INET_GetPort(GAddress *address)
  * -------------------------------------------------------------------------
  */
 
  * -------------------------------------------------------------------------
  */
 

-#ifdef _MSC_VER
-    #pragma warning(disable:4100) /* unreferenced formal parameter */
-#endif /* Visual C++ */
-

 GSocketError _GAddress_Init_UNIX(GAddress *address)
 {
   assert (address != NULL);
 GSocketError _GAddress_Init_UNIX(GAddress *address)
 {
   assert (address != NULL);


@@ -1275,10 +1373,10 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf)
 
 #else /* !wxUSE_SOCKETS */
 
 
 #else /* !wxUSE_SOCKETS */
 

-/* 
+/*

  * Translation unit shouldn't be empty, so include this typedef to make the
  * compiler (VC++ 6.0, for example) happy
  */
  * Translation unit shouldn't be empty, so include this typedef to make the
  * compiler (VC++ 6.0, for example) happy
  */

-typedef (*wxDummy)();
+typedef void (*wxDummy)();

 
 #endif  /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
 
 #endif  /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */