X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Fresolver_api.c;h=2247b49c6e879cc78e371ae47929897e7898ecbd;hb=72c8645af31896829b674b575c5375706f362a30;hp=3bdc40143d398d73e408ee099bb27ede0b9ba5b5;hpb=d9d94d0e53d26af75ec8241383d166544ebd79f3;p=oweals%2Fgnunet.git

diff --git a/src/util/resolver_api.c b/src/util/resolver_api.c
index 3bdc40143..2247b49c6 100644
--- a/src/util/resolver_api.c
+++ b/src/util/resolver_api.c
@@ -139,7 +139,7 @@ struct GNUNET_RESOLVER_RequestHandle
   /**
    * Desired address family.
    */
-  int domain;
+  int af;
 
   /**
    * Has this request been transmitted to the service?
@@ -196,26 +196,26 @@ check_config ()
 #endif
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_string (resolver_cfg, "resolver",
-					     "HOSTNAME", &hostname))
-    {
-      LOG (GNUNET_ERROR_TYPE_ERROR,
-	   _("Must specify `%s' for `%s' in configuration!\n"), "HOSTNAME",
-	   "resolver");
-      GNUNET_assert (0);
-    }
+                                             "HOSTNAME", &hostname))
+  {
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         _("Must specify `%s' for `%s' in configuration!\n"), "HOSTNAME",
+         "resolver");
+    GNUNET_assert (0);
+  }
   if ((1 != inet_pton (AF_INET, hostname, &v4)) ||
       (1 != inet_pton (AF_INET6, hostname, &v6)))
+  {
+    GNUNET_free (hostname);
+    return;
+  }
+  i = 0;
+  while (loopback[i] != NULL)
+    if (0 == strcasecmp (loopback[i++], hostname))
     {
       GNUNET_free (hostname);
       return;
     }
-  i = 0;
-  while (loopback[i] != NULL)
-    if (0 == strcasecmp (loopback[i++], hostname))
-      {
-	GNUNET_free (hostname);
-	return;
-      }
   LOG (GNUNET_ERROR_TYPE_ERROR,
        _
        ("Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"),
@@ -249,86 +249,80 @@ GNUNET_RESOLVER_disconnect ()
   GNUNET_assert (NULL == req_head);
   GNUNET_assert (NULL == req_tail);
   if (NULL != client)
-    {
-#if DEBUG_RESOLVER
-      LOG (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from DNS service\n");
-#endif
-      GNUNET_CLIENT_disconnect (client, GNUNET_NO);
-      client = NULL;
-    }
+  {
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from DNS service\n");
+    GNUNET_CLIENT_disconnect (client);
+    client = NULL;
+  }
   if (r_task != GNUNET_SCHEDULER_NO_TASK)
-    {
-      GNUNET_SCHEDULER_cancel (r_task);
-      r_task = GNUNET_SCHEDULER_NO_TASK;
-    }
+  {
+    GNUNET_SCHEDULER_cancel (r_task);
+    r_task = GNUNET_SCHEDULER_NO_TASK;
+  }
   if (s_task != GNUNET_SCHEDULER_NO_TASK)
-    {
-      GNUNET_SCHEDULER_cancel (s_task);
-      s_task = GNUNET_SCHEDULER_NO_TASK;
-    }
+  {
+    GNUNET_SCHEDULER_cancel (s_task);
+    s_task = GNUNET_SCHEDULER_NO_TASK;
+  }
 }
 
 
 /**
  * Convert IP address to string without DNS resolution.
  *
- * @param sa the address
- * @param salen number of bytes in sa
+ * @param af address family
+ * @param ip the address
+ * @param ip_len number of bytes in ip
  * @return address as a string, NULL on error
  */
 static char *
