6 files changed, 78 insertions, 78 deletions

diff --git a/src/nat/gnunet-nat-server.c b/src/nat/gnunet-nat-server.c
index 0069303ca..db51ef89a 100644
--- a/src/nat/gnunet-nat-server.c
+++ b/src/nat/gnunet-nat-server.c
@@ -294,8 +294,8 @@ run (void *cls, char *const *args, const char *cfgfile,
       GNUNET_SERVER_create (NULL, NULL, (struct sockaddr * const *) sa, slen,
                             GNUNET_TIME_UNIT_SECONDS, GNUNET_YES);
   GNUNET_SERVER_add_handlers (server, handlers);
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
-                                NULL);
+  GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
+                                 NULL);
 }
 
 
diff --git a/src/nat/nat.c b/src/nat/nat.c
index 1c60e4e0d..042a0f686 100644
--- a/src/nat/nat.c
+++ b/src/nat/nat.c
@@ -603,7 +603,8 @@ add_to_address_list (struct GNUNET_NAT_Handle *h,
  */
 static void
 add_ip_to_address_list (struct GNUNET_NAT_Handle *h,
-                        enum LocalAddressSource src, const void *addr,
+                        enum LocalAddressSource src,
+                        const void *addr,
                         socklen_t addrlen)
 {
   struct sockaddr_in s4;
@@ -913,10 +914,12 @@ process_interfaces (void *cls,
     GNUNET_break (0);
     return GNUNET_OK;
   }
-  if ((h->internal_address == NULL) && (h->server_proc == NULL) &&
-      (h->server_read_task == NULL) &&
-      (GNUNET_YES == isDefault) && ((addr->sa_family == AF_INET) ||
-                                    (addr->sa_family == AF_INET6)))
+  if ( (h->internal_address == NULL) &&
+       (h->server_proc == NULL) &&
+       (h->server_read_task == NULL) &&
+       (GNUNET_YES == isDefault) &&
+       ( (addr->sa_family == AF_INET) ||
+         (addr->sa_family == AF_INET6) ) )
   {
     /* no internal address configured, but we found a "default"
      * interface, try using that as our 'internal' address */
@@ -938,12 +941,8 @@ static void
 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);
 }
 
@@ -965,12 +964,8 @@ 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));
   bytes =
     GNUNET_DISK_file_read (h->server_stdout_handle, mybuf, sizeof (mybuf));
@@ -1036,7 +1031,8 @@ nat_server_read (void *cls)
                         sizeof (sin_addr));
   h->server_read_task =
       GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
-                                      h->server_stdout_handle, &nat_server_read,
+                                      h->server_stdout_handle,
+                                      &nat_server_read,
                                       h);
 }
 
diff --git a/src/nat/nat_auto.c b/src/nat/nat_auto.c
index 82e067f73..4611edc62 100644
--- a/src/nat/nat_auto.c
+++ b/src/nat/nat_auto.c
@@ -273,7 +273,9 @@ do_udp_read (void *cls)
       (GNUNET_NETWORK_fdset_isset (tc->read_ready,
                                    lsock4)))
   {
-    rlen = GNUNET_NETWORK_socket_recv (lsock4, reply_buf, sizeof (reply_buf));
+    rlen = GNUNET_NETWORK_socket_recv (lsock4,
+                                       reply_buf,
+                                       sizeof (reply_buf));
 
     //Lets handle the packet
     memset(&answer, 0, sizeof(struct sockaddr_in));
@@ -288,7 +290,8 @@ do_udp_read (void *cls)
     }
     else
     {
-      if (GNUNET_OK == GNUNET_NAT_stun_handle_packet (reply_buf, rlen, &answer))
+      if (GNUNET_OK ==
+          GNUNET_NAT_stun_handle_packet (reply_buf, rlen, &answer))
       {
         //Process the answer
         process_stun_reply (&answer, ah);
@@ -310,9 +313,6 @@ do_udp_read (void *cls)
 
     next_phase (ah);
   }
-
-
-
 }
 
 
@@ -352,10 +352,9 @@ bind_v4 ()
 }
 
 
-
-
-static void request_callback (void *cls,
-                              enum GNUNET_NAT_StatusCode result)
+static void
+request_callback (void *cls,
+                  enum GNUNET_NAT_StatusCode result)
 {
   // struct GNUNET_NAT_AutoHandle *ah = cls;
 
@@ -363,10 +362,7 @@ static void request_callback (void *cls,
   stop_stun ();
 
   // next_phase (ah); FIXME this always will be NULL, as called in test_stun()
-};
-
-
-
+}
 
 
 /**
@@ -518,17 +514,20 @@ test_stun (struct GNUNET_NAT_AutoHandle *ah)
   {
     //Lets call our function now when it accepts
     ltask4 = GNUNET_SCHEDULER_add_read_net (NAT_SERVER_TIMEOUT,
-                                            lsock4, &do_udp_read, ah);
-
+                                            lsock4,
+                                            &do_udp_read,
+                                            ah);
   }
 
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "STUN service listens on port %u\n",
               port);
-  if (GNUNET_NO == GNUNET_NAT_stun_make_request (stun_server, stun_port,
-                                                 lsock4, &request_callback,
-                                                 NULL))
+  if (GNUNET_NO ==
+      GNUNET_NAT_stun_make_request (stun_server, stun_port,
+                                    lsock4,
+                                    &request_callback,
+                                    NULL))
   {
     /*An error happened*/
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "STUN error, stopping\n");
@@ -538,7 +537,6 @@ test_stun (struct GNUNET_NAT_AutoHandle *ah)
 }
 
 
-
 /**
  * Process list of local IP addresses.  Find and set the
  * one of the default interface.
@@ -550,16 +548,16 @@ test_stun (struct GNUNET_NAT_AutoHandle *ah)
  * @param broadcast_addr the broadcast address (can be NULL for unknown or unassigned)
  * @param netmask the network mask (can be NULL for unknown or unassigned))
  * @param addrlen length of the @a addr and @a broadcast_addr
- * @return GNUNET_OK to continue iteration, #GNUNET_SYSERR to abort
+ * @return #GNUNET_OK to continue iteration, #GNUNET_SYSERR to abort
  */
 static int
 process_if (void *cls,
-      const char *name,
-      int isDefault,
-      const struct sockaddr *addr,
-      const struct sockaddr *broadcast_addr,
-      const struct sockaddr *netmask,
-      socklen_t addrlen)
+            const char *name,
+            int isDefault,
+            const struct sockaddr *addr,
+            const struct sockaddr *broadcast_addr,
+            const struct sockaddr *netmask,
+            socklen_t addrlen)
 {
   struct GNUNET_NAT_AutoHandle *ah = cls;
   const struct sockaddr_in *in;
@@ -640,11 +638,9 @@ test_local_ip (struct GNUNET_NAT_AutoHandle *ah)
 static void
 test_nat_punched (struct GNUNET_NAT_AutoHandle *ah)
 {
-
   struct GNUNET_CLIENT_Connection *client;
   struct GNUNET_NAT_TestMessage msg;
 
-
   if (ah->stun_ip)
   {
     LOG (GNUNET_ERROR_TYPE_INFO,
@@ -676,9 +672,10 @@ test_nat_punched (struct GNUNET_NAT_AutoHandle *ah)
     {
       GNUNET_SCHEDULER_cancel (ltask4);
       ltask4 = GNUNET_SCHEDULER_add_read_net (NAT_SERVER_TIMEOUT,
-                                              lsock4, &do_udp_read, ah);
+                                              lsock4,
+                                              &do_udp_read,
+                                              ah);
     }
-
   }
   else
   {
@@ -686,13 +683,9 @@ test_nat_punched (struct GNUNET_NAT_AutoHandle *ah)
          "We don't have a STUN IP");
     next_phase(ah);
   }
-
-
 }
 
 
