LRN: Fix automake deps to allow -j* builds again

[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 b0e2f0be4f76e883e398b4f7d2886c7c0106b38a..39f31745f7b95113e62934f3b5d4c3fcccbe7782 100644 (file)
--- a/src/util/gnunet-service-resolver.c
+++ b/src/util/gnunet-service-resolver.c
@@ -23,8 +23,6 @@
  * @brief code to do DNS resolution
  * @author Christian Grothoff
  */
-
-#include <stdlib.h>
 #include "platform.h"
 #include "gnunet_disk_lib.h"
 #include "gnunet_getopt_lib.h"
@@ -265,12 +263,12 @@ getaddrinfo_resolve (struct GNUNET_SERVER_TransmitContext *tc,
                    AF_INET) ? "IPv4" : ((domain ==
                                          AF_INET6) ? "IPv6" : "any"),
                   gai_strerror (s));
-      if ((s == EAI_BADFLAGS) || (s == EAI_MEMORY) ||
+      if ((s == EAI_BADFLAGS) || (s == EAI_MEMORY) 
 #ifndef MINGW
-          (s == EAI_SYSTEM)
+          || (s == EAI_SYSTEM)
 #else
           // FIXME NILS
-          1
+          || 1
 #endif
         )
         return GNUNET_NO;       /* other function may still succeed */
@@ -327,6 +325,9 @@ gethostbyname2_resolve (struct GNUNET_SERVER_TransmitContext *tc,
       GNUNET_assert (hp->h_length == sizeof (struct in_addr));
       memset (&a4, 0, sizeof (a4));
       a4.sin_family = AF_INET;
+#if HAVE_SOCKADDR_IN_SIN_LEN
+      a4.sin_len = (u_char) sizeof (struct sockaddr_in);
+#endif
       memcpy (&a4.sin_addr, hp->h_addr_list[0], hp->h_length);
       GNUNET_SERVER_transmit_context_append_data (tc,
                                                  &a4,
@@ -338,6 +339,9 @@ gethostbyname2_resolve (struct GNUNET_SERVER_TransmitContext *tc,
       GNUNET_assert (hp->h_length == sizeof (struct in6_addr));
       memset (&a6, 0, sizeof (a6));
       a6.sin6_family = AF_INET6;
+#if HAVE_SOCKADDR_IN_SIN_LEN
+      a6.sin6_len = (u_char) sizeof (struct sockaddr_in6);
+#endif
       memcpy (&a6.sin6_addr, hp->h_addr_list[0], hp->h_length);
       GNUNET_SERVER_transmit_context_append_data (tc,
                                                  &a6,
@@ -372,6 +376,9 @@ gethostbyname_resolve (struct GNUNET_SERVER_TransmitContext *tc,
   GNUNET_assert (hp->h_length == sizeof (struct in_addr));
   memset (&addr, 0, sizeof (addr));
   addr.sin_family = AF_INET;
+#if HAVE_SOCKADDR_IN_SIN_LEN
+  addr.sin_len = (u_char) sizeof (struct sockaddr_in);
+#endif
   memcpy (&addr.sin_addr, hp->h_addr_list[0], hp->h_length);
   GNUNET_SERVER_transmit_context_append_data (tc,
                                              &addr,
@@ -431,6 +438,7 @@ handle_get (void *cls,
   uint16_t msize;
   const struct GNUNET_RESOLVER_GetMessage *msg;
   const char *hostname;
+  const struct sockaddr *sa;
   uint16_t size;
   int direction;
   int domain;
@@ -464,11 +472,51 @@ handle_get (void *cls,
     }
   else
     {
-#if DEBUG_RESOLVER
+#if DEBUG_RESOLVER      
+      char buf[INET6_ADDRSTRLEN];
+#endif
+      if (size < sizeof (struct sockaddr))
+       {
+         GNUNET_break (0);
+         GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+         return;
+       }
+      sa = (const struct sockaddr*) &msg[1];
+      switch (sa->sa_family)
+       {
+       case AF_INET:
+         if (size != sizeof (struct sockaddr_in))
+           {
+             GNUNET_break (0);
+             GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+             return;
+           }
+#if DEBUG_RESOLVER      
+         inet_ntop (AF_INET, sa, buf, size);
+#endif
+         break;
+       case AF_INET6:
+         if (size != sizeof (struct sockaddr_in6))
+           {
+             GNUNET_break (0);
+             GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+             return;
+           }
+#if DEBUG_RESOLVER      
+         inet_ntop (AF_INET6, sa, buf, size);
+#endif
+         break;
+       default:
+         GNUNET_break (0);
+         GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+         return;
+       }      
+#if DEBUG_RESOLVER      
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  _("Resolver asked to look up IP address.\n"));
+                  _("Resolver asked to look up IP address `%s'.\n"),
+                 buf);
 #endif
-      get_ip_as_string (client, (const struct sockaddr *) &msg[1], size);
+      get_ip_as_string (client, sa, size);
     }
 }
 
@@ -477,13 +525,11 @@ handle_get (void *cls,
  * Process resolver requests.
  *
  * @param cls closure
- * @param sched scheduler to use
  * @param server the initialized server
  * @param cfg configuration to use
  */
 static void
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *sched,
      struct GNUNET_SERVER_Handle *server,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {