[GNUnet-SVN] r9092 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2009-10-03 13:05:22 -0600 (Sat, 03 Oct 2009)
New Revision: 9092

Modified:
   gnunet/src/util/service.c
Log:
fix v6 test

Modified: gnunet/src/util/service.c
===================================================================
--- gnunet/src/util/service.c   2009-10-03 19:01:38 UTC (rev 9091)
+++ gnunet/src/util/service.c   2009-10-03 19:05:22 UTC (rev 9092)
@@ -763,6 +763,7 @@
   struct addrinfo *pos;
   int ret;
   int tolerant;
+  struct GNUNET_NETWORK_Handle *desc;
 
   if (GNUNET_CONFIGURATION_have_value (sctx->cfg,
                                        sctx->serviceName, "TIMEOUT"))
@@ -813,8 +814,6 @@
 
   if (!disablev6)
     {
-      struct GNUNET_NETWORK_Handle *desc;
-
       /* probe IPv6 support */
       desc = GNUNET_NETWORK_socket_socket (PF_INET6, SOCK_STREAM, 0);
       if (NULL == desc)
@@ -825,18 +824,16 @@
               GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket");
               return GNUNET_SYSERR;
             }
-          desc = GNUNET_NETWORK_socket_socket (PF_INET, SOCK_STREAM, 0);
-          if (NULL == desc)
-            {
-              GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                          _
-                          ("Disabling IPv6 support for service `%s', failed to 
create IPv6 socket: %s\n"),
-                          sctx->serviceName, STRERROR (errno));
-              disablev6 = GNUNET_YES;
-            }
+         GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                     _("Disabling IPv6 support for service `%s', failed to 
create IPv6 socket: %s\n"),
+                     sctx->serviceName,
+                     STRERROR (errno));
+         disablev6 = GNUNET_YES;
         }
-      if (NULL != desc)
-        GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (desc));
+      else
+       {
+         GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (desc));
+       }
     }