1 files changed, 212 insertions, 212 deletions

diff --git a/src/nat/gnunet-nat.c b/src/nat/gnunet-nat.c
index d82898f56..857ce5093 100644
--- a/src/nat/gnunet-nat.c
+++ b/src/nat/gnunet-nat.c
@@ -95,13 +95,13 @@ static struct GNUNET_SCHEDULER_Task *rtask;
  * terminate.
  */
 static void
-test_finished()
+test_finished ()
 {
   if (NULL != nh)
     return;
   if (NULL != rtask)
     return;
-  GNUNET_SCHEDULER_shutdown();
+  GNUNET_SCHEDULER_shutdown ();
 }
 
 
@@ -119,21 +119,21 @@ test_finished()
  * @param addrlen actual length of the @a addr
  */
 static void
-address_cb(void *cls,
-           void **app_ctx,
-           int add_remove,
-           enum GNUNET_NAT_AddressClass ac,
-           const struct sockaddr *addr,
-           socklen_t addrlen)
+address_cb (void *cls,
+            void **app_ctx,
+            int add_remove,
+            enum GNUNET_NAT_AddressClass ac,
+            const struct sockaddr *addr,
+            socklen_t addrlen)
 {
-  (void)cls;
-  (void)app_ctx;
-
-  fprintf(stdout,
-          "%s %s (%d)\n",
-          add_remove ? "+" : "-",
-          GNUNET_a2s(addr, addrlen),
-          (int)ac);
+  (void) cls;
+  (void) app_ctx;
+
+  fprintf (stdout,
+           "%s %s (%d)\n",
+           add_remove ? "+" : "-",
+           GNUNET_a2s (addr, addrlen),
+           (int) ac);
 }
 
 
@@ -147,13 +147,13 @@ address_cb(void *cls,
  * @param remote_addrlen actual length of the @a remote_addr
  */
 static void
-reversal_cb(void *cls,
-            const struct sockaddr *remote_addr,
-            socklen_t remote_addrlen)
+reversal_cb (void *cls,
+             const struct sockaddr *remote_addr,
+             socklen_t remote_addrlen)
 {
-  GNUNET_log(GNUNET_ERROR_TYPE_MESSAGE,
-             "Connection reversal requested by %s\n",
-             GNUNET_a2s(remote_addr, remote_addrlen));
+  GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+              "Connection reversal requested by %s\n",
+              GNUNET_a2s (remote_addr, remote_addrlen));
 }
 
 
@@ -163,23 +163,23 @@ reversal_cb(void *cls,
  * @param cls NULL
  */
 static void
-do_shutdown(void *cls)
+do_shutdown (void *cls)
 {
   if (NULL != nh)
-    {
-      GNUNET_NAT_unregister(nh);
-      nh = NULL;
-    }
+  {
+    GNUNET_NAT_unregister (nh);
+    nh = NULL;
+  }
   if (NULL != ls)
-    {
-      GNUNET_NETWORK_socket_close(ls);
-      ls = NULL;
-    }
+  {
+    GNUNET_NETWORK_socket_close (ls);
+    ls = NULL;
+  }
   if (NULL != rtask)
-    {
-      GNUNET_SCHEDULER_cancel(rtask);
-      rtask = NULL;
-    }
+  {
+    GNUNET_SCHEDULER_cancel (rtask);
+    rtask = NULL;
+  }
 }
 
 
@@ -187,45 +187,45 @@ do_shutdown(void *cls)
  * Task to receive incoming packets for STUN processing.
  */
 static void
-stun_read_task(void *cls)
+stun_read_task (void *cls)
 {
   ssize_t size;
 
-  rtask = GNUNET_SCHEDULER_add_read_net(GNUNET_TIME_UNIT_FOREVER_REL,
-                                        ls,
-                                        &stun_read_task,
-                                        NULL);
-  size = GNUNET_NETWORK_socket_recvfrom_amount(ls);
+  rtask = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
+                                         ls,
+                                         &stun_read_task,
+                                         NULL);
+  size = GNUNET_NETWORK_socket_recvfrom_amount (ls);
   if (size > 0)
-    {
-      GNUNET_break(0);
-      GNUNET_SCHEDULER_shutdown();
-      global_ret = 1;
-      return;
-    }
+  {
+    GNUNET_break (0);
+    GNUNET_SCHEDULER_shutdown ();
+    global_ret = 1;
+    return;
+  }
   {
     char buf[size + 1];
     struct sockaddr_storage sa;
     socklen_t salen = sizeof(sa);
     ssize_t ret;
 
-    ret = GNUNET_NETWORK_socket_recvfrom(ls,
-                                         buf,
-                                         size + 1,
-                                         (struct sockaddr *)&sa,
-                                         &salen);
+    ret = GNUNET_NETWORK_socket_recvfrom (ls,
+                                          buf,
+                                          size + 1,
+                                          (struct sockaddr *) &sa,
+                                          &salen);
     if (ret != size)
-      {
-        GNUNET_break(0);
-        GNUNET_SCHEDULER_shutdown();
-        global_ret = 1;
-        return;
-      }
-    (void)GNUNET_NAT_stun_handle_packet(nh,
-                                        (const struct sockaddr *)&sa,
-                                        salen,
-                                        buf,
-                                        ret);
+    {
+      GNUNET_break (0);
+      GNUNET_SCHEDULER_shutdown ();
+      global_ret = 1;
+      return;
+    }
+    (void) GNUNET_NAT_stun_handle_packet (nh,
+                                          (const struct sockaddr *) &sa,
+                                          salen,
+                                          buf,
+                                          ret);
   }
 }
 
