1 files changed, 295 insertions, 299 deletions

diff --git a/src/nat/gnunet-service-nat_mini.c b/src/nat/gnunet-service-nat_mini.c
index 375188ff2..94534e81c 100644
--- a/src/nat/gnunet-service-nat_mini.c
+++ b/src/nat/gnunet-service-nat_mini.c
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @file nat/gnunet-service-nat_mini.c
@@ -29,24 +29,24 @@
 #include "gnunet-service-nat_mini.h"
 #include "nat.h"
 
-#define LOG(kind, ...) GNUNET_log_from (kind, "nat", __VA_ARGS__)
+#define LOG(kind, ...) GNUNET_log_from(kind, "nat", __VA_ARGS__)
 
 /**
  * How long do we give upnpc to create a mapping?
  */
-#define MAP_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
+#define MAP_TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 15)
 
 /**
  * How long do we give upnpc to remove a mapping?
  */
 #define UNMAP_TIMEOUT \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
+  GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1)
 
 /**
  * How often do we check for changes in the mapping?
  */
 #define MAP_REFRESH_FREQ \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5)
+  GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 5)
 
 
 /* ************************* external-ip calling ************************ */
@@ -54,9 +54,7 @@
 /**
  * Opaque handle to cancel "GNUNET_NAT_mini_get_external_ipv4" operation.
  */
