indentation

[oweals/gnunet.git] / src / hostlist / hostlist-server.c

diff --git a/src/hostlist/hostlist-server.c b/src/hostlist/hostlist-server.c
index 014c0f41fecdad1a035416a65d04de23c7a07fb5..e30b3c1e08f0d14e92379af7ee822ce6bf0f382b 100644 (file)
--- a/src/hostlist/hostlist-server.c
+++ b/src/hostlist/hostlist-server.c
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
 
      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 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your

      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but


@@ -49,14 +49,9 @@ static struct MHD_Daemon *daemon_handle_v4;
  */
 static const struct GNUNET_CONFIGURATION_Handle *cfg;
 
  */
 static const struct GNUNET_CONFIGURATION_Handle *cfg;
 

-/**
- * Our scheduler.
- */
-static struct GNUNET_SCHEDULER_Handle *sched;
-

 /**
  * For keeping statistics.
 /**
  * For keeping statistics.

- */ 
+ */

 static struct GNUNET_STATISTICS_Handle *stats;
 
 /**
 static struct GNUNET_STATISTICS_Handle *stats;
 
 /**


@@ -112,7 +107,7 @@ static int advertising;
 /**
  * Buffer for the hostlist address
  */
 /**
  * Buffer for the hostlist address
  */

-static char * hostlist_uri;
+static char *hostlist_uri;

 
 
 /**
 
 
 /**


@@ -130,16 +125,14 @@ finish_response (struct HostSet *results)
 #endif
   response = MHD_create_response_from_data (results->size,
                                             results->data, MHD_YES, MHD_NO);
 #endif
   response = MHD_create_response_from_data (results->size,
                                             results->data, MHD_YES, MHD_NO);

-  if ( (daemon_handle_v4 == NULL) &&
-       (daemon_handle_v6 == NULL) )
+  if ((daemon_handle_v4 == NULL) && (daemon_handle_v6 == NULL))

   {
     MHD_destroy_response (response);
     response = NULL;
   }
   GNUNET_STATISTICS_set (stats,
   {
     MHD_destroy_response (response);
     response = NULL;
   }
   GNUNET_STATISTICS_set (stats,

-                         gettext_noop("bytes in hostlist"),
-                         results->size,
-                         GNUNET_YES);
+                         gettext_noop ("bytes in hostlist"),
+                         results->size, GNUNET_YES);

   GNUNET_free (results);
 }
 
   GNUNET_free (results);
 }
 


@@ -156,21 +149,19 @@ finish_response (struct HostSet *results)
  */
 static int
 check_has_addr (void *cls,
  */
 static int
 check_has_addr (void *cls,

-               const char *tname,
-               struct GNUNET_TIME_Absolute expiration,
-               const void *addr,
-               uint16_t addrlen)
+                const char *tname,
+                struct GNUNET_TIME_Absolute expiration,
+                const void *addr, uint16_t addrlen)

 {
   int *arg = cls;
 
 {
   int *arg = cls;
 

-  if (GNUNET_TIME_absolute_get_remaining (expiration).value == 0)
-    {
-      GNUNET_STATISTICS_update (stats,
-                               gettext_noop("expired addresses encountered"),
-                               1,
-                               GNUNET_YES);
-      return GNUNET_YES; /* ignore this address */
-    }
+  if (GNUNET_TIME_absolute_get_remaining (expiration).rel_value == 0)
+  {
+    GNUNET_STATISTICS_update (stats,
+                              gettext_noop ("expired addresses encountered"),
+                              1, GNUNET_YES);
+    return GNUNET_YES;          /* ignore this address */
+  }

   *arg = GNUNET_YES;
   return GNUNET_SYSERR;
 }
   *arg = GNUNET_YES;
   return GNUNET_SYSERR;
 }


