diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2014-04-10 08:18:33 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2014-04-10 08:18:33 +0000 |
commit | a325e4fdee80b05c1df95ef4765b647fecf90f7d (patch) | |
tree | 35e9df084f25717e2bec0ee60265b2e39f8de5c9 /src/nat | |
parent | b293da0013726d44dc9c2341d52332eeac3e807d (diff) | |
download | gnunet-a325e4fdee80b05c1df95ef4765b647fecf90f7d.tar.gz gnunet-a325e4fdee80b05c1df95ef4765b647fecf90f7d.zip |
handle nat_register fail
Diffstat (limited to 'src/nat')
-rw-r--r-- | src/nat/nat_test.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/nat/nat_test.c b/src/nat/nat_test.c index f3b2b41ef..866c15e5e 100644 --- a/src/nat/nat_test.c +++ b/src/nat/nat_test.c | |||
@@ -333,7 +333,7 @@ addr_cb (void *cls, | |||
333 | GNUNET_a2s (addr, addrlen)); | 333 | GNUNET_a2s (addr, addrlen)); |
334 | return; /* ignore IPv6 here */ | 334 | return; /* ignore IPv6 here */ |
335 | } | 335 | } |
336 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 336 | LOG (GNUNET_ERROR_TYPE_INFO, |
337 | "Asking gnunet-nat-server to connect to `%s'\n", | 337 | "Asking gnunet-nat-server to connect to `%s'\n", |
338 | GNUNET_a2s (addr, addrlen)); | 338 | GNUNET_a2s (addr, addrlen)); |
339 | sa = (const struct sockaddr_in *) addr; | 339 | sa = (const struct sockaddr_in *) addr; |
@@ -445,9 +445,19 @@ GNUNET_NAT_test_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
445 | "NAT test listens on port %u (%s)\n", | 445 | "NAT test listens on port %u (%s)\n", |
446 | bnd_port, | 446 | bnd_port, |
447 | (GNUNET_YES == is_tcp) ? "tcp" : "udp"); | 447 | (GNUNET_YES == is_tcp) ? "tcp" : "udp"); |
448 | ret->nat = | 448 | ret->nat = GNUNET_NAT_register (cfg, is_tcp, adv_port, 1, addrs, addrlens, |
449 | GNUNET_NAT_register (cfg, is_tcp, adv_port, 1, addrs, addrlens, | ||
450 | &addr_cb, NULL, ret); | 449 | &addr_cb, NULL, ret); |
450 | if (NULL == ret->nat) | ||
451 | { | ||
452 | LOG (GNUNET_ERROR_TYPE_ERROR, | ||
453 | _("NAT test failed to start NAT library\n")); | ||
454 | if (GNUNET_SCHEDULER_NO_TASK != ret->ltask) | ||
455 | GNUNET_SCHEDULER_cancel (ret->ltask); | ||
456 | if (NULL != ret->lsock) | ||
457 | GNUNET_NETWORK_socket_close (ret->lsock); | ||
458 | GNUNET_free (ret); | ||
459 | return NULL; | ||
460 | } | ||
451 | } | 461 | } |
452 | return ret; | 462 | return ret; |
453 | } | 463 | } |