diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-12-16 12:10:19 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-12-16 12:10:19 +0100 |
commit | f5db4fd9c3225e242633d6545f7b764767a938c1 (patch) | |
tree | ae7415cd4c66aacd2761d4478a4b65ab56d080e2 /src | |
parent | 1a5afc122701558b20e95f34115145bb79180f03 (diff) | |
download | gnunet-f5db4fd9c3225e242633d6545f7b764767a938c1.tar.gz gnunet-f5db4fd9c3225e242633d6545f7b764767a938c1.zip |
fix shutdown, fix size calculation
Diffstat (limited to 'src')
-rw-r--r-- | src/nat/gnunet-nat.c | 6 | ||||
-rw-r--r-- | src/nat/gnunet-service-nat.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/nat/gnunet-nat.c b/src/nat/gnunet-nat.c index ff326fe0c..07e65141b 100644 --- a/src/nat/gnunet-nat.c +++ b/src/nat/gnunet-nat.c | |||
@@ -401,6 +401,9 @@ run (void *cls, | |||
401 | if (use_udp) | 401 | if (use_udp) |
402 | proto = IPPROTO_UDP; | 402 | proto = IPPROTO_UDP; |
403 | 403 | ||
404 | GNUNET_SCHEDULER_add_shutdown (&do_shutdown, | ||
405 | NULL); | ||
406 | |||
404 | if (do_auto) | 407 | if (do_auto) |
405 | { | 408 | { |
406 | ah = GNUNET_NAT_autoconfig_start (c, | 409 | ah = GNUNET_NAT_autoconfig_start (c, |
@@ -501,9 +504,6 @@ run (void *cls, | |||
501 | NULL); | 504 | NULL); |
502 | } | 505 | } |
503 | 506 | ||
504 | GNUNET_SCHEDULER_add_shutdown (&do_shutdown, | ||
505 | NULL); | ||
506 | |||
507 | if (NULL != remote_addr) | 507 | if (NULL != remote_addr) |
508 | { | 508 | { |
509 | int ret; | 509 | int ret; |
diff --git a/src/nat/gnunet-service-nat.c b/src/nat/gnunet-service-nat.c index 0da854883..4ad6c8d2c 100644 --- a/src/nat/gnunet-service-nat.c +++ b/src/nat/gnunet-service-nat.c | |||
@@ -837,7 +837,7 @@ handle_autoconfig_request (void *cls, | |||
837 | const struct GNUNET_NAT_AutoconfigRequestMessage *message) | 837 | const struct GNUNET_NAT_AutoconfigRequestMessage *message) |
838 | { | 838 | { |
839 | struct ClientHandle *ch = cls; | 839 | struct ClientHandle *ch = cls; |
840 | size_t left = ntohs (message->header.size); | 840 | size_t left = ntohs (message->header.size) - sizeof (*message); |
841 | struct GNUNET_CONFIGURATION_Handle *c; | 841 | struct GNUNET_CONFIGURATION_Handle *c; |
842 | 842 | ||
843 | c = GNUNET_CONFIGURATION_create (); | 843 | c = GNUNET_CONFIGURATION_create (); |