diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-09-02 15:02:41 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-09-02 15:02:41 +0000 |
commit | 404dfaa0f707d24e962b3f9d22e27a88b01ffeaf (patch) | |
tree | 14509b34e353489f6908f1b9912bc962edb272b6 /src/transport/plugin_transport_tcp.c | |
parent | 69cb1f4ad8c7f1e8d5b01aa5d9bb9dd0f0fe9e07 (diff) | |
download | gnunet-404dfaa0f707d24e962b3f9d22e27a88b01ffeaf.tar.gz gnunet-404dfaa0f707d24e962b3f9d22e27a88b01ffeaf.zip |
fix for not accepting pong with address null errors in NAT test case
Diffstat (limited to 'src/transport/plugin_transport_tcp.c')
-rw-r--r-- | src/transport/plugin_transport_tcp.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c index ffc738f53..65aea96e0 100644 --- a/src/transport/plugin_transport_tcp.c +++ b/src/transport/plugin_transport_tcp.c | |||
@@ -1573,11 +1573,7 @@ handle_tcp_nat_probe (void *cls, | |||
1573 | GNUNET_SERVER_client_keep (client); | 1573 | GNUNET_SERVER_client_keep (client); |
1574 | session->client = client; | 1574 | session->client = client; |
1575 | session->last_activity = GNUNET_TIME_absolute_get (); | 1575 | session->last_activity = GNUNET_TIME_absolute_get (); |
1576 | /* FIXME: Should this be inbound or outbound? | 1576 | session->inbound = GNUNET_NO; |
1577 | * I think it should be outbound because we technically | ||
1578 | * initiated it... But something goes wrong somewhere. */ | ||
1579 | /* session->inbound = GNUNET_YES; */ | ||
1580 | session->inbound = GNUNET_YES; | ||
1581 | 1577 | ||
1582 | if (GNUNET_OK == | 1578 | if (GNUNET_OK == |
1583 | GNUNET_SERVER_client_get_address (client, &vaddr, &alen)) | 1579 | GNUNET_SERVER_client_get_address (client, &vaddr, &alen)) |
@@ -1932,10 +1928,9 @@ process_interfaces (void *cls, | |||
1932 | GNUNET_break (0); | 1928 | GNUNET_break (0); |
1933 | return GNUNET_OK; | 1929 | return GNUNET_OK; |
1934 | } | 1930 | } |
1935 | GNUNET_log (GNUNET_ERROR_TYPE_INFO | | 1931 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1936 | GNUNET_ERROR_TYPE_BULK, | 1932 | _("Found address `%s' (%s) len %d\n"), |
1937 | _("Found address `%s' (%s)\n"), | 1933 | GNUNET_a2s (addr, addrlen), name, args); |
1938 | GNUNET_a2s (addr, addrlen), name); | ||
1939 | 1934 | ||
1940 | plugin->env->notify_address (plugin->env->cls, | 1935 | plugin->env->notify_address (plugin->env->cls, |
1941 | "tcp", | 1936 | "tcp", |
@@ -1943,10 +1938,9 @@ process_interfaces (void *cls, | |||
1943 | 1938 | ||
1944 | if (arg_nat != NULL) | 1939 | if (arg_nat != NULL) |
1945 | { | 1940 | { |
1946 | GNUNET_log (GNUNET_ERROR_TYPE_INFO | | 1941 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1947 | GNUNET_ERROR_TYPE_BULK, | 1942 | _("Found address `%s' (%s) len %d\n"), |
1948 | _("Found address `%s' (%s)\n"), | 1943 | GNUNET_a2s (addr, addrlen), name, args); |
1949 | GNUNET_a2s (addr, addrlen), name); | ||
1950 | plugin->env->notify_address (plugin->env->cls, | 1944 | plugin->env->notify_address (plugin->env->cls, |
1951 | "tcp", | 1945 | "tcp", |
1952 | arg_nat, args, GNUNET_TIME_UNIT_FOREVER_REL); | 1946 | arg_nat, args, GNUNET_TIME_UNIT_FOREVER_REL); |
@@ -2468,11 +2462,12 @@ libgnunet_plugin_transport_tcp_init (void *cls) | |||
2468 | add_to_address_list (plugin, &t4.ipv4_addr, sizeof (uint32_t)); | 2462 | add_to_address_list (plugin, &t4.ipv4_addr, sizeof (uint32_t)); |
2469 | plugin->env->notify_address (plugin->env->cls, | 2463 | plugin->env->notify_address (plugin->env->cls, |
2470 | "tcp", | 2464 | "tcp", |
2471 | &t4, sizeof(t4), GNUNET_TIME_UNIT_FOREVER_REL); | 2465 | &t4, sizeof(t4), GNUNET_TIME_UNIT_FOREVER_REL); |
2472 | } | 2466 | } |
2473 | else if ((plugin->external_address != NULL) && (inet_pton(AF_INET, plugin->external_address, &t4.ipv4_addr) == 1)) | 2467 | else if ((plugin->external_address != NULL) && (inet_pton(AF_INET, plugin->external_address, &t4.ipv4_addr) == 1)) |
2474 | { | 2468 | { |
2475 | t4.t_port = htons(plugin->adv_port); | 2469 | t4.t_port = htons(plugin->adv_port); |
2470 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Notifying transport of address %s:%d\n", plugin->external_address, plugin->adv_port); | ||
2476 | add_to_address_list (plugin, &t4.ipv4_addr, sizeof (uint32_t)); | 2471 | add_to_address_list (plugin, &t4.ipv4_addr, sizeof (uint32_t)); |
2477 | plugin->env->notify_address (plugin->env->cls, | 2472 | plugin->env->notify_address (plugin->env->cls, |
2478 | "tcp", | 2473 | "tcp", |