-no_resolve (const struct sockaddr *sa, socklen_t salen)
+no_resolve (int af,
+	    const void *ip, socklen_t ip_len)
 {
-  char *ret;
-  char inet4[INET_ADDRSTRLEN];
-  char inet6[INET6_ADDRSTRLEN];
+  char buf[INET6_ADDRSTRLEN];
 
-  if (salen < sizeof (struct sockaddr))
-    return NULL;
-  switch (sa->sa_family)
+  switch (af)
+  {
+  case AF_INET:
+    if (ip_len != sizeof (struct in_addr))
+      return NULL;
+    if (NULL ==
+        inet_ntop (AF_INET, ip, buf, sizeof (buf)))
     {
-    case AF_INET:
-      if (salen != sizeof (struct sockaddr_in))
-	return NULL;
-      if (NULL ==
-	  inet_ntop (AF_INET, &((struct sockaddr_in *) sa)->sin_addr, inet4,
-		     INET_ADDRSTRLEN))
-	{
-	  LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "inet_ntop");
-	  return NULL;
-	}
-      ret = GNUNET_strdup (inet4);
-      break;
-    case AF_INET6:
-      if (salen != sizeof (struct sockaddr_in6))
-	return NULL;
-      if (NULL ==
-	  inet_ntop (AF_INET6, &((struct sockaddr_in6 *) sa)->sin6_addr,
-		     inet6, INET6_ADDRSTRLEN))
-	{
-	  LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "inet_ntop");
-	  return NULL;
-	}
-      ret = GNUNET_strdup (inet6);
-      break;
-    default:
-      ret = NULL;
-      break;
+      LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "inet_ntop");
+      return NULL;
+    }
+    break;
+  case AF_INET6:
+    if (ip_len != sizeof (struct in6_addr))
+      return NULL;
+    if (NULL ==
+        inet_ntop (AF_INET6, ip, buf, sizeof (buf)))
+    {
+      LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "inet_ntop");
+      return NULL;
     }
-  return ret;
+    break;
+  default:
+    GNUNET_break (0);
+    return NULL;
+  }
+  return GNUNET_strdup (buf);
 }
 
 
 /**
  * Adjust exponential back-off and reconnect to the service.
  */
-static void reconnect ();
+static void
+reconnect ();
 
 
 /**
  * Process pending requests to the resolver.
  */
-static void process_requests ();
+static void
+process_requests ();
 
 
 /**
@@ -342,130 +336,146 @@ handle_response (void *cls, const struct GNUNET_MessageHeader *msg)
 {
   struct GNUNET_RESOLVER_RequestHandle *rh = cls;
   uint16_t size;
-  const char *hostname;
-  const struct sockaddr *sa;
-  socklen_t salen;
 
-#if DEBUG_RESOLVER
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Receiving response from DNS service\n");
-#endif
   if (msg == NULL)
+  {
+    char buf[INET6_ADDRSTRLEN];
+
+    if (NULL != rh->name_callback)
+      LOG (GNUNET_ERROR_TYPE_INFO,
+           _("Timeout trying to resolve IP address `%s'.\n"),
+           inet_ntop (rh->af, (const void *) &rh[1], buf, sizeof(buf)));
+    else
+      LOG (GNUNET_ERROR_TYPE_INFO,
+           _("Timeout trying to resolve hostname `%s'.\n"),
+           (const char *) &rh[1]);
+    /* check if request was canceled */
+    if (rh->was_transmitted != GNUNET_SYSERR)
     {
       if (NULL != rh->name_callback)
-	LOG (GNUNET_ERROR_TYPE_INFO,
-	     _("Timeout trying to resolve IP address `%s'.\n"),
-	     GNUNET_a2s ((const void *) &rh[1], rh->data_len));
-      else
-	LOG (GNUNET_ERROR_TYPE_INFO,
-	     _("Timeout trying to resolve hostname `%s'.\n"),
-	     (const char *) &rh[1]);
-      /* check if request was canceled */
-      if (rh->was_transmitted != GNUNET_SYSERR)
-	{
-	  if (NULL != rh->name_callback)
-	    {
-	      /* no reverse lookup was successful, return ip as string */
-	      if (rh->received_response == GNUNET_NO)
-		rh->name_callback (rh->cls,
-				   no_resolve ((const struct sockaddr *)
-					       &rh[1], rh->data_len));
-	      /* at least one reverse lookup was successful */
-	      else
-		rh->name_callback (rh->cls, NULL);
-	    }
-	  if (NULL != rh->addr_callback)
-	    rh->addr_callback (rh->cls, NULL, 0);
-	}
-      GNUNET_CONTAINER_DLL_remove (req_head, req_tail, rh);
-      GNUNET_free (rh);
-      GNUNET_CLIENT_disconnect (client, GNUNET_NO);
-      client = NULL;
-      reconnect ();
-      return;
+      {
+        /* no reverse lookup was successful, return ip as string */
+        if (rh->received_response == GNUNET_NO)
+          rh->name_callback (rh->cls,
+                             no_resolve (rh->af,
+					 &rh[1],
+                                         rh->data_len));
+        /* at least one reverse lookup was successful */
+        else
+          rh->name_callback (rh->cls, NULL);
+      }
+      if (NULL != rh->addr_callback)
+        rh->addr_callback (rh->cls, NULL, 0);
     }
+    GNUNET_CONTAINER_DLL_remove (req_head, req_tail, rh);
+    GNUNET_free (rh);
+    GNUNET_CLIENT_disconnect (client);
+    client = NULL;
+    reconnect ();
+    return;
+  }
   if (GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE != ntohs (msg->type))
