aboutsummaryrefslogtreecommitdiff
path: root/src/nat/nat_test.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2014-10-03 20:48:58 +0000
committerChristian Grothoff <christian@grothoff.org>2014-10-03 20:48:58 +0000
commit5c043b7a736e72573376edc105b4add7c2cc5c04 (patch)
tree1636eea11265269584eb76e6ac12703eca3838ea /src/nat/nat_test.c
parent53504a47148826fc652e105baad5ead9fc289e63 (diff)
downloadgnunet-5c043b7a736e72573376edc105b4add7c2cc5c04.tar.gz
gnunet-5c043b7a736e72573376edc105b4add7c2cc5c04.zip
-set socket to NULL on close to avoid double-close, do not cleanup on timeout, leave that to app
Diffstat (limited to 'src/nat/nat_test.c')
-rw-r--r--src/nat/nat_test.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/nat/nat_test.c b/src/nat/nat_test.c
index 4ed3f6b2a..179b6b171 100644
--- a/src/nat/nat_test.c
+++ b/src/nat/nat_test.c
@@ -391,7 +391,6 @@ do_timeout (void *cls,
391 (GNUNET_NAT_ERROR_SUCCESS == nh->status) 391 (GNUNET_NAT_ERROR_SUCCESS == nh->status)
392 ? GNUNET_NAT_ERROR_TIMEOUT 392 ? GNUNET_NAT_ERROR_TIMEOUT
393 : nh->status); 393 : nh->status);
394 GNUNET_NAT_test_stop (nh);
395} 394}
396 395
397 396
@@ -462,7 +461,10 @@ GNUNET_NAT_test_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
462 GNUNET_a2s ((const struct sockaddr *) &sa, sizeof (sa)), 461 GNUNET_a2s ((const struct sockaddr *) &sa, sizeof (sa)),
463 STRERROR (errno)); 462 STRERROR (errno));
464 if (NULL != nh->lsock) 463 if (NULL != nh->lsock)
464 {
465 GNUNET_NETWORK_socket_close (nh->lsock); 465 GNUNET_NETWORK_socket_close (nh->lsock);
466 nh->lsock = NULL;
467 }
466 nh->status = GNUNET_NAT_ERROR_INTERNAL_NETWORK_ERROR; 468 nh->status = GNUNET_NAT_ERROR_INTERNAL_NETWORK_ERROR;
467 nh->ttask = GNUNET_SCHEDULER_add_now (&do_timeout, nh); 469 nh->ttask = GNUNET_SCHEDULER_add_now (&do_timeout, nh);
468 return nh; 470 return nh;