-
-
 /**
  * Test if UPnPC works.
  *
@@ -772,7 +765,6 @@ err:
     ah->task = GNUNET_SCHEDULER_add_now (&reversal_test, ah);
   else
     next_phase (ah);
-
 }
 
 
@@ -784,8 +776,6 @@ err:
 static void
 test_icmp_client (struct GNUNET_NAT_AutoHandle *ah)
 {
-
-
   char *tmp;
   char *helper;
 
@@ -802,7 +792,8 @@ test_icmp_client (struct GNUNET_NAT_AutoHandle *ah)
 
   if (GNUNET_YES !=
       GNUNET_CONFIGURATION_get_value_yesno (ah->cfg, "nat", "BEHIND_NAT")){
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("test_icmp_server not possible, as we are not behind NAT\n"));
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                _("test_icmp_server not possible, as we are not behind NAT\n"));
   }
   else
     goto err;
@@ -810,14 +801,14 @@ test_icmp_client (struct GNUNET_NAT_AutoHandle *ah)
   if (GNUNET_YES ==
       GNUNET_OS_check_helper_binary (helper, GNUNET_YES, "-d 127.0.0.1 127.0.0.2 42")){
           // none of these parameters are actually used in privilege testing mode
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("No working gnunet-helper-nat-server found\n"));
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                _("No working gnunet-helper-nat-server found\n"));
   }
 err:
   GNUNET_free_non_null (tmp);
   GNUNET_free (helper);
 
   next_phase (ah);
-
 }
 
 
@@ -940,11 +931,7 @@ next_phase (struct GNUNET_NAT_AutoHandle *ah)
     GNUNET_CONFIGURATION_destroy (diff);
     GNUNET_NAT_autoconfig_cancel (ah);
     return;
-
   }
-
-
-
 }
 
 
diff --git a/src/nat/nat_mini.c b/src/nat/nat_mini.c
index d310b3e14..915bcbdb6 100644
--- a/src/nat/nat_mini.c
+++ b/src/nat/nat_mini.c
@@ -121,11 +121,15 @@ read_external_ipv4 (void *cls)
 
   eh->task = NULL;
   tc = GNUNET_SCHEDULER_get_task_context ();
-  if (GNUNET_YES == GNUNET_NETWORK_fdset_handle_isset (tc->read_ready, eh->r))
+  if (GNUNET_YES ==
+      GNUNET_NETWORK_fdset_handle_isset (tc->read_ready, eh->r))
+  {
     ret =
         GNUNET_DISK_file_read (eh->r, &eh->buf[eh->off],
                                sizeof (eh->buf) - eh->off);
-  else {
+  }
+  else
+  {
     eh->ret = GNUNET_NAT_ERROR_IPC_FAILURE;
     ret = -1;                   /* error reading, timeout, etc. */
   }
@@ -541,7 +545,9 @@ process_map_output (void *cls,
                 GNUNET_NAT_ERROR_UPNPC_PORTMAP_FAILED);
     if (NULL == mini->refresh_task)
       mini->refresh_task =
