(no commit message)

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

diff --git a/src/hostlist/gnunet-daemon-hostlist.c b/src/hostlist/gnunet-daemon-hostlist.c
index ffeff0882ec5310a46f6b1075d489b4dfa50337d..bd76b17d3c78af5f0297614e721aa44499cc079d 100644 (file)
--- a/src/hostlist/gnunet-daemon-hostlist.c
+++ b/src/hostlist/gnunet-daemon-hostlist.c
@@ -141,13 +141,12 @@ core_init (void *cls,
  * Core handler for p2p hostlist advertisements
  */
 static int advertisement_handler (void *cls,
-                             const struct GNUNET_PeerIdentity * peer,
-                             const struct GNUNET_MessageHeader * message,
-                             struct GNUNET_TIME_Relative latency,
-                             uint32_t distance)
+                                 const struct GNUNET_PeerIdentity * peer,
+                                 const struct GNUNET_MessageHeader * message,
+                                 const struct GNUNET_TRANSPORT_ATS_Information *atsi)
 {
   GNUNET_assert (NULL != client_adv_handler);
-  return (*client_adv_handler) (cls, peer, message, latency, distance);
+  return (*client_adv_handler) (cls, peer, message, atsi);
 }
 
 
@@ -156,23 +155,21 @@ static int advertisement_handler (void *cls,
  *
  * @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
                  GNUNET_PeerIdentity * peer,
-                 struct GNUNET_TIME_Relative latency,
-                 uint32_t distance)
+                const struct GNUNET_TRANSPORT_ATS_Information *atsi)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "A new peer connected, notifying client and server\n");
   if ( NULL != client_ch)
-    (*client_ch) (cls, peer, latency, distance);
+    (*client_ch) (cls, peer, atsi);
 #if HAVE_MHD
   if ( NULL != server_ch)
-    (*server_ch) (cls, peer, latency, distance);
+    (*server_ch) (cls, peer, atsi);
 #endif
 }
 
@@ -235,14 +232,12 @@ cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * Main function that will be run.
  *
  * @param cls closure
- * @param sched the scheduler to use
  * @param args remaining command-line arguments
  * @param cfgfile name of the configuration file used (for saving, can be NULL!)
  * @param cfg configuration
  */
 static void 
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle * sched,
      char *const *args,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle * cfg)
@@ -268,31 +263,30 @@ run (void *cls,
 
 
 
-  stats = GNUNET_STATISTICS_create (sched, "hostlist", cfg);
+  stats = GNUNET_STATISTICS_create ("hostlist", cfg);
 
-  core = GNUNET_CORE_connect (sched, cfg,
-                             GNUNET_TIME_UNIT_FOREVER_REL,
+  core = GNUNET_CORE_connect (cfg,
+                             1,
                              NULL,
                              &core_init,
-                             &connect_handler, &disconnect_handler,
+                             &connect_handler, &disconnect_handler, NULL,
                              NULL, GNUNET_NO,
                              NULL, GNUNET_NO,
                              learning? learn_handlers : no_learn_handlers);
 
   if (bootstrapping)
     {
-      GNUNET_HOSTLIST_client_start (cfg, sched, stats,
+      GNUNET_HOSTLIST_client_start (cfg, stats,
                                    &client_ch, &client_dh, &client_adv_handler, learning);
     }
 
   #if HAVE_MHD
   if (provide_hostlist)
     {      
-      GNUNET_HOSTLIST_server_start (cfg, sched, stats, core, &server_ch, &server_dh, advertising );
+      GNUNET_HOSTLIST_server_start (cfg, stats, core, &server_ch, &server_dh, advertising );
     }
 #endif
-  GNUNET_SCHEDULER_add_delayed (sched,
-                                GNUNET_TIME_UNIT_FOREVER_REL,
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
                                 &cleaning_task, NULL);
 
   if (NULL == core)
@@ -300,7 +294,7 @@ run (void *cls,
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                  _("Failed to connect to `%s' service.\n"),
                  "core");
-      GNUNET_SCHEDULER_shutdown (sched);
+      GNUNET_SCHEDULER_shutdown ();
       return;     
     }
 }