@@ -239,10 +239,10 @@ stun_read_task(void *cls)
  * @param c configuration
  */
 static void
-run(void *cls,
-    char *const *args,
-    const char *cfgfile,
-    const struct GNUNET_CONFIGURATION_Handle *c)
+run (void *cls,
+     char *const *args,
+     const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *c)
 {
   uint8_t af;
   struct sockaddr *local_sa;
@@ -251,156 +251,156 @@ run(void *cls,
   size_t remote_len;
 
   if (use_tcp && use_udp)
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_MESSAGE, "Cannot use TCP and UDP\n");
-      global_ret = 1;
-      return;
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, "Cannot use TCP and UDP\n");
+    global_ret = 1;
+    return;
+  }
   proto = 0;
   if (use_tcp)
     proto = IPPROTO_TCP;
   if (use_udp)
     proto = IPPROTO_UDP;
 
-  GNUNET_SCHEDULER_add_shutdown(&do_shutdown, NULL);
+  GNUNET_SCHEDULER_add_shutdown (&do_shutdown, NULL);
 
   if (0 == proto)
-    {
-      GNUNET_log(GNUNET_ERROR_TYPE_MESSAGE, "Must specify either TCP or UDP\n");
-      global_ret = 1;
-      return;
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, "Must specify either TCP or UDP\n");
+    global_ret = 1;
+    return;
+  }
   local_len = 0;
   local_sa = NULL;
   remote_len = 0;
   remote_sa = NULL;
   if (NULL != local_addr)
+  {
+    local_len =
+      (socklen_t) GNUNET_STRINGS_parse_socket_addr (local_addr, &af, &local_sa);
+    if (0 == local_len)
     {
-      local_len =
-        (socklen_t)GNUNET_STRINGS_parse_socket_addr(local_addr, &af, &local_sa);
-      if (0 == local_len)
-        {
-          GNUNET_log(GNUNET_ERROR_TYPE_MESSAGE,
-                     "Invalid socket address `%s'\n",
-                     local_addr);
-          goto fail_and_shutdown;
-        }
+      GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+                  "Invalid socket address `%s'\n",
+                  local_addr);
+      goto fail_and_shutdown;
     }
+  }
 
   if (NULL != remote_addr)
+  {
+    remote_len =
+      GNUNET_STRINGS_parse_socket_addr (remote_addr, &af, &remote_sa);
+    if (0 == remote_len)
     {
-      remote_len =
-        GNUNET_STRINGS_parse_socket_addr(remote_addr, &af, &remote_sa);
-      if (0 == remote_len)
-        {
-          GNUNET_log(GNUNET_ERROR_TYPE_MESSAGE,
-                     "Invalid socket address `%s'\n",
-                     remote_addr);
-          goto fail_and_shutdown;
-        }
+      GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+                  "Invalid socket address `%s'\n",
+                  remote_addr);
+      goto fail_and_shutdown;
     }
+  }
 
   if (NULL != local_addr)
