ack florian

[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 f3675edb33471b67902bc280a1ca047157734676..a87b1f5d05c5b2f0b0321531076944e045be5a9a 100644 (file)
--- a/src/util/gnunet-service-resolver.c
+++ b/src/util/gnunet-service-resolver.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2007-2013 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2007-2013 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -101,6 +101,7 @@ getnameinfo_resolve (struct IPCache *cache)
   struct sockaddr_in v4;
   struct sockaddr_in6 v6;
   size_t salen;
+  int ret;
 
   switch (cache->af)
   {
@@ -131,13 +132,19 @@ getnameinfo_resolve (struct IPCache *cache)
   }
 
   if (0 ==
-      getnameinfo (sa, salen,
-                   hostname, sizeof (hostname),
-                   NULL,
-                   0, 0))
+      (ret = getnameinfo (sa, salen,
+                          hostname, sizeof (hostname),
+                          NULL,
+                          0, 0)))
   {
     cache->addr = GNUNET_strdup (hostname);
   }
+  else
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "getnameinfo failed: %s\n",
+                gai_strerror (ret));
+  }
 }
 #endif
 
@@ -160,6 +167,12 @@ gethostbyaddr_resolve (struct IPCache *cache)
   {
     cache->addr = GNUNET_strdup (ent->h_name);
   }
+  else
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "gethostbyaddr failed: %s\n",
+                hstrerror (h_errno));
+  }
 }
 #endif
 
