glitch in the license text detected by hyazinthe, thank you!
[oweals/gnunet.git] / src / util / gnunet-service-resolver.c
index c8d51077047ff5abedc9284606d71dabb6ab9f0a..cd40728362185e7c5fe1f4142b0b63df11555b4a 100644 (file)
@@ -1,21 +1,16 @@
 /*
      This file is part of GNUnet.
-     (C) 2007-2013 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2007-2016 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
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     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.
+     Affero General Public License for more details.
 */
 
 /**
@@ -30,7 +25,7 @@
 #include "resolver.h"
 
 /**
- * A cached DNS lookup result.
+ * A cached DNS lookup result (for reverse lookup).
  */
 struct IPCache
 {
@@ -101,6 +96,7 @@ getnameinfo_resolve (struct IPCache *cache)
   struct sockaddr_in v4;
   struct sockaddr_in6 v6;
   size_t salen;
+  int ret;
 
   switch (cache->af)
   {
@@ -131,9 +127,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
 
@@ -152,8 +158,16 @@ 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);
+  }
+  else
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "gethostbyaddr failed: %s\n",
+                hstrerror (h_errno));
+  }
 }
 #endif
 
@@ -167,16 +181,32 @@ 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
 }
 
 
+/**
+ * Function called after the replies for the request have all
+ * been transmitted to the client, and we can now read the next
+ * request from the client.
+ *
+ * @param cls the `struct GNUNET_SERVICE_Client` to continue with
+ */
+static void
+notify_service_client_done (void *cls)
+{
+  struct GNUNET_SERVICE_Client *client = cls;
+
+  GNUNET_SERVICE_client_continue (client);
+}
+
+
 /**
  * Get an IP address as a string (works for both IPv4 and IPv6).  Note
  * that the resolution happens asynchronously and that the first call
@@ -185,18 +215,22 @@ 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,
+get_ip_as_string (struct GNUNET_SERVICE_Client *client,
                   int af,
                  const void *ip)
 {
   struct IPCache *pos;
   struct IPCache *next;
   struct GNUNET_TIME_Absolute now;
-  struct GNUNET_SERVER_TransmitContext *tc;
+  struct GNUNET_MQ_Envelope *env;
+  struct GNUNET_MQ_Handle *mq;
+  struct GNUNET_MessageHeader *msg;
   size_t ip_len;
+  struct in6_addr ix;
+  size_t alen;
 
   switch (af)
   {
@@ -228,22 +262,28 @@ 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
   {
     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;
@@ -253,109 +293,167 @@ get_ip_as_string (struct GNUNET_SERVER_Client *client,
                                 pos);
     cache_resolve (pos);
   }
-  tc = GNUNET_SERVER_transmit_context_create (client);
-  if (pos->addr != NULL)
-    GNUNET_SERVER_transmit_context_append_data (tc, pos->addr,
-                                                strlen (pos->addr) + 1,
-                                                GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
-  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);
+  if (NULL != pos->addr)
+    alen = strlen (pos->addr) + 1;
+  else
+    alen = 0;
+  mq = GNUNET_SERVICE_client_get_mq (client);
+  env = GNUNET_MQ_msg_extra (msg,
+                            alen,
+                            GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+  GNUNET_memcpy (&msg[1],
+                pos->addr,
+                alen);
+  GNUNET_MQ_send (mq,
+                 env);
+  env = GNUNET_MQ_msg (msg,
+                      GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+  GNUNET_MQ_notify_sent (env,
+                        &notify_service_client_done,
+                        client);
+  GNUNET_MQ_send (mq,
+                 env);
 }
 
 
 #if HAVE_GETADDRINFO
 static int
-getaddrinfo_resolve (struct GNUNET_SERVER_TransmitContext *tc,
-                     const char *hostname, int af)
+getaddrinfo_resolve (struct GNUNET_MQ_Handle *mq,
+                     const char *hostname,
+                    int af)
 {
   int s;
   struct addrinfo hints;
   struct addrinfo *result;
   struct addrinfo *pos;
+  struct GNUNET_MessageHeader *msg;
+  struct GNUNET_MQ_Envelope *env;
 
-  memset (&hints, 0, sizeof (struct addrinfo));
-// FIXME in PlibC
-#ifndef MINGW
-  hints.ai_family = af;
-#else
-  hints.ai_family = AF_INET;
+#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 (mq,
+                               hostname,
+                               AF_INET);
+    ret2 = getaddrinfo_resolve (mq,
+                               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));
+  hints.ai_family = af;
   hints.ai_socktype = SOCK_STREAM;      /* go for TCP */
 