+  {
+    if (NULL == section_name)
+      section_name = GNUNET_strdup ("undefined");
+    nh = GNUNET_NAT_register (c,
+                              section_name,
+                              proto,
+                              1,
+                              (const struct sockaddr **) &local_sa,
+                              &local_len,
+                              &address_cb,
+                              (listen_reversal) ? &reversal_cb : NULL,
+                              NULL);
+  }
+  else if (listen_reversal)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+                "Use of `-W` only effective in combination with `-i`\n");
+    goto fail_and_shutdown;
+  }
+
+  if (NULL != remote_addr)
+  {
+    int ret;
+
+    if ((NULL == nh) || (sizeof(struct sockaddr_in) != local_len))
     {
-      if (NULL == section_name)
-        section_name = GNUNET_strdup("undefined");
-      nh = GNUNET_NAT_register(c,
-                               section_name,
-                               proto,
-                               1,
-                               (const struct sockaddr **)&local_sa,
-                               &local_len,
-                               &address_cb,
-                               (listen_reversal) ? &reversal_cb : NULL,
-                               NULL);
+      GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+                  "Require IPv4 local address to initiate connection reversal\n");
+      goto fail_and_shutdown;
     }
-  else if (listen_reversal)
+    if (sizeof(struct sockaddr_in) != remote_len)
     {
-      GNUNET_log(GNUNET_ERROR_TYPE_MESSAGE,
-                 "Use of `-W` only effective in combination with `-i`\n");
+      GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+                  "Require IPv4 reversal target address\n");
       goto fail_and_shutdown;
     }
-
-  if (NULL != remote_addr)
+    GNUNET_assert (AF_INET == local_sa->sa_family);
+    GNUNET_assert (AF_INET == remote_sa->sa_family);
+    ret = GNUNET_NAT_request_reversal (nh,
+                                       (const struct sockaddr_in *) local_sa,
+                                       (const struct sockaddr_in *) remote_sa);
+    switch (ret)
     {
-      int ret;
-
-      if ((NULL == nh) || (sizeof(struct sockaddr_in) != local_len))
-        {
-          GNUNET_log(GNUNET_ERROR_TYPE_MESSAGE,
-                     "Require IPv4 local address to initiate connection reversal\n");
-          goto fail_and_shutdown;
-        }
-      if (sizeof(struct sockaddr_in) != remote_len)
-        {
-          GNUNET_log(GNUNET_ERROR_TYPE_MESSAGE,
-                     "Require IPv4 reversal target address\n");
-          goto fail_and_shutdown;
-        }
-      GNUNET_assert(AF_INET == local_sa->sa_family);
-      GNUNET_assert(AF_INET == remote_sa->sa_family);
-      ret = GNUNET_NAT_request_reversal(nh,
-                                        (const struct sockaddr_in *)local_sa,
-                                        (const struct sockaddr_in *)remote_sa);
-      switch (ret)
-        {
-        case GNUNET_SYSERR:
-          GNUNET_log(GNUNET_ERROR_TYPE_MESSAGE,
-                     "Connection reversal internal error\n");
-          break;
-
-        case GNUNET_NO:
-          GNUNET_log(GNUNET_ERROR_TYPE_MESSAGE,
-                     "Connection reversal unavailable\n");
-          break;
-
-        case GNUNET_OK:
-          /* operation in progress */
-          break;
-        }
+    case GNUNET_SYSERR:
+      GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+                  "Connection reversal internal error\n");
+      break;
+
+    case GNUNET_NO:
+      GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+                  "Connection reversal unavailable\n");
+      break;
+
+    case GNUNET_OK:
+      /* operation in progress */
+      break;
     }
+  }
 
   if (do_stun)
+  {
+    if (NULL == local_addr)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+                  "Require local address to support STUN requests\n");
+      goto fail_and_shutdown;
+    }
+    if (IPPROTO_UDP != proto)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, "STUN only supported over UDP\n");
+      goto fail_and_shutdown;
+    }
+    ls = GNUNET_NETWORK_socket_create (af, SOCK_DGRAM, IPPROTO_UDP);
+    if (NULL == ls)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, "Failed to create socket\n");
+      goto fail_and_shutdown;
+    }
+    if (GNUNET_OK != GNUNET_NETWORK_socket_bind (ls, local_sa, local_len))
     {
-      if (NULL == local_addr)
-        {
-          GNUNET_log(GNUNET_ERROR_TYPE_MESSAGE,
-                     "Require local address to support STUN requests\n");
-          goto fail_and_shutdown;
-        }
-      if (IPPROTO_UDP != proto)
-        {
-          GNUNET_log(GNUNET_ERROR_TYPE_MESSAGE, "STUN only supported over UDP\n");
-          goto fail_and_shutdown;
-        }
-      ls = GNUNET_NETWORK_socket_create(af, SOCK_DGRAM, IPPROTO_UDP);
-      if (NULL == ls)
-        {
-          GNUNET_log(GNUNET_ERROR_TYPE_MESSAGE, "Failed to create socket\n");
-          goto fail_and_shutdown;
-        }
-      if (GNUNET_OK != GNUNET_NETWORK_socket_bind(ls, local_sa, local_len))
-        {
-          GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-                     "Failed to bind to %s: %s\n",
-                     GNUNET_a2s(local_sa, local_len),
-                     strerror(errno));
-          goto fail_and_shutdown;
-        }
-      rtask = GNUNET_SCHEDULER_add_read_net(GNUNET_TIME_UNIT_FOREVER_REL,
-                                            ls,
-                                            &stun_read_task,
-                                            NULL);
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Failed to bind to %s: %s\n",
+                  GNUNET_a2s (local_sa, local_len),
+                  strerror (errno));
+      goto fail_and_shutdown;
     }
