-fix time assertion introduce in last patch

[oweals/gnunet.git] / src / util / gnunet-service-resolver.c

diff --git a/src/util/gnunet-service-resolver.c b/src/util/gnunet-service-resolver.c
index c8d51077047ff5abedc9284606d71dabb6ab9f0a..f3675edb33471b67902bc280a1ca047157734676 100644 (file)
--- a/src/util/gnunet-service-resolver.c
+++ b/src/util/gnunet-service-resolver.c
@@ -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 @@ getnameinfo_resolve (struct IPCache *cache)
   }
 
   if (0 ==
-      getnameinfo (sa, salen, hostname, sizeof (hostname), NULL,
+      getnameinfo (sa, salen,
+                   hostname, sizeof (hostname),
+                   NULL,
                    0, 0))
+  {
     cache->addr = GNUNET_strdup (hostname);
+  }
 }
 #endif
 
@@ -152,8 +156,10 @@ gethostbyaddr_resolve (struct IPCache *cache)
   ent = gethostbyaddr (cache->ip,
                       cache->ip_len,
                       cache->af);
-  if (ent != NULL)
+  if (NULL != ent)
+  {
     cache->addr = GNUNET_strdup (ent->h_name);
+  }
 }
 #endif
 
@@ -167,11 +173,11 @@ static void
 cache_resolve (struct IPCache *cache)
 {
 #if HAVE_GETNAMEINFO
-  if (cache->addr == NULL)
+  if (NULL == cache->addr)
     getnameinfo_resolve (cache);
 #endif
 #if HAVE_GETHOSTBYADDR
-  if (cache->addr == NULL)
+  if (NULL == cache->addr)
     gethostbyaddr_resolve (cache);
 #endif
 }
@@ -185,7 +191,7 @@ cache_resolve (struct IPCache *cache)
  *
  * @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 @@ get_ip_as_string (struct GNUNET_SERVER_Client *client,
   struct GNUNET_TIME_Absolute now;
   struct GNUNET_SERVER_TransmitContext *tc;
   size_t ip_len;
+  struct in6_addr ix;
 
   switch (af)
   {
@@ -228,15 +235,19 @@ get_ip_as_string (struct GNUNET_SERVER_Client *client,
       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_TIME_absolute_get_duration (pos->last_request).rel_value_us >
+          120 * 1000 * 1000LL) )
     {
+      /* try again if still numeric AND 2 minutes have expired */
       GNUNET_free_non_null (pos->addr);
       pos->addr = NULL;
       cache_resolve (pos);
+      pos->last_request = now;
     }
   }
   else
@@ -254,7 +265,7 @@ get_ip_as_string (struct GNUNET_SERVER_Client *client,
     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);
@@ -274,13 +285,24 @@ getaddrinfo_resolve (struct GNUNET_SERVER_TransmitContext *tc,
   struct addrinfo *result;
   struct addrinfo *pos;
 
+#ifdef WINDOWS
+  /* Due to a bug, getaddrinfo will not return a mix of different families */
+  if (AF_UNSPEC == af)
+  {
+    int ret1;
+    int ret2;
+    ret1 = getaddrinfo_resolve (tc, hostname, AF_INET);
+    ret2 = getaddrinfo_resolve (tc, hostname, AF_INET6);
+    if ((ret1 == GNUNET_OK) || (ret2 == GNUNET_OK))
+      return GNUNET_OK;
+    if ((ret1 == GNUNET_SYSERR) || (ret2 == GNUNET_SYSERR))
+      return GNUNET_SYSERR;
+    return GNUNET_NO;
+  }
+#endif
+
   memset (&hints, 0, sizeof (struct addrinfo));
-// FIXME in PlibC
-#ifndef MINGW
   hints.ai_family = af;
-#else
-  hints.ai_family = AF_INET;
-#endif
   hints.ai_socktype = SOCK_STREAM;      /* go for TCP */
 
   if (0 != (s = getaddrinfo (hostname, NULL, &hints, &result)))
@@ -291,20 +313,18 @@ getaddrinfo_resolve (struct GNUNET_SERVER_TransmitContext *tc,
                  AF_INET) ? "IPv4" : ((af == AF_INET6) ? "IPv6" : "any"),
                 gai_strerror (s));
     if ((s == EAI_BADFLAGS) || (s == EAI_MEMORY)
-#ifndef MINGW
+#ifndef WINDOWS
         || (s == EAI_SYSTEM)
 #else
-        // FIXME NILS
         || 1
 #endif
         )
       return GNUNET_NO;         /* other function may still succeed */
     return GNUNET_SYSERR;
   }
-  if (result == NULL)
+  if (NULL == result)
     return GNUNET_SYSERR;
-  pos = result;
-  while (pos != NULL)
+  for (pos = result; pos != NULL; pos = pos->ai_next)
   {
     switch (pos->ai_family)
     {
@@ -324,7 +344,6 @@ getaddrinfo_resolve (struct GNUNET_SERVER_TransmitContext *tc,
       /* unsupported, skip */
       break;
     }
-    pos = pos->ai_next;
   }
   freeaddrinfo (result);
   return GNUNET_OK;
@@ -341,6 +360,11 @@ gethostbyname2_resolve (struct GNUNET_SERVER_TransmitContext *tc,
   int ret1;
   int ret2;
 
+#ifdef WINDOWS
+  /* gethostbyname2() in plibc is a compat dummy that calls gethostbyname(). */
+  return GNUNET_NO;
+#endif
+
   if (af == AF_UNSPEC)
   {
     ret1 = gethostbyname2_resolve (tc, hostname, AF_INET);
@@ -423,7 +447,8 @@ gethostbyname_resolve (struct GNUNET_SERVER_TransmitContext *tc,
  * @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;
@@ -457,7 +482,8 @@ get_ip_from_hostname (struct GNUNET_SERVER_Client *client, const char *hostname,
  * @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;
@@ -583,7 +609,8 @@ main (int argc, char *const *argv)
 /**
  * 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);