-    {
-      GNUNET_break (0);
-      GNUNET_CLIENT_disconnect (client, GNUNET_NO);
-      client = NULL;
-      reconnect ();
-      return;
-    }
+  {
+    GNUNET_break (0);
+    GNUNET_CLIENT_disconnect (client);
+    client = NULL;
+    reconnect ();
+    return;
+  }
   size = ntohs (msg->size);
   /* message contains not data, just header */
   if (size == sizeof (struct GNUNET_MessageHeader))
+  {
+    /* check if request was canceled */
+    if (rh->was_transmitted != GNUNET_SYSERR)
     {
-      /* check if request was canceled */
-      if (rh->was_transmitted != GNUNET_SYSERR)
-	{
-	  if (NULL != rh->name_callback)
-	    rh->name_callback (rh->cls, NULL);
-	  if (NULL != rh->addr_callback)
-	    rh->addr_callback (rh->cls, NULL, 0);
-	}
-      GNUNET_CONTAINER_DLL_remove (req_head, req_tail, rh);
-      GNUNET_free (rh);
-      process_requests ();
-      return;
+      if (NULL != rh->name_callback)
+        rh->name_callback (rh->cls, NULL);
+      if (NULL != rh->addr_callback)
+        rh->addr_callback (rh->cls, NULL, 0);
     }
+    GNUNET_CONTAINER_DLL_remove (req_head, req_tail, rh);
+    GNUNET_free (rh);
+    process_requests ();
+    return;
+  }
   /* return reverse lookup results to caller */
   if (NULL != rh->name_callback)
+  {
+    const char *hostname;
+
+    hostname = (const char *) &msg[1];
+    if (hostname[size - sizeof (struct GNUNET_MessageHeader) - 1] != '\0')
     {
-      hostname = (const char *) &msg[1];
-      if (hostname[size - sizeof (struct GNUNET_MessageHeader) - 1] != '\0')
-	{
-	  GNUNET_break (0);
-	  if (rh->was_transmitted != GNUNET_SYSERR)
-	    rh->name_callback (rh->cls, NULL);
-	  GNUNET_CONTAINER_DLL_remove (req_head, req_tail, rh);
-	  GNUNET_free (rh);
-	  GNUNET_CLIENT_disconnect (client, GNUNET_NO);
-	  client = NULL;
-	  reconnect ();
-	  return;
-	}
-#if DEBUG_RESOLVER
-      LOG (GNUNET_ERROR_TYPE_DEBUG, _("Resolver returns `%s' for IP `%s'.\n"),
-	   hostname, GNUNET_a2s ((const void *) &rh[1], rh->data_len));
-#endif
+      GNUNET_break (0);
       if (rh->was_transmitted != GNUNET_SYSERR)
-	rh->name_callback (rh->cls, hostname);
-      rh->received_response = GNUNET_YES;
-      GNUNET_CLIENT_receive (client, &handle_response, rh,
-			     GNUNET_TIME_absolute_get_remaining
-			     (rh->timeout));
+        rh->name_callback (rh->cls, NULL);
+      GNUNET_CONTAINER_DLL_remove (req_head, req_tail, rh);
+      GNUNET_free (rh);
+      GNUNET_CLIENT_disconnect (client);
+      client = NULL;
+      reconnect ();
+      return;
     }
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "Resolver returns `%s' for IP `%s'.\n",
+         hostname, GNUNET_a2s ((const void *) &rh[1], rh->data_len));
+    if (rh->was_transmitted != GNUNET_SYSERR)
+      rh->name_callback (rh->cls, hostname);
+    rh->received_response = GNUNET_YES;
+    GNUNET_CLIENT_receive (client, &handle_response, rh,
+                           GNUNET_TIME_absolute_get_remaining (rh->timeout));
+  }
   /* return lookup results to caller */
   if (NULL != rh->addr_callback)
