- fix cli arg parse

[oweals/gnunet.git] / src / util / resolver_api.c

diff --git a/src/util/resolver_api.c b/src/util/resolver_api.c
index 46ac52586c752c1bb8baff3f9728d04779a52578..d097cd6a5dd4dc425b8f389fbb201381fdad5fcf 100644 (file)
--- a/src/util/resolver_api.c
+++ b/src/util/resolver_api.c
@@ -139,9 +139,9 @@ struct GNUNET_RESOLVER_RequestHandle
 
   /**
    * Has this request been transmitted to the service?
-   * GNUNET_YES if transmitted
-   * GNUNET_YES if not transmitted
-   * GNUNET_SYSERR when request was canceled
+   * #GNUNET_YES if transmitted
+   * #GNUNET_YES if not transmitted
+   * #GNUNET_SYSERR when request was canceled
    */
   int was_transmitted;
 
@@ -156,7 +156,7 @@ struct GNUNET_RESOLVER_RequestHandle
   int direction;
 
   /**
-   * GNUNET_YES if a response was received
+   * #GNUNET_YES if a response was received
    */
   int received_response;
 
@@ -245,7 +245,8 @@ GNUNET_RESOLVER_disconnect ()
   GNUNET_assert (NULL == req_tail);
   if (NULL != client)
   {
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from DNS service\n");
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+         "Disconnecting from DNS service\n");
     GNUNET_CLIENT_disconnect (client);
     client = NULL;
   }
@@ -284,7 +285,8 @@ no_resolve (int af,
     if (NULL ==
         inet_ntop (AF_INET, ip, buf, sizeof (buf)))
     {
-      LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "inet_ntop");
+      LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING,
+                    "inet_ntop");
       return NULL;
     }
     break;
@@ -294,7 +296,8 @@ no_resolve (int af,
     if (NULL ==
         inet_ntop (AF_INET6, ip, buf, sizeof (buf)))
     {
-      LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "inet_ntop");
+      LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING,
+                    "inet_ntop");
       return NULL;
     }
     break;
@@ -323,14 +326,16 @@ process_requests ();
 /**
  * Process response with a hostname for a DNS lookup.
  *
- * @param cls our "struct GNUNET_RESOLVER_RequestHandle" context
+ * @param cls our `struct GNUNET_RESOLVER_RequestHandle` context
  * @param msg message with the hostname, NULL on error
  */
 static void
-handle_response (void *cls, const struct GNUNET_MessageHeader *msg)
+handle_response (void *cls,
+                 const struct GNUNET_MessageHeader *msg)
 {
   struct GNUNET_RESOLVER_RequestHandle *rh = cls;
   uint16_t size;
+  char *nret;
 
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Receiving response from DNS service\n");
@@ -354,7 +359,9 @@ handle_response (void *cls, const struct GNUNET_MessageHeader *msg)
         /* no reverse lookup was successful, return ip as string */
         if (rh->received_response == GNUNET_NO)
         {
-          rh->name_callback (rh->cls, no_resolve (rh->af, &rh[1], rh->data_len));
+          nret = no_resolve (rh->af, &rh[1], rh->data_len);
+          rh->name_callback (rh->cls, nret);
+          GNUNET_free (nret);
           rh->name_callback (rh->cls, NULL);
         }
         /* at least one reverse lookup was successful */
@@ -384,7 +391,7 @@ handle_response (void *cls, const struct GNUNET_MessageHeader *msg)
   if (size == sizeof (struct GNUNET_MessageHeader))
   {
     /* check if request was canceled */
-    if (rh->was_transmitted != GNUNET_SYSERR)
+    if (GNUNET_SYSERR != rh->was_transmitted)
     {
       if (NULL != rh->name_callback)
         rh->name_callback (rh->cls, NULL);
@@ -414,8 +421,11 @@ handle_response (void *cls, const struct GNUNET_MessageHeader *msg)
       reconnect ();
       return;
     }
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "Resolver returns `%s' for IP `%s'.\n",
-         hostname, GNUNET_a2s ((const void *) &rh[1], rh->data_len));
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+         "Resolver returns `%s' for IP `%s'.\n",
+         hostname,
+         GNUNET_a2s ((const void *) &rh[1],
+                     rh->data_len));
     if (rh->was_transmitted != GNUNET_SYSERR)
       rh->name_callback (rh->cls, hostname);
     rh->received_response = GNUNET_YES;