-  if (0 != (s = getaddrinfo (hostname, NULL, &hints, &result)))
+  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"),
                 gai_strerror (s));
-    if ((s == EAI_BADFLAGS) || (s == EAI_MEMORY)
-#ifndef MINGW
-        || (s == EAI_SYSTEM)
-#else
-        // FIXME NILS
-        || 1
+    if ( (s == EAI_BADFLAGS) ||
+#ifndef WINDOWS
+        (s == EAI_SYSTEM) ||
 #endif
-        )
+        (s == EAI_MEMORY) )
       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)
     {
     case AF_INET:
-      GNUNET_SERVER_transmit_context_append_data (tc,
-                                                 &((struct sockaddr_in*) pos->ai_addr)->sin_addr,
-                                                 sizeof (struct in_addr),
-                                                 GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+      env = GNUNET_MQ_msg_extra (msg,
+                                sizeof (struct in_addr),
+                                GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+      GNUNET_memcpy (&msg[1],
+                    &((struct sockaddr_in*) pos->ai_addr)->sin_addr,
+                    sizeof (struct in_addr));
+      GNUNET_MQ_send (mq,
+                     env);
       break;
     case AF_INET6:
-      GNUNET_SERVER_transmit_context_append_data (tc,
-                                                 &((struct sockaddr_in6*) pos->ai_addr)->sin6_addr,
-                                                 sizeof (struct in6_addr),
-                                                 GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+      env = GNUNET_MQ_msg_extra (msg,
+                                sizeof (struct in6_addr),
+                                GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+      GNUNET_memcpy (&msg[1],
+                    &((struct sockaddr_in6*) pos->ai_addr)->sin6_addr,
+                    sizeof (struct in6_addr));
+      GNUNET_MQ_send (mq,
+                     env);
       break;
     default:
       /* unsupported, skip */
       break;
     }
-    pos = pos->ai_next;
   }
   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)
+gethostbyname2_resolve (struct GNUNET_MQ_Handle *mq,
+                        const char *hostname,
+                        int af)
 {
   struct hostent *hp;
   int ret1;
   int ret2;
+  struct GNUNET_MQ_Envelope *env;
+  struct GNUNET_MessageHeader *msg;
+
+#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);
-    ret2 = gethostbyname2_resolve (tc, hostname, AF_INET6);
-    if ((ret1 == GNUNET_OK) || (ret2 == GNUNET_OK))
+    ret1 = gethostbyname2_resolve (mq,
+                                  hostname,
+                                  AF_INET);
+    ret2 = gethostbyname2_resolve (mq,
+                                  hostname,
+                                  AF_INET6);
+    if ( (ret1 == GNUNET_OK) ||
+        (ret2 == GNUNET_OK) )
       return GNUNET_OK;
-    if ((ret1 == GNUNET_SYSERR) || (ret2 == GNUNET_SYSERR))
+    if ( (ret1 == GNUNET_SYSERR) ||
+        (ret2 == GNUNET_SYSERR) )
       return GNUNET_SYSERR;
     return GNUNET_NO;
   }
-  hp = gethostbyname2 (hostname, af);
+  hp = gethostbyname2 (hostname,
+                      af);
   if (hp == NULL)
   {
     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;
   }
@@ -364,17 +462,25 @@ 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],
-                                               hp->h_length,
-                                                GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+    env = GNUNET_MQ_msg_extra (msg,
+                              hp->h_length,
+                              GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+    GNUNET_memcpy (&msg[1],
+                  hp->h_addr_list[0],
+                  hp->h_length);
+    GNUNET_MQ_send (mq,
+                   env);
     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],
-                                               hp->h_length,
-                                                GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+    env = GNUNET_MQ_msg_extra (msg,
+                              hp->h_length,
+                              GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+    GNUNET_memcpy (&msg[1],
+                  hp->h_addr_list[0],
+                  hp->h_length);
+    GNUNET_MQ_send (mq,
+                   env);
     break;
   default:
     GNUNET_break (0);
@@ -382,21 +488,24 @@ 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)
+gethostbyname_resolve (struct GNUNET_MQ_Handle *mq,
+                      const char *hostname)
 {
   struct hostent *hp;
+  struct GNUNET_MessageHeader *msg;
+  struct GNUNET_MQ_Envelope *env;
 
   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;
   }
@@ -406,10 +515,14 @@ 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,
-                                             hp->h_addr_list[0],
-                                             hp->h_length,
-                                              GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+  env = GNUNET_MQ_msg_extra (msg,
+                            hp->h_length,
+                            GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+  GNUNET_memcpy (&msg[1],
+                hp->h_addr_list[0],
+                hp->h_length);
+  GNUNET_MQ_send (mq,
+                 env);
   return GNUNET_OK;
 }
 #endif
@@ -423,167 +536,214 @@ 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_SERVICE_Client *client,
+                      const char *hostname,
                       int af)
 {
   int ret;
-  struct GNUNET_SERVER_TransmitContext *tc;
+  struct GNUNET_MQ_Handle *mq;
+  struct GNUNET_MQ_Envelope *env;
+  struct GNUNET_MessageHeader *msg;
 
-  tc = GNUNET_SERVER_transmit_context_create (client);
+  mq = GNUNET_SERVICE_client_get_mq (client);
   ret = GNUNET_NO;
 #if HAVE_GETADDRINFO
   if (ret == GNUNET_NO)
-    ret = getaddrinfo_resolve (tc, hostname, af);
-#endif
-#if HAVE_GETHOSTBYNAME2
+    ret = getaddrinfo_resolve (mq,
+                              hostname,
+                              af);
+#elif HAVE_GETHOSTBYNAME2
   if (ret == GNUNET_NO)
-    ret = gethostbyname2_resolve (tc, hostname, af);
-#endif
-#if HAVE_GETHOSTBYNAME
-  if ((ret == GNUNET_NO) && ((af == AF_UNSPEC) || (af == PF_INET)))
-    gethostbyname_resolve (tc, hostname);
+    ret = gethostbyname2_resolve (mq,
+                                 hostname,
+                                 af);
+#elif HAVE_GETHOSTBYNAME
+  if ( (ret == GNUNET_NO) &&
+       ( (af == AF_UNSPEC) ||
+        (af == PF_INET) ) )
+    gethostbyname_resolve (mq,
+                          hostname);
 #endif
-  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);
+  env = GNUNET_MQ_msg (msg,
+                      GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+  GNUNET_MQ_notify_sent (env,
+                        &notify_service_client_done,
+                        client);
+  GNUNET_MQ_send (mq,
+                 env);
 }
 
 
 /**
- * Handle GET-message.
+ * Verify well-formedness of GET-message.
  *
- * @param cls closure
- * @param client identification of the client
- * @param message the actual message
+ * @param cls closure, unused
+ * @param get the actual message
+ * @return #GNUNET_OK if @a get is well-formed
  */