@@ -182,65 +173,66 @@ check_has_addr (void *cls,
  */
 static void
 host_processor (void *cls,
  */
 static void
 host_processor (void *cls,

-               const struct GNUNET_PeerIdentity * peer,
-                const struct GNUNET_HELLO_Message *hello,
-               uint32_t trust)
+                const struct GNUNET_PeerIdentity *peer,
+                const struct GNUNET_HELLO_Message *hello, const char *err_msg)

 {
   struct HostSet *results = cls;
   size_t old;
   size_t s;
   int has_addr;
 {
   struct HostSet *results = cls;
   size_t old;
   size_t s;
   int has_addr;

-  
+
+  if (err_msg != NULL)
+  {
+    GNUNET_assert (NULL == peer);
+    pitr = NULL;
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                _("Error in communication with PEERINFO service: %s\n"),
+                err_msg);
+    return;
+  }

   if (peer == NULL)
   if (peer == NULL)

-    {
-      pitr = NULL;
-      finish_response (results);
-      return;
-    }
+  {
+    pitr = NULL;
+    finish_response (results);
+    return;
+  }

   if (hello == NULL)
     return;
   has_addr = GNUNET_NO;
   if (hello == NULL)
     return;
   has_addr = GNUNET_NO;

-  GNUNET_HELLO_iterate_addresses (hello,
-                                 GNUNET_NO,
-                                 &check_has_addr,
-                                 &has_addr);
+  GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO, &check_has_addr, &has_addr);

   if (GNUNET_NO == has_addr)
   if (GNUNET_NO == has_addr)

-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                 "HELLO for peer `%4s' has no address, not suitable for hostlist!\n",
-                 GNUNET_i2s (peer));
-      GNUNET_STATISTICS_update (stats,
-                               gettext_noop("HELLOs without addresses encountered (ignored)"),
-                               1,
-                               GNUNET_NO);
-      return; 
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "HELLO for peer `%4s' has no address, not suitable for hostlist!\n",
+                GNUNET_i2s (peer));
+    GNUNET_STATISTICS_update (stats,
+                              gettext_noop
+                              ("HELLOs without addresses encountered (ignored)"),
+                              1, GNUNET_NO);
+    return;
+  }

   old = results->size;
   old = results->size;

-  s = GNUNET_HELLO_size(hello);
+  s = GNUNET_HELLO_size (hello);

 #if DEBUG_HOSTLIST_SERVER
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
 #if DEBUG_HOSTLIST_SERVER
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,

-             "Received %u bytes of `%s' from peer `%s' for hostlist.\n",
-             (unsigned int) s,
-             "HELLO",
-             GNUNET_i2s (peer));
+              "Received %u bytes of `%s' from peer `%s' for hostlist.\n",
+              (unsigned int) s, "HELLO", GNUNET_i2s (peer));

 #endif
 #endif

-  if ( (old + s >= GNUNET_MAX_MALLOC_CHECKED) || (old + s >= MAX_BYTES_PER_HOSTLISTS) )
-    {
-      GNUNET_STATISTICS_update (stats,
-                               gettext_noop("bytes not included in hostlist (size limit)"),
-                               s,
-                               GNUNET_NO);
-      return; /* too large, skip! */
-    }
+  if ((old + s >= GNUNET_MAX_MALLOC_CHECKED) ||
+      (old + s >= MAX_BYTES_PER_HOSTLISTS))
+  {
+    GNUNET_STATISTICS_update (stats,
+                              gettext_noop
+                              ("bytes not included in hostlist (size limit)"),
+                              s, GNUNET_NO);
+    return;                     /* too large, skip! */
+  }

 #if DEBUG_HOSTLIST_SERVER
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
 #if DEBUG_HOSTLIST_SERVER
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,

-             "Adding peer `%s' to hostlist (%u bytes)\n",
-             GNUNET_i2s (peer),
-             (unsigned int) s);
+              "Adding peer `%s' to hostlist (%u bytes)\n",
+              GNUNET_i2s (peer), (unsigned int) s);

 #endif
 #endif

-  GNUNET_array_grow (results->data,
-                     results->size,
-                     old + s);
+  GNUNET_array_grow (results->data, results->size, old + s);

   memcpy (&results->data[old], hello, s);
 }
 
   memcpy (&results->data[old], hello, s);
 }
 


@@ -254,13 +246,13 @@ accept_policy_callback (void *cls,
                         const struct sockaddr *addr, socklen_t addrlen)
 {
   if (NULL == response)
                         const struct sockaddr *addr, socklen_t addrlen)
 {
   if (NULL == response)

-    {
+  {

 #if DEBUG_HOSTLIST_SERVER
 #if DEBUG_HOSTLIST_SERVER

-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                 "Received request for hostlist, but I am not yet ready; rejecting!\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Received request for hostlist, but I am not yet ready; rejecting!\n");

 #endif
 #endif

-      return MHD_NO;
-    }
+    return MHD_NO;
+  }

   return MHD_YES;               /* accept all */
 }
 
   return MHD_YES;               /* accept all */
 }
 