-struct GNUNET_NAT_ExternalHandle
-{
-
+struct GNUNET_NAT_ExternalHandle {
   /**
    * Function to call with the result.
    */
@@ -111,43 +109,43 @@ struct GNUNET_NAT_ExternalHandle
  * @param cls the `struct GNUNET_NAT_ExternalHandle`
  */
 static void
-read_external_ipv4 (void *cls)
+read_external_ipv4(void *cls)
 {
   struct GNUNET_NAT_ExternalHandle *eh = cls;
   ssize_t ret;
   struct in_addr addr;
 
   eh->task = NULL;
-  ret = GNUNET_DISK_file_read (eh->r,
-                               &eh->buf[eh->off],
-                               sizeof (eh->buf) - eh->off);
+  ret = GNUNET_DISK_file_read(eh->r,
+                              &eh->buf[eh->off],
+                              sizeof(eh->buf) - eh->off);
   if (ret > 0)
-  {
-    /* try to read more */
-    eh->off += ret;
-    eh->task = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
-                                               eh->r,
-                                               &read_external_ipv4,
-                                               eh);
-    return;
-  }
+    {
+      /* try to read more */
+      eh->off += ret;
+      eh->task = GNUNET_SCHEDULER_add_read_file(GNUNET_TIME_UNIT_FOREVER_REL,
+                                                eh->r,
+                                                &read_external_ipv4,
+                                                eh);
+      return;
+    }
   eh->ret = GNUNET_NAT_ERROR_EXTERNAL_IP_UTILITY_OUTPUT_INVALID;
   if ((eh->off > 7) && (eh->buf[eh->off - 1] == '\n'))
-  {
-    eh->buf[eh->off - 1] = '\0';
-    if (1 == inet_pton (AF_INET, eh->buf, &addr))
     {
-      if (0 == addr.s_addr)
-        eh->ret =
-          GNUNET_NAT_ERROR_EXTERNAL_IP_ADDRESS_INVALID; /* got 0.0.0.0 */
-      else
-        eh->ret = GNUNET_NAT_ERROR_SUCCESS;
+      eh->buf[eh->off - 1] = '\0';
+      if (1 == inet_pton(AF_INET, eh->buf, &addr))
+        {
+          if (0 == addr.s_addr)
+            eh->ret =
+              GNUNET_NAT_ERROR_EXTERNAL_IP_ADDRESS_INVALID; /* got 0.0.0.0 */
+          else
+            eh->ret = GNUNET_NAT_ERROR_SUCCESS;
+        }
     }
-  }
-  eh->cb (eh->cb_cls,
-          (GNUNET_NAT_ERROR_SUCCESS == eh->ret) ? &addr : NULL,
-          eh->ret);
-  GNUNET_NAT_mini_get_external_ipv4_cancel_ (eh);
+  eh->cb(eh->cb_cls,
+         (GNUNET_NAT_ERROR_SUCCESS == eh->ret) ? &addr : NULL,
+         eh->ret);
+  GNUNET_NAT_mini_get_external_ipv4_cancel_(eh);
 }
 
 
@@ -157,13 +155,13 @@ read_external_ipv4 (void *cls)
  * @param cls the `struct GNUNET_NAT_ExternalHandle` (freed)
  */
 static void
-signal_external_ip_error (void *cls)
+signal_external_ip_error(void *cls)
 {
   struct GNUNET_NAT_ExternalHandle *eh = cls;
 
   eh->task = NULL;
-  eh->cb (eh->cb_cls, NULL, eh->ret);
-  GNUNET_free (eh);
+  eh->cb(eh->cb_cls, NULL, eh->ret);
+  GNUNET_free(eh);
 }
 
 
@@ -175,52 +173,52 @@ signal_external_ip_error (void *cls)
  * @return handle for cancellation (can only be used until @a cb is called), never NULL
  */
 struct GNUNET_NAT_ExternalHandle *
-GNUNET_NAT_mini_get_external_ipv4_ (GNUNET_NAT_IPCallback cb, void *cb_cls)
+GNUNET_NAT_mini_get_external_ipv4_(GNUNET_NAT_IPCallback cb, void *cb_cls)
 {
   struct GNUNET_NAT_ExternalHandle *eh;
 
-  eh = GNUNET_new (struct GNUNET_NAT_ExternalHandle);
+  eh = GNUNET_new(struct GNUNET_NAT_ExternalHandle);
   eh->cb = cb;
   eh->cb_cls = cb_cls;
   eh->ret = GNUNET_NAT_ERROR_SUCCESS;
   if (GNUNET_SYSERR ==
-      GNUNET_OS_check_helper_binary ("external-ip", GNUNET_NO, NULL))
-  {
-    LOG (GNUNET_ERROR_TYPE_INFO, _ ("`external-ip' command not found\n"));
-    eh->ret = GNUNET_NAT_ERROR_EXTERNAL_IP_UTILITY_NOT_FOUND;
-    eh->task = GNUNET_SCHEDULER_add_now (&signal_external_ip_error, eh);
-    return eh;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Running `external-ip' to determine our external IP\n");
-  eh->opipe = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO, GNUNET_YES);
+      GNUNET_OS_check_helper_binary("external-ip", GNUNET_NO, NULL))
+    {
+      LOG(GNUNET_ERROR_TYPE_INFO, _("`external-ip' command not found\n"));
+      eh->ret = GNUNET_NAT_ERROR_EXTERNAL_IP_UTILITY_NOT_FOUND;
+      eh->task = GNUNET_SCHEDULER_add_now(&signal_external_ip_error, eh);
+      return eh;
+    }
+  LOG(GNUNET_ERROR_TYPE_DEBUG,
+      "Running `external-ip' to determine our external IP\n");
+  eh->opipe = GNUNET_DISK_pipe(GNUNET_YES, GNUNET_YES, GNUNET_NO, GNUNET_YES);
   if (NULL == eh->opipe)
-  {
-    eh->ret = GNUNET_NAT_ERROR_IPC_FAILURE;
-    eh->task = GNUNET_SCHEDULER_add_now (&signal_external_ip_error, eh);
-    return eh;
-  }
-  eh->eip = GNUNET_OS_start_process (GNUNET_NO,
-                                     0,
-                                     NULL,
-                                     eh->opipe,
-                                     NULL,
-                                     "external-ip",
-                                     "external-ip",
-                                     NULL);
+    {
+      eh->ret = GNUNET_NAT_ERROR_IPC_FAILURE;
+      eh->task = GNUNET_SCHEDULER_add_now(&signal_external_ip_error, eh);
+      return eh;
+    }
+  eh->eip = GNUNET_OS_start_process(GNUNET_NO,
+                                    0,
+                                    NULL,
+                                    eh->opipe,
+                                    NULL,
+                                    "external-ip",
+                                    "external-ip",
+                                    NULL);
   if (NULL == eh->eip)
-  {
-    GNUNET_DISK_pipe_close (eh->opipe);
-    eh->ret = GNUNET_NAT_ERROR_EXTERNAL_IP_UTILITY_FAILED;
-    eh->task = GNUNET_SCHEDULER_add_now (&signal_external_ip_error, eh);
-    return eh;
-  }
-  GNUNET_DISK_pipe_close_end (eh->opipe, GNUNET_DISK_PIPE_END_WRITE);
-  eh->r = GNUNET_DISK_pipe_handle (eh->opipe, GNUNET_DISK_PIPE_END_READ);
-  eh->task = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
-                                             eh->r,
-                                             &read_external_ipv4,
-                                             eh);
+    {
+      GNUNET_DISK_pipe_close(eh->opipe);
+      eh->ret = GNUNET_NAT_ERROR_EXTERNAL_IP_UTILITY_FAILED;
+      eh->task = GNUNET_SCHEDULER_add_now(&signal_external_ip_error, eh);
+      return eh;
+    }
+  GNUNET_DISK_pipe_close_end(eh->opipe, GNUNET_DISK_PIPE_END_WRITE);
+  eh->r = GNUNET_DISK_pipe_handle(eh->opipe, GNUNET_DISK_PIPE_END_READ);
+  eh->task = GNUNET_SCHEDULER_add_read_file(GNUNET_TIME_UNIT_FOREVER_REL,
+                                            eh->r,
+                                            &read_external_ipv4,
+                                            eh);
   return eh;
 }
 
