[GNUnet-SVN] r33643 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2014-06-11 12:00:22 +0200 (Wed, 11 Jun 2014)
New Revision: 33643

Modified:
   gnunet/src/util/gnunet-service-resolver.c
   gnunet/src/util/server_tc.c
Log:
-indentation, doxygen

Modified: gnunet/src/util/gnunet-service-resolver.c
===================================================================
--- gnunet/src/util/gnunet-service-resolver.c   2014-06-11 09:44:46 UTC (rev 
33642)
+++ gnunet/src/util/gnunet-service-resolver.c   2014-06-11 10:00:22 UTC (rev 
33643)
@@ -30,7 +30,7 @@
 #include "resolver.h"
 
 /**
- * A cached DNS lookup result.
+ * A cached DNS lookup result (for reverse lookup).
  */
 struct IPCache
 {
@@ -131,9 +131,13 @@
   }
 
   if (0 ==
-      getnameinfo (sa, salen, hostname, sizeof (hostname), NULL,
+      getnameinfo (sa, salen,
+                   hostname, sizeof (hostname),
+                   NULL,
                    0, 0))
+  {
     cache->addr = GNUNET_strdup (hostname);
+  }
 }
 #endif
 
@@ -153,7 +157,9 @@
                       cache->ip_len,
                       cache->af);
   if (NULL != ent)
+  {
     cache->addr = GNUNET_strdup (ent->h_name);
+  }
 }
 #endif
 
@@ -185,7 +191,7 @@
  *
  * @param client handle to the client making the request (for sending the 
reply)
  * @param af AF_INET or AF_INET6
- * @param ip 'struct in_addr' or 'struct in6_addr'
+ * @param ip `struct in_addr` or `struct in6_addr`
  */
 static void
 get_ip_as_string (struct GNUNET_SERVER_Client *client,
@@ -197,6 +203,7 @@
   struct GNUNET_TIME_Absolute now;
   struct GNUNET_SERVER_TransmitContext *tc;
   size_t ip_len;
+  struct in6_addr ix;
 
   switch (af)
   {
@@ -228,16 +235,17 @@
       continue;
     }
   }
-  if (pos != NULL)
+  if (NULL != pos)
   {
-    pos->last_request = now;
-    if (GNUNET_TIME_absolute_get_duration (pos->last_request).rel_value_us <
-        60 * 60 * 1000 * 1000LL)
+    if (1 == inet_pton (af,
+                        pos->ip,
+                        &ix))
     {
       GNUNET_free_non_null (pos->addr);
       pos->addr = NULL;
       cache_resolve (pos);
     }
+    pos->last_request = now;
   }
   else
   {
@@ -254,7 +262,7 @@
     cache_resolve (pos);
   }
   tc = GNUNET_SERVER_transmit_context_create (client);
-  if (pos->addr != NULL)
+  if (NULL != pos->addr)
     GNUNET_SERVER_transmit_context_append_data (tc, pos->addr,
                                                 strlen (pos->addr) + 1,
                                                 
GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
@@ -311,7 +319,7 @@
       return GNUNET_NO;         /* other function may still succeed */
     return GNUNET_SYSERR;
   }
-  if (result == NULL)
+  if (NULL == result)
     return GNUNET_SYSERR;
   for (pos = result; pos != NULL; pos = pos->ai_next)
   {
@@ -436,7 +444,8 @@
  * @param af AF_INET or AF_INET6; use AF_UNSPEC for "any"
  */
 static void
-get_ip_from_hostname (struct GNUNET_SERVER_Client *client, const char 
*hostname,
+get_ip_from_hostname (struct GNUNET_SERVER_Client *client,
+                      const char *hostname,
                       int af)
 {
   int ret;
@@ -470,7 +479,8 @@
  * @param message the actual message
  */
 static void
-handle_get (void *cls, struct GNUNET_SERVER_Client *client,
+handle_get (void *cls,
+            struct GNUNET_SERVER_Client *client,
             const struct GNUNET_MessageHeader *message)
 {
   uint16_t msize;
@@ -596,7 +606,8 @@
 /**
  * MINIMIZE heap size (way below 128k) since this process doesn't need much.
  */
-void __attribute__ ((constructor)) GNUNET_ARM_memory_init ()
+void __attribute__ ((constructor))
+GNUNET_ARM_memory_init ()
 {
   mallopt (M_TRIM_THRESHOLD, 4 * 1024);
   mallopt (M_TOP_PAD, 1 * 1024);

Modified: gnunet/src/util/server_tc.c
===================================================================
--- gnunet/src/util/server_tc.c 2014-06-11 09:44:46 UTC (rev 33642)
+++ gnunet/src/util/server_tc.c 2014-06-11 10:00:22 UTC (rev 33643)
@@ -192,9 +192,9 @@
 
 /**
  * Execute a transmission context.  If there is
- * an error in the transmission, the receive_done
- * method will be called with an error code (GNUNET_SYSERR),
- * otherwise with GNUNET_OK.
+ * an error in the transmission, the #GNUNET_SERVER_receive_done()
+ * method will be called with an error code (#GNUNET_SYSERR),
+ * otherwise with #GNUNET_OK.
  *
  * @param tc transmission context to use
  * @param timeout when to time out and abort the transmission