compilation fix for a patch which didn't compile...

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

diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c
index 1b8f5b0e52ac4d2c836d8402de337d59e092814e..28b5f54307b88a2f2f2ff7056ce8d036fc5b8e7e 100644 (file)
--- a/src/unix/gsocket.c
+++ b/src/unix/gsocket.c
@@ -4,7 +4,7 @@
  * Authors: Guilhem Lavaux,
  *          Guillermo Rodriguez Garcia <guille@iies.es> (maintainer)
  * Purpose: GSocket main Unix and OS/2 file
  * Authors: Guilhem Lavaux,
  *          Guillermo Rodriguez Garcia <guille@iies.es> (maintainer)
  * Purpose: GSocket main Unix and OS/2 file

- * Licence: The wxWindows licence
+ * Licence: The wxWidgets licence

  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */
  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */


@@ -483,11 +483,6 @@ GSocketError GSocket_SetServer(GSocket *sck)
 #endif
   _GSocket_Enable_Events(sck);
 
 #endif
   _GSocket_Enable_Events(sck);
 

-  /* allow a socket to re-bind if the socket is in the TIME_WAIT
-     state after being previously closed.
-   */
-  setsockopt(sck->m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(u_long));
-

   /* Bind to the local address,
    * retrieve the actual address bound,
    * and listen up to 5 connections.
   /* Bind to the local address,
    * retrieve the actual address bound,
    * and listen up to 5 connections.


@@ -800,27 +795,26 @@ int GSocket_Read(GSocket *socket, char *buffer, int size)
 
   assert(socket != NULL);
 
 
   assert(socket != NULL);
 

-  /* When using CFSocket we MUST NOT reenable events until we finish reading */
-#ifndef __DARWIN__
-  /* Reenable INPUT events */
-  _GSocket_Enable(socket, GSOCK_INPUT);
-#endif
-

   if (socket->m_fd == INVALID_SOCKET || socket->m_server)
   {
     socket->m_error = GSOCK_INVSOCK;
     return -1;
   }
 
   if (socket->m_fd == INVALID_SOCKET || socket->m_server)
   {
     socket->m_error = GSOCK_INVSOCK;
     return -1;
   }
 

+  /* Disable events during query of socket status */
+  _GSocket_Disable(socket, GSOCK_INPUT);
+    

   /* If the socket is blocking, wait for data (with a timeout) */
   if (_GSocket_Input_Timeout(socket) == GSOCK_TIMEDOUT)
   /* If the socket is blocking, wait for data (with a timeout) */
   if (_GSocket_Input_Timeout(socket) == GSOCK_TIMEDOUT)

-    return -1;
-
-  /* Read the data */
-  if (socket->m_stream)
-    ret = _GSocket_Recv_Stream(socket, buffer, size);
-  else
-    ret = _GSocket_Recv_Dgram(socket, buffer, size);
+    /* We no longer return here immediately, otherwise socket events would not be re-enabled! */
+    ret = -1;
+  else {
+    /* Read the data */
+    if (socket->m_stream)
+      ret = _GSocket_Recv_Stream(socket, buffer, size);
+    else
+      ret = _GSocket_Recv_Dgram(socket, buffer, size);
+  }

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


@@ -830,11 +824,9 @@ int GSocket_Read(GSocket *socket, char *buffer, int size)
       socket->m_error = GSOCK_IOERR;
   }
   
       socket->m_error = GSOCK_IOERR;
   }
   

-#ifdef __DARWIN__
-  /* Reenable INPUT events */
+  /* Enable events again now that we are done processing */

   _GSocket_Enable(socket, GSOCK_INPUT);
   _GSocket_Enable(socket, GSOCK_INPUT);

-#endif
-
+  

   return ret;
 }
 
   return ret;
 }
 


@@ -913,17 +905,17 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
     fd_set exceptfds;
     struct timeval tv;
 
     fd_set exceptfds;
     struct timeval tv;
 

