1 files changed, 90 insertions, 91 deletions

diff --git a/src/nat/gnunet-service-nat_externalip.c b/src/nat/gnunet-service-nat_externalip.c
index 282b070d3..c97f7f58b 100644
--- a/src/nat/gnunet-service-nat_externalip.c
+++ b/src/nat/gnunet-service-nat_externalip.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
-*/
+ */
 /**
  * Code to figure out what our external IPv4 address(es) might
  * be (external IPv4s are what is seen on the rest of the Internet).
@@ -54,26 +54,25 @@
  * How long do we wait until we re-try running `external-ip` if the
  * command failed to terminate nicely?
  */
-#define EXTERN_IP_RETRY_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15)
+#define EXTERN_IP_RETRY_TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 15)
 
 /**
  * How long do we wait until we re-try running `external-ip` if the
  * command failed (but terminated)?
  */
-#define EXTERN_IP_RETRY_FAILURE GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 30)
+#define EXTERN_IP_RETRY_FAILURE GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 30)
 
 /**
  * How long do we wait until we re-try running `external-ip` if the
  * command succeeded?
  */
-#define EXTERN_IP_RETRY_SUCCESS GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5)
+#define EXTERN_IP_RETRY_SUCCESS GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 5)
 
 
 /**
  * Handle to monitor for external IP changes.
  */
-struct GN_ExternalIPMonitor
-{
+struct GN_ExternalIPMonitor {
   /**
    * Kept in DLL.
    */
@@ -93,7 +92,6 @@ struct GN_ExternalIPMonitor
    * Closure for @e cb.
    */
   void *cb_cls;
-
 };
 
 
@@ -133,15 +131,15 @@ static struct in_addr mini_external_ipv4;
  * @param v4 the external address that changed
  */
 static void
-notify_monitors_external_ipv4_change (int add,
-                                      const struct in_addr *v4)
+notify_monitors_external_ipv4_change(int add,
+                                     const struct in_addr *v4)
 {
   for (struct GN_ExternalIPMonitor *mon = mon_head;
        NULL != mon;
        mon = mon->next)
-    mon->cb (mon->cb_cls,
-             v4,
-             add);
+    mon->cb(mon->cb_cls,
+            v4,
+            add);
 }
 
 
@@ -152,7 +150,7 @@ notify_monitors_external_ipv4_change (int add,
  * @param cls NULL
  */
 static void
-run_external_ip (void *cls);
+run_external_ip(void *cls);
 
 
 /**
@@ -165,46 +163,47 @@ run_external_ip (void *cls);
  * @param result #GNUNET_NAT_ERROR_SUCCESS on success, otherwise the specific error code
  */
 static void
-handle_external_ip (void *cls,
-                    const struct in_addr *addr,
-                    enum GNUNET_NAT_StatusCode result)
+handle_external_ip(void *cls,
+                   const struct in_addr *addr,
+                   enum GNUNET_NAT_StatusCode result)
 {
   char buf[INET_ADDRSTRLEN];
 
   probe_external_ip_op = NULL;
-  GNUNET_SCHEDULER_cancel (probe_external_ip_task);
+  GNUNET_SCHEDULER_cancel(probe_external_ip_task);
   probe_external_ip_task
-    = GNUNET_SCHEDULER_add_delayed ((NULL == addr)
-                                    ? EXTERN_IP_RETRY_FAILURE
-                                    : EXTERN_IP_RETRY_SUCCESS,
-                                    &run_external_ip,
-                                    NULL);
+    = GNUNET_SCHEDULER_add_delayed((NULL == addr)
+                                   ? EXTERN_IP_RETRY_FAILURE
+                                   : EXTERN_IP_RETRY_SUCCESS,
+                                   &run_external_ip,
+                                   NULL);
   switch (result)
-  {
-  case GNUNET_NAT_ERROR_SUCCESS:
-    GNUNET_assert (NULL != addr);
-    if (addr->s_addr == mini_external_ipv4.s_addr)
-      return; /* not change */
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Our external IP is now %s\n",
-                inet_ntop (AF_INET,
-                           addr,
-                           buf,
-                           sizeof (buf)));
-    if (0 != mini_external_ipv4.s_addr)
-      notify_monitors_external_ipv4_change (GNUNET_NO,
-                                            &mini_external_ipv4);
-    mini_external_ipv4 = *addr;
-    notify_monitors_external_ipv4_change (GNUNET_YES,
-                                          &mini_external_ipv4);
-    break;
-  default:
-    if (0 != mini_external_ipv4.s_addr)
-      notify_monitors_external_ipv4_change (GNUNET_NO,
-                                            &mini_external_ipv4);
-    mini_external_ipv4.s_addr = 0;
-    break;
-  }
+    {
+    case GNUNET_NAT_ERROR_SUCCESS:
+      GNUNET_assert(NULL != addr);
+      if (addr->s_addr == mini_external_ipv4.s_addr)
+        return; /* not change */
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+                 "Our external IP is now %s\n",
+                 inet_ntop(AF_INET,
+                           addr,
+                           buf,
+                           sizeof(buf)));
+      if (0 != mini_external_ipv4.s_addr)
+        notify_monitors_external_ipv4_change(GNUNET_NO,
+                                             &mini_external_ipv4);
+      mini_external_ipv4 = *addr;
+      notify_monitors_external_ipv4_change(GNUNET_YES,
+                                           &mini_external_ipv4);
+      break;
+
+    default:
+      if (0 != mini_external_ipv4.s_addr)
+        notify_monitors_external_ipv4_change(GNUNET_NO,
+                                             &mini_external_ipv4);
+      mini_external_ipv4.s_addr = 0;
+      break;
+    }
 }
 
 