@@ -275,58 +267,54 @@ access_handler_callback (void *cls,
                          const char *method,
                          const char *version,
                          const char *upload_data,
                          const char *method,
                          const char *version,
                          const char *upload_data,

-                         size_t*upload_data_size, void **con_cls)
+                         size_t * upload_data_size, void **con_cls)

 {
   static int dummy;
 {
   static int dummy;

-  
+

   if (0 != strcmp (method, MHD_HTTP_METHOD_GET))
   if (0 != strcmp (method, MHD_HTTP_METHOD_GET))

-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                 _("Refusing `%s' request to hostlist server\n"),
-                 method);
-      GNUNET_STATISTICS_update (stats,
-                               gettext_noop("hostlist requests refused (not HTTP GET)"),
-                               1,
-                               GNUNET_YES);
-      return MHD_NO;
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                _("Refusing `%s' request to hostlist server\n"), method);
+    GNUNET_STATISTICS_update (stats,
+                              gettext_noop
+                              ("hostlist requests refused (not HTTP GET)"), 1,
+                              GNUNET_YES);
+    return MHD_NO;
+  }

   if (NULL == *con_cls)
   if (NULL == *con_cls)

-    {
-      (*con_cls) = &dummy;
+  {
+    (*con_cls) = &dummy;

 #if DEBUG_HOSTLIST_SERVER
 #if DEBUG_HOSTLIST_SERVER

-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                 _("Sending 100 CONTINUE reply\n"));
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Sending 100 CONTINUE reply\n"));

 #endif
 #endif

-      return MHD_YES;           /* send 100 continue */
-    }
+    return MHD_YES;             /* send 100 continue */
+  }

   if (*upload_data_size != 0)
   if (*upload_data_size != 0)

-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                 _("Refusing `%s' request with %llu bytes of upload data\n"),
-                 method,
-                 (unsigned long long) *upload_data_size);
-      GNUNET_STATISTICS_update (stats,
-                               gettext_noop("hostlist requests refused (upload data)"),
-                               1,
-                               GNUNET_YES);
-      return MHD_NO;              /* do not support upload data */
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                _("Refusing `%s' request with %llu bytes of upload data\n"),
+                method, (unsigned long long) *upload_data_size);
+    GNUNET_STATISTICS_update (stats,
+                              gettext_noop
+                              ("hostlist requests refused (upload data)"), 1,
+                              GNUNET_YES);
+    return MHD_NO;              /* do not support upload data */
+  }

   if (response == NULL)
   if (response == NULL)

-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                 _("Could not handle hostlist request since I do not have a response yet\n"));
-      GNUNET_STATISTICS_update (stats,
-                               gettext_noop("hostlist requests refused (not ready)"),
-                               1,
-                               GNUNET_YES);
-      return MHD_NO;              /* internal error, no response yet */
-    }
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-             _("Received request for our hostlist\n"));
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                _
+                ("Could not handle hostlist request since I do not have a response yet\n"));
+    GNUNET_STATISTICS_update (stats,
+                              gettext_noop
+                              ("hostlist requests refused (not ready)"), 1,
+                              GNUNET_YES);
+    return MHD_NO;              /* internal error, no response yet */
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Received request for our hostlist\n"));

   GNUNET_STATISTICS_update (stats,
   GNUNET_STATISTICS_update (stats,

-                           gettext_noop("hostlist requests processed"),
-                           1,
-                           GNUNET_YES);
+                            gettext_noop ("hostlist requests processed"),
+                            1, GNUNET_YES);

   return MHD_queue_response (connection, MHD_HTTP_OK, response);
 }
 
   return MHD_queue_response (connection, MHD_HTTP_OK, response);
 }
 


@@ -338,41 +326,38 @@ access_handler_callback (void *cls,
  * @param buf   buffer to copy message to
  */
 static size_t
  * @param buf   buffer to copy message to
  */
 static size_t

-adv_transmit_ready ( void *cls, size_t size, void *buf)
+adv_transmit_ready (void *cls, size_t size, void *buf)

 {
   static uint64_t hostlist_adv_count;
 
   size_t transmission_size;
 {
   static uint64_t hostlist_adv_count;
 
   size_t transmission_size;

-  size_t uri_size; /* Including \0 termination! */
+  size_t uri_size;              /* Including \0 termination! */

   struct GNUNET_MessageHeader header;
   char *cbuf;
 
   if (buf == NULL)
   struct GNUNET_MessageHeader header;
   char *cbuf;
 
   if (buf == NULL)

-    {
-      GNUNET_log ( GNUNET_ERROR_TYPE_DEBUG, 
-                  "Transmission failed, buffer invalid!\n" );
-      return 0;
-    }
-  uri_size = strlen ( hostlist_uri ) + 1;
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Transmission failed, buffer invalid!\n");
+    return 0;
+  }
+  uri_size = strlen (hostlist_uri) + 1;

   transmission_size = sizeof (struct GNUNET_MessageHeader) + uri_size;
   header.type = htons (GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT);
   header.size = htons (transmission_size);
   GNUNET_assert (size >= transmission_size);
   memcpy (buf, &header, sizeof (struct GNUNET_MessageHeader));
   transmission_size = sizeof (struct GNUNET_MessageHeader) + uri_size;
   header.type = htons (GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT);
   header.size = htons (transmission_size);
   GNUNET_assert (size >= transmission_size);
   memcpy (buf, &header, sizeof (struct GNUNET_MessageHeader));

-  cbuf = buf;  
-  memcpy (&cbuf[sizeof (struct GNUNET_MessageHeader)],
-         hostlist_uri, uri_size);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
-             "Sent advertisement message: Copied %u bytes into buffer!\n", 
-             (unsigned int) transmission_size);
+  cbuf = buf;
+  memcpy (&cbuf[sizeof (struct GNUNET_MessageHeader)], hostlist_uri, uri_size);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Sent advertisement message: Copied %u bytes into buffer!\n",
+              (unsigned int) transmission_size);

   hostlist_adv_count++;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
   hostlist_adv_count++;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,