+  {
+    struct sockaddr_in v4;
+    struct sockaddr_in6 v6;
+    const struct sockaddr *sa;
+    socklen_t salen;
+    const void *ip;
+    size_t ip_len;
+
+    ip = &msg[1];
+    ip_len = size - sizeof (struct GNUNET_MessageHeader);
+    if (ip_len == sizeof (struct in_addr))
     {
-      sa = (const struct sockaddr *) &msg[1];
-      salen = size - sizeof (struct GNUNET_MessageHeader);
-      if (salen < sizeof (struct sockaddr))
-	{
-	  GNUNET_break (0);
-	  if (rh->was_transmitted != GNUNET_SYSERR)
-	    rh->addr_callback (rh->cls, NULL, 0);
-	  GNUNET_CONTAINER_DLL_remove (req_head, req_tail, rh);
-	  GNUNET_free (rh);
-	  GNUNET_CLIENT_disconnect (client, GNUNET_NO);
-	  client = NULL;
-	  reconnect ();
-	  return;
-	}
-#if DEBUG_RESOLVER
-      {
-	char *ips = no_resolve (sa, salen);
-
-	LOG (GNUNET_ERROR_TYPE_DEBUG, "Resolver returns `%s' for `%s'.\n",
-	     ips, (const char *) &rh[1]);
-	GNUNET_free (ips);
-      }
+      memset (&v4, 0, sizeof (v4));
+      v4.sin_family = AF_INET;
+      v4.sin_addr = *(struct in_addr*) ip;
+#if HAVE_SOCKADDR_IN_SIN_LEN
+      v4.sin_len = sizeof (v4);
 #endif
-      rh->addr_callback (rh->cls, sa, salen);
-      GNUNET_CLIENT_receive (client, &handle_response, rh,
-			     GNUNET_TIME_absolute_get_remaining
-			     (rh->timeout));
+      salen = sizeof (v4);
+      sa = (const struct sockaddr *) &v4;
     }
+    else if (ip_len == sizeof (struct in6_addr))
+    {
+      memset (&v6, 0, sizeof (v6));
+      v6.sin6_family = AF_INET6;
+      v6.sin6_addr = *(struct in6_addr*) ip;
+#if HAVE_SOCKADDR_IN_SIN_LEN
+      v6.sin6_len = sizeof (v6);
+#endif
+      salen = sizeof (v6);
+      sa = (const struct sockaddr *) &v6;
+    }
+    else
+    {
+      GNUNET_break (0);
+      if (rh->was_transmitted != GNUNET_SYSERR)
+        rh->addr_callback (rh->cls, NULL, 0);
+      GNUNET_CONTAINER_DLL_remove (req_head, req_tail, rh);
+      GNUNET_free (rh);
+      GNUNET_CLIENT_disconnect (client);
+      client = NULL;
+      reconnect ();
+      return;
+    }
+    rh->addr_callback (rh->cls, sa, salen);
+    GNUNET_CLIENT_receive (client, &handle_response, rh,
+                           GNUNET_TIME_absolute_get_remaining (rh->timeout));
+  }
 }
 
 
