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

[gnunet]

Author: nevans
Date: 2010-06-11 13:42:58 +0200 (Fri, 11 Jun 2010)
New Revision: 11670

Modified:
   gnunet/src/transport/plugin_transport_tcp.c
   gnunet/src/transport/plugin_transport_udp.c
Log:
always add user provided external addresses (duh)

Modified: gnunet/src/transport/plugin_transport_tcp.c
===================================================================
--- gnunet/src/transport/plugin_transport_tcp.c 2010-06-11 11:39:20 UTC (rev 
11669)
+++ gnunet/src/transport/plugin_transport_tcp.c 2010-06-11 11:42:58 UTC (rev 
11670)
@@ -2358,6 +2358,13 @@
                                   "tcp",
                                   &t4, sizeof(t4), 
GNUNET_TIME_UNIT_FOREVER_REL);
     }
+  else if ((plugin->external_address != NULL) && (inet_pton(AF_INET, 
plugin->external_address, &t4.ipv4_addr) == 1))
+    {
+      t4.t_port = htons(plugin->adv_port);
+      plugin->env->notify_address (plugin->env->cls,
+                                   "tcp",
+                                   &t4, sizeof(t4), 
GNUNET_TIME_UNIT_FOREVER_REL);
+    }
 
   return api;
 }

Modified: gnunet/src/transport/plugin_transport_udp.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp.c 2010-06-11 11:39:20 UTC (rev 
11669)
+++ gnunet/src/transport/plugin_transport_udp.c 2010-06-11 11:42:58 UTC (rev 
11670)
@@ -1830,6 +1830,14 @@
                                   "udp",
                                   &in_addr, sizeof(in_addr), 
GNUNET_TIME_UNIT_FOREVER_REL);
     }
+  else if ((plugin->external_address != NULL) && (inet_pton(AF_INET, 
plugin->external_address, &in_addr.sin_addr) == 1))
+    {
+      in_addr.sin_port = htons(plugin->port);
+      in_addr.sin_family = AF_INET;
+      plugin->env->notify_address (plugin->env->cls,
+                                  "udp",
+                                  &in_addr, sizeof(in_addr), 
GNUNET_TIME_UNIT_FOREVER_REL);
+    }
 
   sockets_created = udp_transport_server_start (plugin);