Add a third default.

[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 97eba6d11d2e7a14721bcdec5b350f3950032ddd..c8d51077047ff5abedc9284606d71dabb6ab9f0a 100644 (file)
--- a/src/util/gnunet-service-resolver.c
+++ b/src/util/gnunet-service-resolver.c
@@ -1,10 +1,10 @@
 /*
      This file is part of GNUnet.
-     (C) 2007, 2008, 2009, 2012 Christian Grothoff (and other contributing authors)
+     (C) 2007-2013 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -213,12 +213,12 @@ get_ip_as_string (struct GNUNET_SERVER_Client *client,
   next = cache_head;
   while ( (NULL != (pos = next)) &&
          ( (pos->af != af) ||
-           (pos->ip_len != ip_len) || 
+           (pos->ip_len != ip_len) ||
            (0 != memcmp (pos->ip, ip, ip_len))) )
   {
     next = pos->next;
-    if (GNUNET_TIME_absolute_get_duration (pos->last_request).rel_value <
-        60 * 60 * 1000)
+    if (GNUNET_TIME_absolute_get_duration (pos->last_request).rel_value_us <
+        60 * 60 * 1000 * 1000LL)
     {
       GNUNET_CONTAINER_DLL_remove (cache_head,
                                   cache_tail,
@@ -231,8 +231,8 @@ get_ip_as_string (struct GNUNET_SERVER_Client *client,
   if (pos != NULL)
   {
     pos->last_request = now;
-    if (GNUNET_TIME_absolute_get_duration (pos->last_request).rel_value <
-        60 * 60 * 1000)
+    if (GNUNET_TIME_absolute_get_duration (pos->last_request).rel_value_us <
+        60 * 60 * 1000 * 1000LL)
     {
       GNUNET_free_non_null (pos->addr);
       pos->addr = NULL;
@@ -323,7 +323,7 @@ getaddrinfo_resolve (struct GNUNET_SERVER_TransmitContext *tc,
     default:
       /* unsupported, skip */
       break;
-    }     
+    }
     pos = pos->ai_next;
   }
   freeaddrinfo (result);
@@ -364,15 +364,15 @@ gethostbyname2_resolve (struct GNUNET_SERVER_TransmitContext *tc,
   {
   case AF_INET:
     GNUNET_assert (hp->h_length == sizeof (struct in_addr));
-    GNUNET_SERVER_transmit_context_append_data (tc, 
-                                               hp->h_addr_list[0], 
+    GNUNET_SERVER_transmit_context_append_data (tc,
+                                               hp->h_addr_list[0],
                                                hp->h_length,
                                                 GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
     break;
   case AF_INET6:
     GNUNET_assert (hp->h_length == sizeof (struct in6_addr));
-    GNUNET_SERVER_transmit_context_append_data (tc, 
-                                               hp->h_addr_list[0], 
+    GNUNET_SERVER_transmit_context_append_data (tc,
+                                               hp->h_addr_list[0],
                                                hp->h_length,
                                                 GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
     break;
@@ -406,7 +406,7 @@ gethostbyname_resolve (struct GNUNET_SERVER_TransmitContext *tc,
     return GNUNET_SYSERR;
   }
   GNUNET_assert (hp->h_length == sizeof (struct in_addr));
-  GNUNET_SERVER_transmit_context_append_data (tc, 
+  GNUNET_SERVER_transmit_context_append_data (tc,
                                              hp->h_addr_list[0],
                                              hp->h_length,
                                               GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
@@ -482,7 +482,7 @@ handle_get (void *cls, struct GNUNET_SERVER_Client *client,
   {
     /* IP from hostname */
     const char *hostname;
-  
+
     hostname = (const char *) &msg[1];
     if (hostname[size - 1] != '\0')
     {
@@ -521,12 +521,12 @@ handle_get (void *cls, struct GNUNET_SERVER_Client *client,
   }
   {
     char buf[INET6_ADDRSTRLEN];
-    
+
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-               "Resolver asked to look up IP address `%s'.\n", 
+               "Resolver asked to look up IP address `%s'.\n",
                inet_ntop (af, ip, buf, sizeof (buf)));
   }
-  get_ip_as_string (client, af, ip);  
+  get_ip_as_string (client, af, ip);
 }
 
 
@@ -577,4 +577,19 @@ main (int argc, char *const *argv)
   return ret;
 }
 
+#ifdef LINUX
+#include <malloc.h>
+
+/**
+ * MINIMIZE heap size (way below 128k) since this process doesn't need much.
+ */
+void __attribute__ ((constructor)) GNUNET_ARM_memory_init ()
+{
+  mallopt (M_TRIM_THRESHOLD, 4 * 1024);
+  mallopt (M_TOP_PAD, 1 * 1024);
+  malloc_trim (0);
+}
+#endif
+
+
 /* end of gnunet-service-resolver.c */