use new SCHEDULER_add_at API where applicable

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

diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c
index f56cd4bc805995809c4a4aa26b15d65e261c91a9..067ebce238890b34cbaffd2abb3c3890065bea5c 100644 (file)
--- a/src/topology/gnunet-daemon-topology.c
+++ b/src/topology/gnunet-daemon-topology.c
@@ -534,10 +534,10 @@ schedule_next_hello (void *cls)
                            1,
                            GNUNET_NO);
   /* prepare to send the next one */
-  if (NULL != pl->hello_delay_task)
-    GNUNET_SCHEDULER_cancel (pl->hello_delay_task);
   pl->next_hello_allowed
     = GNUNET_TIME_relative_to_absolute (HELLO_ADVERTISEMENT_MIN_FREQUENCY);
+  if (NULL != pl->hello_delay_task)
+    GNUNET_SCHEDULER_cancel (pl->hello_delay_task);
   pl->hello_delay_task
     = GNUNET_SCHEDULER_add_now (&schedule_next_hello,
                                pl);
@@ -902,7 +902,7 @@ process_peer (void *cls,
 
 
 /**
- * Function called after #GNUNET_CORE_connecT has succeeded
+ * Function called after #GNUNET_CORE_connect has succeeded
  * (or failed for good).
  *
  * @param cls closure
@@ -1022,7 +1022,7 @@ check_hello (void *cls,
             const struct GNUNET_HELLO_Message *message)
 {
   struct GNUNET_PeerIdentity pid;
-    
+
   if (GNUNET_OK !=
       GNUNET_HELLO_get_id (message,
                           &pid))
@@ -1101,7 +1101,7 @@ cleaning_task (void *cls)
   }
   if (NULL != handle)
   {
-    GNUNET_CORE_disconnecT (handle);
+    GNUNET_CORE_disconnect (handle);
     handle = NULL;
   }
   whitelist_peers ();
@@ -1147,11 +1147,11 @@ run (void *cls,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
-  GNUNET_MQ_hd_var_size (hello,
-                        GNUNET_MESSAGE_TYPE_HELLO,
-                        struct GNUNET_HELLO_Message);
   struct GNUNET_MQ_MessageHandler handlers[] = {
-    make_hello_handler (NULL),
+    GNUNET_MQ_hd_var_size (hello,
+                           GNUNET_MESSAGE_TYPE_HELLO,
+                           struct GNUNET_HELLO_Message,
+                           NULL),
     GNUNET_MQ_handler_end ()
   };
   unsigned long long opt;
@@ -1189,7 +1189,7 @@ run (void *cls,
                                             &blacklist_check,
                                             NULL);
   ats = GNUNET_ATS_connectivity_init (cfg);
-  handle = GNUNET_CORE_connecT (cfg,
+  handle = GNUNET_CORE_connect (cfg,
                                NULL,
                                &core_init,
                                &connect_notify,