@@ -231,25 +229,25 @@ GNUNET_NAT_mini_get_external_ipv4_ (GNUNET_NAT_IPCallback cb, void *cb_cls)
  * @param eh operation to cancel
  */
 void
-GNUNET_NAT_mini_get_external_ipv4_cancel_ (struct GNUNET_NAT_ExternalHandle *eh)
+GNUNET_NAT_mini_get_external_ipv4_cancel_(struct GNUNET_NAT_ExternalHandle *eh)
 {
   if (NULL != eh->eip)
-  {
-    (void) GNUNET_OS_process_kill (eh->eip, SIGKILL);
-    GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (eh->eip));
-    GNUNET_OS_process_destroy (eh->eip);
-  }
+    {
+      (void)GNUNET_OS_process_kill(eh->eip, SIGKILL);
+      GNUNET_break(GNUNET_OK == GNUNET_OS_process_wait(eh->eip));
+      GNUNET_OS_process_destroy(eh->eip);
+    }
   if (NULL != eh->opipe)
-  {
-    GNUNET_DISK_pipe_close (eh->opipe);
-    eh->opipe = NULL;
-  }
+    {
+      GNUNET_DISK_pipe_close(eh->opipe);
+      eh->opipe = NULL;
+    }
   if (NULL != eh->task)
-  {
-    GNUNET_SCHEDULER_cancel (eh->task);
-    eh->task = NULL;
-  }
-  GNUNET_free (eh);
+    {
+      GNUNET_SCHEDULER_cancel(eh->task);
+      eh->task = NULL;
+    }
+  GNUNET_free(eh);
 }
 
 
@@ -259,9 +257,7 @@ GNUNET_NAT_mini_get_external_ipv4_cancel_ (struct GNUNET_NAT_ExternalHandle *eh)
 /**
  * Handle to a mapping created with upnpc.
  */