-              " # Sent advertisement message: %u\n",
-              hostlist_adv_count);
+              " # Sent advertisement message: %u\n", hostlist_adv_count);

   GNUNET_STATISTICS_update (stats,
   GNUNET_STATISTICS_update (stats,

-                           gettext_noop("# hostlist advertisements send"),
-                           1,
-                           GNUNET_NO);
+                            gettext_noop ("# hostlist advertisements send"),
+                            1, GNUNET_NO);

   return transmission_size;
 }
 
   return transmission_size;
 }
 


@@ -382,47 +367,47 @@ adv_transmit_ready ( void *cls, size_t size, void *buf)
  *
  * @param cls closure
  * @param peer peer identity this notification is about
  *
  * @param cls closure
  * @param peer peer identity this notification is about

- * @param latency reported latency of the connection with 'other'
- * @param distance reported distance (DV) to 'other'
+ * @param atsi performance data

  */
 static void
 connect_handler (void *cls,
                  const struct
  */
 static void
 connect_handler (void *cls,
                  const struct

-                 GNUNET_PeerIdentity * peer,
-                 struct GNUNET_TIME_Relative latency,
-                 uint32_t distance)
+                 GNUNET_PeerIdentity *peer,
+                 const struct GNUNET_TRANSPORT_ATS_Information *atsi)

 {
   size_t size;
 
 {
   size_t size;
 

-  if ( !advertising )
+  if (!advertising)

     return;
   if (hostlist_uri == NULL)
     return;
   size = strlen (hostlist_uri) + 1;
     return;
   if (hostlist_uri == NULL)
     return;
   size = strlen (hostlist_uri) + 1;

-  if (size + sizeof (struct GNUNET_MessageHeader) >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
-    {
-      GNUNET_break (0);
-      return;
-    }
+  if (size + sizeof (struct GNUNET_MessageHeader) >=
+      GNUNET_SERVER_MAX_MESSAGE_SIZE)
+  {
+    GNUNET_break (0);
+    return;
+  }

   size += sizeof (struct GNUNET_MessageHeader);
   if (NULL == core)
   size += sizeof (struct GNUNET_MessageHeader);
   if (NULL == core)

-    {
-      GNUNET_break (0);
-      return;
-    }
+  {
+    GNUNET_break (0);
+    return;
+  }

   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Asked core to transmit advertisement message with a size of %u bytes to peer `%s'\n",
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Asked core to transmit advertisement message with a size of %u bytes to peer `%s'\n",

-             size,GNUNET_i2s(peer));
+              size, GNUNET_i2s (peer));

   if (NULL == GNUNET_CORE_notify_transmit_ready (core,
   if (NULL == GNUNET_CORE_notify_transmit_ready (core,

-                                                0,
-                                                GNUNET_ADV_TIMEOUT,
-                                                peer,
-                                                size,
-                                                &adv_transmit_ready, NULL))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                 _("Advertisement message could not be queued by core\n"));
-    }
+                                                 GNUNET_YES,
+                                                 0,
+                                                 GNUNET_ADV_TIMEOUT,
+                                                 peer,
+                                                 size,
+                                                 &adv_transmit_ready, NULL))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                _("Advertisement message could not be queued by core\n"));
+  }

 }
 
 
 }
 
 


