[GNUnet-SVN] r3995 - GNUnet/src/util/network

[grothoff]

Author: grothoff
Date: 2006-12-21 14:09:37 -0800 (Thu, 21 Dec 2006)
New Revision: 3995

Modified:
   GNUnet/src/util/network/select.c
Log:
OS X FIONREAD includes IP headers and all pending packets

Modified: GNUnet/src/util/network/select.c
===================================================================
--- GNUnet/src/util/network/select.c    2006-12-21 22:08:06 UTC (rev 3994)
+++ GNUnet/src/util/network/select.c    2006-12-21 22:09:37 UTC (rev 3995)
@@ -617,13 +617,13 @@
                           &size,
                           clientAddr,
                           &lenOfIncomingAddr);
-       } else if (pending >= 70000) {
-         /* allowing a bit more for OSX FIONREAD */
-         GE_BREAK(sh->ectx, 0);
-         socket_close(sh->listen_sock);
        } else {
          char * msg;
-       
+
+         if (pending >= 65536) 
+           /* OS X includes size of all pending packets,
+              so we must reduce pending in that case */
+           pending = 65536;    
          msg = MALLOC(pending);
          size = 0;
          if (YES != socket_recv_from(sh->listen_sock,