@@ -215,20 +214,20 @@ handle_external_ip (void *cls,
  * @param cls NULL
  */
 static void
-run_external_ip (void *cls)
+run_external_ip(void *cls)
 {
   probe_external_ip_task
-    = GNUNET_SCHEDULER_add_delayed (EXTERN_IP_RETRY_TIMEOUT,
-                                    &run_external_ip,
-                                    NULL);
+    = GNUNET_SCHEDULER_add_delayed(EXTERN_IP_RETRY_TIMEOUT,
+                                   &run_external_ip,
+                                   NULL);
   if (NULL != probe_external_ip_op)
-  {
-    GNUNET_NAT_mini_get_external_ipv4_cancel_ (probe_external_ip_op);
-    probe_external_ip_op = NULL;
-  }
+    {
+      GNUNET_NAT_mini_get_external_ipv4_cancel_(probe_external_ip_op);
+      probe_external_ip_op = NULL;
+    }
   probe_external_ip_op
-    = GNUNET_NAT_mini_get_external_ipv4_ (&handle_external_ip,
-                                          NULL);
+    = GNUNET_NAT_mini_get_external_ipv4_(&handle_external_ip,
+                                         NULL);
 }
 
 
@@ -239,32 +238,32 @@ run_external_ip (void *cls)
  * @param have_nat #GNUNET_YES if we believe we are behind NAT
  */
 void
-GN_nat_status_changed (int have_nat)
+GN_nat_status_changed(int have_nat)
 {
   if (GNUNET_YES != enable_upnp)
     return;
-  if ( (GNUNET_YES == have_nat) &&
-       (NULL == probe_external_ip_task) &&
-       (NULL == probe_external_ip_op) )
-  {
-    probe_external_ip_task
-      = GNUNET_SCHEDULER_add_now (&run_external_ip,
-                                  NULL);
-    return;
-  }
-  if (GNUNET_NO == have_nat)
-  {
-    if (NULL != probe_external_ip_task)
+  if ((GNUNET_YES == have_nat) &&
+      (NULL == probe_external_ip_task) &&
+      (NULL == probe_external_ip_op))
     {
-      GNUNET_SCHEDULER_cancel (probe_external_ip_task);
-      probe_external_ip_task = NULL;
+      probe_external_ip_task
+        = GNUNET_SCHEDULER_add_now(&run_external_ip,
+                                   NULL);
+      return;
     }
-    if (NULL != probe_external_ip_op)
+  if (GNUNET_NO == have_nat)
     {
-      GNUNET_NAT_mini_get_external_ipv4_cancel_ (probe_external_ip_op);
-      probe_external_ip_op = NULL;
+      if (NULL != probe_external_ip_task)
+        {
+          GNUNET_SCHEDULER_cancel(probe_external_ip_task);
+          probe_external_ip_task = NULL;
+        }
+      if (NULL != probe_external_ip_op)
+        {
+          GNUNET_NAT_mini_get_external_ipv4_cancel_(probe_external_ip_op);
+          probe_external_ip_op = NULL;
+        }
     }
-  }
 }
 
 
@@ -276,21 +275,21 @@ GN_nat_status_changed (int have_nat)
  * @return handle to cancel
  */
 struct GN_ExternalIPMonitor *
-GN_external_ipv4_monitor_start (GN_NotifyExternalIPv4Change cb,
-                                void *cb_cls)
+GN_external_ipv4_monitor_start(GN_NotifyExternalIPv4Change cb,
+                               void *cb_cls)
 {
   struct GN_ExternalIPMonitor *mon;
 
-  mon = GNUNET_new (struct GN_ExternalIPMonitor);
+  mon = GNUNET_new(struct GN_ExternalIPMonitor);
   mon->cb = cb;
   mon->cb_cls = cb_cls;
-  GNUNET_CONTAINER_DLL_insert (mon_head,
-                               mon_tail,
-                               mon);
+  GNUNET_CONTAINER_DLL_insert(mon_head,
+                              mon_tail,
+                              mon);
   if (0 != mini_external_ipv4.s_addr)
-    cb (cb_cls,
-        &mini_external_ipv4,
-        GNUNET_YES);
+    cb(cb_cls,
+       &mini_external_ipv4,
+       GNUNET_YES);
   return mon;
 }
 
@@ -301,12 +300,12 @@ GN_external_ipv4_monitor_start (GN_NotifyExternalIPv4Change cb,
  * @param mon monitor to call
  */
 void
-GN_external_ipv4_monitor_stop (struct GN_ExternalIPMonitor *mon)
+GN_external_ipv4_monitor_stop(struct GN_ExternalIPMonitor *mon)
 {
-  GNUNET_CONTAINER_DLL_remove (mon_head,
-                               mon_tail,
-                               mon);
-  GNUNET_free (mon);
+  GNUNET_CONTAINER_DLL_remove(mon_head,
+                              mon_tail,
+                              mon);
+  GNUNET_free(mon);
 }
 
 /* end of gnunet-service-nat_externalip.c */