[GNUnet-SVN] r5248 - in GNUnet/src: applications/testbed applications/vpn transports util/network util/network_client

[gnunet]

Author: durner
Date: 2007-07-05 13:56:14 -0600 (Thu, 05 Jul 2007)
New Revision: 5248

Modified:
   GNUnet/src/applications/testbed/commands.c
   GNUnet/src/applications/testbed/gnunet-testbed.c
   GNUnet/src/applications/testbed/testbed.c
   GNUnet/src/applications/vpn/vpn.c
   GNUnet/src/transports/tcp.c
   GNUnet/src/transports/tcp6.c
   GNUnet/src/util/network/io.c
   GNUnet/src/util/network/ip.c
   GNUnet/src/util/network/selecttest.c
   GNUnet/src/util/network_client/tcpio.c
Log:
fix socks

Modified: GNUnet/src/applications/testbed/commands.c
===================================================================
--- GNUnet/src/applications/testbed/commands.c  2007-07-05 06:50:44 UTC (rev 
5247)
+++ GNUnet/src/applications/testbed/commands.c  2007-07-05 19:56:14 UTC (rev 
5248)
@@ -1601,7 +1601,7 @@
   soaddr.sin_family = AF_INET;
   if (CONNECT(sock,
              (struct sockaddr*)&soaddr,
-             sizeof(soaddr)) < 0) {
+             sizeof(soaddr)) < 0 && errno != EWOULDBLOCK) {
     XPRINTF(" failed to send HTTP request to host %s: %s\n",
           hostname,
           STRERROR(errno));

Modified: GNUnet/src/applications/testbed/gnunet-testbed.c
===================================================================
--- GNUnet/src/applications/testbed/gnunet-testbed.c    2007-07-05 06:50:44 UTC 
(rev 5247)
+++ GNUnet/src/applications/testbed/gnunet-testbed.c    2007-07-05 19:56:14 UTC 
(rev 5248)
@@ -179,7 +179,7 @@
                (struct sockaddr*)&soaddr,
                sizeof(soaddr));
   if ( (res < 0) &&
-       (errno != EINPROGRESS) ) {
+       (errno != EINPROGRESS) && (errno != EWOULDBLOCK) ) {
     GE_LOG(ectx, GE_INFO | GE_REQUEST | GE_USER,
        _("Cannot connect to LOOPBACK port %d: %s\n"),
        PORT,

Modified: GNUnet/src/applications/testbed/testbed.c
===================================================================
--- GNUnet/src/applications/testbed/testbed.c   2007-07-05 06:50:44 UTC (rev 
5247)
+++ GNUnet/src/applications/testbed/testbed.c   2007-07-05 19:56:14 UTC (rev 
5248)
@@ -1172,7 +1172,7 @@
   soaddr.sin_family = AF_INET;
   if (CONNECT(sock,
              (struct sockaddr*)&soaddr,
-             sizeof(soaddr)) < 0) {
+             sizeof(soaddr)) < 0 && errno != EWOULDBLOCK) {
     GE_LOG(ectx, GE_WARNING | GE_BULK | GE_USER,
        _("Failed to send HTTP request to host `%s': %s\n"),
        hostname,

Modified: GNUnet/src/applications/vpn/vpn.c
===================================================================
--- GNUnet/src/applications/vpn/vpn.c   2007-07-05 06:50:44 UTC (rev 5247)
+++ GNUnet/src/applications/vpn/vpn.c   2007-07-05 19:56:14 UTC (rev 5248)
@@ -1334,9 +1334,12 @@
 
 static int makeNonblocking(int handle) {
 #if MINGW
+  u_long mode;
+  
+  mode = 1;
   if (ioctlsocket(handle,
                  FIONBIO,
-                 (u_long FAR*) 1) == SOCKET_ERROR) {
+                 &mode == SOCKET_ERROR) {
     SetErrnoFromWinsockError(WSAGetLastError());
     return SYSERR;
   } else {

Modified: GNUnet/src/transports/tcp.c
===================================================================
--- GNUnet/src/transports/tcp.c 2007-07-05 06:50:44 UTC (rev 5247)
+++ GNUnet/src/transports/tcp.c 2007-07-05 19:56:14 UTC (rev 5248)
@@ -381,7 +381,7 @@
              (struct sockaddr*)&soaddr,
              sizeof(soaddr));
   if ( (i < 0) &&
-       (errno != EINPROGRESS) ) {
+       (errno != EINPROGRESS) && (errno != EWOULDBLOCK) ) {
     GE_LOG(ectx,
           GE_ERROR | GE_ADMIN | GE_USER | GE_BULK,
           _("Cannot connect to %u.%u.%u.%u:%u: %s\n"),

Modified: GNUnet/src/transports/tcp6.c
===================================================================
--- GNUnet/src/transports/tcp6.c        2007-07-05 06:50:44 UTC (rev 5247)
+++ GNUnet/src/transports/tcp6.c        2007-07-05 19:56:14 UTC (rev 5248)
@@ -340,7 +340,7 @@
                res->ai_addr,
                res->ai_addrlen);
     if ( (i < 0) &&
-        (errno != EINPROGRESS) ) {
+        (errno != EINPROGRESS) && (errno != EWOULDBLOCK) ) {
       GE_LOG_STRERROR(ectx,
                      GE_WARNING | GE_ADMIN | GE_BULK,
                      "connect");

Modified: GNUnet/src/util/network/io.c
===================================================================
--- GNUnet/src/util/network/io.c        2007-07-05 06:50:44 UTC (rev 5247)
+++ GNUnet/src/util/network/io.c        2007-07-05 19:56:14 UTC (rev 5248)
@@ -169,8 +169,11 @@
 int socket_set_blocking(struct SocketHandle * s,
                        int doBlock) {
 #if MINGW
+  u_long mode;
+  
+  mode = !doBlock;
   if (ioctlsocket(s->handle,
-                 FIONBIO, (u_long FAR*) !doBlock) == SOCKET_ERROR) {
+                 FIONBIO, &mode) == SOCKET_ERROR) {
     SetErrnoFromWinsockError(WSAGetLastError());
 
     return -1;

Modified: GNUnet/src/util/network/ip.c
===================================================================
--- GNUnet/src/util/network/ip.c        2007-07-05 06:50:44 UTC (rev 5247)
+++ GNUnet/src/util/network/ip.c        2007-07-05 19:56:14 UTC (rev 5248)
@@ -319,7 +319,7 @@
       = *((unsigned long *) pHost->h_addr_list[0]);
     if (CONNECT(s,
                (SOCKADDR *) &theHost,
-               sizeof(theHost)) == SOCKET_ERROR) {
+               sizeof(theHost)) == SOCKET_ERROR && errno != EWOULDBLOCK) {
       GE_LOG_STRERROR(ectx, GE_ERROR | GE_BULK | GE_USER,
                   "connect");
       return SYSERR;

Modified: GNUnet/src/util/network/selecttest.c
===================================================================
--- GNUnet/src/util/network/selecttest.c        2007-07-05 06:50:44 UTC (rev 
5247)
+++ GNUnet/src/util/network/selecttest.c        2007-07-05 19:56:14 UTC (rev 
5248)
@@ -231,7 +231,7 @@
              (struct sockaddr*)&serverAddr,
              sizeof(serverAddr));
   if ( (i < 0) &&
-       (errno != EINPROGRESS) ) {
+       (errno != EINPROGRESS) && (errno != EWOULDBLOCK) ) {
     CLOSE(write_sock);
     select_destroy(sh);
     return 1;

Modified: GNUnet/src/util/network_client/tcpio.c
===================================================================
--- GNUnet/src/util/network_client/tcpio.c      2007-07-05 06:50:44 UTC (rev 
5247)
+++ GNUnet/src/util/network_client/tcpio.c      2007-07-05 19:56:14 UTC (rev 
5248)
@@ -274,7 +274,7 @@
                (struct sockaddr*)&soaddr,
                sizeof(soaddr));
   if ( (ret != 0) &&
-       (errno != EINPROGRESS) ) {
+       (errno != EINPROGRESS) && (errno != EWOULDBLOCK)) {
     GE_LOG(sock->ectx,
           GE_WARNING | GE_USER | GE_BULK,
           _("Cannot connect to %s:%u: %s\n"),