1 files changed, 127 insertions, 130 deletions

diff --git a/src/gns/gns_api.c b/src/gns/gns_api.c
index ba83b73cd..62f250959 100644
--- a/src/gns/gns_api.c
+++ b/src/gns/gns_api.c
@@ -16,7 +16,7 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 /**
  * @file gns/gns_api.c
  * @brief library to access the GNS service
@@ -34,14 +34,12 @@
 #include "gns_api.h"
 
 
-#define LOG(kind,...) GNUNET_log_from (kind, "gns-api",__VA_ARGS__)
+#define LOG(kind, ...) GNUNET_log_from(kind, "gns-api", __VA_ARGS__)
 
 /**
  * Handle to a lookup request
  */
-struct GNUNET_GNS_LookupRequest
-{
-
+struct GNUNET_GNS_LookupRequest {
   /**
    * DLL
    */
@@ -76,7 +74,6 @@ struct GNUNET_GNS_LookupRequest
    * request id
    */
   uint32_t r_id;
-
 };
 
 
@@ -86,7 +83,7 @@ struct GNUNET_GNS_LookupRequest
  * @param handle the handle to the GNS service
  */
 static void
-reconnect (struct GNUNET_GNS_Handle *handle);
+reconnect(struct GNUNET_GNS_Handle *handle);
 
 
 /**
@@ -95,12 +92,12 @@ reconnect (struct GNUNET_GNS_Handle *handle);
  * @param cls the handle
  */
 static void
-reconnect_task (void *cls)
+reconnect_task(void *cls)
 {
   struct GNUNET_GNS_Handle *handle = cls;
 
   handle->reconnect_task = NULL;
-  reconnect (handle);
+  reconnect(handle);
 }
 
 
@@ -110,16 +107,16 @@ reconnect_task (void *cls)
  * @param handle our handle
  */
 static void
-force_reconnect (struct GNUNET_GNS_Handle *handle)
+force_reconnect(struct GNUNET_GNS_Handle *handle)
 {
-  GNUNET_MQ_destroy (handle->mq);
+  GNUNET_MQ_destroy(handle->mq);
   handle->mq = NULL;
   handle->reconnect_backoff
-    = GNUNET_TIME_STD_BACKOFF (handle->reconnect_backoff);
+    = GNUNET_TIME_STD_BACKOFF(handle->reconnect_backoff);
   handle->reconnect_task
-    = GNUNET_SCHEDULER_add_delayed (handle->reconnect_backoff,
-                                    &reconnect_task,
-                                    handle);
+    = GNUNET_SCHEDULER_add_delayed(handle->reconnect_backoff,
+                                   &reconnect_task,
+                                   handle);
 }
 
 
@@ -132,15 +129,15 @@ force_reconnect (struct GNUNET_GNS_Handle *handle)
  * @param error error code
  */
 static void
-mq_error_handler (void *cls,
-                  enum GNUNET_MQ_Error error)
+mq_error_handler(void *cls,
+                 enum GNUNET_MQ_Error error)
 {
   struct GNUNET_GNS_Handle *handle = cls;
 
-  LOG (GNUNET_ERROR_TYPE_WARNING,
-       "Problem with message queue. error: %i\n",
-       error);
-  force_reconnect (handle);
+  LOG(GNUNET_ERROR_TYPE_WARNING,
+      "Problem with message queue. error: %i\n",
+      error);
+  force_reconnect(handle);
 }
 
 
@@ -151,23 +148,23 @@ mq_error_handler (void *cls,
  * @param loookup_msg the incoming message
  */
 static int
-check_result (void *cls,
-              const struct LookupResultMessage *lookup_msg)
+check_result(void *cls,
+             const struct LookupResultMessage *lookup_msg)
 {
-  size_t mlen = ntohs (lookup_msg->header.size) - sizeof (*lookup_msg);
-  uint32_t rd_count = ntohl (lookup_msg->rd_count);
+  size_t mlen = ntohs(lookup_msg->header.size) - sizeof(*lookup_msg);
+  uint32_t rd_count = ntohl(lookup_msg->rd_count);
   struct GNUNET_GNSRECORD_Data rd[rd_count];
 
-  (void) cls;
+  (void)cls;
   if (GNUNET_SYSERR ==
-      GNUNET_GNSRECORD_records_deserialize (mlen,
-                                            (const char*) &lookup_msg[1],
-                                            rd_count,
-                                            rd))
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
+      GNUNET_GNSRECORD_records_deserialize(mlen,
+                                           (const char*)&lookup_msg[1],
+                                           rd_count,
+                                           rd))
+    {
+      GNUNET_break(0);
+      return GNUNET_SYSERR;
+    }
   return GNUNET_OK;
 }
 
@@ -179,21 +176,21 @@ check_result (void *cls,
  * @param loookup_msg the incoming message
  */
 static void
-handle_result (void *cls,
-               const struct LookupResultMessage *lookup_msg)
+handle_result(void *cls,
+              const struct LookupResultMessage *lookup_msg)
 {
   struct GNUNET_GNS_Handle *handle = cls;
-  size_t mlen = ntohs (lookup_msg->header.size) - sizeof (*lookup_msg);
-  uint32_t rd_count = ntohl (lookup_msg->rd_count);
+  size_t mlen = ntohs(lookup_msg->header.size) - sizeof(*lookup_msg);
+  uint32_t rd_count = ntohl(lookup_msg->rd_count);
   struct GNUNET_GNSRECORD_Data rd[rd_count];
-  uint32_t r_id = ntohl (lookup_msg->id);
+  uint32_t r_id = ntohl(lookup_msg->id);
   struct GNUNET_GNS_LookupRequest *lr;
   GNUNET_GNS_LookupResultProcessor proc;
   void *proc_cls;
 
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Received lookup reply from GNS service (%u records)\n",
-       (unsigned int) rd_count);
+  LOG(GNUNET_ERROR_TYPE_DEBUG,
+      "Received lookup reply from GNS service (%u records)\n",
+      (unsigned int)rd_count);
   for (lr = handle->lookup_head; NULL != lr; lr = lr->next)
     if (lr->r_id == r_id)
       break;
@@ -202,20 +199,20 @@ handle_result (void *cls,
   proc = lr->lookup_proc;
   proc_cls = lr->proc_cls;
 
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_GNSRECORD_records_deserialize (mlen,
-                                                       (const char*) &lookup_msg[1],
-                                                       rd_count,
-                                                       rd));
-  proc (proc_cls,
-        rd_count,
-        rd);
-  GNUNET_CONTAINER_DLL_remove (handle->lookup_head,
-                               handle->lookup_tail,
-                               lr);
+  GNUNET_assert(GNUNET_OK ==
+                GNUNET_GNSRECORD_records_deserialize(mlen,
+                                                     (const char*)&lookup_msg[1],
+                                                     rd_count,
+                                                     rd));
+  proc(proc_cls,
+       rd_count,
+       rd);
+  GNUNET_CONTAINER_DLL_remove(handle->lookup_head,
+                              handle->lookup_tail,
+                              lr);
   if (NULL != lr->env)
-    GNUNET_MQ_discard (lr->env);
-  GNUNET_free (lr);
+    GNUNET_MQ_discard(lr->env);
+  GNUNET_free(lr);
 }
 
 
@@ -225,31 +222,31 @@ handle_result (void *cls,
  * @param handle the handle to the GNS service
  */
 static void
-reconnect (struct GNUNET_GNS_Handle *handle)
+reconnect(struct GNUNET_GNS_Handle *handle)
 {
   struct GNUNET_MQ_MessageHandler handlers[] = {
-    GNUNET_MQ_hd_var_size (result,
-                           GNUNET_MESSAGE_TYPE_GNS_LOOKUP_RESULT,
-                           struct LookupResultMessage,
-                           handle),
-    GNUNET_MQ_handler_end ()
+    GNUNET_MQ_hd_var_size(result,
+                          GNUNET_MESSAGE_TYPE_GNS_LOOKUP_RESULT,
+                          struct LookupResultMessage,
+                          handle),
+    GNUNET_MQ_handler_end()
   };
 
-  GNUNET_assert (NULL == handle->mq);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Trying to connect to GNS\n");
-  handle->mq = GNUNET_CLIENT_connect (handle->cfg,
-                                      "gns",
-                                      handlers,
-                                      &mq_error_handler,
-                                      handle);
+  GNUNET_assert(NULL == handle->mq);
+  LOG(GNUNET_ERROR_TYPE_DEBUG,
+      "Trying to connect to GNS\n");
+  handle->mq = GNUNET_CLIENT_connect(handle->cfg,
+                                     "gns",
+                                     handlers,
+                                     &mq_error_handler,
+                                     handle);
   if (NULL == handle->mq)
     return;
   for (struct GNUNET_GNS_LookupRequest *lh = handle->lookup_head;
        NULL != lh;
        lh = lh->next)
-    GNUNET_MQ_send_copy (handle->mq,
-                         lh->env);
+    GNUNET_MQ_send_copy(handle->mq,
+                        lh->env);
 }
 
 
@@ -260,18 +257,18 @@ reconnect (struct GNUNET_GNS_Handle *handle)
  * @return handle to the GNS service, or NULL on error
  */
 struct GNUNET_GNS_Handle *
-GNUNET_GNS_connect (const struct GNUNET_CONFIGURATION_Handle *cfg)
+GNUNET_GNS_connect(const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   struct GNUNET_GNS_Handle *handle;
 
-  handle = GNUNET_new (struct GNUNET_GNS_Handle);
+  handle = GNUNET_new(struct GNUNET_GNS_Handle);
   handle->cfg = cfg;
-  reconnect (handle);
+  reconnect(handle);
   if (NULL == handle->mq)
-  {
-    GNUNET_free (handle);
-    return NULL;
-  }
+    {
+      GNUNET_free(handle);
+      return NULL;
+    }
   return handle;
 }
 
@@ -282,20 +279,20 @@ GNUNET_GNS_connect (const struct GNUNET_CONFIGURATION_Handle *cfg)
  * @param handle handle of the GNS connection to stop
  */
 void
-GNUNET_GNS_disconnect (struct GNUNET_GNS_Handle *handle)
+GNUNET_GNS_disconnect(struct GNUNET_GNS_Handle *handle)
 {
   if (NULL != handle->mq)
-  {
-    GNUNET_MQ_destroy (handle->mq);
-    handle->mq = NULL;
-  }
+    {
+      GNUNET_MQ_destroy(handle->mq);
+      handle->mq = NULL;
+    }
   if (NULL != handle->reconnect_task)
-  {
-    GNUNET_SCHEDULER_cancel (handle->reconnect_task);
-    handle->reconnect_task = NULL;
-  }
-  GNUNET_assert (NULL == handle->lookup_head);
-  GNUNET_free (handle);
+    {
+      GNUNET_SCHEDULER_cancel(handle->reconnect_task);
+      handle->reconnect_task = NULL;
+    }
+  GNUNET_assert(NULL == handle->lookup_head);
+  GNUNET_free(handle);
 }
 
 
@@ -306,17 +303,17 @@ GNUNET_GNS_disconnect (struct GNUNET_GNS_Handle *handle)
  * @return closure from the lookup result processor
  */
 void *
-GNUNET_GNS_lookup_cancel (struct GNUNET_GNS_LookupRequest *lr)
+GNUNET_GNS_lookup_cancel(struct GNUNET_GNS_LookupRequest *lr)
 {
   struct GNUNET_GNS_Handle *handle = lr->gns_handle;
   void *ret;
 
-  GNUNET_CONTAINER_DLL_remove (handle->lookup_head,
-                               handle->lookup_tail,
-                               lr);
-  GNUNET_MQ_discard (lr->env);
+  GNUNET_CONTAINER_DLL_remove(handle->lookup_head,
+                              handle->lookup_tail,
+                              lr);
+  GNUNET_MQ_discard(lr->env);
   ret = lr->proc_cls;
-  GNUNET_free (lr);
+  GNUNET_free(lr);
   return ret;
 }
 
@@ -334,13 +331,13 @@ GNUNET_GNS_lookup_cancel (struct GNUNET_GNS_LookupRequest *lr)
  * @return handle to the get request
  */
 struct GNUNET_GNS_LookupRequest*
-GNUNET_GNS_lookup (struct GNUNET_GNS_Handle *handle,
-                   const char *name,
-                   const struct GNUNET_CRYPTO_EcdsaPublicKey *zone,
-                   uint32_t type,
-                   enum GNUNET_GNS_LocalOptions options,
-                   GNUNET_GNS_LookupResultProcessor proc,
-                   void *proc_cls)
+GNUNET_GNS_lookup(struct GNUNET_GNS_Handle *handle,
+                  const char *name,
+                  const struct GNUNET_CRYPTO_EcdsaPublicKey *zone,
+                  uint32_t type,
+                  enum GNUNET_GNS_LocalOptions options,
+                  GNUNET_GNS_LookupResultProcessor proc,
+                  void *proc_cls)
 {
   /* IPC to shorten gns names, return shorten_handle */
   struct LookupMessage *lookup_msg;
@@ -348,40 +345,40 @@ GNUNET_GNS_lookup (struct GNUNET_GNS_Handle *handle,
   size_t nlen;
 
   if (NULL == name)
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Trying to lookup `%s' in GNS\n",
-       name);
-  nlen = strlen (name) + 1;
-  if (nlen >= GNUNET_MAX_MESSAGE_SIZE - sizeof (*lr))
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-  lr = GNUNET_new (struct GNUNET_GNS_LookupRequest);
+    {
+      GNUNET_break(0);
+      return NULL;
+    }
+  LOG(GNUNET_ERROR_TYPE_DEBUG,
+      "Trying to lookup `%s' in GNS\n",
+      name);
+  nlen = strlen(name) + 1;
+  if (nlen >= GNUNET_MAX_MESSAGE_SIZE - sizeof(*lr))
+    {
+      GNUNET_break(0);
+      return NULL;
+    }
+  lr = GNUNET_new(struct GNUNET_GNS_LookupRequest);
   lr->gns_handle = handle;
   lr->lookup_proc = proc;
   lr->proc_cls = proc_cls;
   lr->r_id = handle->r_id_gen++;
-  lr->env = GNUNET_MQ_msg_extra (lookup_msg,
-                                 nlen,
-                                 GNUNET_MESSAGE_TYPE_GNS_LOOKUP);
-  lookup_msg->id = htonl (lr->r_id);
-  lookup_msg->options = htons ((uint16_t) options);
+  lr->env = GNUNET_MQ_msg_extra(lookup_msg,
+                                nlen,
+                                GNUNET_MESSAGE_TYPE_GNS_LOOKUP);
+  lookup_msg->id = htonl(lr->r_id);
+  lookup_msg->options = htons((uint16_t)options);
   lookup_msg->zone = *zone;
-  lookup_msg->type = htonl (type);
-  GNUNET_memcpy (&lookup_msg[1],
-                 name,
-                 nlen);
-  GNUNET_CONTAINER_DLL_insert (handle->lookup_head,
-                               handle->lookup_tail,
-                               lr);
+  lookup_msg->type = htonl(type);
+  GNUNET_memcpy(&lookup_msg[1],
+                name,
+                nlen);
+  GNUNET_CONTAINER_DLL_insert(handle->lookup_head,
+                              handle->lookup_tail,
+                              lr);
   if (NULL != handle->mq)
-    GNUNET_MQ_send_copy (handle->mq,
-                         lr->env);
+    GNUNET_MQ_send_copy(handle->mq,
+                        lr->env);
   return lr;
 }