-static void
-handle_get (void *cls, struct GNUNET_SERVER_Client *client,
-            const struct GNUNET_MessageHeader *message)
+static int
+check_get (void *cls,
+          const struct GNUNET_RESOLVER_GetMessage *get)
 {
-  uint16_t msize;
-  const struct GNUNET_RESOLVER_GetMessage *msg;
-  const void *ip;
   uint16_t size;
   int direction;
   int af;
 
-  msize = ntohs (message->size);
-  if (msize < sizeof (struct GNUNET_RESOLVER_GetMessage))
-  {
-    GNUNET_break (0);
-    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)
+  (void) cls;
+  size = ntohs (get->header.size) - sizeof (*get);
+  direction = ntohl (get->direction);
+  if (GNUNET_NO == direction)
   {
     /* IP from hostname */
     const char *hostname;
 
-    hostname = (const char *) &msg[1];
+    hostname = (const char *) &get[1];
     if (hostname[size - 1] != '\0')
     {
       GNUNET_break (0);
-      GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-      return;
+      return GNUNET_SYSERR;
     }
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Resolver asked to look up `%s'.\n",
-                hostname);
-    get_ip_from_hostname (client, hostname, af);
-    return;
+    return GNUNET_OK;
   }
-  ip = &msg[1];
+  af = ntohl (get->af);
   switch (af)
   {
   case AF_INET:
     if (size != sizeof (struct in_addr))
     {
       GNUNET_break (0);
-      GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-      return;
+      return GNUNET_SYSERR;
     }
     break;
   case AF_INET6:
     if (size != sizeof (struct in6_addr))
     {
       GNUNET_break (0);
-      GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-      return;
+      return GNUNET_SYSERR;
     }
     break;
   default:
     GNUNET_break (0);
-    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * Handle GET-message.
+ *
+ * @param cls identification of the client
+ * @param msg the actual message
+ */
+static void
+handle_get (void *cls,
+           const struct GNUNET_RESOLVER_GetMessage *msg)
+{
+  struct GNUNET_SERVICE_Client *client = cls;
+  const void *ip;
+  int direction;
+  int af;
+
+  direction = ntohl (msg->direction);
+  af = ntohl (msg->af);
+  if (GNUNET_NO == direction)
+  {
+    /* IP from hostname */
+    const char *hostname;
+
+    hostname = (const char *) &msg[1];
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Resolver asked to look up `%s'.\n",
+                hostname);
+    get_ip_from_hostname (client,
+                         hostname,
+                         af);
     return;
   }
