Reverted FILLCOLORHINT->FILLCOLOR change. Now when a near black themeColor is returne...

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

diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c
index 36a2ca622fbb5220b9df7dc3edf8852e7e137867..dc6c7e570204b4003710cab36a86d44267200401 100644 (file)
--- a/src/unix/gsocket.c
+++ b/src/unix/gsocket.c
@@ -3,7 +3,7 @@
  * Name:    gsocket.c
  * Authors: Guilhem Lavaux,
  *          Guillermo Rodriguez Garcia <guille@iies.es> (maintainer)
  * Name:    gsocket.c
  * Authors: Guilhem Lavaux,
  *          Guillermo Rodriguez Garcia <guille@iies.es> (maintainer)

- * Purpose: GSocket main Unix file
+ * Purpose: GSocket main Unix and OS/2 file

  * Licence: The wxWindows licence
  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  * Licence: The wxWindows licence
  * CVSID:   $Id$
  * -------------------------------------------------------------------------


@@ -17,10 +17,23 @@
 #include "wx/setup.h"
 #endif
 
 #include "wx/setup.h"
 #endif
 

+#if defined(__VISAGECPP__)
+/* Seems to be needed by Visual Age C++, though I don't see how it manages
+   to not break on including a C++ header into a plain C source file      */
+#include "wx/defs.h"
+#define BSD_SELECT /* use Berkley Sockets select */
+#endif
+

 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 
 #include <assert.h>
 #include <sys/types.h>
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 
 #include <assert.h>
 #include <sys/types.h>

+#ifdef __VISAGECPP__
+#include <string.h>
+#include <sys/time.h>
+#include <types.h>
+#include <netinet/in.h>
+#endif

 #include <netdb.h>
 #include <sys/ioctl.h>
 
 #include <netdb.h>
 #include <sys/ioctl.h>
 


@@ -37,12 +50,42 @@ struct sockaddr_un
 #include <sys/un.h>
 #endif
 
 #include <sys/un.h>
 #endif
 

+#ifndef __VISAGECPP__

 #include <sys/time.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/time.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>

+#else
+#include <nerrno.h>
+#  if __IBMCPP__ < 400
+#include <machine/endian.h>
+#include <socket.h>
+#include <ioctl.h>
+#include <select.h>
+#include <unistd.h>
+
+#define EBADF   SOCEBADF
+
+#    ifdef min
+#    undef min
+#    endif
+#  else
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <sys/select.h>
+
+#define close(a) soclose(a)
+#define select(a,b,c,d,e) bsdselect(a,b,c,d,e)
+int _System bsdselect(int,
+                      struct fd_set *,
+                      struct fd_set *,
+                      struct fd_set *,
+                      struct timeval *);
+int _System soclose(int);
+#  endif
+#endif

 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>


@@ -218,7 +261,10 @@ GSocket *GSocket_new(void)
 void GSocket_close(GSocket *socket)
 {
     _GSocket_Disable_Events(socket);
 void GSocket_close(GSocket *socket)
 {
     _GSocket_Disable_Events(socket);

+// gsockosx.c calls CFSocketInvalidate which closes the socket for us
+#if !(defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__)))

     close(socket->m_fd);
     close(socket->m_fd);

+#endif

     socket->m_fd = INVALID_SOCKET;
 }
 
     socket->m_fd = INVALID_SOCKET;
 }
 


@@ -430,10 +476,18 @@ GSocketError GSocket_SetServer(GSocket *sck)
     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }
     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }

-
+#if defined(__EMX__) || defined(__VISAGECPP__)
+  ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(arg));
+#else

   ioctl(sck->m_fd, FIONBIO, &arg);
   ioctl(sck->m_fd, FIONBIO, &arg);

+#endif

   _GSocket_Enable_Events(sck);
 
   _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.


@@ -535,8 +589,11 @@ GSocket *GSocket_WaitConnection(GSocket *socket)
     socket->m_error = err;
     return NULL;
   }
     socket->m_error = err;
     return NULL;
   }

-
+#if defined(__EMX__) || defined(__VISAGECPP__)
+  ioctl(connection->m_fd, FIONBIO, (char*)&arg, sizeof(arg));
+#else

   ioctl(connection->m_fd, FIONBIO, &arg);
   ioctl(connection->m_fd, FIONBIO, &arg);

