diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-04-09 23:14:03 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-04-09 23:14:03 +0000 |
commit | 29e6158507a0758192075ac6ece7ba8e75ddc49a (patch) | |
tree | b91ded48da322f8ba4c9bb0f5504228aa036c2d1 /src/gns | |
parent | 5dfcb058ab5db9ae0c4b147d8a99c64ca0980028 (diff) | |
download | gnunet-29e6158507a0758192075ac6ece7ba8e75ddc49a.tar.gz gnunet-29e6158507a0758192075ac6ece7ba8e75ddc49a.zip |
small API change: do no longer pass rarely needed GNUNET_SCHEDULER_TaskContext to all scheduler tasks; instead, allow the relatively few tasks that need it to obtain the context via GNUNET_SCHEDULER_get_task_context()
Diffstat (limited to 'src/gns')
-rw-r--r-- | src/gns/gns_api.c | 3 | ||||
-rw-r--r-- | src/gns/gnunet-bcd.c | 7 | ||||
-rw-r--r-- | src/gns/gnunet-dns2gns.c | 22 | ||||
-rw-r--r-- | src/gns/gnunet-gns-helper-service-w32.c | 4 | ||||
-rw-r--r-- | src/gns/gnunet-gns-import.c | 4 | ||||
-rw-r--r-- | src/gns/gnunet-gns-proxy.c | 42 | ||||
-rw-r--r-- | src/gns/gnunet-gns.c | 4 | ||||
-rw-r--r-- | src/gns/gnunet-service-gns.c | 15 | ||||
-rw-r--r-- | src/gns/gnunet-service-gns_resolver.c | 11 | ||||
-rw-r--r-- | src/gns/plugin_rest_gns.c | 9 | ||||
-rw-r--r-- | src/gns/test_gns_proxy.c | 12 |
11 files changed, 49 insertions, 84 deletions
diff --git a/src/gns/gns_api.c b/src/gns/gns_api.c index da64b3a3a..6696158c9 100644 --- a/src/gns/gns_api.c +++ b/src/gns/gns_api.c | |||
@@ -203,10 +203,9 @@ reconnect (struct GNUNET_GNS_Handle *handle) | |||
203 | * Reconnect to GNS | 203 | * Reconnect to GNS |
204 | * | 204 | * |
205 | * @param cls the handle | 205 | * @param cls the handle |
206 | * @param tc task context | ||
207 | */ | 206 | */ |
208 | static void | 207 | static void |
209 | reconnect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 208 | reconnect_task (void *cls) |
210 | { | 209 | { |
211 | struct GNUNET_GNS_Handle *handle = cls; | 210 | struct GNUNET_GNS_Handle *handle = cls; |
212 | 211 | ||
diff --git a/src/gns/gnunet-bcd.c b/src/gns/gnunet-bcd.c index 24014f204..e7be8fd84 100644 --- a/src/gns/gnunet-bcd.c +++ b/src/gns/gnunet-bcd.c | |||
@@ -287,11 +287,13 @@ prepare_daemon (struct MHD_Daemon *daemon_handle); | |||
287 | * and schedule the next run. | 287 | * and schedule the next run. |
288 | */ | 288 | */ |
289 | static void | 289 | static void |
290 | run_daemon (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 290 | run_daemon (void *cls) |
291 | { | 291 | { |
292 | struct MHD_Daemon *daemon_handle = cls; | 292 | struct MHD_Daemon *daemon_handle = cls; |
293 | const struct GNUNET_SCHEDULER_TaskContext *tc; | ||
293 | 294 | ||
294 | http_task = NULL; | 295 | http_task = NULL; |
296 | tc = GNUNET_SCHEDULER_get_task_context (); | ||
295 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) | 297 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) |
296 | return; | 298 | return; |
297 | GNUNET_assert (MHD_YES == MHD_run (daemon_handle)); | 299 | GNUNET_assert (MHD_YES == MHD_run (daemon_handle)); |
@@ -384,8 +386,7 @@ server_start () | |||
384 | * Stop HTTP server. | 386 | * Stop HTTP server. |
385 | */ | 387 | */ |
386 | static void | 388 | static void |
387 | server_stop (void *cls, | 389 | server_stop (void *cls) |
388 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
389 | { | 390 | { |
390 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 391 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
391 | "HTTP server shutdown\n"); | 392 | "HTTP server shutdown\n"); |
diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c index 7b5613234..119bda91a 100644 --- a/src/gns/gnunet-dns2gns.c +++ b/src/gns/gnunet-dns2gns.c | |||
@@ -170,11 +170,9 @@ static struct GNUNET_IDENTITY_Operation *id_op; | |||
170 | * Task run on shutdown. Cleans up everything. | 170 | * Task run on shutdown. Cleans up everything. |
171 | * | 171 | * |
172 | * @param cls unused | 172 | * @param cls unused |
173 | * @param tc scheduler context | ||
174 | */ | 173 | */ |
175 | static void | 174 | static void |
176 | do_shutdown (void *cls, | 175 | do_shutdown (void *cls) |
177 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
178 | { | 176 | { |
179 | if (NULL != t4) | 177 | if (NULL != t4) |
180 | GNUNET_SCHEDULER_cancel (t4); | 178 | GNUNET_SCHEDULER_cancel (t4); |
@@ -252,12 +250,10 @@ send_response (struct Request *request) | |||
252 | /** | 250 | /** |
253 | * Task run on timeout. Cleans up request. | 251 | * Task run on timeout. Cleans up request. |
254 | * | 252 | * |
255 | * @param cls 'struct Request' of the request to clean up | 253 | * @param cls `struct Request *` of the request to clean up |
256 | * @param tc scheduler context | ||
257 | */ | 254 | */ |
258 | static void | 255 | static void |
259 | do_timeout (void *cls, | 256 | do_timeout (void *cls) |
260 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
261 | { | 257 | { |
262 | struct Request *request = cls; | 258 | struct Request *request = cls; |
263 | 259 | ||
@@ -507,21 +503,21 @@ handle_request (struct GNUNET_NETWORK_Handle *lsock, | |||
507 | * Task to read IPv4 DNS packets. | 503 | * Task to read IPv4 DNS packets. |
508 | * | 504 | * |
509 | * @param cls the 'listen_socket4' | 505 | * @param cls the 'listen_socket4' |
510 | * @param tc scheduler context | ||
511 | */ | 506 | */ |
512 | static void | 507 | static void |
513 | read_dns4 (void *cls, | 508 | read_dns4 (void *cls) |
514 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
515 | { | 509 | { |
516 | struct sockaddr_in v4; | 510 | struct sockaddr_in v4; |
517 | socklen_t addrlen; | 511 | socklen_t addrlen; |
518 | ssize_t size; | 512 | ssize_t size; |
513 | const struct GNUNET_SCHEDULER_TaskContext *tc; | ||
519 | 514 | ||
520 | GNUNET_assert (listen_socket4 == cls); | 515 | GNUNET_assert (listen_socket4 == cls); |
521 | t4 = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, | 516 | t4 = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, |
522 | listen_socket4, | 517 | listen_socket4, |
523 | &read_dns4, | 518 | &read_dns4, |
524 | listen_socket4); | 519 | listen_socket4); |
520 | tc = GNUNET_SCHEDULER_get_task_context (); | ||
525 | if (0 == (GNUNET_SCHEDULER_REASON_READ_READY & tc->reason)) | 521 | if (0 == (GNUNET_SCHEDULER_REASON_READ_READY & tc->reason)) |
526 | return; /* shutdown? */ | 522 | return; /* shutdown? */ |
527 | size = GNUNET_NETWORK_socket_recvfrom_amount (listen_socket4); | 523 | size = GNUNET_NETWORK_socket_recvfrom_amount (listen_socket4); |
@@ -550,21 +546,21 @@ read_dns4 (void *cls, | |||
550 | * Task to read IPv6 DNS packets. | 546 | * Task to read IPv6 DNS packets. |
551 | * | 547 | * |
552 | * @param cls the 'listen_socket6' | 548 | * @param cls the 'listen_socket6' |
553 | * @param tc scheduler context | ||
554 | */ | 549 | */ |
555 | static void | 550 | static void |
556 | read_dns6 (void *cls, | 551 | read_dns6 (void *cls) |
557 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
558 | { | 552 | { |
559 | struct sockaddr_in6 v6; | 553 | struct sockaddr_in6 v6; |
560 | socklen_t addrlen; | 554 | socklen_t addrlen; |
561 | ssize_t size; | 555 | ssize_t size; |
556 | const struct GNUNET_SCHEDULER_TaskContext *tc; | ||
562 | 557 | ||
563 | GNUNET_assert (listen_socket6 == cls); | 558 | GNUNET_assert (listen_socket6 == cls); |
564 | t6 = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, | 559 | t6 = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, |
565 | listen_socket6, | 560 | listen_socket6, |
566 | &read_dns6, | 561 | &read_dns6, |
567 | listen_socket6); | 562 | listen_socket6); |
563 | tc = GNUNET_SCHEDULER_get_task_context (); | ||
568 | if (0 == (GNUNET_SCHEDULER_REASON_READ_READY & tc->reason)) | 564 | if (0 == (GNUNET_SCHEDULER_REASON_READ_READY & tc->reason)) |
569 | return; /* shutdown? */ | 565 | return; /* shutdown? */ |
570 | size = GNUNET_NETWORK_socket_recvfrom_amount (listen_socket6); | 566 | size = GNUNET_NETWORK_socket_recvfrom_amount (listen_socket6); |
diff --git a/src/gns/gnunet-gns-helper-service-w32.c b/src/gns/gnunet-gns-helper-service-w32.c index e4fc2f304..112bcd258 100644 --- a/src/gns/gnunet-gns-helper-service-w32.c +++ b/src/gns/gnunet-gns-helper-service-w32.c | |||
@@ -112,11 +112,9 @@ static int got_egos = 0; | |||
112 | * Task run on shutdown. Cleans up everything. | 112 | * Task run on shutdown. Cleans up everything. |
113 | * | 113 | * |
114 | * @param cls unused | 114 | * @param cls unused |
115 | * @param tc scheduler context | ||
116 | */ | 115 | */ |
117 | static void | 116 | static void |
118 | do_shutdown (void *cls, | 117 | do_shutdown (void *cls) |
119 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
120 | { | 118 | { |
121 | struct request *rq; | 119 | struct request *rq; |
122 | if (NULL != id_op) | 120 | if (NULL != id_op) |
diff --git a/src/gns/gnunet-gns-import.c b/src/gns/gnunet-gns-import.c index ad874cfeb..5f94e7792 100644 --- a/src/gns/gnunet-gns-import.c +++ b/src/gns/gnunet-gns-import.c | |||
@@ -344,11 +344,9 @@ get_ego (void *cls, | |||
344 | * Task run on shutdown. | 344 | * Task run on shutdown. |
345 | * | 345 | * |
346 | * @param cls NULL | 346 | * @param cls NULL |
347 | * @param tc unused | ||
348 | */ | 347 | */ |
349 | static void | 348 | static void |
350 | shutdown_task (void *cls, | 349 | shutdown_task (void *cls) |
351 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
352 | { | 350 | { |
353 | GNUNET_free_non_null (master_zone_pkey); | 351 | GNUNET_free_non_null (master_zone_pkey); |
354 | master_zone_pkey = NULL; | 352 | master_zone_pkey = NULL; |
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index 3b5adc8b1..9a34c83af 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c | |||
@@ -1257,10 +1257,9 @@ curl_upload_cb (void *buf, size_t size, size_t nmemb, void *cls) | |||
1257 | * from curl | 1257 | * from curl |
1258 | * | 1258 | * |
1259 | * @param cls closure | 1259 | * @param cls closure |
1260 | * @param tc task context | ||
1261 | */ | 1260 | */ |
1262 | static void | 1261 | static void |
1263 | curl_task_download (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); | 1262 | curl_task_download (void *cls); |
1264 | 1263 | ||
1265 | 1264 | ||
1266 | /** | 1265 | /** |
@@ -1328,11 +1327,9 @@ curl_download_prepare () | |||
1328 | * Task that is run when we are ready to receive more data from curl. | 1327 | * Task that is run when we are ready to receive more data from curl. |
1329 | * | 1328 | * |
1330 | * @param cls closure, NULL | 1329 | * @param cls closure, NULL |
1331 | * @param tc task context | ||
1332 | */ | 1330 | */ |
1333 | static void | 1331 | static void |
1334 | curl_task_download (void *cls, | 1332 | curl_task_download (void *cls) |
1335 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
1336 | { | 1333 | { |
1337 | int running; | 1334 | int running; |
1338 | int msgnum; | 1335 | int msgnum; |
@@ -1821,11 +1818,9 @@ kill_httpd (struct MhdHttpList *hd) | |||
1821 | * Task run whenever HTTP server is idle for too long. Kill it. | 1818 | * Task run whenever HTTP server is idle for too long. Kill it. |
1822 | * | 1819 | * |
1823 | * @param cls the `struct MhdHttpList *` | 1820 | * @param cls the `struct MhdHttpList *` |
1824 | * @param tc sched context | ||
1825 | */ | 1821 | */ |
1826 | static void | 1822 | static void |
1827 | kill_httpd_task (void *cls, | 1823 | kill_httpd_task (void *cls) |
1828 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
1829 | { | 1824 | { |
1830 | struct MhdHttpList *hd = cls; | 1825 | struct MhdHttpList *hd = cls; |
1831 | 1826 | ||
@@ -1838,11 +1833,9 @@ kill_httpd_task (void *cls, | |||
1838 | * Task run whenever HTTP server operations are pending. | 1833 | * Task run whenever HTTP server operations are pending. |
1839 | * | 1834 | * |
1840 | * @param cls the `struct MhdHttpList *` of the daemon that is being run | 1835 | * @param cls the `struct MhdHttpList *` of the daemon that is being run |
1841 | * @param tc sched context | ||
1842 | */ | 1836 | */ |
1843 | static void | 1837 | static void |
1844 | do_httpd (void *cls, | 1838 | do_httpd (void *cls); |
1845 | const struct GNUNET_SCHEDULER_TaskContext *tc); | ||
1846 | 1839 | ||
1847 | 1840 | ||
1848 | /** | 1841 | /** |
@@ -1920,11 +1913,9 @@ schedule_httpd (struct MhdHttpList *hd) | |||
1920 | * Task run whenever HTTP server operations are pending. | 1913 | * Task run whenever HTTP server operations are pending. |
1921 | * | 1914 | * |
1922 | * @param cls the `struct MhdHttpList` of the daemon that is being run | 1915 | * @param cls the `struct MhdHttpList` of the daemon that is being run |
1923 | * @param tc scheduler context | ||
1924 | */ | 1916 | */ |
1925 | static void | 1917 | static void |
1926 | do_httpd (void *cls, | 1918 | do_httpd (void *cls) |
1927 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
1928 | { | 1919 | { |
1929 | struct MhdHttpList *hd = cls; | 1920 | struct MhdHttpList *hd = cls; |
1930 | 1921 | ||
@@ -2171,11 +2162,9 @@ lookup_ssl_httpd (const char* domain) | |||
2171 | * the SOCKS5 handshake). Clean up. | 2162 | * the SOCKS5 handshake). Clean up. |
2172 | * | 2163 | * |
2173 | * @param cls the `struct Socks5Request *` | 2164 | * @param cls the `struct Socks5Request *` |
2174 | * @param tc sched context | ||
2175 | */ | 2165 | */ |
2176 | static void | 2166 | static void |
2177 | timeout_s5r_handshake (void *cls, | 2167 | timeout_s5r_handshake (void *cls) |
2178 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
2179 | { | 2168 | { |
2180 | struct Socks5Request *s5r = cls; | 2169 | struct Socks5Request *s5r = cls; |
2181 | 2170 | ||
@@ -2245,11 +2234,9 @@ setup_data_transfer (struct Socks5Request *s5r) | |||
2245 | * Write data from buffer to socks5 client, then continue with state machine. | 2234 | * Write data from buffer to socks5 client, then continue with state machine. |
2246 | * | 2235 | * |
2247 | * @param cls the closure with the `struct Socks5Request` | 2236 | * @param cls the closure with the `struct Socks5Request` |
2248 | * @param tc scheduler context | ||
2249 | */ | 2237 | */ |
2250 | static void | 2238 | static void |
2251 | do_write (void *cls, | 2239 | do_write (void *cls) |
2252 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
2253 | { | 2240 | { |
2254 | struct Socks5Request *s5r = cls; | 2241 | struct Socks5Request *s5r = cls; |
2255 | ssize_t len; | 2242 | ssize_t len; |
@@ -2502,11 +2489,9 @@ clear_from_s5r_rbuf (struct Socks5Request *s5r, | |||
2502 | * Read data from incoming Socks5 connection | 2489 | * Read data from incoming Socks5 connection |
2503 | * | 2490 | * |
2504 | * @param cls the closure with the `struct Socks5Request` | 2491 | * @param cls the closure with the `struct Socks5Request` |
2505 | * @param tc the scheduler context | ||
2506 | */ | 2492 | */ |
2507 | static void | 2493 | static void |
2508 | do_s5r_read (void *cls, | 2494 | do_s5r_read (void *cls) |
2509 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
2510 | { | 2495 | { |
2511 | struct Socks5Request *s5r = cls; | 2496 | struct Socks5Request *s5r = cls; |
2512 | const struct Socks5ClientHelloMessage *c_hello; | 2497 | const struct Socks5ClientHelloMessage *c_hello; |
@@ -2514,8 +2499,10 @@ do_s5r_read (void *cls, | |||
2514 | const struct Socks5ClientRequestMessage *c_req; | 2499 | const struct Socks5ClientRequestMessage *c_req; |
2515 | ssize_t rlen; | 2500 | ssize_t rlen; |
2516 | size_t alen; | 2501 | size_t alen; |
2502 | const struct GNUNET_SCHEDULER_TaskContext *tc; | ||
2517 | 2503 | ||
2518 | s5r->rtask = NULL; | 2504 | s5r->rtask = NULL; |
2505 | tc = GNUNET_SCHEDULER_get_task_context (); | ||
2519 | if ( (NULL != tc->read_ready) && | 2506 | if ( (NULL != tc->read_ready) && |
2520 | (GNUNET_NETWORK_fdset_isset (tc->read_ready, s5r->sock)) ) | 2507 | (GNUNET_NETWORK_fdset_isset (tc->read_ready, s5r->sock)) ) |
2521 | { | 2508 | { |
@@ -2721,17 +2708,18 @@ do_s5r_read (void *cls, | |||
2721 | * @param tc the scheduler context | 2708 | * @param tc the scheduler context |
2722 | */ | 2709 | */ |
2723 | static void | 2710 | static void |
2724 | do_accept (void *cls, | 2711 | do_accept (void *cls) |
2725 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
2726 | { | 2712 | { |
2727 | struct GNUNET_NETWORK_Handle *lsock = cls; | 2713 | struct GNUNET_NETWORK_Handle *lsock = cls; |
2728 | struct GNUNET_NETWORK_Handle *s; | 2714 | struct GNUNET_NETWORK_Handle *s; |
2729 | struct Socks5Request *s5r; | 2715 | struct Socks5Request *s5r; |
2716 | const struct GNUNET_SCHEDULER_TaskContext *tc; | ||
2730 | 2717 | ||
2731 | if (lsock == lsock4) | 2718 | if (lsock == lsock4) |
2732 | ltask4 = NULL; | 2719 | ltask4 = NULL; |
2733 | else | 2720 | else |
2734 | ltask6 = NULL; | 2721 | ltask6 = NULL; |
2722 | tc = GNUNET_SCHEDULER_get_task_context (); | ||
2735 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) | 2723 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) |
2736 | return; | 2724 | return; |
2737 | if (lsock == lsock4) | 2725 | if (lsock == lsock4) |
@@ -2769,11 +2757,9 @@ do_accept (void *cls, | |||
2769 | * Task run on shutdown | 2757 | * Task run on shutdown |
2770 | * | 2758 | * |
2771 | * @param cls closure | 2759 | * @param cls closure |
2772 | * @param tc task context | ||
2773 | */ | 2760 | */ |
2774 | static void | 2761 | static void |
2775 | do_shutdown (void *cls, | 2762 | do_shutdown (void *cls) |
2776 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
2777 | { | 2763 | { |
2778 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 2764 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
2779 | "Shutting down...\n"); | 2765 | "Shutting down...\n"); |
diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c index 5d083cdb6..c8310db46 100644 --- a/src/gns/gnunet-gns.c +++ b/src/gns/gnunet-gns.c | |||
@@ -105,11 +105,9 @@ static struct GNUNET_IDENTITY_Operation *id_op; | |||
105 | * Task run on shutdown. Cleans up everything. | 105 | * Task run on shutdown. Cleans up everything. |
106 | * | 106 | * |
107 | * @param cls unused | 107 | * @param cls unused |
108 | * @param tc scheduler context | ||
109 | */ | 108 | */ |
110 | static void | 109 | static void |
111 | do_shutdown (void *cls, | 110 | do_shutdown (void *cls) |
112 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
113 | { | 111 | { |
114 | if (NULL != el) | 112 | if (NULL != el) |
115 | { | 113 | { |
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c index 076475d2c..87b0fd04e 100644 --- a/src/gns/gnunet-service-gns.c +++ b/src/gns/gnunet-service-gns.c | |||
@@ -260,8 +260,7 @@ static struct GNUNET_STATISTICS_Handle *statistics; | |||
260 | * @param tc unused | 260 | * @param tc unused |
261 | */ | 261 | */ |
262 | static void | 262 | static void |
263 | shutdown_task (void *cls, | 263 | shutdown_task (void *cls) |
264 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
265 | { | 264 | { |
266 | struct ClientLookupHandle *clh; | 265 | struct ClientLookupHandle *clh; |
267 | struct MonitorActivity *ma; | 266 | struct MonitorActivity *ma; |
@@ -349,11 +348,9 @@ shutdown_task (void *cls, | |||
349 | * Method called periodically that triggers iteration over authoritative records | 348 | * Method called periodically that triggers iteration over authoritative records |
350 | * | 349 | * |
351 | * @param cls closure | 350 | * @param cls closure |
352 | * @param tc task context | ||
353 | */ | 351 | */ |
354 | static void | 352 | static void |
355 | publish_zone_dht_next (void *cls, | 353 | publish_zone_dht_next (void *cls) |
356 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
357 | { | 354 | { |
358 | zone_publish_task = NULL; | 355 | zone_publish_task = NULL; |
359 | GNUNET_NAMESTORE_zone_iterator_next (namestore_iter); | 356 | GNUNET_NAMESTORE_zone_iterator_next (namestore_iter); |
@@ -364,11 +361,9 @@ publish_zone_dht_next (void *cls, | |||
364 | * Periodically iterate over our zone and store everything in dht | 361 | * Periodically iterate over our zone and store everything in dht |
365 | * | 362 | * |
366 | * @param cls NULL | 363 | * @param cls NULL |
367 | * @param tc task context | ||
368 | */ | 364 | */ |
369 | static void | 365 | static void |
370 | publish_zone_dht_start (void *cls, | 366 | publish_zone_dht_start (void *cls); |
371 | const struct GNUNET_SCHEDULER_TaskContext *tc); | ||
372 | 367 | ||
373 | 368 | ||
374 | /** | 369 | /** |
@@ -629,11 +624,9 @@ put_gns_record (void *cls, | |||
629 | * Periodically iterate over all zones and store everything in DHT | 624 | * Periodically iterate over all zones and store everything in DHT |
630 | * | 625 | * |
631 | * @param cls NULL | 626 | * @param cls NULL |
632 | * @param tc task context | ||
633 | */ | 627 | */ |
634 | static void | 628 | static void |
635 | publish_zone_dht_start (void *cls, | 629 | publish_zone_dht_start (void *cls) |
636 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
637 | { | 630 | { |
638 | zone_publish_task = NULL; | 631 | zone_publish_task = NULL; |
639 | 632 | ||
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c index 9a54a8080..daae46ab7 100644 --- a/src/gns/gnunet-service-gns_resolver.c +++ b/src/gns/gnunet-service-gns_resolver.c | |||
@@ -541,11 +541,9 @@ translate_dot_plus (struct GNS_ResolverHandle *rh, | |||
541 | * Task scheduled to asynchronously fail a resolution. | 541 | * Task scheduled to asynchronously fail a resolution. |
542 | * | 542 | * |
543 | * @param cls the 'struct GNS_ResolverHandle' of the resolution to fail | 543 | * @param cls the 'struct GNS_ResolverHandle' of the resolution to fail |
544 | * @param tc task context | ||
545 | */ | 544 | */ |
546 | static void | 545 | static void |
547 | fail_resolution (void *cls, | 546 | fail_resolution (void *cls) |
548 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
549 | { | 547 | { |
550 | struct GNS_ResolverHandle *rh = cls; | 548 | struct GNS_ResolverHandle *rh = cls; |
551 | 549 | ||
@@ -808,8 +806,7 @@ handle_dns_result (void *cls, | |||
808 | * @param tc task context | 806 | * @param tc task context |
809 | */ | 807 | */ |
810 | static void | 808 | static void |
811 | recursive_resolution (void *cls, | 809 | recursive_resolution (void *cls); |
812 | const struct GNUNET_SCHEDULER_TaskContext *tc); | ||
813 | 810 | ||
814 | 811 | ||
815 | /** | 812 | /** |
@@ -2229,11 +2226,9 @@ recursive_gns_resolution_revocation (struct GNS_ResolverHandle *rh) | |||
2229 | * Task scheduled to continue with the resolution process. | 2226 | * Task scheduled to continue with the resolution process. |
2230 | * | 2227 | * |
2231 | * @param cls the `struct GNS_ResolverHandle` of the resolution | 2228 | * @param cls the `struct GNS_ResolverHandle` of the resolution |
2232 | * @param tc task context | ||
2233 | */ | 2229 | */ |
2234 | static void | 2230 | static void |
2235 | recursive_resolution (void *cls, | 2231 | recursive_resolution (void *cls) |
2236 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
2237 | { | 2232 | { |
2238 | struct GNS_ResolverHandle *rh = cls; | 2233 | struct GNS_ResolverHandle *rh = cls; |
2239 | 2234 | ||
diff --git a/src/gns/plugin_rest_gns.c b/src/gns/plugin_rest_gns.c index 4878669e4..8a3f26041 100644 --- a/src/gns/plugin_rest_gns.c +++ b/src/gns/plugin_rest_gns.c | |||
@@ -211,11 +211,12 @@ cleanup_handle (struct LookupHandle *handle) | |||
211 | * @param tc scheduler context | 211 | * @param tc scheduler context |
212 | */ | 212 | */ |
213 | static void | 213 | static void |
214 | do_error (void *cls, | 214 | do_error (void *cls) |
215 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
216 | { | 215 | { |
217 | struct LookupHandle *handle = cls; | 216 | struct LookupHandle *handle = cls; |
218 | struct MHD_Response *resp = GNUNET_REST_create_json_response (NULL); | 217 | struct MHD_Response *resp; |
218 | |||
219 | resp = GNUNET_REST_create_json_response (NULL); | ||
219 | handle->proc (handle->proc_cls, resp, MHD_HTTP_BAD_REQUEST); | 220 | handle->proc (handle->proc_cls, resp, MHD_HTTP_BAD_REQUEST); |
220 | cleanup_handle (handle); | 221 | cleanup_handle (handle); |
221 | } | 222 | } |
@@ -550,7 +551,7 @@ get_gns_cont (struct RestConnectionDataHandle *conndata_handle, | |||
550 | GNUNET_CONTAINER_multihashmap_contains (conndata_handle->url_param_map, | 551 | GNUNET_CONTAINER_multihashmap_contains (conndata_handle->url_param_map, |
551 | &key) ) | 552 | &key) ) |
552 | { | 553 | { |
553 | handle->type = GNUNET_GNSRECORD_typename_to_number | 554 | handle->type = GNUNET_GNSRECORD_typename_to_number |
554 | (GNUNET_CONTAINER_multihashmap_get (conndata_handle->url_param_map, | 555 | (GNUNET_CONTAINER_multihashmap_get (conndata_handle->url_param_map, |
555 | &key)); | 556 | &key)); |
556 | } | 557 | } |
diff --git a/src/gns/test_gns_proxy.c b/src/gns/test_gns_proxy.c index 72e8ff20b..0afc3ea0b 100644 --- a/src/gns/test_gns_proxy.c +++ b/src/gns/test_gns_proxy.c | |||
@@ -165,8 +165,7 @@ curl_main (void); | |||
165 | 165 | ||
166 | 166 | ||
167 | static void | 167 | static void |
168 | curl_task (void *cls, | 168 | curl_task (void *cls) |
169 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
170 | { | 169 | { |
171 | curl_task_id = NULL; | 170 | curl_task_id = NULL; |
172 | curl_main (); | 171 | curl_main (); |
@@ -247,7 +246,7 @@ curl_main () | |||
247 | } | 246 | } |
248 | 247 | ||
249 | static void | 248 | static void |
250 | start_curl (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 249 | start_curl (void *cls) |
251 | { | 250 | { |
252 | GNUNET_asprintf (&url, | 251 | GNUNET_asprintf (&url, |
253 | "http://%s:%d/hello_world", | 252 | "http://%s:%d/hello_world", |
@@ -269,12 +268,14 @@ start_curl (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
269 | curl_main (); | 268 | curl_main (); |
270 | } | 269 | } |
271 | 270 | ||
271 | |||
272 | static void | 272 | static void |
273 | disco_ns (void* cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 273 | disco_ns (void* cls) |
274 | { | 274 | { |
275 | GNUNET_NAMESTORE_disconnect (namestore); | 275 | GNUNET_NAMESTORE_disconnect (namestore); |
276 | } | 276 | } |
277 | 277 | ||
278 | |||
278 | /** | 279 | /** |
279 | * Callback invoked from the namestore service once record is | 280 | * Callback invoked from the namestore service once record is |
280 | * created. | 281 | * created. |
@@ -315,8 +316,7 @@ mhd_main (void); | |||
315 | 316 | ||
316 | 317 | ||
317 | static void | 318 | static void |
318 | mhd_task (void *cls, | 319 | mhd_task (void *cls) |
319 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
320 | { | 320 | { |
321 | mhd_task_id = NULL; | 321 | mhd_task_id = NULL; |
322 | MHD_run (mhd); | 322 | MHD_run (mhd); |