Returns now GNUNET_SYSERR

[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 b3e40b889f08152b1d2e9ae5a1e44442f9e96318..68d2daae72527ad5d8ce4e7762bcadeb0d980994 100644 (file)
--- a/src/util/gnunet-service-resolver.c
+++ b/src/util/gnunet-service-resolver.c
@@ -168,6 +168,7 @@ get_ip_as_string (struct GNUNET_SERVER_Client *client,
   if (salen < sizeof (struct sockaddr))
     {
       GNUNET_break (0);
+      GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
       return;
     }
   now = GNUNET_TIME_absolute_get ();
@@ -176,7 +177,7 @@ get_ip_as_string (struct GNUNET_SERVER_Client *client,
   while ((cache != NULL) &&
          ((cache->salen != salen) || (0 != memcmp (cache->sa, sa, salen))))
     {
-      if (GNUNET_TIME_absolute_get_duration (cache->last_request).value <
+      if (GNUNET_TIME_absolute_get_duration (cache->last_request).rel_value <
           60 * 60 * 1000)
         {
           if (prev != NULL)
@@ -203,7 +204,7 @@ get_ip_as_string (struct GNUNET_SERVER_Client *client,
   if (cache != NULL)
     {
       cache->last_request = now;
-      if (GNUNET_TIME_absolute_get_duration (cache->last_request).value <
+      if (GNUNET_TIME_absolute_get_duration (cache->last_request).rel_value <
           60 * 60 * 1000)
         {
           GNUNET_free_non_null (cache->addr);
@@ -227,12 +228,12 @@ get_ip_as_string (struct GNUNET_SERVER_Client *client,
     }
   tc = GNUNET_SERVER_transmit_context_create (client);
   if (cache->addr != NULL)
-    GNUNET_SERVER_transmit_context_append (tc,
-                                           cache->addr,
-                                           strlen (cache->addr) + 1,
-                                           GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
-  GNUNET_SERVER_transmit_context_append (tc, NULL, 0,
-                                         GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+    GNUNET_SERVER_transmit_context_append_data (tc,
+                                               cache->addr,
+                                               strlen (cache->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);
 }
 
@@ -280,10 +281,10 @@ getaddrinfo_resolve (struct GNUNET_SERVER_TransmitContext *tc,
   pos = result;
   while (pos != NULL)
     {
-      GNUNET_SERVER_transmit_context_append (tc,
-                                             result->ai_addr,
-                                             result->ai_addrlen,
-                                             GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+      GNUNET_SERVER_transmit_context_append_data (tc,
+                                                 pos->ai_addr,
+                                                 pos->ai_addrlen,
+                                                 GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
       pos = pos->ai_next;
     }
   freeaddrinfo (result);
@@ -327,10 +328,10 @@ gethostbyname2_resolve (struct GNUNET_SERVER_TransmitContext *tc,
       memset (&a4, 0, sizeof (a4));
       a4.sin_family = AF_INET;
       memcpy (&a4.sin_addr, hp->h_addr_list[0], hp->h_length);
-      GNUNET_SERVER_transmit_context_append (tc,
-                                             &a4,
-                                             sizeof (a4),
-                                             GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+      GNUNET_SERVER_transmit_context_append_data (tc,
+                                                 &a4,
+                                                 sizeof (a4),
+                                                 GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
     }
   else
     {
@@ -338,10 +339,10 @@ gethostbyname2_resolve (struct GNUNET_SERVER_TransmitContext *tc,
       memset (&a6, 0, sizeof (a6));
       a6.sin6_family = AF_INET6;
       memcpy (&a6.sin6_addr, hp->h_addr_list[0], hp->h_length);
-      GNUNET_SERVER_transmit_context_append (tc,
-                                             &a6,
-                                             sizeof (a6),
-                                             GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+      GNUNET_SERVER_transmit_context_append_data (tc,
+                                                 &a6,
+                                                 sizeof (a6),
+                                                 GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
     }
   return GNUNET_OK;
 }
@@ -372,10 +373,10 @@ gethostbyname_resolve (struct GNUNET_SERVER_TransmitContext *tc,
   memset (&addr, 0, sizeof (addr));
   addr.sin_family = AF_INET;
   memcpy (&addr.sin_addr, hp->h_addr_list[0], hp->h_length);
-  GNUNET_SERVER_transmit_context_append (tc,
-                                         &addr,
-                                         sizeof (addr),
-                                         GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+  GNUNET_SERVER_transmit_context_append_data (tc,
+                                             &addr,
+                                             sizeof (addr),
+                                             GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
   return GNUNET_OK;
 }
 #endif
@@ -409,8 +410,8 @@ get_ip_from_hostname (struct GNUNET_SERVER_Client *client,
   if ((ret == GNUNET_NO) && ((domain == AF_UNSPEC) || (domain == PF_INET)))
     gethostbyname_resolve (tc, hostname);
 #endif
-  GNUNET_SERVER_transmit_context_append (tc, NULL, 0,
-                                         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);
 }
 
@@ -472,30 +473,22 @@ handle_get (void *cls,
 }
 
 
-/**
- * List of handlers for the messages understood by this
- * service.
- */
-static struct GNUNET_SERVER_MessageHandler handlers[] = {
-  {&handle_get, NULL, GNUNET_MESSAGE_TYPE_RESOLVER_REQUEST, 0},
-  {NULL, NULL, 0, 0}
-};
-
-
 /**
  * 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)
 {
+  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);
 }