-struct GNUNET_NAT_MiniHandle
-{
-
+struct GNUNET_NAT_MiniHandle {
   /**
    * Function to call on mapping changes.
    */
@@ -326,7 +322,7 @@ struct GNUNET_NAT_MiniHandle
  * @param cls the `struct GNUNET_NAT_MiniHandle`
  */
 static void
-do_refresh (void *cls);
+do_refresh(void *cls);
 
 
 /**
@@ -336,7 +332,7 @@ do_refresh (void *cls);
  * @param line line of output, NULL at the end
  */
 static void
-process_map_output (void *cls, const char *line);
+process_map_output(void *cls, const char *line);
 
 
 /**
@@ -345,29 +341,29 @@ process_map_output (void *cls, const char *line);
  * @param mini our handle
  */
 static void
-run_upnpc_r (struct GNUNET_NAT_MiniHandle *mini)
+run_upnpc_r(struct GNUNET_NAT_MiniHandle *mini)
 {
   char pstr[6];
 
-  GNUNET_snprintf (pstr, sizeof (pstr), "%u", (unsigned int) mini->port);
-  mini->map_cmd = GNUNET_OS_command_run (&process_map_output,
-                                         mini,
-                                         MAP_TIMEOUT,
-                                         "upnpc",
-                                         "upnpc",
-                                         "-r",
-                                         pstr,
-                                         mini->is_tcp ? "tcp" : "udp",
-                                         NULL);
+  GNUNET_snprintf(pstr, sizeof(pstr), "%u", (unsigned int)mini->port);
+  mini->map_cmd = GNUNET_OS_command_run(&process_map_output,
+                                        mini,
+                                        MAP_TIMEOUT,
+                                        "upnpc",
+                                        "upnpc",
+                                        "-r",
+                                        pstr,
+                                        mini->is_tcp ? "tcp" : "udp",
+                                        NULL);
   if (NULL == mini->map_cmd)
-  {
-    mini->ac (mini->ac_cls,
-              GNUNET_SYSERR,
-              NULL,
-              0,
-              GNUNET_NAT_ERROR_UPNPC_FAILED);
-    return;
-  }
+    {
+      mini->ac(mini->ac_cls,
+               GNUNET_SYSERR,
+               NULL,
+               0,
+               GNUNET_NAT_ERROR_UPNPC_FAILED);
+      return;
+    }
 }
 
 
@@ -379,7 +375,7 @@ run_upnpc_r (struct GNUNET_NAT_MiniHandle *mini)
  * @param line line of output, NULL at the end
  */
 static void
-process_refresh_output (void *cls, const char *line)
+process_refresh_output(void *cls, const char *line)
 {
   struct GNUNET_NAT_MiniHandle *mini = cls;
   char pstr[9];
@@ -388,53 +384,53 @@ process_refresh_output (void *cls, const char *line)
   struct in_addr exip;
 
   if (NULL == line)
-  {
-    GNUNET_OS_command_stop (mini->refresh_cmd);
-    mini->refresh_cmd = NULL;
-    if (GNUNET_NO == mini->found)
     {
-      /* mapping disappeared, try to re-create */
-      if (GNUNET_YES == mini->did_map)
-      {
-        mini->ac (mini->ac_cls,
-                  GNUNET_NO,
-                  (const struct sockaddr *) &mini->current_addr,
-                  sizeof (mini->current_addr),
-                  GNUNET_NAT_ERROR_SUCCESS);
-        mini->did_map = GNUNET_NO;
-      }
-      run_upnpc_r (mini);
+      GNUNET_OS_command_stop(mini->refresh_cmd);
+      mini->refresh_cmd = NULL;
+      if (GNUNET_NO == mini->found)
+        {
+          /* mapping disappeared, try to re-create */
+          if (GNUNET_YES == mini->did_map)
+            {
+              mini->ac(mini->ac_cls,
+                       GNUNET_NO,
+                       (const struct sockaddr *)&mini->current_addr,
+                       sizeof(mini->current_addr),
+                       GNUNET_NAT_ERROR_SUCCESS);
+              mini->did_map = GNUNET_NO;
+            }
+          run_upnpc_r(mini);
+        }
+      return;
     }
-    return;
-  }
-  if (! mini->did_map)
+  if (!mini->did_map)
     return; /* never mapped, won't find our mapping anyway */
 
   /* we're looking for output of the form:
-   * "ExternalIPAddress = 12.134.41.124" */
+  * "ExternalIPAddress = 12.134.41.124" */
 
-  s = strstr (line, "ExternalIPAddress = ");
+  s = strstr(line, "ExternalIPAddress = ");
   if (NULL != s)
-  {
-    s += strlen ("ExternalIPAddress = ");
-    if (1 != inet_pton (AF_INET, s, &exip))
-      return; /* skip */
-    if (exip.s_addr == mini->current_addr.sin_addr.s_addr)
-      return; /* no change */
-    /* update mapping */
-    mini->ac (mini->ac_cls,
-              GNUNET_NO,
-              (const struct sockaddr *) &mini->current_addr,
-              sizeof (mini->current_addr),
-              GNUNET_NAT_ERROR_SUCCESS);
-    mini->current_addr.sin_addr = exip;
-    mini->ac (mini->ac_cls,
-              GNUNET_YES,
-              (const struct sockaddr *) &mini->current_addr,
-              sizeof (mini->current_addr),
-              GNUNET_NAT_ERROR_SUCCESS);
-    return;
-  }
+    {
+      s += strlen("ExternalIPAddress = ");
+      if (1 != inet_pton(AF_INET, s, &exip))
+        return; /* skip */
+      if (exip.s_addr == mini->current_addr.sin_addr.s_addr)
+        return; /* no change */
+      /* update mapping */
+      mini->ac(mini->ac_cls,
+               GNUNET_NO,
+               (const struct sockaddr *)&mini->current_addr,
+               sizeof(mini->current_addr),
+               GNUNET_NAT_ERROR_SUCCESS);
+      mini->current_addr.sin_addr = exip;
+      mini->ac(mini->ac_cls,
+               GNUNET_YES,
+               (const struct sockaddr *)&mini->current_addr,
+               sizeof(mini->current_addr),
+               GNUNET_NAT_ERROR_SUCCESS);
+      return;
+    }
   /*
    * we're looking for output of the form:
    *
@@ -446,32 +442,32 @@ process_refresh_output (void *cls, const char *line)
    * "%s TCP  PORT->STRING:OURPORT *" or
    * "%s UDP  PORT->STRING:OURPORT *"
    */
-  GNUNET_snprintf (pstr, sizeof (pstr), ":%u ", mini->port);
-  if (NULL == (s = strstr (line, "->")))
+  GNUNET_snprintf(pstr, sizeof(pstr), ":%u ", mini->port);
+  if (NULL == (s = strstr(line, "->")))
     return; /* skip */
-  if (NULL == strstr (s, pstr))
+  if (NULL == strstr(s, pstr))
     return; /* skip */
-  if (1 != sscanf (line,
-                   (mini->is_tcp) ? "%*u TCP  %u->%*s:%*u %*s"
-                                  : "%*u UDP  %u->%*s:%*u %*s",
-                   &nport))
+  if (1 != sscanf(line,
+                  (mini->is_tcp) ? "%*u TCP  %u->%*s:%*u %*s"
+                  : "%*u UDP  %u->%*s:%*u %*s",
+                  &nport))
     return; /* skip */
   mini->found = GNUNET_YES;
-  if (nport == ntohs (mini->current_addr.sin_port))
+  if (nport == ntohs(mini->current_addr.sin_port))
     return; /* no change */
 
   /* external port changed, update mapping */
-  mini->ac (mini->ac_cls,
-            GNUNET_NO,
-            (const struct sockaddr *) &mini->current_addr,
-            sizeof (mini->current_addr),
-            GNUNET_NAT_ERROR_SUCCESS);
-  mini->current_addr.sin_port = htons ((uint16_t) nport);
-  mini->ac (mini->ac_cls,
-            GNUNET_YES,
-            (const struct sockaddr *) &mini->current_addr,
-            sizeof (mini->current_addr),
-            GNUNET_NAT_ERROR_SUCCESS);
+  mini->ac(mini->ac_cls,
+           GNUNET_NO,
+           (const struct sockaddr *)&mini->current_addr,
+           sizeof(mini->current_addr),
+           GNUNET_NAT_ERROR_SUCCESS);
+  mini->current_addr.sin_port = htons((uint16_t)nport);
+  mini->ac(mini->ac_cls,
+           GNUNET_YES,
+           (const struct sockaddr *)&mini->current_addr,
+           sizeof(mini->current_addr),
+           GNUNET_NAT_ERROR_SUCCESS);
 }
 
 
@@ -481,44 +477,44 @@ process_refresh_output (void *cls, const char *line)
  * @param cls the 'struct GNUNET_NAT_MiniHandle'
  */
 static void
-do_refresh (void *cls)
+do_refresh(void *cls)
 {
   struct GNUNET_NAT_MiniHandle *mini = cls;
   int ac;
 
   mini->refresh_task =
-    GNUNET_SCHEDULER_add_delayed (MAP_REFRESH_FREQ, &do_refresh, mini);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Running `upnpc' to check if our mapping still exists\n");
+    GNUNET_SCHEDULER_add_delayed(MAP_REFRESH_FREQ, &do_refresh, mini);
+  LOG(GNUNET_ERROR_TYPE_DEBUG,
+      "Running `upnpc' to check if our mapping still exists\n");
   mini->found = GNUNET_NO;
   ac = GNUNET_NO;
   if (NULL != mini->map_cmd)
-  {
-    /* took way too long, abort it! */
-    GNUNET_OS_command_stop (mini->map_cmd);
-    mini->map_cmd = NULL;
-    ac = GNUNET_YES;
-  }
+    {
+      /* took way too long, abort it! */
+      GNUNET_OS_command_stop(mini->map_cmd);
+      mini->map_cmd = NULL;
+      ac = GNUNET_YES;
+    }
   if (NULL != mini->refresh_cmd)
-  {
-    /* took way too long, abort it! */
-    GNUNET_OS_command_stop (mini->refresh_cmd);
-    mini->refresh_cmd = NULL;
-    ac = GNUNET_YES;
-  }
-  mini->refresh_cmd = GNUNET_OS_command_run (&process_refresh_output,
-                                             mini,
-                                             MAP_TIMEOUT,
-                                             "upnpc",
-                                             "upnpc",
-                                             "-l",
-                                             NULL);
+    {
+      /* took way too long, abort it! */
+      GNUNET_OS_command_stop(mini->refresh_cmd);
+      mini->refresh_cmd = NULL;
+      ac = GNUNET_YES;
+    }
+  mini->refresh_cmd = GNUNET_OS_command_run(&process_refresh_output,
+                                            mini,
+                                            MAP_TIMEOUT,
+                                            "upnpc",
+                                            "upnpc",
+                                            "-l",
+                                            NULL);
   if (GNUNET_YES == ac)
-    mini->ac (mini->ac_cls,
-              GNUNET_SYSERR,
-              NULL,
-              0,
-              GNUNET_NAT_ERROR_UPNPC_TIMEOUT);
+    mini->ac(mini->ac_cls,
+             GNUNET_SYSERR,
+             NULL,
+             0,
+             GNUNET_NAT_ERROR_UPNPC_TIMEOUT);
 }
 
 
@@ -529,7 +525,7 @@ do_refresh (void *cls)
  * @param line line of output, NULL at the end
  */
 static void
-process_map_output (void *cls, const char *line)
+process_map_output(void *cls, const char *line)
 {
   struct GNUNET_NAT_MiniHandle *mini = cls;
   const char *ipaddr;
@@ -538,51 +534,51 @@ process_map_output (void *cls, const char *line)
   unsigned int port;
 
   if (NULL == line)
-  {
-    GNUNET_OS_command_stop (mini->map_cmd);
-    mini->map_cmd = NULL;
-    if (GNUNET_YES != mini->did_map)
-      mini->ac (mini->ac_cls,
-                GNUNET_SYSERR,
-                NULL,
-                0,
-                GNUNET_NAT_ERROR_UPNPC_PORTMAP_FAILED);
-    if (NULL == mini->refresh_task)
-      mini->refresh_task =
-        GNUNET_SCHEDULER_add_delayed (MAP_REFRESH_FREQ, &do_refresh, mini);
-    return;
-  }
+    {
+      GNUNET_OS_command_stop(mini->map_cmd);
+      mini->map_cmd = NULL;
+      if (GNUNET_YES != mini->did_map)
+        mini->ac(mini->ac_cls,
+                 GNUNET_SYSERR,
+                 NULL,
+                 0,
+                 GNUNET_NAT_ERROR_UPNPC_PORTMAP_FAILED);
+      if (NULL == mini->refresh_task)
+        mini->refresh_task =
+          GNUNET_SCHEDULER_add_delayed(MAP_REFRESH_FREQ, &do_refresh, mini);
+      return;
+    }
   /*
    * The upnpc output we're after looks like this:
    *
    * "external 87.123.42.204:3000 TCP is redirected to internal 192.168.2.150:3000"
    */
-  if ((NULL == (ipaddr = strstr (line, " "))) ||
-      (NULL == (pstr = strstr (ipaddr, ":"))) ||
-      (1 != sscanf (pstr + 1, "%u", &port)))
-  {
-    return; /* skip line */
-  }
-  ipa = GNUNET_strdup (ipaddr + 1);
-  strstr (ipa, ":")[0] = '\0';
-  if (1 != inet_pton (AF_INET, ipa, &mini->current_addr.sin_addr))
-  {
-    GNUNET_free (ipa);
-    return; /* skip line */
-  }
-  GNUNET_free (ipa);
-
-  mini->current_addr.sin_port = htons (port);
+  if ((NULL == (ipaddr = strstr(line, " "))) ||
+      (NULL == (pstr = strstr(ipaddr, ":"))) ||
+      (1 != sscanf(pstr + 1, "%u", &port)))
+    {
+      return; /* skip line */
+    }
+  ipa = GNUNET_strdup(ipaddr + 1);
+  strstr(ipa, ":")[0] = '\0';
+  if (1 != inet_pton(AF_INET, ipa, &mini->current_addr.sin_addr))
+    {
+      GNUNET_free(ipa);
+      return; /* skip line */
+    }
+  GNUNET_free(ipa);
+
+  mini->current_addr.sin_port = htons(port);
   mini->current_addr.sin_family = AF_INET;
 #if HAVE_SOCKADDR_IN_SIN_LEN
-  mini->current_addr.sin_len = sizeof (struct sockaddr_in);
+  mini->current_addr.sin_len = sizeof(struct sockaddr_in);
 #endif
   mini->did_map = GNUNET_YES;
-  mini->ac (mini->ac_cls,
-            GNUNET_YES,
-            (const struct sockaddr *) &mini->current_addr,
-            sizeof (mini->current_addr),
-            GNUNET_NAT_ERROR_SUCCESS);
+  mini->ac(mini->ac_cls,
+           GNUNET_YES,
+           (const struct sockaddr *)&mini->current_addr,
+           sizeof(mini->current_addr),
+           GNUNET_NAT_ERROR_SUCCESS);
 }
 
 
@@ -600,28 +596,28 @@ process_map_output (void *cls, const char *line)
  * @return NULL on error (no 'upnpc' installed)
  */
 struct GNUNET_NAT_MiniHandle *
-GNUNET_NAT_mini_map_start (uint16_t port,
-                           int is_tcp,
-                           GNUNET_NAT_MiniAddressCallback ac,
-                           void *ac_cls)
+GNUNET_NAT_mini_map_start(uint16_t port,
+                          int is_tcp,
+                          GNUNET_NAT_MiniAddressCallback ac,
+                          void *ac_cls)
 {
   struct GNUNET_NAT_MiniHandle *ret;
 
-  if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary ("upnpc", GNUNET_NO, NULL))
-  {
-    LOG (GNUNET_ERROR_TYPE_INFO, _ ("`upnpc' command not found\n"));
-    ac (ac_cls, GNUNET_SYSERR, NULL, 0, GNUNET_NAT_ERROR_UPNPC_NOT_FOUND);
-    return NULL;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Running `upnpc' to install mapping\n");
-  ret = GNUNET_new (struct GNUNET_NAT_MiniHandle);
+  if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary("upnpc", GNUNET_NO, NULL))
+    {
+      LOG(GNUNET_ERROR_TYPE_INFO, _("`upnpc' command not found\n"));
+      ac(ac_cls, GNUNET_SYSERR, NULL, 0, GNUNET_NAT_ERROR_UPNPC_NOT_FOUND);
+      return NULL;
+    }
+  LOG(GNUNET_ERROR_TYPE_DEBUG, "Running `upnpc' to install mapping\n");
+  ret = GNUNET_new(struct GNUNET_NAT_MiniHandle);
   ret->ac = ac;
   ret->ac_cls = ac_cls;
   ret->is_tcp = is_tcp;
   ret->port = port;
   ret->refresh_task =
-    GNUNET_SCHEDULER_add_delayed (MAP_REFRESH_FREQ, &do_refresh, ret);
-  run_upnpc_r (ret);
+    GNUNET_SCHEDULER_add_delayed(MAP_REFRESH_FREQ, &do_refresh, ret);
+  run_upnpc_r(ret);
   return ret;
 }
 
@@ -633,18 +629,18 @@ GNUNET_NAT_mini_map_start (uint16_t port,
  * @param line line of output, NULL at the end
  */
 static void
-process_unmap_output (void *cls, const char *line)
+process_unmap_output(void *cls, const char *line)
 {
   struct GNUNET_NAT_MiniHandle *mini = cls;
 
   if (NULL == line)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "UPnP unmap done\n");
-    GNUNET_OS_command_stop (mini->unmap_cmd);
-    mini->unmap_cmd = NULL;
-    GNUNET_free (mini);
-    return;
-  }
+    {
+      LOG(GNUNET_ERROR_TYPE_DEBUG, "UPnP unmap done\n");
+      GNUNET_OS_command_stop(mini->unmap_cmd);
+      mini->unmap_cmd = NULL;
+      GNUNET_free(mini);
+      return;
+    }
   /* we don't really care about the output... */
 }
 
