[GNUnet-SVN] r5156 - in GNUnet/src: applications/vpn util/network

[gnunet]

Author: durner
Date: 2007-06-27 23:44:56 -0600 (Wed, 27 Jun 2007)
New Revision: 5156

Modified:
   GNUnet/src/applications/vpn/vpn.c
   GNUnet/src/util/network/io.c
   GNUnet/src/util/network/select.c
Log:
make sockets really non-blocking

Modified: GNUnet/src/applications/vpn/vpn.c
===================================================================
--- GNUnet/src/applications/vpn/vpn.c   2007-06-28 05:30:07 UTC (rev 5155)
+++ GNUnet/src/applications/vpn/vpn.c   2007-06-28 05:44:56 UTC (rev 5156)
@@ -1334,10 +1334,9 @@
 
 static int makeNonblocking(int handle) {
 #if MINGW
-  u_long l = 1;
   if (ioctlsocket(handle,
                  FIONBIO,
-                 &l) == SOCKET_ERROR) {
+                 (u_long FAR*) 1) == SOCKET_ERROR) {
     SetErrnoFromWinsockError(WSAGetLastError());
     return SYSERR;
   } else {

Modified: GNUnet/src/util/network/io.c
===================================================================
--- GNUnet/src/util/network/io.c        2007-06-28 05:30:07 UTC (rev 5155)
+++ GNUnet/src/util/network/io.c        2007-06-28 05:44:56 UTC (rev 5156)
@@ -159,9 +159,8 @@
 int socket_set_blocking(struct SocketHandle * s,
                        int doBlock) {
 #if MINGW
-  u_long l = !doBlock;
   if (ioctlsocket(s->handle,
-                 FIONBIO, &l) == SOCKET_ERROR) {
+                 FIONBIO, (u_long FAR*) !doBlock) == SOCKET_ERROR) {
     SetErrnoFromWinsockError(WSAGetLastError());
 
     return -1;

Modified: GNUnet/src/util/network/select.c
===================================================================
--- GNUnet/src/util/network/select.c    2007-06-28 05:30:07 UTC (rev 5155)
+++ GNUnet/src/util/network/select.c    2007-06-28 05:44:56 UTC (rev 5156)
@@ -766,10 +766,9 @@
 static int makeNonblocking(struct GE_Context * ectx,
                            int handle) {
 #if MINGW
-  u_long l = 1;
   if (ioctlsocket(handle,
                  FIONBIO,
-                 &l) == SOCKET_ERROR) {
+                 (u_long FAR*) 1) == SOCKET_ERROR) {
     SetErrnoFromWinsockError(WSAGetLastError());
     GE_LOG_STRERROR(ectx,
                    GE_WARNING | GE_USER | GE_ADMIN | GE_IMMEDIATE,