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/gnunet-dns2gns.c | |
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/gnunet-dns2gns.c')
-rw-r--r-- | src/gns/gnunet-dns2gns.c | 22 |
1 files changed, 9 insertions, 13 deletions
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); |