-  GNUNET_free_non_null(remote_sa);
-  GNUNET_free_non_null(local_sa);
-  test_finished();
+    rtask = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
+                                           ls,
+                                           &stun_read_task,
+                                           NULL);
+  }
+  GNUNET_free_non_null (remote_sa);
+  GNUNET_free_non_null (local_sa);
+  test_finished ();
   return;
 fail_and_shutdown:
   global_ret = 1;
-  GNUNET_SCHEDULER_shutdown();
-  GNUNET_free_non_null(remote_sa);
-  GNUNET_free_non_null(local_sa);
+  GNUNET_SCHEDULER_shutdown ();
+  GNUNET_free_non_null (remote_sa);
+  GNUNET_free_non_null (local_sa);
 }
 
 
@@ -412,63 +412,63 @@ fail_and_shutdown:
  * @return 0 on success, -1 on error
  */
 int
-main(int argc, char *const argv[])
+main (int argc, char *const argv[])
 {
   struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_option_string(
+    GNUNET_GETOPT_option_string (
       'i',
       "in",
       "ADDRESS",
-      gettext_noop("which IP and port are we locally using to bind/listen to"),
+      gettext_noop ("which IP and port are we locally using to bind/listen to"),
       &local_addr),
 
-    GNUNET_GETOPT_option_string(
+    GNUNET_GETOPT_option_string (
       'r',
       "remote",
       "ADDRESS",
-      gettext_noop(
+      gettext_noop (
         "which remote IP and port should be asked for connection reversal"),
       &remote_addr),
 
-    GNUNET_GETOPT_option_string(
+    GNUNET_GETOPT_option_string (
       'S',
       "section",
       NULL,
-      gettext_noop(
+      gettext_noop (
         "name of configuration section to find additional options, such as manual host punching data"),
       &section_name),
 
-    GNUNET_GETOPT_option_flag('s',
-                              "stun",
-                              gettext_noop("enable STUN processing"),
-                              &do_stun),
+    GNUNET_GETOPT_option_flag ('s',
+                               "stun",
+                               gettext_noop ("enable STUN processing"),
+                               &do_stun),
 
-    GNUNET_GETOPT_option_flag('t', "tcp", gettext_noop("use TCP"), &use_tcp),
+    GNUNET_GETOPT_option_flag ('t', "tcp", gettext_noop ("use TCP"), &use_tcp),
 
-    GNUNET_GETOPT_option_flag('u', "udp", gettext_noop("use UDP"), &use_udp),
+    GNUNET_GETOPT_option_flag ('u', "udp", gettext_noop ("use UDP"), &use_udp),
 
-    GNUNET_GETOPT_option_flag('W',
-                              "watch",
-                              gettext_noop(
-                                "watch for connection reversal requests"),
-                              &listen_reversal),
+    GNUNET_GETOPT_option_flag ('W',
+                               "watch",
+                               gettext_noop (
+                                 "watch for connection reversal requests"),
+                               &listen_reversal),
     GNUNET_GETOPT_OPTION_END
   };
 
-  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args(argc, argv, &argc, &argv))
+  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
     return 2;
   if (GNUNET_OK !=
-      GNUNET_PROGRAM_run(argc,
-                         argv,
-                         "gnunet-nat [options]",
-                         _("GNUnet NAT traversal autoconfigure daemon"),
-                         options,
-                         &run,
-                         NULL))
-    {
-      global_ret = 1;
-    }
-  GNUNET_free((void *)argv);
+      GNUNET_PROGRAM_run (argc,
+                          argv,
+                          "gnunet-nat [options]",
+                          _ ("GNUnet NAT traversal autoconfigure daemon"),
+                          options,
+                          &run,
+                          NULL))
+  {
+    global_ret = 1;
+  }
+  GNUNET_free ((void *) argv);
   return global_ret;
 }