@@ -496,29 +506,28 @@ numeric_resolution (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   v6.sin6_len = sizeof (v6);
 #endif
   hostname = (const char *) &rh[1];
-  if (((rh->domain == AF_UNSPEC) || (rh->domain == AF_INET)) &&
+  if (((rh->af == AF_UNSPEC) || (rh->af == AF_INET)) &&
       (1 == inet_pton (AF_INET, hostname, &v4.sin_addr)))
+  {
+    rh->addr_callback (rh->cls, (const struct sockaddr *) &v4, sizeof (v4));
+    if ((rh->af == AF_UNSPEC) &&
+        (1 == inet_pton (AF_INET6, hostname, &v6.sin6_addr)))
     {
-      rh->addr_callback (rh->cls, (const struct sockaddr *) &v4, sizeof (v4));
-      if ((rh->domain == AF_UNSPEC) &&
-	  (1 == inet_pton (AF_INET6, hostname, &v6.sin6_addr)))
-	{
-	  /* this can happen on some systems IF "hostname" is "localhost" */
-	  rh->addr_callback (rh->cls, (const struct sockaddr *) &v6,
-			     sizeof (v6));
-	}
-      rh->addr_callback (rh->cls, NULL, 0);
-      GNUNET_free (rh);
-      return;
-    }
-  if (((rh->domain == AF_UNSPEC) || (rh->domain == AF_INET6)) &&
-      (1 == inet_pton (AF_INET6, hostname, &v6.sin6_addr)))
-    {
+      /* this can happen on some systems IF "hostname" is "localhost" */
       rh->addr_callback (rh->cls, (const struct sockaddr *) &v6, sizeof (v6));
-      rh->addr_callback (rh->cls, NULL, 0);
-      GNUNET_free (rh);
-      return;
     }
+    rh->addr_callback (rh->cls, NULL, 0);
+    GNUNET_free (rh);
+    return;
+  }
+  if (((rh->af == AF_UNSPEC) || (rh->af == AF_INET6)) &&
+      (1 == inet_pton (AF_INET6, hostname, &v6.sin6_addr)))
+  {
+    rh->addr_callback (rh->cls, (const struct sockaddr *) &v6, sizeof (v6));
+    rh->addr_callback (rh->cls, NULL, 0);
+    GNUNET_free (rh);
+    return;
+  }
   /* why are we here? this task should not have been scheduled! */
   GNUNET_assert (0);
   GNUNET_free (rh);
@@ -552,22 +561,22 @@ loopback_resolution (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   v6.sin6_len = sizeof (v6);
 #endif
   v6.sin6_addr = in6addr_loopback;
-  switch (rh->domain)
-    {
-    case AF_INET:
-      rh->addr_callback (rh->cls, (const struct sockaddr *) &v4, sizeof (v4));
-      break;
-    case AF_INET6:
-      rh->addr_callback (rh->cls, (const struct sockaddr *) &v6, sizeof (v6));
-      break;
-    case AF_UNSPEC:
-      rh->addr_callback (rh->cls, (const struct sockaddr *) &v6, sizeof (v6));
-      rh->addr_callback (rh->cls, (const struct sockaddr *) &v4, sizeof (v4));
-      break;
-    default:
-      GNUNET_break (0);
-      break;
-    }
+  switch (rh->af)
+  {
+  case AF_INET:
+    rh->addr_callback (rh->cls, (const struct sockaddr *) &v4, sizeof (v4));
+    break;
+  case AF_INET6:
+    rh->addr_callback (rh->cls, (const struct sockaddr *) &v6, sizeof (v6));
+    break;
+  case AF_UNSPEC:
+    rh->addr_callback (rh->cls, (const struct sockaddr *) &v6, sizeof (v6));
+    rh->addr_callback (rh->cls, (const struct sockaddr *) &v4, sizeof (v4));
+    break;
+  default:
+    GNUNET_break (0);
+    break;
+  }
   rh->addr_callback (rh->cls, NULL, 0);
   GNUNET_free (rh);
 }
@@ -591,48 +600,46 @@ static void
 process_requests ()
 {
   struct GNUNET_RESOLVER_GetMessage *msg;
-  char buf[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1];
+  char buf[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1] GNUNET_ALIGN;
   struct GNUNET_RESOLVER_RequestHandle *rh;
 
   if (NULL == client)
-    {
-      reconnect ();
-      return;
-    }
+  {
+    reconnect ();
+    return;
+  }
   rh = req_head;
   if (NULL == rh)
-    {
-      /* nothing to do, release socket really soon if there is nothing
-       * else happening... */
-      s_task =
-	GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MILLISECONDS,
-				      &shutdown_task, NULL);
-      return;
-    }
+  {
+    /* nothing to do, release socket really soon if there is nothing
+     * else happening... */
+    s_task =
+        GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MILLISECONDS,
+                                      &shutdown_task, NULL);
+    return;
+  }
   if (GNUNET_YES == rh->was_transmitted)
-    return;			/* waiting for reply */
+    return;                     /* waiting for reply */
   msg = (struct GNUNET_RESOLVER_GetMessage *) buf;
   msg->header.size =
-    htons (sizeof (struct GNUNET_RESOLVER_GetMessage) + rh->data_len);
+      htons (sizeof (struct GNUNET_RESOLVER_GetMessage) + rh->data_len);
   msg->header.type = htons (GNUNET_MESSAGE_TYPE_RESOLVER_REQUEST);
   msg->direction = htonl (rh->direction);
-  msg->domain = htonl (rh->domain);
+  msg->af = htonl (rh->af);
   memcpy (&msg[1], &rh[1], rh->data_len);
-#if DEBUG_RESOLVER
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Transmitting DNS resolution request to DNS service\n");
-#endif
   if (GNUNET_OK !=
       GNUNET_CLIENT_transmit_and_get_response (client, &msg->header,
-					       GNUNET_TIME_absolute_get_remaining
-					       (rh->timeout), GNUNET_YES,
-					       &handle_response, rh))
-    {
-      GNUNET_CLIENT_disconnect (client, GNUNET_NO);
-      client = NULL;
-      reconnect ();
-      return;
-    }
+                                               GNUNET_TIME_absolute_get_remaining
+                                               (rh->timeout), GNUNET_YES,
+                                               &handle_response, rh))
+  {
+    GNUNET_CLIENT_disconnect (client);
+    client = NULL;
+    reconnect ();
+    return;
+  }
   rh->was_transmitted = GNUNET_YES;
 }
 
@@ -648,20 +655,17 @@ reconnect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   r_task = GNUNET_SCHEDULER_NO_TASK;
   if (NULL == req_head)
-    return;			/* no work pending */
+    return;                     /* no work pending */
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
     return;