@@ -254,7 +267,7 @@ get_ip_as_string (struct GNUNET_SERVER_Client *client,
   {
     pos = GNUNET_malloc (sizeof (struct IPCache) + ip_len);
     pos->ip = &pos[1];
-    memcpy (&pos[1], ip, ip_len);
+    GNUNET_memcpy (&pos[1], ip, ip_len);
     pos->last_request = now;
     pos->last_refresh = now;
     pos->ip_len = ip_len;
@@ -269,6 +282,9 @@ get_ip_as_string (struct GNUNET_SERVER_Client *client,
     GNUNET_SERVER_transmit_context_append_data (tc, pos->addr,
                                                 strlen (pos->addr) + 1,
                                                 GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+  else
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Reverse lookup failed\n");
   GNUNET_SERVER_transmit_context_append_data (tc, NULL, 0,
                                               GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
   GNUNET_SERVER_transmit_context_run (tc, GNUNET_TIME_UNIT_FOREVER_REL);
@@ -307,7 +323,8 @@ getaddrinfo_resolve (struct GNUNET_SERVER_TransmitContext *tc,
 
   if (0 != (s = getaddrinfo (hostname, NULL, &hints, &result)))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Could not resolve `%s' (%s): %s\n"),
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                _("Could not resolve `%s' (%s): %s\n"),
                 hostname,
                 (af ==
                  AF_INET) ? "IPv4" : ((af == AF_INET6) ? "IPv6" : "any"),
@@ -348,13 +365,15 @@ getaddrinfo_resolve (struct GNUNET_SERVER_TransmitContext *tc,
   freeaddrinfo (result);
   return GNUNET_OK;
 }
-#endif
 
 
-#if HAVE_GETHOSTBYNAME2
+#elif HAVE_GETHOSTBYNAME2
+
+
 static int
 gethostbyname2_resolve (struct GNUNET_SERVER_TransmitContext *tc,
-                        const char *hostname, int af)
+                        const char *hostname,
+                        int af)
 {
   struct hostent *hp;
   int ret1;
@@ -406,10 +425,10 @@ gethostbyname2_resolve (struct GNUNET_SERVER_TransmitContext *tc,
   }
   return GNUNET_OK;
 }
-#endif
+
+#elif HAVE_GETHOSTBYNAME
 
 
-#if HAVE_GETHOSTBYNAME
 static int
 gethostbyname_resolve (struct GNUNET_SERVER_TransmitContext *tc,
                        const char *hostname)
@@ -417,10 +436,11 @@ gethostbyname_resolve (struct GNUNET_SERVER_TransmitContext *tc,
   struct hostent *hp;
 
   hp = GETHOSTBYNAME (hostname);
-  if (hp == NULL)
+  if (NULL == hp)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                _("Could not find IP of host `%s': %s\n"), hostname,
+                _("Could not find IP of host `%s': %s\n"),
+                hostname,
                 hstrerror (h_errno));
     return GNUNET_SYSERR;
   }
@@ -459,12 +479,10 @@ get_ip_from_hostname (struct GNUNET_SERVER_Client *client,
 #if HAVE_GETADDRINFO
   if (ret == GNUNET_NO)
     ret = getaddrinfo_resolve (tc, hostname, af);
-#endif
-#if HAVE_GETHOSTBYNAME2
+#elif HAVE_GETHOSTBYNAME2
   if (ret == GNUNET_NO)
     ret = gethostbyname2_resolve (tc, hostname, af);
-#endif
-#if HAVE_GETHOSTBYNAME
+#elif HAVE_GETHOSTBYNAME
   if ((ret == GNUNET_NO) && ((af == AF_UNSPEC) || (af == PF_INET)))
     gethostbyname_resolve (tc, hostname);
 #endif
@@ -497,14 +515,15 @@ handle_get (void *cls,
   if (msize < sizeof (struct GNUNET_RESOLVER_GetMessage))
   {
     GNUNET_break (0);
-    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+    GNUNET_SERVER_receive_done (client,
+                                GNUNET_SYSERR);
     return;
   }
   msg = (const struct GNUNET_RESOLVER_GetMessage *) message;
   size = msize - sizeof (struct GNUNET_RESOLVER_GetMessage);
   direction = ntohl (msg->direction);
   af = ntohl (msg->af);
-  if (direction == GNUNET_NO)
+  if (GNUNET_NO == direction)
   {
     /* IP from hostname */
     const char *hostname;
@@ -513,10 +532,12 @@ handle_get (void *cls,
     if (hostname[size - 1] != '\0')
     {
       GNUNET_break (0);
-      GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+      GNUNET_SERVER_receive_done (client,
+                                  GNUNET_SYSERR);
       return;
     }
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Resolver asked to look up `%s'.\n",
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Resolver asked to look up `%s'.\n",
                 hostname);
     get_ip_from_hostname (client, hostname, af);
     return;
@@ -528,7 +549,8 @@ handle_get (void *cls,
     if (size != sizeof (struct in_addr))
     {
       GNUNET_break (0);
-      GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+      GNUNET_SERVER_receive_done (client,
+                                  GNUNET_SYSERR);
       return;
     }
     break;
@@ -536,13 +558,15 @@ handle_get (void *cls,
     if (size != sizeof (struct in6_addr))
     {
       GNUNET_break (0);
-      GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+      GNUNET_SERVER_receive_done (client,
+                                  GNUNET_SYSERR);
       return;
     }
     break;
   default:
     GNUNET_break (0);
-    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+    GNUNET_SERVER_receive_done (client,
+                                GNUNET_SYSERR);
     return;
   }
   {
@@ -590,7 +614,9 @@ main (int argc, char *const *argv)
 
   ret =
       (GNUNET_OK ==
-       GNUNET_SERVICE_run (argc, argv, "resolver", GNUNET_SERVICE_OPTION_NONE,
+       GNUNET_SERVICE_run (argc, argv,
+                           "resolver",
+                           GNUNET_SERVICE_OPTION_NONE,
                            &run, NULL)) ? 0 : 1;
   while (NULL != (pos = cache_head))
   {
@@ -603,7 +629,7 @@ main (int argc, char *const *argv)
   return ret;
 }
 
-#ifdef LINUX
+#if defined(LINUX) && defined(__GLIBC__)
 #include <malloc.h>
 
 /**