@@ -480,11 +490,12 @@ handle_response (void *cls, const struct GNUNET_MessageHeader *msg)
  * given a valid numeric string.  Perform the callbacks for the
  * numeric addresses.
  *
- * @param cls struct GNUNET_RESOLVER_RequestHandle for the request
+ * @param cls `struct GNUNET_RESOLVER_RequestHandle` for the request
  * @param tc unused scheduler context
  */
 static void
-numeric_resolution (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+numeric_resolution (void *cls,
+                    const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GNUNET_RESOLVER_RequestHandle *rh = cls;
   struct sockaddr_in v4;
@@ -535,11 +546,12 @@ numeric_resolution (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * given a variant of "loopback".  Perform the callbacks for the
  * respective loopback numeric addresses.
  *
- * @param cls struct GNUNET_RESOLVER_RequestHandle for the request
+ * @param cls `struct GNUNET_RESOLVER_RequestHandle` for the request
  * @param tc unused scheduler context
  */
 static void
-loopback_resolution (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+loopback_resolution (void *cls,
+                     const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GNUNET_RESOLVER_RequestHandle *rh = cls;
   struct sockaddr_in v4;
@@ -650,7 +662,8 @@ process_requests ()
  * @param tc scheduler context
  */
 static void
-reconnect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+reconnect_task (void *cls,
+                const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   r_task = GNUNET_SCHEDULER_NO_TASK;
   if (NULL == req_head)
@@ -718,7 +731,7 @@ reconnect ()
  * @param hostname the hostname to resolve
  * @param af AF_INET or AF_INET6; use AF_UNSPEC for "any"
  * @param callback function to call with addresses
- * @param callback_cls closure for callback
+ * @param callback_cls closure for @a callback
  * @param timeout how long to try resolving
  * @return handle that can be used to cancel the request, NULL on error
  */
@@ -782,18 +795,21 @@ GNUNET_RESOLVER_ip_get (const char *hostname, int af,
  * We've been asked to convert an address to a string without
  * a reverse lookup.  Do it.
  *
- * @param cls struct GNUNET_RESOLVER_RequestHandle for the request
+ * @param cls `struct GNUNET_RESOLVER_RequestHandle` for the request
  * @param tc unused scheduler context
  */
 static void
-numeric_reverse (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+numeric_reverse (void *cls,
+                 const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GNUNET_RESOLVER_RequestHandle *rh = cls;
   char *result;
 
   result = no_resolve (rh->af, &rh[1], rh->data_len);
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Resolver returns `%s'.\n", result);
-  if (result != NULL)
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Resolver returns `%s'.\n",
+       result);
+  if (NULL != result)
   {
     rh->name_callback (rh->cls, result);
     GNUNET_free (result);
@@ -807,16 +823,17 @@ numeric_reverse (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * Get an IP address as a string.
  *
  * @param sa host address
- * @param salen length of host address
- * @param do_resolve use GNUNET_NO to return numeric hostname
+ * @param salen length of host address in @a sa
+ * @param do_resolve use #GNUNET_NO to return numeric hostname
  * @param timeout how long to try resolving
  * @param callback function to call with hostnames
  *        last callback is NULL when finished
- * @param cls closure for callback
+ * @param cls closure for @a callback
  * @return handle that can be used to cancel the request
  */
 struct GNUNET_RESOLVER_RequestHandle *
-GNUNET_RESOLVER_hostname_get (const struct sockaddr *sa, socklen_t salen,
+GNUNET_RESOLVER_hostname_get (const struct sockaddr *sa,
+                              socklen_t salen,
                               int do_resolve,
                               struct GNUNET_TIME_Relative timeout,
                               GNUNET_RESOLVER_HostnameCallback callback,
@@ -901,7 +918,7 @@ GNUNET_RESOLVER_local_fqdn_get ()
  *
  * @param af AF_INET or AF_INET6; use AF_UNSPEC for "any"
  * @param callback function to call with addresses
- * @param cls closure for callback
+ * @param cls closure for @a callback
  * @param timeout how long to try resolving
  * @return handle that can be used to cancel the request, NULL on error
  */