[GNUnet-SVN] r27148 - gnunet/src/transport

[gnunet]

Author: grothoff
Date: 2013-05-15 14:49:34 +0200 (Wed, 15 May 2013)
New Revision: 27148

Modified:
   gnunet/src/transport/plugin_transport_tcp.c
Log:
-do not call NAT with zero addresses

Modified: gnunet/src/transport/plugin_transport_tcp.c
===================================================================
--- gnunet/src/transport/plugin_transport_tcp.c 2013-05-15 12:28:13 UTC (rev 
27147)
+++ gnunet/src/transport/plugin_transport_tcp.c 2013-05-15 12:49:34 UTC (rev 
27148)
@@ -2374,26 +2374,21 @@
   plugin->lsock = NULL;
   if ((service != NULL) &&
       (GNUNET_SYSERR !=
-       (ret =
+       (ret_s =
         GNUNET_SERVICE_get_server_addresses ("transport-tcp", env->cfg, &addrs,
                                              &addrlens))))
   {
-               ret_s = ret;
-               while (ret > 0)
-               {
-                       ret--;
-                       LOG (GNUNET_ERROR_TYPE_INFO, "Binding to address 
`%s'\n", GNUNET_a2s (addrs[ret], addrlens[ret]));
-               }
-
+    for (ret = ret_s-1; ret >= 0; ret--)
+      LOG (GNUNET_ERROR_TYPE_INFO,
+          "Binding to address `%s'\n", 
+          GNUNET_a2s (addrs[ret], addrlens[ret]));
     plugin->nat =
-        GNUNET_NAT_register (env->cfg, GNUNET_YES, aport, (unsigned int) ret,
+        GNUNET_NAT_register (env->cfg, GNUNET_YES, aport, (unsigned int) ret_s,
                              (const struct sockaddr **) addrs, addrlens,
                              &tcp_nat_port_map_callback,
                              &try_connection_reversal, plugin);
-               ret = ret_s;
-    while (ret > 0)
+    for (ret = ret_s -1; ret >= 0; ret--)
     {
-      ret--;
       GNUNET_assert (addrs[ret] != NULL);
       GNUNET_free (addrs[ret]);
     }
@@ -2403,8 +2398,8 @@
   else
   {
     plugin->nat = GNUNET_NAT_register (plugin->env->cfg,
-                                                                               
                 GNUNET_YES, 0, 0, NULL, NULL, NULL,
-                             &try_connection_reversal, plugin);
+                                      GNUNET_YES, 0, 0, NULL, NULL, NULL,
+                                      &try_connection_reversal, plugin);
   }
   api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
   api->cls = plugin;