diff options
-rw-r--r-- | src/transport/plugin_transport_tcp.c | 14 | ||||
-rw-r--r-- | src/transport/plugin_transport_udp.c | 5 |
2 files changed, 17 insertions, 2 deletions
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c index 08fe21573..986eb4ef8 100644 --- a/src/transport/plugin_transport_tcp.c +++ b/src/transport/plugin_transport_tcp.c | |||
@@ -520,8 +520,9 @@ tcp_nat_port_map_callback (void *cls, int add_remove, | |||
520 | void *arg; | 520 | void *arg; |
521 | size_t args; | 521 | size_t args; |
522 | 522 | ||
523 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 523 | LOG (GNUNET_ERROR_TYPE_INFO, |
524 | "NPMC called with %d for address `%s'\n", add_remove, | 524 | "NAT notification to %s address `%s'\n", |
525 | (GNUNET_YES == add_remove) ? "add" : "remove", | ||
525 | GNUNET_a2s (addr, addrlen)); | 526 | GNUNET_a2s (addr, addrlen)); |
526 | /* convert 'addr' to our internal format */ | 527 | /* convert 'addr' to our internal format */ |
527 | switch (addr->sa_family) | 528 | switch (addr->sa_family) |
@@ -2307,6 +2308,7 @@ libgnunet_plugin_transport_tcp_init (void *cls) | |||
2307 | unsigned int i; | 2308 | unsigned int i; |
2308 | struct GNUNET_TIME_Relative idle_timeout; | 2309 | struct GNUNET_TIME_Relative idle_timeout; |
2309 | int ret; | 2310 | int ret; |
2311 | int ret_s; | ||
2310 | struct sockaddr **addrs; | 2312 | struct sockaddr **addrs; |
2311 | socklen_t *addrlens; | 2313 | socklen_t *addrlens; |
2312 | 2314 | ||
@@ -2376,11 +2378,19 @@ libgnunet_plugin_transport_tcp_init (void *cls) | |||
2376 | GNUNET_SERVICE_get_server_addresses ("transport-tcp", env->cfg, &addrs, | 2378 | GNUNET_SERVICE_get_server_addresses ("transport-tcp", env->cfg, &addrs, |
2377 | &addrlens)))) | 2379 | &addrlens)))) |
2378 | { | 2380 | { |
2381 | ret_s = ret; | ||
2382 | while (ret > 0) | ||
2383 | { | ||
2384 | ret--; | ||
2385 | LOG (GNUNET_ERROR_TYPE_INFO, "Binding to address `%s'\n", GNUNET_a2s (addrs[ret], addrlens[ret])); | ||
2386 | } | ||
2387 | |||
2379 | plugin->nat = | 2388 | plugin->nat = |
2380 | GNUNET_NAT_register (env->cfg, GNUNET_YES, aport, (unsigned int) ret, | 2389 | GNUNET_NAT_register (env->cfg, GNUNET_YES, aport, (unsigned int) ret, |
2381 | (const struct sockaddr **) addrs, addrlens, | 2390 | (const struct sockaddr **) addrs, addrlens, |
2382 | &tcp_nat_port_map_callback, | 2391 | &tcp_nat_port_map_callback, |
2383 | &try_connection_reversal, plugin); | 2392 | &try_connection_reversal, plugin); |
2393 | ret = ret_s; | ||
2384 | while (ret > 0) | 2394 | while (ret > 0) |
2385 | { | 2395 | { |
2386 | ret--; | 2396 | ret--; |
diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c index 3605bfde0..36a3650cf 100644 --- a/src/transport/plugin_transport_udp.c +++ b/src/transport/plugin_transport_udp.c | |||
@@ -1851,6 +1851,11 @@ udp_nat_port_map_callback (void *cls, int add_remove, | |||
1851 | void *arg; | 1851 | void *arg; |
1852 | size_t args; | 1852 | size_t args; |
1853 | 1853 | ||
1854 | LOG (GNUNET_ERROR_TYPE_INFO, | ||
1855 | "NAT notification to %s address `%s'\n", | ||
1856 | (GNUNET_YES == add_remove) ? "add" : "remove", | ||
1857 | GNUNET_a2s (addr, addrlen)); | ||
1858 | |||
1854 | /* convert 'addr' to our internal format */ | 1859 | /* convert 'addr' to our internal format */ |
1855 | switch (addr->sa_family) | 1860 | switch (addr->sa_family) |
1856 | { | 1861 | { |