Fixes for smoother cross compilation;

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

diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c
index 622f5e0681100e794873d7d09ee8167516408703..2ffafc86b6993ac60e806f8c349d0853966e723d 100644 (file)
--- a/src/unix/gsocket.c
+++ b/src/unix/gsocket.c
@@ -90,7 +90,7 @@ GSocket *GSocket_new()
 
   socket->m_fd                  = -1;
   for (i=0;i<GSOCK_MAX_EVENT;i++) {
 
   socket->m_fd                  = -1;
   for (i=0;i<GSOCK_MAX_EVENT;i++) {

-    socket->m_fbacks[i]         = NULL;
+    socket->m_cbacks[i]         = NULL;

     socket->m_iocalls[i]        = FALSE;
   }
   socket->m_local               = NULL;
     socket->m_iocalls[i]        = FALSE;
   }
   socket->m_local               = NULL;


@@ -99,9 +99,9 @@ GSocket *GSocket_new()
   socket->m_server             = FALSE;
   socket->m_stream             = TRUE;
   socket->m_gui_dependent      = NULL;
   socket->m_server             = FALSE;
   socket->m_stream             = TRUE;
   socket->m_gui_dependent      = NULL;

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

   socket->m_timeout             = 10*60*1000;
   socket->m_timeout             = 10*60*1000;

-                                      // 10 minutes * 60 sec * 1000 millisec
+                                      /* 10 minutes * 60 sec * 1000 millisec */

 
   /* We initialize the GUI specific entries here */
   _GSocket_GUI_Init(socket);
 
   /* We initialize the GUI specific entries here */
   _GSocket_GUI_Init(socket);


@@ -139,7 +139,9 @@ void GSocket_Shutdown(GSocket *socket)
 
   /* If socket has been created, we shutdown it */
   if (socket->m_fd != -1) {
 
   /* If socket has been created, we shutdown it */
   if (socket->m_fd != -1) {

-    shutdown(socket->m_fd, 2);
+    /* Only oriented connection should be shutdowned */
+    if (socket->m_oriented)
+      shutdown(socket->m_fd, 2);

     close(socket->m_fd);
     socket->m_fd = -1;
   }
     close(socket->m_fd);
     socket->m_fd = -1;
   }


@@ -263,6 +265,7 @@ GSocketError GSocket_SetServer(GSocket *sck)
 
   /* We always have a stream here  */
   sck->m_stream = TRUE;
 
   /* We always have a stream here  */
   sck->m_stream = TRUE;

+  sck->m_server = 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);


@@ -288,7 +291,7 @@ GSocketError GSocket_SetServer(GSocket *sck)
     return GSOCK_IOERR;
   }
 
     return GSOCK_IOERR;
   }
 

-  GSocket_SetNonBlocking(sck, sck->m_blocking);
+  GSocket_SetNonBlocking(sck, sck->m_non_blocking);

   GSocket_SetTimeout(sck, sck->m_timeout);
 
   return GSOCK_NOERROR;
   GSocket_SetTimeout(sck, sck->m_timeout);
 
   return GSOCK_NOERROR;


@@ -362,7 +365,7 @@ GSocketError GSocket_SetNonOriented(GSocket *sck)
     return GSOCK_IOERR;
   }
 
     return GSOCK_IOERR;
   }
 

-  GSocket_SetNonBlocking(sck, sck->m_blocking);
+  GSocket_SetNonBlocking(sck, sck->m_non_blocking);

   GSocket_SetTimeout(sck, sck->m_timeout);
 
   return GSOCK_NOERROR;
   GSocket_SetTimeout(sck, sck->m_timeout);
 
   return GSOCK_NOERROR;


@@ -420,7 +423,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
   /* It is not a server */
   sck->m_server = FALSE;
 
   /* It is not a server */
   sck->m_server = FALSE;
 

-  GSocket_SetNonBlocking(sck, sck->m_blocking);
+  GSocket_SetNonBlocking(sck, sck->m_non_blocking);

   GSocket_SetTimeout(sck, sck->m_timeout);
 
   return GSOCK_NOERROR;
   GSocket_SetTimeout(sck, sck->m_timeout);
 
   return GSOCK_NOERROR;