@@ -433,9 +418,7 @@ connect_handler (void *cls,
  * @param peer peer identity this notification is about
  */
 static void
  * @param peer peer identity this notification is about
  */
 static void

-disconnect_handler (void *cls,
-                    const struct
-                    GNUNET_PeerIdentity * peer)
+disconnect_handler (void *cls, const struct GNUNET_PeerIdentity *peer)

 {
   /* nothing to do */
 }
 {
   /* nothing to do */
 }


@@ -447,27 +430,31 @@ disconnect_handler (void *cls,
  * @param cls closure (not used)
  * @param peer potential peer to connect to
  * @param hello HELLO for this peer (or NULL)
  * @param cls closure (not used)
  * @param peer potential peer to connect to
  * @param hello HELLO for this peer (or NULL)

- * @param trust how much we trust the peer (not used)
+ * @param err_msg NULL if successful, otherwise contains error message

  */
 static void
 process_notify (void *cls,
                 const struct GNUNET_PeerIdentity *peer,
  */
 static void
 process_notify (void *cls,
                 const struct GNUNET_PeerIdentity *peer,

-                const struct GNUNET_HELLO_Message *hello,
-                uint32_t trust)
+                const struct GNUNET_HELLO_Message *hello, const char *err_msg)

 {
   struct HostSet *results;
 {
   struct HostSet *results;

+

 #if DEBUG_HOSTLIST_SERVER
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
 #if DEBUG_HOSTLIST_SERVER
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,

-            "Peerinfo is notifying us to rebuild our hostlist\n");
+              "Peerinfo is notifying us to rebuild our hostlist\n");

 #endif
 #endif

-  results = GNUNET_malloc(sizeof(struct HostSet));
+  if (err_msg != NULL)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                _("Error in communication with PEERINFO service\n"));
+    /* return; */
+  }
+  results = GNUNET_malloc (sizeof (struct HostSet));

   GNUNET_assert (peerinfo != NULL);
   pitr = GNUNET_PEERINFO_iterate (peerinfo,
                                   NULL,
   GNUNET_assert (peerinfo != NULL);
   pitr = GNUNET_PEERINFO_iterate (peerinfo,
                                   NULL,

-                                  0,

                                   GNUNET_TIME_UNIT_MINUTES,
                                   GNUNET_TIME_UNIT_MINUTES,

-                                  &host_processor,
-                                  results);
+                                  &host_processor, results);

 }
 
 /**
 }
 
 /**


@@ -483,8 +470,7 @@ prepare_daemon (struct MHD_Daemon *daemon_handle);
  * and schedule the next run.
  */
 static void
  * and schedule the next run.
  */
 static void

-run_daemon (void *cls,
-           const struct GNUNET_SCHEDULER_TaskContext *tc)
+run_daemon (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)

 {
   struct MHD_Daemon *daemon_handle = cls;
 
 {
   struct MHD_Daemon *daemon_handle = cls;
 


@@ -494,7 +480,7 @@ run_daemon (void *cls,
     hostlist_task_v6 = GNUNET_SCHEDULER_NO_TASK;
 
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
     hostlist_task_v6 = GNUNET_SCHEDULER_NO_TASK;
 
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))

-    return;    
+    return;

   GNUNET_assert (MHD_YES == MHD_run (daemon_handle));
   if (daemon_handle == daemon_handle_v4)
     hostlist_task_v4 = prepare_daemon (daemon_handle);
   GNUNET_assert (MHD_YES == MHD_run (daemon_handle));
   if (daemon_handle == daemon_handle_v4)
     hostlist_task_v4 = prepare_daemon (daemon_handle);


@@ -521,36 +507,26 @@ prepare_daemon (struct MHD_Daemon *daemon_handle)
   unsigned long long timeout;
   int haveto;
   struct GNUNET_TIME_Relative tv;
   unsigned long long timeout;
   int haveto;
   struct GNUNET_TIME_Relative tv;

-  
-  FD_ZERO(&rs);
-  FD_ZERO(&ws);
-  FD_ZERO(&es);
+
+  FD_ZERO (&rs);
+  FD_ZERO (&ws);
+  FD_ZERO (&es);

   wrs = GNUNET_NETWORK_fdset_create ();
   wes = GNUNET_NETWORK_fdset_create ();
   wws = GNUNET_NETWORK_fdset_create ();
   max = -1;
   wrs = GNUNET_NETWORK_fdset_create ();
   wes = GNUNET_NETWORK_fdset_create ();
   wws = GNUNET_NETWORK_fdset_create ();
   max = -1;

-  GNUNET_assert (MHD_YES ==
-                MHD_get_fdset (daemon_handle,
-                               &rs,
-                               &ws,
-                               &es,
-                               &max));
+  GNUNET_assert (MHD_YES == MHD_get_fdset (daemon_handle, &rs, &ws, &es, &max));

   haveto = MHD_get_timeout (daemon_handle, &timeout);
   if (haveto == MHD_YES)
   haveto = MHD_get_timeout (daemon_handle, &timeout);
   if (haveto == MHD_YES)

-    tv.value = (uint64_t) timeout;
+    tv.rel_value = (uint64_t) timeout;

   else
     tv = GNUNET_TIME_UNIT_FOREVER_REL;
   else
     tv = GNUNET_TIME_UNIT_FOREVER_REL;

-  GNUNET_NETWORK_fdset_copy_native (wrs, &rs, max);
-  GNUNET_NETWORK_fdset_copy_native (wws, &ws, max);
-  GNUNET_NETWORK_fdset_copy_native (wes, &es, max);
-  ret = GNUNET_SCHEDULER_add_select (sched,
-                                    GNUNET_SCHEDULER_PRIORITY_HIGH,
-                                    GNUNET_SCHEDULER_NO_TASK,
-                                    tv,
-                                    wrs,
-                                    wws,
-                                    &run_daemon,
-                                    daemon_handle);
+  GNUNET_NETWORK_fdset_copy_native (wrs, &rs, max + 1);
+  GNUNET_NETWORK_fdset_copy_native (wws, &ws, max + 1);
+  GNUNET_NETWORK_fdset_copy_native (wes, &es, max + 1);
+  ret = GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_HIGH,
+                                     GNUNET_SCHEDULER_NO_TASK,
+                                     tv, wrs, wws, &run_daemon, daemon_handle);

   GNUNET_NETWORK_fdset_destroy (wrs);
   GNUNET_NETWORK_fdset_destroy (wws);
   GNUNET_NETWORK_fdset_destroy (wes);
   GNUNET_NETWORK_fdset_destroy (wrs);
   GNUNET_NETWORK_fdset_destroy (wws);
   GNUNET_NETWORK_fdset_destroy (wes);


