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/dns | |
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/dns')
-rw-r--r-- | src/dns/dns_api.c | 5 | ||||
-rw-r--r-- | src/dns/dnsstub.c | 10 | ||||
-rw-r--r-- | src/dns/gnunet-dns-monitor.c | 2 | ||||
-rw-r--r-- | src/dns/gnunet-dns-redirector.c | 2 | ||||
-rw-r--r-- | src/dns/gnunet-service-dns.c | 4 |
5 files changed, 9 insertions, 14 deletions
diff --git a/src/dns/dns_api.c b/src/dns/dns_api.c index 984aa1a4c..f96ac3142 100644 --- a/src/dns/dns_api.c +++ b/src/dns/dns_api.c | |||
@@ -162,8 +162,7 @@ queue_reply (struct GNUNET_DNS_Handle *dh, | |||
162 | * @param tc scheduler context (unused) | 162 | * @param tc scheduler context (unused) |
163 | */ | 163 | */ |
164 | static void | 164 | static void |
165 | reconnect (void *cls, | 165 | reconnect (void *cls) |
166 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
167 | { | 166 | { |
168 | struct GNUNET_DNS_Handle *dh = cls; | 167 | struct GNUNET_DNS_Handle *dh = cls; |
169 | struct ReplyQueueEntry *qe; | 168 | struct ReplyQueueEntry *qe; |
@@ -440,7 +439,7 @@ GNUNET_DNS_request_drop (struct GNUNET_DNS_RequestHandle *rh) | |||
440 | * @param reply reply data | 439 | * @param reply reply data |
441 | */ | 440 | */ |
442 | void | 441 | void |
443 | GNUNET_DNS_request_answer (struct GNUNET_DNS_RequestHandle *rh, | 442 | GNUNET_DNS_request_answer (struct GNUNET_DNS_RequestHandle *rh, |
444 | uint16_t reply_length, | 443 | uint16_t reply_length, |
445 | const char *reply) | 444 | const char *reply) |
446 | { | 445 | { |
diff --git a/src/dns/dnsstub.c b/src/dns/dnsstub.c index 32049f66b..957777cba 100644 --- a/src/dns/dnsstub.c +++ b/src/dns/dnsstub.c | |||
@@ -185,11 +185,9 @@ open_socket (int af) | |||
185 | * Read a DNS response from the (unhindered) UDP-Socket | 185 | * Read a DNS response from the (unhindered) UDP-Socket |
186 | * | 186 | * |
187 | * @param cls socket to read from | 187 | * @param cls socket to read from |
188 | * @param tc scheduler context (must be shutdown or read ready) | ||
189 | */ | 188 | */ |
190 | static void | 189 | static void |
191 | read_response (void *cls, | 190 | read_response (void *cls); |
192 | const struct GNUNET_SCHEDULER_TaskContext *tc); | ||
193 | 191 | ||
194 | 192 | ||
195 | /** | 193 | /** |
@@ -466,16 +464,16 @@ do_dns_read (struct GNUNET_DNSSTUB_RequestSocket *rs, | |||
466 | * Read a DNS response from the (unhindered) UDP-Socket | 464 | * Read a DNS response from the (unhindered) UDP-Socket |
467 | * | 465 | * |
468 | * @param cls socket to read from | 466 | * @param cls socket to read from |
469 | * @param tc scheduler context (must be shutdown or read ready) | ||
470 | */ | 467 | */ |
471 | static void | 468 | static void |
472 | read_response (void *cls, | 469 | read_response (void *cls) |
473 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
474 | { | 470 | { |
475 | struct GNUNET_DNSSTUB_RequestSocket *rs = cls; | 471 | struct GNUNET_DNSSTUB_RequestSocket *rs = cls; |
476 | struct GNUNET_NETWORK_FDSet *rset; | 472 | struct GNUNET_NETWORK_FDSet *rset; |
473 | const struct GNUNET_SCHEDULER_TaskContext *tc; | ||
477 | 474 | ||
478 | rs->read_task = NULL; | 475 | rs->read_task = NULL; |
476 | tc = GNUNET_SCHEDULER_get_task_context (); | ||
479 | if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) | 477 | if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) |
480 | { | 478 | { |
481 | /* timeout or shutdown */ | 479 | /* timeout or shutdown */ |
diff --git a/src/dns/gnunet-dns-monitor.c b/src/dns/gnunet-dns-monitor.c index a7bc953ee..c9d840325 100644 --- a/src/dns/gnunet-dns-monitor.c +++ b/src/dns/gnunet-dns-monitor.c | |||
@@ -303,7 +303,7 @@ display_request (void *cls, | |||
303 | * Shutdown. | 303 | * Shutdown. |
304 | */ | 304 | */ |
305 | static void | 305 | static void |
306 | do_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 306 | do_disconnect (void *cls) |
307 | { | 307 | { |
308 | if (NULL != handle) | 308 | if (NULL != handle) |
309 | { | 309 | { |
diff --git a/src/dns/gnunet-dns-redirector.c b/src/dns/gnunet-dns-redirector.c index daf74bf18..8ef69eb91 100644 --- a/src/dns/gnunet-dns-redirector.c +++ b/src/dns/gnunet-dns-redirector.c | |||
@@ -177,7 +177,7 @@ modify_request (void *cls, | |||
177 | * Shutdown. | 177 | * Shutdown. |
178 | */ | 178 | */ |
179 | static void | 179 | static void |
180 | do_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 180 | do_disconnect (void *cls) |
181 | { | 181 | { |
182 | if (NULL != handle) | 182 | if (NULL != handle) |
183 | { | 183 | { |
diff --git a/src/dns/gnunet-service-dns.c b/src/dns/gnunet-service-dns.c index a8fd7b5e2..0f975e82f 100644 --- a/src/dns/gnunet-service-dns.c +++ b/src/dns/gnunet-service-dns.c | |||
@@ -273,11 +273,9 @@ cleanup_rr (struct RequestRecord *rr) | |||
273 | * Task run during shutdown. | 273 | * Task run during shutdown. |
274 | * | 274 | * |
275 | * @param cls unused | 275 | * @param cls unused |
276 | * @param tc unused | ||
277 | */ | 276 | */ |
278 | static void | 277 | static void |
279 | cleanup_task (void *cls GNUNET_UNUSED, | 278 | cleanup_task (void *cls GNUNET_UNUSED) |
280 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
281 | { | 279 | { |
282 | unsigned int i; | 280 | unsigned int i; |
283 | 281 | ||