+#endif

   _GSocket_Enable_Events(connection);
 
   return connection;
   _GSocket_Enable_Events(connection);
 
   return connection;


@@ -604,8 +661,11 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }
     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }

-
+#if defined(__EMX__) || defined(__VISAGECPP__)
+  ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(arg));
+#else

   ioctl(sck->m_fd, FIONBIO, &arg);
   ioctl(sck->m_fd, FIONBIO, &arg);

+#endif

   _GSocket_Enable_Events(sck);
 
   /* Connect it to the peer address, with a timeout (see below) */
   _GSocket_Enable_Events(sck);
 
   /* Connect it to the peer address, with a timeout (see below) */


@@ -708,8 +768,11 @@ GSocketError GSocket_SetNonOriented(GSocket *sck)
     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }
     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }

-
+#if defined(__EMX__) || defined(__VISAGECPP__)
+  ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(arg));
+#else

   ioctl(sck->m_fd, FIONBIO, &arg);
   ioctl(sck->m_fd, FIONBIO, &arg);

+#endif

   _GSocket_Enable_Events(sck);
 
   /* Bind to the local address,
   _GSocket_Enable_Events(sck);
 
   /* Bind to the local address,


@@ -737,8 +800,11 @@ 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);
   /* Reenable INPUT events */
   _GSocket_Enable(socket, GSOCK_INPUT);

+#endif

 
   if (socket->m_fd == INVALID_SOCKET || socket->m_server)
   {
 
   if (socket->m_fd == INVALID_SOCKET || socket->m_server)
   {


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

+#ifdef __DARWIN__
+  /* Reenable INPUT events */
+  _GSocket_Enable(socket, GSOCK_INPUT);
+#endif
+

   return ret;
 }
 
   return ret;
 }
 


@@ -843,8 +914,8 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
     struct timeval tv;
 
     /* Do not use a static struct, Linux can garble it */
     struct timeval tv;
 
     /* Do not use a static struct, Linux can garble it */

-    tv.tv_sec = 0;
-    tv.tv_usec = 0;
+    tv.tv_sec = socket->m_timeout / 1000;
+    tv.tv_usec = (socket->m_timeout % 1000) / 1000;

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


@@ -852,7 +923,8 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
     FD_ZERO(&writefds);
     FD_ZERO(&exceptfds);
     FD_SET(socket->m_fd, &readfds);
     FD_ZERO(&writefds);
     FD_ZERO(&exceptfds);
     FD_SET(socket->m_fd, &readfds);

-    FD_SET(socket->m_fd, &writefds);
+    if (flags & GSOCK_OUTPUT_FLAG)
+      FD_SET(socket->m_fd, &writefds);

     FD_SET(socket->m_fd, &exceptfds);
 
     /* Check 'sticky' CONNECTION flag first */
     FD_SET(socket->m_fd, &exceptfds);
 
     /* Check 'sticky' CONNECTION flag first */


@@ -1216,9 +1288,13 @@ int _GSocket_Send_Stream(GSocket *socket, const char *buffer, int size)
 {
   int ret;
 
 {
   int ret;
 

+#ifndef __VISAGECPP__

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

+#else
+  ret = send(socket->m_fd, (char *)buffer, size, 0);
+#endif

 
   return ret;
 }
 
   return ret;
 }


@@ -1242,9 +1318,13 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size)
     return -1;
   }
 
     return -1;
   }
 

+#ifndef __VISAGECPP__

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

+#else
+  ret = sendto(socket->m_fd, (char *)buffer, size, 0, addr, len);
+#endif

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


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

-  if (1)
+  int val = 1;  //VA doesn't like constants in conditional expressions at all
+  if (val)

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


@@ -1681,6 +1762,7 @@ unsigned short GAddress_INET_GetPort(GAddress *address)
  * -------------------------------------------------------------------------
  */
 
  * -------------------------------------------------------------------------
  */
 

+#ifndef __VISAGECPP__

 GSocketError _GAddress_Init_UNIX(GAddress *address)
 {
   address->m_len  = sizeof(struct sockaddr_un);
 GSocketError _GAddress_Init_UNIX(GAddress *address)
 {
   address->m_len  = sizeof(struct sockaddr_un);


@@ -1729,6 +1811,6 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf)
 
   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }

-
+#endif  /* !defined(__VISAGECPP__) */

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