-#if DEBUG_RESOLVER
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Trying to connect to DNS service\n");
-#endif
   client = GNUNET_CLIENT_connect ("resolver", resolver_cfg);
   if (NULL == client)
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-	   "Failed to connect, will try again later\n");
-      reconnect ();
-      return;
-    }
+  {
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "Failed to connect, will try again later\n");
+    reconnect ();
+    return;
+  }
   process_requests ();
 }
 
@@ -678,34 +682,32 @@ reconnect ()
     return;
   GNUNET_assert (NULL == client);
   if (NULL != (rh = req_head))
+  {
+    switch (rh->was_transmitted)
     {
-      switch (rh->was_transmitted)
-	{
-	case GNUNET_NO:
-	  /* nothing more to do */
-	  break;
-	case GNUNET_YES:
-	  /* disconnected, transmit again! */
-	  rh->was_transmitted = GNUNET_NO;
-	  break;
-	case GNUNET_SYSERR:
-	  /* request was cancelled, remove entirely */
-	  GNUNET_CONTAINER_DLL_remove (req_head, req_tail, rh);
-	  GNUNET_free (rh);
-	  break;
-	default:
-	  GNUNET_assert (0);
-	  break;
-	}
+    case GNUNET_NO:
+      /* nothing more to do */
+      break;
+    case GNUNET_YES:
+      /* disconnected, transmit again! */
+      rh->was_transmitted = GNUNET_NO;
+      break;
+    case GNUNET_SYSERR:
+      /* request was cancelled, remove entirely */
+      GNUNET_CONTAINER_DLL_remove (req_head, req_tail, rh);
+      GNUNET_free (rh);
+      break;
+    default:
+      GNUNET_assert (0);
+      break;
     }
-#if DEBUG_RESOLVER
+  }
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Will try to connect to DNS service in %llu ms\n",
        (unsigned long long) backoff.rel_value);
-#endif
   GNUNET_assert (NULL != resolver_cfg);
   r_task = GNUNET_SCHEDULER_add_delayed (backoff, &reconnect_task, NULL);
-  backoff = GNUNET_TIME_relative_multiply (backoff, 2);
+  backoff = GNUNET_TIME_STD_BACKOFF (backoff);
 }
 
 
@@ -713,17 +715,17 @@ reconnect ()
  * Convert a string to one or more IP addresses.
  *
  * @param hostname the hostname to resolve
- * @param domain AF_INET or AF_INET6; use AF_UNSPEC for "any"
+ * @param af AF_INET or AF_INET6; use AF_UNSPEC for "any"
  * @param callback function to call with addresses
  * @param callback_cls closure for callback
  * @param timeout how long to try resolving
  * @return handle that can be used to cancel the request, NULL on error
  */
 struct GNUNET_RESOLVER_RequestHandle *
-GNUNET_RESOLVER_ip_get (const char *hostname, int domain,
-			struct GNUNET_TIME_Relative timeout,
-			GNUNET_RESOLVER_AddressCallback callback,
-			void *callback_cls)
+GNUNET_RESOLVER_ip_get (const char *hostname, int af,
+                        struct GNUNET_TIME_Relative timeout,
+                        GNUNET_RESOLVER_AddressCallback callback,
+                        void *callback_cls)
 {
   struct GNUNET_RESOLVER_RequestHandle *rh;
   size_t slen;
@@ -734,12 +736,12 @@ GNUNET_RESOLVER_ip_get (const char *hostname, int domain,
   slen = strlen (hostname) + 1;
   if (slen + sizeof (struct GNUNET_RESOLVER_GetMessage) >=
       GNUNET_SERVER_MAX_MESSAGE_SIZE)
-    {
-      GNUNET_break (0);
-      return NULL;
-    }
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
   rh = GNUNET_malloc (sizeof (struct GNUNET_RESOLVER_RequestHandle) + slen);
-  rh->domain = domain;
+  rh->af = af;
   rh->addr_callback = callback;
   rh->cls = callback_cls;
   memcpy (&rh[1], hostname, slen);
@@ -748,28 +750,28 @@ GNUNET_RESOLVER_ip_get (const char *hostname, int domain,
   rh->direction = GNUNET_NO;
   /* first, check if this is a numeric address */
   if (((1 == inet_pton (AF_INET, hostname, &v4)) &&
-       ((domain == AF_INET) || (domain == AF_UNSPEC))) ||
+       ((af == AF_INET) || (af == AF_UNSPEC))) ||
       ((1 == inet_pton (AF_INET6, hostname, &v6)) &&
-       ((domain == AF_INET6) || (domain == AF_UNSPEC))))
-    {
-      rh->task = GNUNET_SCHEDULER_add_now (&numeric_resolution, rh);
-      return rh;
-    }
+       ((af == AF_INET6) || (af == AF_UNSPEC))))
+  {
+    rh->task = GNUNET_SCHEDULER_add_now (&numeric_resolution, rh);
+    return rh;
+  }
   /* then, check if this is a loopback address */
   i = 0;
   while (loopback[i] != NULL)
     if (0 == strcasecmp (loopback[i++], hostname))
