diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-10-03 18:59:15 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-10-03 18:59:15 +0000 |
commit | 53504a47148826fc652e105baad5ead9fc289e63 (patch) | |
tree | 76412e0ac166a35fa4cfb550f1e866ebdcbfbc75 /src/nat | |
parent | 087af9e6288d5de3f8b9592ba2f0c63305c56555 (diff) | |
download | gnunet-53504a47148826fc652e105baad5ead9fc289e63.tar.gz gnunet-53504a47148826fc652e105baad5ead9fc289e63.zip |
-return non-NULL even if we instantly fail
Diffstat (limited to 'src/nat')
-rw-r--r-- | src/nat/nat_test.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/nat/nat_test.c b/src/nat/nat_test.c index 25945cef0..4ed3f6b2a 100644 --- a/src/nat/nat_test.c +++ b/src/nat/nat_test.c | |||
@@ -438,7 +438,6 @@ GNUNET_NAT_test_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
438 | nh->adv_port = adv_port; | 438 | nh->adv_port = adv_port; |
439 | nh->report = report; | 439 | nh->report = report; |
440 | nh->report_cls = report_cls; | 440 | nh->report_cls = report_cls; |
441 | nh->ttask = GNUNET_SCHEDULER_NO_TASK; | ||
442 | nh->status = GNUNET_NAT_ERROR_SUCCESS; | 441 | nh->status = GNUNET_NAT_ERROR_SUCCESS; |
443 | if (0 == bnd_port) | 442 | if (0 == bnd_port) |
444 | { | 443 | { |
@@ -466,7 +465,7 @@ GNUNET_NAT_test_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
466 | GNUNET_NETWORK_socket_close (nh->lsock); | 465 | GNUNET_NETWORK_socket_close (nh->lsock); |
467 | nh->status = GNUNET_NAT_ERROR_INTERNAL_NETWORK_ERROR; | 466 | nh->status = GNUNET_NAT_ERROR_INTERNAL_NETWORK_ERROR; |
468 | nh->ttask = GNUNET_SCHEDULER_add_now (&do_timeout, nh); | 467 | nh->ttask = GNUNET_SCHEDULER_add_now (&do_timeout, nh); |
469 | return NULL; | 468 | return nh; |
470 | } | 469 | } |
471 | if (GNUNET_YES == is_tcp) | 470 | if (GNUNET_YES == is_tcp) |
472 | { | 471 | { |
@@ -504,7 +503,7 @@ GNUNET_NAT_test_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
504 | } | 503 | } |
505 | nh->status = GNUNET_NAT_ERROR_NAT_REGISTER_FAILED; | 504 | nh->status = GNUNET_NAT_ERROR_NAT_REGISTER_FAILED; |
506 | nh->ttask = GNUNET_SCHEDULER_add_now (&do_timeout, nh); | 505 | nh->ttask = GNUNET_SCHEDULER_add_now (&do_timeout, nh); |
507 | return NULL; | 506 | return nh; |
508 | } | 507 | } |
509 | } | 508 | } |
510 | nh->ttask = GNUNET_SCHEDULER_add_delayed (timeout, &do_timeout, nh); | 509 | nh->ttask = GNUNET_SCHEDULER_add_delayed (timeout, &do_timeout, nh); |