9 files changed, 47 insertions, 69 deletions

diff --git a/src/nat/gnunet-nat-server.c b/src/nat/gnunet-nat-server.c
index 31a8f294b..0069303ca 100644
--- a/src/nat/gnunet-nat-server.c
+++ b/src/nat/gnunet-nat-server.c
@@ -92,13 +92,14 @@ struct TcpContext
  * (or once we failed to connect...).
  *
  * @param cls the 'struct TcpContext'
- * @param tc scheduler context
  */
 static void
-tcp_send (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+tcp_send (void *cls)
 {
   struct TcpContext *ctx = cls;
+  const struct GNUNET_SCHEDULER_TaskContext *tc;
 
+  tc = GNUNET_SCHEDULER_get_task_context ();
   if ((NULL != tc->write_ready) &&
       (GNUNET_NETWORK_fdset_isset (tc->write_ready, ctx->s)))
   {
@@ -228,10 +229,9 @@ test (void *cls, struct GNUNET_SERVER_Client *client,
  * Task run during shutdown.
  *
  * @param cls unused
- * @param tc scheduler context
  */
 static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
 {
   GNUNET_SERVER_destroy (server);
   server = NULL;
diff --git a/src/nat/nat.c b/src/nat/nat.c
index 57961ffaf..1c60e4e0d 100644
--- a/src/nat/nat.c
+++ b/src/nat/nat.c
@@ -463,11 +463,9 @@ start_gnunet_nat_server (struct GNUNET_NAT_Handle *h);
  * Call task to process STUN
  *
  * @param cls handle to NAT
- * @param tc TaskContext
  */
 static void
-process_stun (void *cls,
-              const struct GNUNET_SCHEDULER_TaskContext *tc);
+process_stun (void *cls);
 
 
 /**
@@ -662,10 +660,9 @@ add_ip_to_address_list (struct GNUNET_NAT_Handle *h,
  * get DynDNS-IP addresses.
  *
  * @param cls the NAT handle
- * @param tc scheduler context
  */
 static void
-resolve_dns (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+resolve_dns (void *cls);
 
 
 /**
@@ -716,11 +713,9 @@ process_external_ip (void *cls,
  * Task to do a lookup on our hostname for IP addresses.
  *
  * @param cls the NAT handle
- * @param tc scheduler context
  */
 static void
-resolve_hostname (void *cls,
-                  const struct GNUNET_SCHEDULER_TaskContext *tc);
+resolve_hostname (void *cls);
 
 
 /**
@@ -938,14 +933,15 @@ process_interfaces (void *cls,
  * after a certain delay.
  *
  * @param cls the `struct GNUNET_NAT_Handle`
- * @param tc scheduler context
  */
 static void
-restart_nat_server (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+restart_nat_server (void *cls)
 {
   struct GNUNET_NAT_Handle *h = cls;
+  const struct GNUNET_SCHEDULER_TaskContext *tc;
 
   h->server_read_task = NULL;
+  tc = GNUNET_SCHEDULER_get_task_context ();
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
     return;
   start_gnunet_nat_server (h);
@@ -958,11 +954,9 @@ restart_nat_server (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * function to be called again once more is available.
  *
  * @param cls the NAT handle
- * @param tc the scheduling context
  */
 static void
-nat_server_read (void *cls,
-                 const struct GNUNET_SCHEDULER_TaskContext *tc)
+nat_server_read (void *cls)
 {
   struct GNUNET_NAT_Handle *h = cls;
   char mybuf[40];
@@ -971,8 +965,10 @@ nat_server_read (void *cls,
   int port;
   const char *port_start;
   struct sockaddr_in sin_addr;
+  const struct GNUNET_SCHEDULER_TaskContext *tc;
 
   h->server_read_task = NULL;
+  tc = GNUNET_SCHEDULER_get_task_context ();
   if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
     return;
   memset (mybuf, 0, sizeof (mybuf));
@@ -1099,11 +1095,9 @@ start_gnunet_nat_server (struct GNUNET_NAT_Handle *h)
  * Task to scan the local network interfaces for IP addresses.
  *
  * @param cls the NAT handle
- * @param tc scheduler context
  */
 static void
-list_interfaces (void *cls,
-                 const struct GNUNET_SCHEDULER_TaskContext *tc)
+list_interfaces (void *cls)
 {
   struct GNUNET_NAT_Handle *h = cls;
 
@@ -1209,11 +1203,9 @@ GNUNET_NAT_is_valid_stun_packet (void *cls,
  * Task to do a STUN request
  *
  * @param cls the NAT handle
- * @param tc scheduler context
  */
 static void
-process_stun (void *cls,
-              const struct GNUNET_SCHEDULER_TaskContext *tc)
+process_stun (void *cls)
 {
   struct GNUNET_NAT_Handle *h = cls;
   struct StunServerList* elem = h->actual_stun_server;
@@ -1264,11 +1256,9 @@ process_stun (void *cls,
  * Task to do a lookup on our hostname for IP addresses.
  *
  * @param cls the NAT handle
- * @param tc scheduler context
  */
 static void
-resolve_hostname (void *cls,
-                  const struct GNUNET_SCHEDULER_TaskContext *tc)
+resolve_hostname (void *cls)
 {
   struct GNUNET_NAT_Handle *h = cls;
 
@@ -1285,11 +1275,9 @@ resolve_hostname (void *cls,
  * get DynDNS-IP addresses.
  *
  * @param cls the NAT handle
- * @param tc scheduler context
  */
 static void
-resolve_dns (void *cls,
-             const struct GNUNET_SCHEDULER_TaskContext *tc)
+resolve_dns (void *cls)
 {
   struct GNUNET_NAT_Handle *h = cls;
   struct LocalAddressList *pos;
diff --git a/src/nat/nat_auto.c b/src/nat/nat_auto.c
index 9fab8bf67..82e067f73 100644
--- a/src/nat/nat_auto.c
+++ b/src/nat/nat_auto.c
@@ -258,18 +258,17 @@ stop_stun ()
  * incoming connection.
  *
  * @param cls
- * @param tc scheduler context
  */
 static void
-do_udp_read (void *cls,
-             const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_udp_read (void *cls)
 {
   struct GNUNET_NAT_AutoHandle *ah = cls;
   unsigned char reply_buf[1024];
   ssize_t rlen;
   struct sockaddr_in answer;
+  const struct GNUNET_SCHEDULER_TaskContext *tc;
 
-
+  tc = GNUNET_SCHEDULER_get_task_context ();
   if ((0 != (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) &&
       (GNUNET_NETWORK_fdset_isset (tc->read_ready,
                                    lsock4)))
@@ -402,11 +401,9 @@ result_callback (void *cls,
  * Main function for the connection reversal test.
  *
  * @param cls the `struct GNUNET_NAT_AutoHandle`
- * @param tc scheduler context
  */
 static void
-reversal_test (void *cls,
-               const struct GNUNET_SCHEDULER_TaskContext *tc)
+reversal_test (void *cls)
 {
   struct GNUNET_NAT_AutoHandle *ah = cls;
 
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
  * address and call our callback.
  *
  * @param cls the `struct GNUNET_NAT_ExternalHandle`
- * @param tc scheduler context
  */
 static void
-read_external_ipv4 (void *cls,
-                    const struct GNUNET_SCHEDULER_TaskContext *tc)
+read_external_ipv4 (void *cls)
 {
   struct GNUNET_NAT_ExternalHandle *eh = cls;
   ssize_t ret;
   struct in_addr addr;
+  const struct GNUNET_SCHEDULER_TaskContext *tc;
 
   eh->task = NULL;
+  tc = GNUNET_SCHEDULER_get_task_context ();
   if (GNUNET_YES == GNUNET_NETWORK_fdset_handle_isset (tc->read_ready, eh->r))
     ret =
         GNUNET_DISK_file_read (eh->r, &eh->buf[eh->off],
@@ -162,11 +162,9 @@ read_external_ipv4 (void *cls,
  * (Asynchronously) signal error invoking "external-ip" to client.
  *
  * @param cls the `struct GNUNET_NAT_ExternalHandle` (freed)
- * @param tc scheduler context
  */
 static void
-signal_external_ip_error (void *cls,
-                          const struct GNUNET_SCHEDULER_TaskContext *tc)
+signal_external_ip_error (void *cls)
 {
   struct GNUNET_NAT_ExternalHandle *eh = cls;
 
@@ -329,10 +327,9 @@ struct GNUNET_NAT_MiniHandle
  * Run "upnpc -l" to find out if our mapping changed.
  *
  * @param cls the `struct GNUNET_NAT_MiniHandle`
- * @param tc scheduler context
  */
 static void
-do_refresh (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+do_refresh (void *cls);
 
 
 /**
@@ -478,10 +475,9 @@ process_refresh_output (void *cls, const char *line)
  * Run "upnpc -l" to find out if our mapping changed.
  *
  * @param cls the 'struct GNUNET_NAT_MiniHandle'
- * @param tc scheduler context
  */
 static void
-do_refresh (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_refresh (void *cls)
 {
   struct GNUNET_NAT_MiniHandle *mini = cls;
   int ac;
diff --git a/src/nat/nat_test.c b/src/nat/nat_test.c
index 32cf6c42c..33f81d800 100644
--- a/src/nat/nat_test.c
+++ b/src/nat/nat_test.c
@@ -205,15 +205,15 @@ reversal_cb (void *cls,
  * incoming connection.
  *
  * @param cls the `struct GNUNET_NAT_Test`
- * @param tc scheduler context
  */
 static void
-do_udp_read (void *cls,
-             const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_udp_read (void *cls)
 {
   struct GNUNET_NAT_Test *tst = cls;
   uint16_t data;
+  const struct GNUNET_SCHEDULER_TaskContext *tc;
 
+  tc = GNUNET_SCHEDULER_get_task_context ();
   tst->ltask =
       GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
                                      tst->lsock,
@@ -240,16 +240,16 @@ do_udp_read (void *cls,
  * incoming connection.
  *
  * @param cls the `struct NatActivity`
- * @param tc scheduler context
  */
 static void
-do_read (void *cls,
-         const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_read (void *cls)
 {
   struct NatActivity *na = cls;
   struct GNUNET_NAT_Test *tst;
   uint16_t data;
+  const struct GNUNET_SCHEDULER_TaskContext *tc;
 
+  tc = GNUNET_SCHEDULER_get_task_context ();
   na->rtask = NULL;
   tst = na->h;
   GNUNET_CONTAINER_DLL_remove (tst->na_head, tst->na_tail, na);
@@ -277,17 +277,17 @@ do_read (void *cls,
  * incoming connection.
  *
  * @param cls the `struct GNUNET_NAT_Test`
- * @param tc scheduler context
  */
 static void
-do_accept (void *cls,
-           const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_accept (void *cls)
 {
   struct GNUNET_NAT_Test *tst = cls;
   struct GNUNET_NETWORK_Handle *s;
   struct NatActivity *wl;
+  const struct GNUNET_SCHEDULER_TaskContext *tc;
 
   tst->ltask = NULL;
+  tc = GNUNET_SCHEDULER_get_task_context ();
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
     return;
   tst->ltask =
@@ -378,11 +378,9 @@ addr_cb (void *cls,
  * Destroys the nat handle after the callback has been processed.
  *
  * @param cls handle to the timed out NAT test
- * @param tc not used
  */
 static void
-do_timeout (void *cls,
-            const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_timeout (void *cls)
 {
   struct GNUNET_NAT_Test *nh = cls;
 
@@ -440,8 +438,8 @@ GNUNET_NAT_test_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
   nh->status = GNUNET_NAT_ERROR_SUCCESS;
   if (0 == bnd_port)
   {
-    nh->nat 
-      = GNUNET_NAT_register (cfg, is_tcp, 0, 0, 
+    nh->nat
+      = GNUNET_NAT_register (cfg, is_tcp, 0, 0,
                              NULL, NULL,
                              &addr_cb,
                              &reversal_cb, nh, NULL);
diff --git a/src/nat/test_nat.c b/src/nat/test_nat.c
index de8ff8c13..a840f3ef9 100644
--- a/src/nat/test_nat.c
+++ b/src/nat/test_nat.c
@@ -65,7 +65,7 @@ addr_callback (void *cls, int add_remove, const struct sockaddr *addr,
  * Function that terminates the test.
  */
 static void
-stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+stop (void *cls)
 {
   struct GNUNET_NAT_Handle *nat = cls;
 
diff --git a/src/nat/test_nat_mini.c b/src/nat/test_nat_mini.c
index 1819d5e91..f5b63f698 100644
--- a/src/nat/test_nat_mini.c
+++ b/src/nat/test_nat_mini.c
@@ -67,7 +67,7 @@ addr_callback (void *cls, int add_remove,
  * Function that terminates the test.
  */
 static void
-stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+stop (void *cls)
 {
   struct GNUNET_NAT_MiniHandle *mini = cls;
 
diff --git a/src/nat/test_nat_test.c b/src/nat/test_nat_test.c
index c0cce6e45..402671bd2 100644
--- a/src/nat/test_nat_test.c
+++ b/src/nat/test_nat_test.c
@@ -59,8 +59,7 @@ report_result (void *cls,
 
 
 static void
-failed_timeout (void *cls,
-                const struct GNUNET_SCHEDULER_TaskContext *tc)
+failed_timeout (void *cls)
 {
   tsk = NULL;
   fprintf (stderr,
@@ -86,7 +85,7 @@ run (void *cls, char *const *args, const char *cfgfile,
                                                                      2),
                                       &failed_timeout,
                                       NULL);
-  
+
 }
 
 
@@ -127,7 +126,7 @@ main (int argc, char *const argv[])
                                  "12345", NULL);
   GNUNET_assert (NULL != gns);
   GNUNET_PROGRAM_run (3, argv_prog,
-                      "test-nat-test", "nohelp", 
+                      "test-nat-test", "nohelp",
                       options, &run,
                       NULL);
   GNUNET_break (0 == GNUNET_OS_process_kill (gns, GNUNET_TERM_SIG));
diff --git a/src/nat/test_stun.c b/src/nat/test_stun.c
index a856fa971..7fbba1cd6 100644
--- a/src/nat/test_stun.c
+++ b/src/nat/test_stun.c
@@ -112,18 +112,18 @@ stop ()
  * incoming connection.
  *
  * @param cls
- * @param tc scheduler context
  */
 static void
-do_udp_read (void *cls,
-             const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_udp_read (void *cls)
 {
   //struct GNUNET_NAT_Test *tst = cls;
   unsigned char reply_buf[1024];
   ssize_t rlen;
   struct sockaddr_in answer;
+  const struct GNUNET_SCHEDULER_TaskContext *tc;
 
   ltask4 = NULL;
+  tc = GNUNET_SCHEDULER_get_task_context ();
   if ( (0 == (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY)) ||
        (! GNUNET_NETWORK_fdset_isset (tc->read_ready,
                                       lsock4)) )