@@ -566,10 +542,9 @@ prepare_daemon (struct MHD_Daemon *daemon_handle)
  */
 int
 GNUNET_HOSTLIST_server_start (const struct GNUNET_CONFIGURATION_Handle *c,
  */
 int
 GNUNET_HOSTLIST_server_start (const struct GNUNET_CONFIGURATION_Handle *c,

-                             struct GNUNET_SCHEDULER_Handle *s,
-                             struct GNUNET_STATISTICS_Handle *st,
-                             struct GNUNET_CORE_Handle *co,
-                             GNUNET_CORE_ConnectEventHandler *server_ch,
+                              struct GNUNET_STATISTICS_Handle *st,
+                              struct GNUNET_CORE_Handle *co,
+                              GNUNET_CORE_ConnectEventHandler *server_ch,

                               GNUNET_CORE_DisconnectEventHandler *server_dh,
                               int advertise)
 {
                               GNUNET_CORE_DisconnectEventHandler *server_dh,
                               int advertise)
 {


@@ -578,103 +553,100 @@ GNUNET_HOSTLIST_server_start (const struct GNUNET_CONFIGURATION_Handle *c,
   size_t size;
 
   advertising = advertise;
   size_t size;
 
   advertising = advertise;

-  if  ( !advertising )
+  if (!advertising)

     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,

-              "Advertising not enabled on this hostlist server\n");
+                "Advertising not enabled on this hostlist server\n");

   else
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
   else
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,

-              "Advertising enabled on this hostlist server\n");
-  sched = s;
+                "Advertising enabled on this hostlist server\n");

   cfg = c;
   stats = st;
   cfg = c;
   stats = st;

-  peerinfo = GNUNET_PEERINFO_connect (sched, cfg);
+  peerinfo = GNUNET_PEERINFO_connect (cfg);

   if (peerinfo == NULL)
   if (peerinfo == NULL)

-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                 _("Could not access PEERINFO service.  Exiting.\n"));     
-      return GNUNET_SYSERR;
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Could not access PEERINFO service.  Exiting.\n"));
+    return GNUNET_SYSERR;
+  }

   if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg,
   if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg,

-                                                         "HOSTLIST",
-                                                         "HTTPPORT", 
-                                                         &port))
+                                                          "HOSTLIST",
+                                                          "HTTPPORT", &port))

     return GNUNET_SYSERR;
     return GNUNET_SYSERR;

-  if ( (port == 0) ||
-       (port > UINT16_MAX) )
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                 _("Invalid port number %llu.  Exiting.\n"),
-                 port);            
-      return GNUNET_SYSERR;
-    }
+  if ((port == 0) || (port > UINT16_MAX))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Invalid port number %llu.  Exiting.\n"), port);
+    return GNUNET_SYSERR;
+  }

 
 

