diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-05-17 15:47:54 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-05-17 15:47:54 +0000 |
commit | 31ef7d36f5c003767aeedee385411f87ad1a9791 (patch) | |
tree | 81b843bd3e0a9a6a67b7e2d747be1a01f8c96c24 /src/nat/nat_test.c | |
parent | 3dc2315c9c73418d37c8390ad7c8400c55be146f (diff) | |
download | gnunet-31ef7d36f5c003767aeedee385411f87ad1a9791.tar.gz gnunet-31ef7d36f5c003767aeedee385411f87ad1a9791.zip |
-fix
Diffstat (limited to 'src/nat/nat_test.c')
-rw-r--r-- | src/nat/nat_test.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/nat/nat_test.c b/src/nat/nat_test.c index 5704d3484..387a68d8f 100644 --- a/src/nat/nat_test.c +++ b/src/nat/nat_test.c | |||
@@ -318,7 +318,12 @@ addr_cb (void *cls, int add_remove, const struct sockaddr *addr, | |||
318 | if (GNUNET_YES != add_remove) | 318 | if (GNUNET_YES != add_remove) |
319 | return; | 319 | return; |
320 | if (addrlen != sizeof (struct sockaddr_in)) | 320 | if (addrlen != sizeof (struct sockaddr_in)) |
321 | { | ||
322 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
323 | "NAT test ignores IPv6 address `%s' returned from NAT library\n", | ||
324 | GNUNET_a2s (addr, addrlen)); | ||
321 | return; /* ignore IPv6 here */ | 325 | return; /* ignore IPv6 here */ |
326 | } | ||
322 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Asking gnunet-nat-server to connect to `%s'\n", | 327 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Asking gnunet-nat-server to connect to `%s'\n", |
323 | GNUNET_a2s (addr, addrlen)); | 328 | GNUNET_a2s (addr, addrlen)); |
324 | sa = (const struct sockaddr_in *) addr; | 329 | sa = (const struct sockaddr_in *) addr; |
@@ -424,6 +429,10 @@ GNUNET_NAT_test_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
424 | GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, | 429 | GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, |
425 | ret->lsock, &do_udp_read, ret); | 430 | ret->lsock, &do_udp_read, ret); |
426 | } | 431 | } |
432 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
433 | "NAT test listens on port %u (%s)\n", | ||
434 | bnd_port, | ||
435 | (GNUNET_YES == is_tcp) ? "tcp" : "udp"); | ||
427 | ret->nat = | 436 | ret->nat = |
428 | GNUNET_NAT_register (cfg, is_tcp, adv_port, 1, addrs, addrlens, | 437 | GNUNET_NAT_register (cfg, is_tcp, adv_port, 1, addrs, addrlens, |
429 | &addr_cb, NULL, ret); | 438 | &addr_cb, NULL, ret); |
@@ -443,6 +452,8 @@ GNUNET_NAT_test_stop (struct GNUNET_NAT_Test *tst) | |||
443 | struct NatActivity *pos; | 452 | struct NatActivity *pos; |
444 | struct ClientActivity *cpos; | 453 | struct ClientActivity *cpos; |
445 | 454 | ||
455 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
456 | "Stopping NAT test\n"); | ||
446 | while (NULL != (cpos = tst->ca_head)) | 457 | while (NULL != (cpos = tst->ca_head)) |
447 | { | 458 | { |
448 | GNUNET_CONTAINER_DLL_remove (tst->ca_head, tst->ca_tail, cpos); | 459 | GNUNET_CONTAINER_DLL_remove (tst->ca_head, tst->ca_tail, cpos); |