diff options
Diffstat (limited to 'src/nat/nat_mini.c')
-rw-r--r-- | src/nat/nat_mini.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/nat/nat_mini.c b/src/nat/nat_mini.c index aa29ff07b..d310b3e14 100644 --- a/src/nat/nat_mini.c +++ b/src/nat/nat_mini.c | |||
@@ -110,17 +110,17 @@ struct GNUNET_NAT_ExternalHandle | |||
110 | * address and call our callback. | 110 | * address and call our callback. |
111 | * | 111 | * |
112 | * @param cls the `struct GNUNET_NAT_ExternalHandle` | 112 | * @param cls the `struct GNUNET_NAT_ExternalHandle` |
113 | * @param tc scheduler context | ||
114 | */ | 113 | */ |
115 | static void | 114 | static void |
116 | read_external_ipv4 (void *cls, | 115 | read_external_ipv4 (void *cls) |
117 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
118 | { | 116 | { |
119 | struct GNUNET_NAT_ExternalHandle *eh = cls; | 117 | struct GNUNET_NAT_ExternalHandle *eh = cls; |
120 | ssize_t ret; | 118 | ssize_t ret; |
121 | struct in_addr addr; | 119 | struct in_addr addr; |
120 | const struct GNUNET_SCHEDULER_TaskContext *tc; | ||
122 | 121 | ||
123 | eh->task = NULL; | 122 | eh->task = NULL; |
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 == GNUNET_NETWORK_fdset_handle_isset (tc->read_ready, eh->r)) |
125 | ret = | 125 | ret = |
126 | GNUNET_DISK_file_read (eh->r, &eh->buf[eh->off], | 126 | GNUNET_DISK_file_read (eh->r, &eh->buf[eh->off], |
@@ -162,11 +162,9 @@ read_external_ipv4 (void *cls, | |||
162 | * (Asynchronously) signal error invoking "external-ip" to client. | 162 | * (Asynchronously) signal error invoking "external-ip" to client. |
163 | * | 163 | * |
164 | * @param cls the `struct GNUNET_NAT_ExternalHandle` (freed) | 164 | * @param cls the `struct GNUNET_NAT_ExternalHandle` (freed) |
165 | * @param tc scheduler context | ||
166 | */ | 165 | */ |
167 | static void | 166 | static void |
168 | signal_external_ip_error (void *cls, | 167 | signal_external_ip_error (void *cls) |
169 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
170 | { | 168 | { |
171 | struct GNUNET_NAT_ExternalHandle *eh = cls; | 169 | struct GNUNET_NAT_ExternalHandle *eh = cls; |
172 | 170 | ||
@@ -329,10 +327,9 @@ struct GNUNET_NAT_MiniHandle | |||
329 | * Run "upnpc -l" to find out if our mapping changed. | 327 | * Run "upnpc -l" to find out if our mapping changed. |
330 | * | 328 | * |
331 | * @param cls the `struct GNUNET_NAT_MiniHandle` | 329 | * @param cls the `struct GNUNET_NAT_MiniHandle` |
332 | * @param tc scheduler context | ||
333 | */ | 330 | */ |
334 | static void | 331 | static void |
335 | do_refresh (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); | 332 | do_refresh (void *cls); |
336 | 333 | ||
337 | 334 | ||
338 | /** | 335 | /** |
@@ -478,10 +475,9 @@ process_refresh_output (void *cls, const char *line) | |||
478 | * Run "upnpc -l" to find out if our mapping changed. | 475 | * Run "upnpc -l" to find out if our mapping changed. |
479 | * | 476 | * |
480 | * @param cls the 'struct GNUNET_NAT_MiniHandle' | 477 | * @param cls the 'struct GNUNET_NAT_MiniHandle' |
481 | * @param tc scheduler context | ||
482 | */ | 478 | */ |
483 | static void | 479 | static void |
484 | do_refresh (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 480 | do_refresh (void *cls) |
485 | { | 481 | { |
486 | struct GNUNET_NAT_MiniHandle *mini = cls; | 482 | struct GNUNET_NAT_MiniHandle *mini = cls; |
487 | int ac; | 483 | int ac; |