-        GNUNET_SCHEDULER_add_delayed (MAP_REFRESH_FREQ, &do_refresh, mini);
+        GNUNET_SCHEDULER_add_delayed (MAP_REFRESH_FREQ,
+                                      &do_refresh,
+                                      mini);
     return;
   }
   /*
@@ -617,7 +623,9 @@ GNUNET_NAT_mini_map_start (uint16_t port,
   ret->is_tcp = is_tcp;
   ret->port = port;
   ret->refresh_task =
-    GNUNET_SCHEDULER_add_delayed (MAP_REFRESH_FREQ, &do_refresh, ret);
+    GNUNET_SCHEDULER_add_delayed (MAP_REFRESH_FREQ,
+                                  &do_refresh,
+                                  ret);
   run_upnpc_r (ret);
   return ret;
 }
diff --git a/src/nat/nat_test.c b/src/nat/nat_test.c
index 33f81d800..b2f22781e 100644
--- a/src/nat/nat_test.c
+++ b/src/nat/nat_test.c
@@ -252,7 +252,9 @@ do_read (void *cls)
   tc = GNUNET_SCHEDULER_get_task_context ();
   na->rtask = NULL;
   tst = na->h;
-  GNUNET_CONTAINER_DLL_remove (tst->na_head, tst->na_tail, na);
+  GNUNET_CONTAINER_DLL_remove (tst->na_head,
+                               tst->na_tail,
+                               na);
   if ((NULL != tc->write_ready) &&
       (GNUNET_NETWORK_fdset_isset (tc->read_ready, na->sock)) &&
       (sizeof (data) ==
@@ -284,14 +286,10 @@ 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 =
-      GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, tst->lsock,
+      GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
+                                     tst->lsock,
                                      &do_accept, tst);
   s = GNUNET_NETWORK_socket_accept (tst->lsock, NULL, NULL);
   if (NULL == s)
@@ -308,7 +306,9 @@ do_accept (void *cls)
     GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
                                    wl->sock,
                                    &do_read, wl);
-  GNUNET_CONTAINER_DLL_insert (tst->na_head, tst->na_tail, wl);
+  GNUNET_CONTAINER_DLL_insert (tst->na_head,
+                               tst->na_tail,
+                               wl);
 }
 
 
@@ -474,13 +474,15 @@ GNUNET_NAT_test_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
       GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_listen (nh->lsock, 5));
       nh->ltask =
           GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
-                                         nh->lsock, &do_accept, nh);
+                                         nh->lsock,
+                                         &do_accept, nh);
     }
     else
     {
       nh->ltask =
           GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
-                                         nh->lsock, &do_udp_read, nh);
+                                         nh->lsock,
+                                         &do_udp_read, nh);
     }
     LOG (GNUNET_ERROR_TYPE_INFO,
          "NAT test listens on port %u (%s)\n",
@@ -508,7 +510,9 @@ GNUNET_NAT_test_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
       return nh;
     }
   }
-  nh->ttask = GNUNET_SCHEDULER_add_delayed (timeout, &do_timeout, nh);
+  nh->ttask = GNUNET_SCHEDULER_add_delayed (timeout,
+                                            &do_timeout,
+                                            nh);
   return nh;
 }
 
@@ -528,13 +532,17 @@ GNUNET_NAT_test_stop (struct GNUNET_NAT_Test *tst)
        "Stopping NAT test\n");
   while (NULL != (cpos = tst->ca_head))
   {
-    GNUNET_CONTAINER_DLL_remove (tst->ca_head, tst->ca_tail, cpos);
+    GNUNET_CONTAINER_DLL_remove (tst->ca_head,
+                                 tst->ca_tail,
+                                 cpos);
     GNUNET_CLIENT_disconnect (cpos->client);
     GNUNET_free (cpos);
   }
   while (NULL != (pos = tst->na_head))
   {
-    GNUNET_CONTAINER_DLL_remove (tst->na_head, tst->na_tail, pos);
+    GNUNET_CONTAINER_DLL_remove (tst->na_head,
+                                 tst->na_tail,
+                                 pos);
     GNUNET_SCHEDULER_cancel (pos->rtask);
     GNUNET_NETWORK_socket_close (pos->sock);
     GNUNET_free (pos);
diff --git a/src/nat/test_nat.c b/src/nat/test_nat.c
index a840f3ef9..fd67473ee 100644
--- a/src/nat/test_nat.c
+++ b/src/nat/test_nat.c
@@ -69,7 +69,8 @@ stop (void *cls)
 {
   struct GNUNET_NAT_Handle *nat = cls;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stopping NAT and quitting...\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Stopping NAT and quitting...\n");
   GNUNET_NAT_unregister (nat);
 }