@@ -658,54 +654,54 @@ process_unmap_output (void *cls, const char *line)
  * @param mini the handle
  */
 void
-GNUNET_NAT_mini_map_stop (struct GNUNET_NAT_MiniHandle *mini)
+GNUNET_NAT_mini_map_stop(struct GNUNET_NAT_MiniHandle *mini)
 {
   char pstr[6];
 
   if (NULL != mini->refresh_task)
-  {
-    GNUNET_SCHEDULER_cancel (mini->refresh_task);
-    mini->refresh_task = NULL;
-  }
+    {
+      GNUNET_SCHEDULER_cancel(mini->refresh_task);
+      mini->refresh_task = NULL;
+    }
   if (NULL != mini->refresh_cmd)
-  {
-    GNUNET_OS_command_stop (mini->refresh_cmd);
-    mini->refresh_cmd = NULL;
-  }
+    {
+      GNUNET_OS_command_stop(mini->refresh_cmd);
+      mini->refresh_cmd = NULL;
+    }
   if (NULL != mini->map_cmd)
-  {
-    GNUNET_OS_command_stop (mini->map_cmd);
-    mini->map_cmd = NULL;
-  }
+    {
+      GNUNET_OS_command_stop(mini->map_cmd);
+      mini->map_cmd = NULL;
+    }
   if (GNUNET_NO == mini->did_map)
-  {
-    GNUNET_free (mini);
-    return;
-  }
-  mini->ac (mini->ac_cls,
-            GNUNET_NO,
-            (const struct sockaddr *) &mini->current_addr,
-            sizeof (mini->current_addr),
-            GNUNET_NAT_ERROR_SUCCESS);
+    {
+      GNUNET_free(mini);
+      return;
+    }
+  mini->ac(mini->ac_cls,
+           GNUNET_NO,
+           (const struct sockaddr *)&mini->current_addr,
+           sizeof(mini->current_addr),
+           GNUNET_NAT_ERROR_SUCCESS);
   /* Note: oddly enough, deletion uses the external port whereas
    * addition uses the internal port; this rarely matters since they
    * often are the same, but it might... */
-  GNUNET_snprintf (pstr,
-                   sizeof (pstr),
-                   "%u",
-                   (unsigned int) ntohs (mini->current_addr.sin_port));
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Unmapping port %u with UPnP\n",
-       ntohs (mini->current_addr.sin_port));
-  mini->unmap_cmd = GNUNET_OS_command_run (&process_unmap_output,
-                                           mini,
-                                           UNMAP_TIMEOUT,
-                                           "upnpc",
-                                           "upnpc",
-                                           "-d",
-                                           pstr,
-                                           mini->is_tcp ? "tcp" : "udp",
-                                           NULL);
+  GNUNET_snprintf(pstr,
+                  sizeof(pstr),
+                  "%u",
+                  (unsigned int)ntohs(mini->current_addr.sin_port));
+  LOG(GNUNET_ERROR_TYPE_DEBUG,
+      "Unmapping port %u with UPnP\n",
+      ntohs(mini->current_addr.sin_port));
+  mini->unmap_cmd = GNUNET_OS_command_run(&process_unmap_output,
+                                          mini,
+                                          UNMAP_TIMEOUT,
+                                          "upnpc",
+                                          "upnpc",
+                                          "-d",
+                                          pstr,
+                                          mini->is_tcp ? "tcp" : "udp",
+                                          NULL);
 }