@@ -498,7 +501,7 @@ void GSocket_SetNonBlocking(GSocket *socket, bool non_block)
 {
   assert(socket != NULL);
 
 {
   assert(socket != NULL);
 

-  socket->m_blocking = non_block;
+  socket->m_non_blocking = non_block;

 
   if (socket->m_fd != -1)
     ioctl(socket->m_fd, FIONBIO, &non_block);
 
   if (socket->m_fd != -1)
     ioctl(socket->m_fd, FIONBIO, &non_block);


@@ -517,6 +520,10 @@ void GSocket_SetTimeout(GSocket *socket, unsigned long millisec)
     SO_RCVTIMEO. The man pages, that these flags should exist but
     are read only. RR. */
  /* OK, restrict this to GLIBC 2.1. GL. */
     SO_RCVTIMEO. The man pages, that these flags should exist but
     are read only. RR. */
  /* OK, restrict this to GLIBC 2.1. GL. */

+ /* Anyway, they seem to pose problems: I need to know the socket level and
+    it varies (may be SOL_TCP, SOL_UDP, ...). I disables this and use the
+    other solution. GL. */
+#if 0

 #ifdef CAN_USE_TIMEOUT 
   if (socket->m_fd != -1) {
     struct timeval tval;
 #ifdef CAN_USE_TIMEOUT 
   if (socket->m_fd != -1) {
     struct timeval tval;


@@ -527,6 +534,7 @@ void GSocket_SetTimeout(GSocket *socket, unsigned long millisec)
     setsockopt(socket->m_fd, SOL_SOCKET, SO_RCVTIMEO, &tval, sizeof(tval));
   }
 #endif
     setsockopt(socket->m_fd, SOL_SOCKET, SO_RCVTIMEO, &tval, sizeof(tval));
   }
 #endif

+#endif

 }
 
 /*
 }
 
 /*


@@ -543,7 +551,7 @@ GSocketError GSocket_GetError(GSocket *socket)
 /* Callbacks */
 
 /* 
 /* Callbacks */
 
 /* 

-   Only one fallback is possible for each event (INPUT, OUTPUT, CONNECTION)
+   Only one callback is possible for each event (INPUT, OUTPUT, CONNECTION)

    INPUT: The function is called when there is at least a byte in the 
           input buffer
    OUTPUT: The function is called when the system is sure the next write call
    INPUT: The function is called when there is at least a byte in the 
           input buffer
    OUTPUT: The function is called when the system is sure the next write call


@@ -562,7 +570,7 @@ GSocketError GSocket_GetError(GSocket *socket)
                 CONNECTION -> GSocket_Accept()
 */
 void GSocket_SetCallback(GSocket *socket, GSocketEventFlags event,
                 CONNECTION -> GSocket_Accept()
 */
 void GSocket_SetCallback(GSocket *socket, GSocketEventFlags event,

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

 {
   int count;
 
 {
   int count;
 


@@ -572,7 +580,7 @@ void GSocket_SetCallback(GSocket *socket, GSocketEventFlags event,
     /* We test each flag and, if it is enabled, we enable the corresponding
        event */
     if ((event & (1 << count)) != 0) {
     /* We test each flag and, if it is enabled, we enable the corresponding
        event */
     if ((event & (1 << count)) != 0) {

-      socket->m_fbacks[count] = fallback;
+      socket->m_cbacks[count] = callback;

       socket->m_data[count] = cdata;
       _GSocket_Enable(socket, count);
     }
       socket->m_data[count] = cdata;
       _GSocket_Enable(socket, count);
     }


@@ -580,7 +588,7 @@ void GSocket_SetCallback(GSocket *socket, GSocketEventFlags event,
 }
 
 /*
 }
 
 /*

-  UnsetCallback will disables all fallbacks specified by "event".
+  UnsetCallback will disables all callbacks specified by "event".

   NOTE: event may be a combination of flags
 */
 void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags event)
   NOTE: event may be a combination of flags
 */
 void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags event)


@@ -592,16 +600,16 @@ void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags event)
   for (count=0;count<GSOCK_MAX_EVENT;count++) {
     if ((event & (1 << count)) != 0) {
       _GSocket_Disable(socket, count);
   for (count=0;count<GSOCK_MAX_EVENT;count++) {
     if ((event & (1 << count)) != 0) {
       _GSocket_Disable(socket, count);

-      socket->m_fbacks[count] = NULL;
+      socket->m_cbacks[count] = NULL;

     }
   }
 }
 
 #define CALL_FALLBACK(socket, event) \
 if (socket->m_iocalls[event] && \
     }
   }
 }
 
 #define CALL_FALLBACK(socket, event) \
 if (socket->m_iocalls[event] && \

-    socket->m_fbacks[event]) {\
+    socket->m_cbacks[event]) {\

   _GSocket_Disable(socket, event); \
   _GSocket_Disable(socket, event); \

-  socket->m_fbacks[event](socket, event, \
+  socket->m_cbacks[event](socket, event, \

                    socket->m_data[event]); \
 }
 
                    socket->m_data[event]); \
 }
 


@@ -615,48 +623,36 @@ if (socket->m_iocalls[event] && \
   signal(SIGPIPE, old_handler); \
 }
 
   signal(SIGPIPE, old_handler); \
 }
 

