diff options
Diffstat (limited to 'src/nat/nat_mini.c')
-rw-r--r-- | src/nat/nat_mini.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/nat/nat_mini.c b/src/nat/nat_mini.c index d310b3e14..915bcbdb6 100644 --- a/src/nat/nat_mini.c +++ b/src/nat/nat_mini.c | |||
@@ -121,11 +121,15 @@ read_external_ipv4 (void *cls) | |||
121 | 121 | ||
122 | eh->task = NULL; | 122 | eh->task = NULL; |
123 | tc = GNUNET_SCHEDULER_get_task_context (); | 123 | tc = GNUNET_SCHEDULER_get_task_context (); |
124 | if (GNUNET_YES == GNUNET_NETWORK_fdset_handle_isset (tc->read_ready, eh->r)) | 124 | if (GNUNET_YES == |
125 | GNUNET_NETWORK_fdset_handle_isset (tc->read_ready, eh->r)) | ||
126 | { | ||
125 | ret = | 127 | ret = |
126 | GNUNET_DISK_file_read (eh->r, &eh->buf[eh->off], | 128 | GNUNET_DISK_file_read (eh->r, &eh->buf[eh->off], |
127 | sizeof (eh->buf) - eh->off); | 129 | sizeof (eh->buf) - eh->off); |
128 | else { | 130 | } |
131 | else | ||
132 | { | ||
129 | eh->ret = GNUNET_NAT_ERROR_IPC_FAILURE; | 133 | eh->ret = GNUNET_NAT_ERROR_IPC_FAILURE; |
130 | ret = -1; /* error reading, timeout, etc. */ | 134 | ret = -1; /* error reading, timeout, etc. */ |
131 | } | 135 | } |
@@ -541,7 +545,9 @@ process_map_output (void *cls, | |||
541 | GNUNET_NAT_ERROR_UPNPC_PORTMAP_FAILED); | 545 | GNUNET_NAT_ERROR_UPNPC_PORTMAP_FAILED); |
542 | if (NULL == mini->refresh_task) | 546 | if (NULL == mini->refresh_task) |
543 | mini->refresh_task = | 547 | mini->refresh_task = |
544 | GNUNET_SCHEDULER_add_delayed (MAP_REFRESH_FREQ, &do_refresh, mini); | 548 | GNUNET_SCHEDULER_add_delayed (MAP_REFRESH_FREQ, |
549 | &do_refresh, | ||
550 | mini); | ||
545 | return; | 551 | return; |
546 | } | 552 | } |
547 | /* | 553 | /* |
@@ -617,7 +623,9 @@ GNUNET_NAT_mini_map_start (uint16_t port, | |||
617 | ret->is_tcp = is_tcp; | 623 | ret->is_tcp = is_tcp; |
618 | ret->port = port; | 624 | ret->port = port; |
619 | ret->refresh_task = | 625 | ret->refresh_task = |
620 | GNUNET_SCHEDULER_add_delayed (MAP_REFRESH_FREQ, &do_refresh, ret); | 626 | GNUNET_SCHEDULER_add_delayed (MAP_REFRESH_FREQ, |
627 | &do_refresh, | ||
628 | ret); | ||
621 | run_upnpc_r (ret); | 629 | run_upnpc_r (ret); |
622 | return ret; | 630 | return ret; |
623 | } | 631 | } |