-  if ( GNUNET_SYSERR  == GNUNET_CONFIGURATION_get_value_string (cfg,
-                                                   "HOSTLIST",
-                                                   "EXTERNAL_DNS_NAME",
-                                                   &hostname))
+  if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string (cfg,
+                                                              "HOSTLIST",
+                                                              "EXTERNAL_DNS_NAME",
+                                                              &hostname))

     hostname = GNUNET_RESOLVER_local_fqdn_get ();
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
     hostname = GNUNET_RESOLVER_local_fqdn_get ();
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,

-              _("Hostlist service starts on %s:%llu\n"),
-              hostname, port);
+              _("Hostlist service starts on %s:%llu\n"), hostname, port);

   if (NULL != hostname)
   if (NULL != hostname)

+  {
+    size = strlen (hostname);
+    if (size + 15 > MAX_URL_LEN)

     {
     {

-      size = strlen (hostname);
-      if (size + 15 > MAX_URL_LEN)
-       {
-         GNUNET_break (0);
-       }
-      else
-       {
-         GNUNET_asprintf (&hostlist_uri,
-                          "http://%s:%u/",
-                          hostname,
-                          (unsigned int) port);
-         GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                     _("Address to obtain hostlist: `%s'\n"), 
-                     hostlist_uri);
-       }
-      GNUNET_free ( hostname );
+      GNUNET_break (0);
+    }
+    else
+    {
+      GNUNET_asprintf (&hostlist_uri,
+                       "http://%s:%u/", hostname, (unsigned int) port);
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                  _("Address to obtain hostlist: `%s'\n"), hostlist_uri);

     }
     }

-  daemon_handle_v6 = MHD_start_daemon (MHD_USE_IPv6 
+    GNUNET_free (hostname);
+  }
+  daemon_handle_v6 = MHD_start_daemon (MHD_USE_IPv6

 #if DEBUG_HOSTLIST_SERVER
 #if DEBUG_HOSTLIST_SERVER

-                                      | MHD_USE_DEBUG
+                                       | MHD_USE_DEBUG

 #endif
 #endif

-                                      ,
-                                      (unsigned short) port,
-                                      &accept_policy_callback,
-                                      NULL,
-                                      &access_handler_callback,
-                                      NULL,
-                                      MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 16,
-                                      MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) 1,
-                                      MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 16,
-                                      MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (16 * 1024),
-                                      MHD_OPTION_END);
+                                       ,
+                                       (unsigned short) port,
+                                       &accept_policy_callback,
+                                       NULL,
+                                       &access_handler_callback,
+                                       NULL,
+                                       MHD_OPTION_CONNECTION_LIMIT,
+                                       (unsigned int) 16,
+                                       MHD_OPTION_PER_IP_CONNECTION_LIMIT,
+                                       (unsigned int) 1,
+                                       MHD_OPTION_CONNECTION_TIMEOUT,
+                                       (unsigned int) 16,
+                                       MHD_OPTION_CONNECTION_MEMORY_LIMIT,
+                                       (size_t) (16 * 1024), MHD_OPTION_END);

   daemon_handle_v4 = MHD_start_daemon (MHD_NO_FLAG
 #if DEBUG_HOSTLIST_SERVER
   daemon_handle_v4 = MHD_start_daemon (MHD_NO_FLAG
 #if DEBUG_HOSTLIST_SERVER

-                                      | MHD_USE_DEBUG
+                                       | MHD_USE_DEBUG

 #endif
 #endif

-                                      ,
-                                      (unsigned short) port,
-                                      &accept_policy_callback,
-                                      NULL,
-                                      &access_handler_callback,
-                                      NULL,
-                                      MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 16,
-                                      MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) 1,
-                                      MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 16,
-                                      MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (16 * 1024),
-                                      MHD_OPTION_END);
-
-  if ( (daemon_handle_v6 == NULL) &&
-       (daemon_handle_v4 == NULL) )
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                 _("Could not start hostlist HTTP server on port %u\n"),
-                 (unsigned short) port);
-      return GNUNET_SYSERR;    
-    }
+                                       ,
+                                       (unsigned short) port,
+                                       &accept_policy_callback,
+                                       NULL,
+                                       &access_handler_callback,
+                                       NULL,
+                                       MHD_OPTION_CONNECTION_LIMIT,
+                                       (unsigned int) 16,
+                                       MHD_OPTION_PER_IP_CONNECTION_LIMIT,
+                                       (unsigned int) 1,
+                                       MHD_OPTION_CONNECTION_TIMEOUT,
+                                       (unsigned int) 16,
+                                       MHD_OPTION_CONNECTION_MEMORY_LIMIT,
+                                       (size_t) (16 * 1024), MHD_OPTION_END);
+
+  if ((daemon_handle_v6 == NULL) && (daemon_handle_v4 == NULL))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Could not start hostlist HTTP server on port %u\n"),
+                (unsigned short) port);
+    return GNUNET_SYSERR;
+  }

 
   core = co;
 
 
   core = co;
 