+  ip = &msg[1];
+
+#if !defined(GNUNET_CULL_LOGGING)
   {
     char buf[INET6_ADDRSTRLEN];
 
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                "Resolver asked to look up IP address `%s'.\n",
-               inet_ntop (af, ip, buf, sizeof (buf)));
+               inet_ntop (af,
+                          ip,
+                          buf,
+                          sizeof (buf)));
   }
-  get_ip_as_string (client, af, ip);
+#endif
+  get_ip_as_string (client,
+                   af,
+                   ip);
 }
 
 
 /**
- * Process resolver requests.
+ * Callback called when a client connects to the service.
  *
- * @param cls closure
- * @param server the initialized server
- * @param cfg configuration to use
+ * @param cls closure for the service, unused
+ * @param c the new client that connected to the service
+ * @param mq the message queue used to send messages to the client
+ * @return @a c
  */
-static void
-run (void *cls, struct GNUNET_SERVER_Handle *server,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+static void *
+connect_cb (void *cls,
+           struct GNUNET_SERVICE_Client *c,
+           struct GNUNET_MQ_Handle *mq)
 {
-  static const struct GNUNET_SERVER_MessageHandler handlers[] = {
-    {&handle_get, NULL, GNUNET_MESSAGE_TYPE_RESOLVER_REQUEST, 0},
-    {NULL, NULL, 0, 0}
-  };
-  GNUNET_SERVER_add_handlers (server, handlers);
+  (void) cls;
+  (void) mq;
+
+  return c;
 }
 
 
 /**
- * The main function for the resolver service.
+ * Callback called when a client disconnected from the service
  *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
+ * @param cls closure for the service
+ * @param c the client that disconnected
+ * @param internal_cls should be equal to @a c
  */
-int
-main (int argc, char *const *argv)
+static void
+disconnect_cb (void *cls,
+              struct GNUNET_SERVICE_Client *c,
+              void *internal_cls)
 {
-  struct IPCache *pos;
-  int ret;
+  (void) cls;
 
-  ret =
-      (GNUNET_OK ==
-       GNUNET_SERVICE_run (argc, argv, "resolver", GNUNET_SERVICE_OPTION_NONE,
-                           &run, NULL)) ? 0 : 1;
-  while (NULL != (pos = cache_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (cache_head,
-                                cache_tail,
-                                pos);
-    GNUNET_free_non_null (pos->addr);
-    GNUNET_free (pos);
-  }
-  return ret;
+  GNUNET_assert (c == internal_cls);
 }
 
-#ifdef LINUX
+
+/**
+ * Define "main" method using service macro.
+ */
+GNUNET_SERVICE_MAIN
+("resolver",
+ GNUNET_SERVICE_OPTION_NONE,
+ NULL,
+ &connect_cb,
+ &disconnect_cb,
+ NULL,
+ GNUNET_MQ_hd_var_size (get,
+                       GNUNET_MESSAGE_TYPE_RESOLVER_REQUEST,
+                       struct GNUNET_RESOLVER_GetMessage,
+                       NULL),
+ GNUNET_MQ_handler_end ());
+
+
+#if defined(LINUX) && defined(__GLIBC__)
 #include <malloc.h>
 
 /**
  * MINIMIZE heap size (way below 128k) since this process doesn't need much.
  */
-void __attribute__ ((constructor)) GNUNET_ARM_memory_init ()
+void __attribute__ ((constructor))
+GNUNET_RESOLVER_memory_init ()
 {
   mallopt (M_TRIM_THRESHOLD, 4 * 1024);
   mallopt (M_TOP_PAD, 1 * 1024);
@@ -592,4 +752,23 @@ void __attribute__ ((constructor)) GNUNET_ARM_memory_init ()
 #endif
 
 
+/**
+ * Free globals on exit.
+ */
+void __attribute__ ((destructor))
+GNUNET_RESOLVER_memory_done ()
+{
+  struct IPCache *pos;
+
+  while (NULL != (pos = cache_head))
+  {
+    GNUNET_CONTAINER_DLL_remove (cache_head,
+                                cache_tail,
+                                pos);
+    GNUNET_free_non_null (pos->addr);
+    GNUNET_free (pos);
+  }
+}
+
+
 /* end of gnunet-service-resolver.c */