-#if 0
-#ifndef CAN_USE_TIMEOUT
-

 #define ENABLE_TIMEOUT(socket) \
 { \
   struct itimerval old_ival, new_ival; \
   void (*old_timer_sig)(int); \
 \
 #define ENABLE_TIMEOUT(socket) \
 { \
   struct itimerval old_ival, new_ival; \
   void (*old_timer_sig)(int); \
 \

-  new_ival.it_interval.tv_sec = socket->m_timeout / 1000; \
-  new_ival.it_interval.tv_usec = (socket->m_timeout % 1000) * 1000; \
-  setitimer(ITIMER_REAL, &new_ival, &old_ival); \
-  old_timer_sig = signal(SIGALRM, SIG_DFL);
+  old_timer_sig = signal(SIGALRM, SIG_DFL); \
+  siginterrupt(SIGALRM, 1); \
+  new_ival.it_value.tv_sec = socket->m_timeout / 1000; \
+  new_ival.it_value.tv_usec = (socket->m_timeout % 1000) * 1000; \
+  new_ival.it_interval.tv_sec = 0; \
+  new_ival.it_interval.tv_usec = 0; \
+  setitimer(ITIMER_REAL, &new_ival, &old_ival);

 
 #define DISABLE_TIMEOUT(socket) \
   signal(SIGALRM, old_timer_sig); \
 
 #define DISABLE_TIMEOUT(socket) \
   signal(SIGALRM, old_timer_sig); \

+  siginterrupt(SIGALRM, 0); \

   setitimer(ITIMER_REAL, &old_ival, NULL); \
 }
 
   setitimer(ITIMER_REAL, &old_ival, NULL); \
 }
 

-#else
-
-#define ENABLE_TIMEOUT(s)
-#define DISABLE_TIMEOUT(s)
-
-#endif
-
-#endif
-
-/* Temporary */
-#define ENABLE_TIMEOUT(s)
-#define DISABLE_TIMEOUT(s)
-

 void _GSocket_Enable(GSocket *socket, GSocketEvent event)
 {
   socket->m_iocalls[event] = TRUE;
 void _GSocket_Enable(GSocket *socket, GSocketEvent event)
 {
   socket->m_iocalls[event] = TRUE;

-  if (socket->m_fbacks[event])
+  if (socket->m_cbacks[event])

     _GSocket_Install_Callback(socket, event);
 }
 
 void _GSocket_Disable(GSocket *socket, GSocketEvent event)
 {
   socket->m_iocalls[event] = FALSE;
     _GSocket_Install_Callback(socket, event);
 }
 
 void _GSocket_Disable(GSocket *socket, GSocketEvent event)
 {
   socket->m_iocalls[event] = FALSE;

-  if (socket->m_fbacks[event])
+  if (socket->m_cbacks[event])

     _GSocket_Uninstall_Callback(socket, event);
 }
 
     _GSocket_Uninstall_Callback(socket, event);
 }
 


@@ -670,12 +666,12 @@ int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size)
   DISABLE_TIMEOUT(socket);
   UNMASK_SIGNAL();
 
   DISABLE_TIMEOUT(socket);
   UNMASK_SIGNAL();
 

-  if (ret == -1 && errno != EAGAIN) {
+  if (ret == -1 && errno != EWOULDBLOCK) {

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

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

     return -1;
   }
   return ret;
     return -1;
   }
   return ret;


@@ -694,12 +690,12 @@ int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size)
   ret = recvfrom(socket->m_fd, buffer, size, 0, &from, &fromlen);
   DISABLE_TIMEOUT(socket);
   UNMASK_SIGNAL();
   ret = recvfrom(socket->m_fd, buffer, size, 0, &from, &fromlen);
   DISABLE_TIMEOUT(socket);
   UNMASK_SIGNAL();

-  if (ret == -1 && errno != EAGAIN) {
+  if (ret == -1 && errno != EWOULDBLOCK) {

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

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

     return -1;
   }
 
     return -1;
   }
 


@@ -726,12 +722,12 @@ int _GSocket_Send_Stream(GSocket *socket, const char *buffer, int size)
   ret = send(socket->m_fd, buffer, size, 0);
   DISABLE_TIMEOUT(socket);
   UNMASK_SIGNAL();
   ret = send(socket->m_fd, buffer, size, 0);
   DISABLE_TIMEOUT(socket);
   UNMASK_SIGNAL();

-  if (ret == -1 && errno != EAGAIN) {
+  if (ret == -1 && errno != EWOULDBLOCK) {

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

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

     return -1;
   }
   return ret;
     return -1;
   }
   return ret;


@@ -760,12 +756,12 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size)
   /* Frees memory allocated from _GAddress_translate_to */
   free(addr);
 
   /* Frees memory allocated from _GAddress_translate_to */
   free(addr);
 

-  if (ret == -1 && errno != EAGAIN) {
+  if (ret == -1 && errno != EWOULDBLOCK) {

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

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

     return -1;
   }
 
     return -1;
   }
 


@@ -961,7 +957,7 @@ GSocketError _GAddress_Init_INET(GAddress *address)
   ((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_family = AF_INET;
   ((struct sockaddr_in *)address->m_addr)->sin_addr.s_addr   = INADDR_ANY;
 

-  return TRUE;
+  return GSOCK_NOERROR;

 }
 
 GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
 }
 
 GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)


@@ -976,7 +972,15 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
   addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
 
   /* If it is a numeric host name, convert it now */
   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)
+  /* Fix from Guillermo Rodriguez Garcia <guille@iies.es> */
+  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 */
     struct in_addr *array_addr;
 
     /* It is a real name, we solve it */


@@ -1150,4 +1154,5 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf)
   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }
 

-#endif // wxUSE_SOCKETS
+#endif
+  /* wxUSE_SOCKETS */