-      {
-	rh->task = GNUNET_SCHEDULER_add_now (&loopback_resolution, rh);
-	return rh;
-      }
+    {
+      rh->task = GNUNET_SCHEDULER_add_now (&loopback_resolution, rh);
+      return rh;
+    }
   GNUNET_CONTAINER_DLL_insert_tail (req_head, req_tail, rh);
   rh->was_queued = GNUNET_YES;
   if (s_task != GNUNET_SCHEDULER_NO_TASK)
-    {
-      GNUNET_SCHEDULER_cancel (s_task);
-      s_task = GNUNET_SCHEDULER_NO_TASK;
-    }
+  {
+    GNUNET_SCHEDULER_cancel (s_task);
+    s_task = GNUNET_SCHEDULER_NO_TASK;
+  }
   process_requests ();
   return rh;
 }
@@ -788,15 +790,13 @@ numeric_reverse (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   struct GNUNET_RESOLVER_RequestHandle *rh = cls;
   char *result;
 
-  result = no_resolve ((const struct sockaddr *) &rh[1], rh->data_len);
-#if DEBUG_RESOLVER
-  LOG (GNUNET_ERROR_TYPE_DEBUG, _("Resolver returns `%s'.\n"), result);
-#endif
+  result = no_resolve (rh->af, &rh[1], rh->data_len);
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Resolver returns `%s'.\n", result);
   if (result != NULL)
-    {
-      rh->name_callback (rh->cls, result);
-      GNUNET_free (result);
-    }
+  {
+    rh->name_callback (rh->cls, result);
+    GNUNET_free (result);
+  }
   rh->name_callback (rh->cls, NULL);
   GNUNET_free (rh);
 }
@@ -816,48 +816,58 @@ numeric_reverse (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  */
 struct GNUNET_RESOLVER_RequestHandle *
 GNUNET_RESOLVER_hostname_get (const struct sockaddr *sa, socklen_t salen,
-			      int do_resolve,
-			      struct GNUNET_TIME_Relative timeout,
-			      GNUNET_RESOLVER_HostnameCallback callback,
-			      void *cls)
+                              int do_resolve,
+                              struct GNUNET_TIME_Relative timeout,
+                              GNUNET_RESOLVER_HostnameCallback callback,
+                              void *cls)
 {
   struct GNUNET_RESOLVER_RequestHandle *rh;
+  size_t ip_len;
+  const void *ip;
 
   check_config ();
+  switch (sa->sa_family)
+  {
+  case AF_INET:
+    ip_len = sizeof (struct in_addr);
+    ip = &((const struct sockaddr_in*)sa)->sin_addr;
+    break;
+  case AF_INET6:
+    ip_len = sizeof (struct in6_addr);
+    ip = &((const struct sockaddr_in6*)sa)->sin6_addr;
+    break;
+  default:
+    GNUNET_break (0);
+    return NULL;
+  }
   rh = GNUNET_malloc (sizeof (struct GNUNET_RESOLVER_RequestHandle) + salen);
   rh->name_callback = callback;
   rh->cls = cls;
+  rh->af = sa->sa_family;
   rh->timeout = GNUNET_TIME_relative_to_absolute (timeout);
-  memcpy (&rh[1], sa, salen);
-  rh->data_len = salen;
+  memcpy (&rh[1], ip, ip_len);
+  rh->data_len = ip_len;
   rh->direction = GNUNET_YES;
   rh->received_response = GNUNET_NO;
   if (GNUNET_NO == do_resolve)
-    {
-      rh->task = GNUNET_SCHEDULER_add_now (&numeric_reverse, rh);
-      return rh;
-    }
-  if (salen + sizeof (struct GNUNET_RESOLVER_GetMessage) >=
-      GNUNET_SERVER_MAX_MESSAGE_SIZE)
-    {
-      GNUNET_break (0);
-      GNUNET_free (rh);
-      return NULL;
-    }
+  {
+    rh->task = GNUNET_SCHEDULER_add_now (&numeric_reverse, rh);
+    return rh;
+  }
   GNUNET_CONTAINER_DLL_insert_tail (req_head, req_tail, rh);
   rh->was_queued = GNUNET_YES;
   if (s_task != GNUNET_SCHEDULER_NO_TASK)
-    {
-      GNUNET_SCHEDULER_cancel (s_task);
-      s_task = GNUNET_SCHEDULER_NO_TASK;
-    }
+  {
+    GNUNET_SCHEDULER_cancel (s_task);
+    s_task = GNUNET_SCHEDULER_NO_TASK;
+  }
   process_requests ();
   return rh;
 }
 
 
 /**
- * Get local fully qualified domain name
+ * Get local fully qualified af name
  *
  * @return fqdn
  */
@@ -868,21 +878,19 @@ GNUNET_RESOLVER_local_fqdn_get ()
   char hostname[GNUNET_OS_get_hostname_max_length () + 1];
 
   if (0 != gethostname (hostname, sizeof (hostname) - 1))
-    {
-      LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-		    "gethostname");
-      return NULL;
-    }
-#if DEBUG_RESOLVER
-  LOG (GNUNET_ERROR_TYPE_DEBUG, _("Resolving our FQDN `%s'\n"), hostname);
-#endif
+  {
+    LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                  "gethostname");
+    return NULL;
+  }
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Resolving our FQDN `%s'\n", hostname);
   host = gethostbyname (hostname);
   if (NULL == host)
-    {
-      LOG (GNUNET_ERROR_TYPE_ERROR, _("Could not resolve our FQDN : %s\n"),
-	   hstrerror (h_errno));
-      return NULL;
-    }
+  {
+    LOG (GNUNET_ERROR_TYPE_ERROR, _("Could not resolve our FQDN : %s\n"),
+         hstrerror (h_errno));
+    return NULL;
+  }
   return GNUNET_strdup (host->h_name);
 }
 
@@ -890,30 +898,28 @@ GNUNET_RESOLVER_local_fqdn_get ()
 /**
  * Looking our own hostname.
  *
- * @param domain AF_INET or AF_INET6; use AF_UNSPEC for "any"
+ * @param af AF_INET or AF_INET6; use AF_UNSPEC for "any"
  * @param callback function to call with addresses
  * @param cls closure for callback
  * @param timeout how long to try resolving
  * @return handle that can be used to cancel the request, NULL on error
  */
 struct GNUNET_RESOLVER_RequestHandle *
-GNUNET_RESOLVER_hostname_resolve (int domain,
-				  struct GNUNET_TIME_Relative timeout,
-				  GNUNET_RESOLVER_AddressCallback callback,
-				  void *cls)
+GNUNET_RESOLVER_hostname_resolve (int af,
+                                  struct GNUNET_TIME_Relative timeout,
+                                  GNUNET_RESOLVER_AddressCallback callback,
+                                  void *cls)
 {
   char hostname[GNUNET_OS_get_hostname_max_length () + 1];
 
   if (0 != gethostname (hostname, sizeof (hostname) - 1))
-    {
-      LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-		    "gethostname");
-      return NULL;
-    }
-#if DEBUG_RESOLVER
-  LOG (GNUNET_ERROR_TYPE_DEBUG, _("Resolving our hostname `%s'\n"), hostname);
-#endif
-  return GNUNET_RESOLVER_ip_get (hostname, domain, timeout, callback, cls);
+  {
+    LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                  "gethostname");
+    return NULL;
+  }
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Resolving our hostname `%s'\n", hostname);
+  return GNUNET_RESOLVER_ip_get (hostname, af, timeout, callback, cls);
 }
 
 
@@ -929,19 +935,19 @@ void
 GNUNET_RESOLVER_request_cancel (struct GNUNET_RESOLVER_RequestHandle *rh)
 {
   if (rh->task != GNUNET_SCHEDULER_NO_TASK)
-    {
-      GNUNET_SCHEDULER_cancel (rh->task);
-      rh->task = GNUNET_SCHEDULER_NO_TASK;
-    }
+  {
+    GNUNET_SCHEDULER_cancel (rh->task);
+    rh->task = GNUNET_SCHEDULER_NO_TASK;
+  }
   if (rh->was_transmitted == GNUNET_NO)
-    {
-      if (rh->was_queued == GNUNET_YES)
-	GNUNET_CONTAINER_DLL_remove (req_head, req_tail, rh);
-      GNUNET_free (rh);
-      return;
-    }
+  {
+    if (rh->was_queued == GNUNET_YES)
+      GNUNET_CONTAINER_DLL_remove (req_head, req_tail, rh);
+    GNUNET_free (rh);
+    return;
+  }
   GNUNET_assert (rh->was_transmitted == GNUNET_YES);
-  rh->was_transmitted = GNUNET_SYSERR;	/* mark as cancelled */
+  rh->was_transmitted = GNUNET_SYSERR;  /* mark as cancelled */
 }