@@ -686,7 +658,7 @@ GNUNET_HOSTLIST_server_start (const struct GNUNET_CONFIGURATION_Handle *c,
   if (daemon_handle_v6 != NULL)
     hostlist_task_v6 = prepare_daemon (daemon_handle_v6);
 
   if (daemon_handle_v6 != NULL)
     hostlist_task_v6 = prepare_daemon (daemon_handle_v6);
 

-  notify = GNUNET_PEERINFO_notify ( cfg, sched, process_notify, NULL);
+  notify = GNUNET_PEERINFO_notify (cfg, process_notify, NULL);

 
   return GNUNET_OK;
 }
 
   return GNUNET_OK;
 }


@@ -698,51 +670,49 @@ void
 GNUNET_HOSTLIST_server_stop ()
 {
 #if DEBUG_HOSTLIST_SERVER
 GNUNET_HOSTLIST_server_stop ()
 {
 #if DEBUG_HOSTLIST_SERVER

-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Hostlist server shutdown\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Hostlist server shutdown\n");

 #endif
   if (NULL != notify)
 #endif
   if (NULL != notify)

-    {
-      GNUNET_PEERINFO_notify_cancel (notify);
-      notify = NULL;
-    }
+  {
+    GNUNET_PEERINFO_notify_cancel (notify);
+    notify = NULL;
+  }

   if (GNUNET_SCHEDULER_NO_TASK != hostlist_task_v6)
   if (GNUNET_SCHEDULER_NO_TASK != hostlist_task_v6)

-    {
-      GNUNET_SCHEDULER_cancel (sched, hostlist_task_v6);
-      hostlist_task_v6 = GNUNET_SCHEDULER_NO_TASK;
-    }
+  {
+    GNUNET_SCHEDULER_cancel (hostlist_task_v6);
+    hostlist_task_v6 = GNUNET_SCHEDULER_NO_TASK;
+  }

   if (GNUNET_SCHEDULER_NO_TASK != hostlist_task_v4)
   if (GNUNET_SCHEDULER_NO_TASK != hostlist_task_v4)

-    {
-      GNUNET_SCHEDULER_cancel (sched, hostlist_task_v4);
-      hostlist_task_v4 = GNUNET_SCHEDULER_NO_TASK;
-    }
+  {
+    GNUNET_SCHEDULER_cancel (hostlist_task_v4);
+    hostlist_task_v4 = GNUNET_SCHEDULER_NO_TASK;
+  }

   if (pitr != NULL)
   if (pitr != NULL)

-    {
-      GNUNET_PEERINFO_iterate_cancel (pitr);
-      pitr = NULL;
-    }
+  {
+    GNUNET_PEERINFO_iterate_cancel (pitr);
+    pitr = NULL;
+  }

   if (NULL != daemon_handle_v4)
   if (NULL != daemon_handle_v4)

-    {
-      MHD_stop_daemon (daemon_handle_v4);
-      daemon_handle_v4 = NULL;
-    }
+  {
+    MHD_stop_daemon (daemon_handle_v4);
+    daemon_handle_v4 = NULL;
+  }

   if (NULL != daemon_handle_v6)
   if (NULL != daemon_handle_v6)

-    {
-      MHD_stop_daemon (daemon_handle_v6);
-      daemon_handle_v6 = NULL;
-    }
+  {
+    MHD_stop_daemon (daemon_handle_v6);
+    daemon_handle_v6 = NULL;
+  }

   if (response != NULL)
   if (response != NULL)

-    {
-      MHD_destroy_response (response);
-      response = NULL;
-    }
+  {
+    MHD_destroy_response (response);
+    response = NULL;
+  }

   if (peerinfo != NULL)
   if (peerinfo != NULL)

-    {
-      GNUNET_PEERINFO_disconnect (peerinfo);
-      peerinfo = NULL;
-    }
+  {
+    GNUNET_PEERINFO_disconnect (peerinfo);
+    peerinfo = NULL;
+  }

   cfg = NULL;
   cfg = NULL;

-  sched = NULL;

   stats = NULL;
   core = NULL;
 }
   stats = NULL;
   core = NULL;
 }