+    assert(socket != NULL);
+

     /* Do not use a static struct, Linux can garble it */
     tv.tv_sec = socket->m_timeout / 1000;
     tv.tv_usec = (socket->m_timeout % 1000) / 1000;
 
     /* Do not use a static struct, Linux can garble it */
     tv.tv_sec = socket->m_timeout / 1000;
     tv.tv_usec = (socket->m_timeout % 1000) / 1000;
 

-    assert(socket != NULL);
-

     FD_ZERO(&readfds);
     FD_ZERO(&writefds);
     FD_ZERO(&exceptfds);
     FD_SET(socket->m_fd, &readfds);
     FD_ZERO(&readfds);
     FD_ZERO(&writefds);
     FD_ZERO(&exceptfds);
     FD_SET(socket->m_fd, &readfds);

-    if (flags & GSOCK_OUTPUT_FLAG)
+    if (flags & GSOCK_OUTPUT_FLAG || flags & GSOCK_CONNECTION_FLAG)

       FD_SET(socket->m_fd, &writefds);
     FD_SET(socket->m_fd, &exceptfds);
 
       FD_SET(socket->m_fd, &writefds);
     FD_SET(socket->m_fd, &exceptfds);
 


@@ -1132,6 +1124,44 @@ void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags)
   }
 }
 
   }
 }
 

+GSocketError GSocket_GetSockOpt(GSocket *socket, int level, int optname,
+                                void *optval, int *optlen)
+{
+    if (getsockopt(socket->m_fd, level, optname, optval, optlen) == 0)
+    {
+        return GSOCK_NOERROR;
+    }
+    return GSOCK_OPTERR;
+}
+
+GSocketError GSocket_SetSockOpt(GSocket *socket, int level, int optname, 
+                                const void *optval, int optlen)
+{
+    if (setsockopt(socket->m_fd, level, optname, optval, optlen) == 0)
+    {
+        return GSOCK_NOERROR;       
+    }
+    return GSOCK_OPTERR;
+}
+
+GSocketError GSocket_SetReuseAddr(GSocket *socket)
+{
+  /* allow a socket to re-bind if the socket is in the TIME_WAIT
+     state after being previously closed.
+   */
+  u_long arg = 1;
+  setsockopt(socket->m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(u_long));
+}
+
+void GSocket_Streamed(GSocket *socket)
+{
+    socket->m_stream = TRUE;
+}
+
+void GSocket_Unstreamed(GSocket *socket)
+{
+    socket->m_stream = FALSE;
+}

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


@@ -1616,8 +1646,10 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
   {
 #else
   /* Use gethostbyname by default */
   {
 #else
   /* Use gethostbyname by default */

+#ifndef __WXMAC__

   int val = 1;  /* VA doesn't like constants in conditional expressions */
   if (val)
   int val = 1;  /* VA doesn't like constants in conditional expressions */
   if (val)

+#endif

   {
 #endif
     struct in_addr *array_addr;
   {
 #endif
     struct in_addr *array_addr;


@@ -1651,7 +1683,7 @@ GSocketError GAddress_INET_SetHostAddress(GAddress *address,
   CHECK_ADDRESS(address, INET);
 
   addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
   CHECK_ADDRESS(address, INET);
 
   addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);

-  addr->s_addr = hostaddr;
+  addr->s_addr = htonl(hostaddr);

 
   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }


@@ -1742,7 +1774,7 @@ unsigned long GAddress_INET_GetHostAddress(GAddress *address)
 
   addr = (struct sockaddr_in *)address->m_addr;
 
 
   addr = (struct sockaddr_in *)address->m_addr;
 

-  return addr->sin_addr.s_addr;
+  return ntohl(addr->sin_addr.s_addr);

 }
 
 unsigned short GAddress_INET_GetPort(GAddress *address)
 }
 
 unsigned short GAddress_INET_GetPort(GAddress *address)