retry faster

[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 e1c90462278d057fd069525ad1312d16d81491a2..08b1ba1c3c0effb852fa29cbd34b8880afc645ca 100644 (file)
--- a/src/topology/gnunet-daemon-topology.c
+++ b/src/topology/gnunet-daemon-topology.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


@@ -35,7 +35,7 @@
 #include "gnunet_util_lib.h"
 
 
 #include "gnunet_util_lib.h"
 
 

-#define DEBUG_TOPOLOGY GNUNET_NO
+#define DEBUG_TOPOLOGY GNUNET_YES

 
 /**
  * For how long do we blacklist a peer after a failed connection
 
 /**
  * For how long do we blacklist a peer after a failed connection


@@ -59,7 +59,7 @@
  * For how long do we blacklist anyone under any cirumstances after a failed connection
  * attempt?
  */
  * For how long do we blacklist anyone under any cirumstances after a failed connection
  * attempt?
  */

-#define GREYLIST_AFTER_ATTEMPT_MAX GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 18)
+#define GREYLIST_AFTER_ATTEMPT_MAX GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 1)

 
 /**
  * How often do we at most advertise any HELLO to a peer?
 
 /**
  * How often do we at most advertise any HELLO to a peer?


@@ -156,11 +156,6 @@ struct Peer
  */
 static struct GNUNET_PEERINFO_NotifyContext *peerinfo_notify;
 
  */
 static struct GNUNET_PEERINFO_NotifyContext *peerinfo_notify;
 

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

 /**
  * Our configuration.
  */
 /**
  * Our configuration.
  */


@@ -276,11 +271,11 @@ whitelist_peers ()
  * Function called by core when our attempt to connect succeeded.
  *
  * @param cls the 'struct Peer' for which we issued the connect request
  * Function called by core when our attempt to connect succeeded.
  *
  * @param cls the 'struct Peer' for which we issued the connect request

- * @param tc scheduler context
+ * @param success was the request transmitted

  */
 static void
 connect_completed_callback (void *cls,
  */
 static void
 connect_completed_callback (void *cls,

-                           const struct GNUNET_SCHEDULER_TaskContext *tc)
+                           int success)

 {
   struct Peer *pos = cls;
 
 {
   struct Peer *pos = cls;
 


@@ -347,11 +342,9 @@ free_peer (void *cls,
   if (pos->connect_req != NULL)
     GNUNET_CORE_peer_request_connect_cancel (pos->connect_req);              
   if (pos->hello_delay_task != GNUNET_SCHEDULER_NO_TASK)
   if (pos->connect_req != NULL)
     GNUNET_CORE_peer_request_connect_cancel (pos->connect_req);              
   if (pos->hello_delay_task != GNUNET_SCHEDULER_NO_TASK)

-    GNUNET_SCHEDULER_cancel (sched,
-                            pos->hello_delay_task);
+    GNUNET_SCHEDULER_cancel (pos->hello_delay_task);

   if (pos->greylist_clean_task != GNUNET_SCHEDULER_NO_TASK)
   if (pos->greylist_clean_task != GNUNET_SCHEDULER_NO_TASK)

-    GNUNET_SCHEDULER_cancel (sched,
-                            pos->greylist_clean_task);
+    GNUNET_SCHEDULER_cancel (pos->greylist_clean_task);

   GNUNET_free_non_null (pos->hello);   
   if (pos->filter != NULL)
     GNUNET_CONTAINER_bloomfilter_free (pos->filter);
   GNUNET_free_non_null (pos->hello);   
   if (pos->filter != NULL)
     GNUNET_CONTAINER_bloomfilter_free (pos->filter);


@@ -389,7 +382,7 @@ attempt_connect (struct Peer *pos)
     return;
   if (GNUNET_OK != is_connection_allowed (pos))
     return;
     return;
   if (GNUNET_OK != is_connection_allowed (pos))
     return;

-  if (GNUNET_TIME_absolute_get_remaining (pos->greylisted_until).value > 0)
+  if (GNUNET_TIME_absolute_get_remaining (pos->greylisted_until).rel_value > 0)

     return;
   if (GNUNET_YES == pos->is_friend)
     rem = GREYLIST_AFTER_ATTEMPT_FRIEND;
     return;
   if (GNUNET_YES == pos->is_friend)
     rem = GREYLIST_AFTER_ATTEMPT_FRIEND;


@@ -406,11 +399,9 @@ attempt_connect (struct Peer *pos)
                                  GREYLIST_AFTER_ATTEMPT_MAX);
   pos->greylisted_until = GNUNET_TIME_relative_to_absolute (rem);
   if (pos->greylist_clean_task != GNUNET_SCHEDULER_NO_TASK)
                                  GREYLIST_AFTER_ATTEMPT_MAX);
   pos->greylisted_until = GNUNET_TIME_relative_to_absolute (rem);
   if (pos->greylist_clean_task != GNUNET_SCHEDULER_NO_TASK)

-    GNUNET_SCHEDULER_cancel (sched,
-                            pos->greylist_clean_task);
+    GNUNET_SCHEDULER_cancel (pos->greylist_clean_task);

   pos->greylist_clean_task 
   pos->greylist_clean_task 

-    = GNUNET_SCHEDULER_add_delayed (sched,
-                                   rem,
+    = GNUNET_SCHEDULER_add_delayed (rem,

                                    &remove_from_greylist,
                                    pos);
 #if DEBUG_TOPOLOGY
                                    &remove_from_greylist,
                                    pos);
 #if DEBUG_TOPOLOGY


@@ -422,7 +413,7 @@ attempt_connect (struct Peer *pos)
                            gettext_noop ("# connect requests issued to core"),
                            1,
                            GNUNET_NO);
                            gettext_noop ("# connect requests issued to core"),
                            1,
                            GNUNET_NO);

-  pos->connect_req = GNUNET_CORE_peer_request_connect (sched, cfg,
+  pos->connect_req = GNUNET_CORE_peer_request_connect (handle,

                                                       GNUNET_TIME_UNIT_MINUTES,
                                                       &pos->pid,
                                                       &connect_completed_callback,
                                                       GNUNET_TIME_UNIT_MINUTES,
                                                       &pos->pid,
                                                       &connect_completed_callback,


@@ -446,15 +437,14 @@ remove_from_greylist (void *cls,
 
   pos->greylist_clean_task = GNUNET_SCHEDULER_NO_TASK;
   rem = GNUNET_TIME_absolute_get_remaining (pos->greylisted_until);
 
   pos->greylist_clean_task = GNUNET_SCHEDULER_NO_TASK;
   rem = GNUNET_TIME_absolute_get_remaining (pos->greylisted_until);

-  if (rem.value == 0)
+  if (rem.rel_value == 0)

     {
       attempt_connect (pos);
     }
   else
     {
       pos->greylist_clean_task 
     {
       attempt_connect (pos);
     }
   else
     {
       pos->greylist_clean_task 

-       = GNUNET_SCHEDULER_add_delayed (sched,
-                                       rem,
+       = GNUNET_SCHEDULER_add_delayed (rem,

                                        &remove_from_greylist,
                                        pos);
     }
                                        &remove_from_greylist,
                                        pos);
     }


@@ -586,7 +576,7 @@ find_advertisable_hello (void *cls,
   if (pos->hello == NULL)
     return GNUNET_YES;
   rst_time = GNUNET_TIME_absolute_get_remaining (pos->filter_expiration);
   if (pos->hello == NULL)
     return GNUNET_YES;
   rst_time = GNUNET_TIME_absolute_get_remaining (pos->filter_expiration);

-  if (0 == rst_time.value)
+  if (0 == rst_time.rel_value)

     {
       /* time to discard... */
       GNUNET_CONTAINER_bloomfilter_free (pos->filter);
     {
       /* time to discard... */
       GNUNET_CONTAINER_bloomfilter_free (pos->filter);


@@ -629,21 +619,20 @@ schedule_next_hello (void *cls,
   /* find applicable HELLOs */
   fah.peer = pl;
   fah.result = NULL;
   /* find applicable HELLOs */
   fah.peer = pl;
   fah.result = NULL;

-  fah.max_size = GNUNET_SERVER_MAX_MESSAGE_SIZE;
+  fah.max_size = GNUNET_SERVER_MAX_MESSAGE_SIZE - 1;

   fah.next_adv = GNUNET_TIME_UNIT_FOREVER_REL;
   GNUNET_CONTAINER_multihashmap_iterate (peers,
                                         &find_advertisable_hello,
                                         &fah);
   pl->hello_delay_task 
   fah.next_adv = GNUNET_TIME_UNIT_FOREVER_REL;
   GNUNET_CONTAINER_multihashmap_iterate (peers,
                                         &find_advertisable_hello,
                                         &fah);
   pl->hello_delay_task 

-    = GNUNET_SCHEDULER_add_delayed (sched,
-                                   fah.next_adv,
+    = GNUNET_SCHEDULER_add_delayed (fah.next_adv,

                                    &schedule_next_hello,
                                    pl);
   if (fah.result == NULL)
     return;   
   next_want = GNUNET_HELLO_size (fah.result->hello);
   delay = GNUNET_TIME_absolute_get_remaining (pl->next_hello_allowed);
                                    &schedule_next_hello,
                                    pl);
   if (fah.result == NULL)
     return;   
   next_want = GNUNET_HELLO_size (fah.result->hello);
   delay = GNUNET_TIME_absolute_get_remaining (pl->next_hello_allowed);

-  if (delay.value == 0)
+  if (delay.rel_value == 0)

     {
       /* now! */
       pl->hello_req = GNUNET_CORE_notify_transmit_ready (handle, 0,
     {
       /* now! */
       pl->hello_req = GNUNET_CORE_notify_transmit_ready (handle, 0,


@@ -652,7 +641,6 @@ schedule_next_hello (void *cls,
                                                         next_want,
                                                         &hello_advertising_ready,
                                                         pl);
                                                         next_want,
                                                         &hello_advertising_ready,
                                                         pl);

-      return;

     }
 }
 
     }
 }
 


@@ -686,13 +674,11 @@ reschedule_hellos (void *cls,
     }
   if (peer->hello_delay_task != GNUNET_SCHEDULER_NO_TASK)
     {
     }
   if (peer->hello_delay_task != GNUNET_SCHEDULER_NO_TASK)
     {

-      GNUNET_SCHEDULER_cancel (sched,
-                              peer->hello_delay_task);
+      GNUNET_SCHEDULER_cancel (peer->hello_delay_task);

       peer->hello_delay_task = GNUNET_SCHEDULER_NO_TASK;
     }
   peer->hello_delay_task 
       peer->hello_delay_task = GNUNET_SCHEDULER_NO_TASK;
     }
   peer->hello_delay_task 

-    = GNUNET_SCHEDULER_add_now (sched,
-                               &schedule_next_hello,
+    = GNUNET_SCHEDULER_add_now (&schedule_next_hello,

                                peer);
   return GNUNET_YES;
 }
                                peer);
   return GNUNET_YES;
 }


@@ -703,15 +689,13 @@ reschedule_hellos (void *cls,
  *
  * @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_notify (void *cls,
                const struct
                GNUNET_PeerIdentity * peer,
  */
 static void 
 connect_notify (void *cls,
                const struct
                GNUNET_PeerIdentity * peer,

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

 {
   struct Peer *pos;
 
 {
   struct Peer *pos;
 


@@ -720,6 +704,9 @@ connect_notify (void *cls,
              "Core told us that we are connecting to `%s'\n",
              GNUNET_i2s (peer));
 #endif
              "Core told us that we are connecting to `%s'\n",
              GNUNET_i2s (peer));
 #endif

+  if (0 == memcmp(&my_identity, peer, sizeof(struct GNUNET_PeerIdentity)))
+    return;
+

   connection_count++;
   GNUNET_STATISTICS_set (stats,
                         gettext_noop ("# peers connected"),
   connection_count++;
   GNUNET_STATISTICS_set (stats,
                         gettext_noop ("# peers connected"),


@@ -734,7 +721,7 @@ connect_notify (void *cls,
   else
     {
       GNUNET_assert (GNUNET_NO == pos->is_connected);
   else
     {
       GNUNET_assert (GNUNET_NO == pos->is_connected);

-      pos->greylisted_until.value = 0; /* remove greylisting */
+      pos->greylisted_until.abs_value = 0; /* remove greylisting */

     }
   pos->is_connected = GNUNET_YES;
   pos->connect_attempts = 0; /* re-set back-off factor */
     }
   pos->is_connected = GNUNET_YES;
   pos->connect_attempts = 0; /* re-set back-off factor */


@@ -746,7 +733,7 @@ connect_notify (void *cls,
       friend_count++;
       GNUNET_STATISTICS_set (stats,
                             gettext_noop ("# friends connected"),
       friend_count++;
       GNUNET_STATISTICS_set (stats,
                             gettext_noop ("# friends connected"),

-                            connection_count,
+                            friend_count,

                             GNUNET_NO);
     }
   reschedule_hellos (NULL, &peer->hashPubKey, pos);
                             GNUNET_NO);
     }
   reschedule_hellos (NULL, &peer->hashPubKey, pos);


@@ -785,7 +772,9 @@ disconnect_notify (void *cls,
                   GNUNET_PeerIdentity * peer)
 {
   struct Peer *pos;
                   GNUNET_PeerIdentity * peer)
 {
   struct Peer *pos;

- 
+
+  if (0 == memcmp(&my_identity, peer, sizeof(struct GNUNET_PeerIdentity)))
+    return;

 #if DEBUG_TOPOLOGY
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Core told us that we disconnected from `%s'\n",
 #if DEBUG_TOPOLOGY
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Core told us that we disconnected from `%s'\n",


@@ -813,7 +802,7 @@ disconnect_notify (void *cls,
       friend_count--; 
       GNUNET_STATISTICS_set (stats,
                             gettext_noop ("# friends connected"),
       friend_count--; 
       GNUNET_STATISTICS_set (stats,
                             gettext_noop ("# friends connected"),

-                            connection_count,
+                            friend_count,

                             GNUNET_NO);
     }
   if ( (connection_count < target_connection_count) ||
                             GNUNET_NO);
     }
   if ( (connection_count < target_connection_count) ||


@@ -823,7 +812,7 @@ disconnect_notify (void *cls,
                                           NULL);
   if ( (friend_count < minimum_friend_count) &&
        (blacklist == NULL) )
                                           NULL);
   if ( (friend_count < minimum_friend_count) &&
        (blacklist == NULL) )

-    blacklist = GNUNET_TRANSPORT_blacklist (sched, cfg,
+    blacklist = GNUNET_TRANSPORT_blacklist (cfg,

                                            &blacklist_check, NULL);
 }
 
                                            &blacklist_check, NULL);
 }
 


@@ -894,7 +883,7 @@ consider_for_advertising (const struct GNUNET_HELLO_Message *hello)
       dt = GNUNET_HELLO_equals (peer->hello,
                                hello,
                                GNUNET_TIME_absolute_get());
       dt = GNUNET_HELLO_equals (peer->hello,
                                hello,
                                GNUNET_TIME_absolute_get());

-      if (dt.value == GNUNET_TIME_UNIT_FOREVER_ABS.value)
+      if (dt.abs_value == GNUNET_TIME_UNIT_FOREVER_ABS.abs_value)

        return; /* nothing new here */
     }
 #if DEBUG_TOPOLOGY
        return; /* nothing new here */
     }
 #if DEBUG_TOPOLOGY


@@ -934,13 +923,11 @@ consider_for_advertising (const struct GNUNET_HELLO_Message *hello)
  * @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)

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

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

 {
   struct Peer *pos;
 
 {
   struct Peer *pos;
 


@@ -964,7 +951,7 @@ process_peer (void *cls,
            }
          if ( (! pos->is_connected) &&
               (! pos->is_friend) &&
            }
          if ( (! pos->is_connected) &&
               (! pos->is_friend) &&

-              (0 == GNUNET_TIME_absolute_get_remaining (pos->greylisted_until).value) )
+              (0 == GNUNET_TIME_absolute_get_remaining (pos->greylisted_until).rel_value) )

            free_peer (NULL, &pos->pid.hashPubKey, pos);
        }
       return;
            free_peer (NULL, &pos->pid.hashPubKey, pos);
        }
       return;


@@ -984,7 +971,7 @@ process_peer (void *cls,
 #endif 
       return;
     }
 #endif 
       return;
     }

-  if (GNUNET_TIME_absolute_get_remaining (pos->greylisted_until).value > 0)
+  if (GNUNET_TIME_absolute_get_remaining (pos->greylisted_until).rel_value > 0)

     {
 #if DEBUG_TOPOLOGY
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
     {
 #if DEBUG_TOPOLOGY
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,


@@ -1024,7 +1011,7 @@ core_init (void *cls,
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                  _("Failed to connect to core service, can not manage topology!\n"));
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                  _("Failed to connect to core service, can not manage topology!\n"));

-      GNUNET_SCHEDULER_shutdown (sched);
+      GNUNET_SCHEDULER_shutdown ();

       return;
     }
   handle = server;
       return;
     }
   handle = server;


@@ -1034,8 +1021,7 @@ core_init (void *cls,
              "I am peer `%s'\n",
              GNUNET_i2s (my_id));
 #endif         
              "I am peer `%s'\n",
              GNUNET_i2s (my_id));
 #endif         

-  peerinfo_notify = GNUNET_PEERINFO_notify (cfg, sched,
-                                           &process_peer,
+  peerinfo_notify = GNUNET_PEERINFO_notify (cfg, &process_peer,

                                            NULL);
 }
 
                                            NULL);
 }
 


@@ -1184,8 +1170,7 @@ read_friends_file (const struct GNUNET_CONFIGURATION_Handle *cfg)
  * @param other the other peer involved (sender or receiver, NULL
  *        for loopback messages where we are both sender and receiver)
  * @param message the actual HELLO message
  * @param other the other peer involved (sender or receiver, NULL
  *        for loopback messages where we are both sender and receiver)
  * @param message the actual HELLO message

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

  * @return GNUNET_OK to keep the connection open,
  *         GNUNET_SYSERR to close it (signal serious error)
  */
  * @return GNUNET_OK to keep the connection open,
  *         GNUNET_SYSERR to close it (signal serious error)
  */


@@ -1194,8 +1179,7 @@ handle_encrypted_hello (void *cls,
                        const struct GNUNET_PeerIdentity * other,
                        const struct GNUNET_MessageHeader *
                        message,
                        const struct GNUNET_PeerIdentity * other,
                        const struct GNUNET_MessageHeader *
                        message,

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

 {
   struct Peer *peer;
   struct GNUNET_PeerIdentity pid;
 {
   struct Peer *peer;
   struct GNUNET_PeerIdentity pid;


@@ -1278,7 +1262,7 @@ hello_advertising_ready (void *cls,
 #if DEBUG_TOPOLOGY
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                  "Sending `%s' with %u bytes",
 #if DEBUG_TOPOLOGY
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                  "Sending `%s' with %u bytes",

-                 "HELLO"
+                 "HELLO",

                  (unsigned int) want);
 #endif         
       GNUNET_STATISTICS_update (stats,
                  (unsigned int) want);
 #endif         
       GNUNET_STATISTICS_update (stats,


@@ -1288,8 +1272,7 @@ hello_advertising_ready (void *cls,
     }
   pl->next_hello_allowed = GNUNET_TIME_relative_to_absolute (HELLO_ADVERTISEMENT_MIN_FREQUENCY);
   pl->hello_delay_task 
     }
   pl->next_hello_allowed = GNUNET_TIME_relative_to_absolute (HELLO_ADVERTISEMENT_MIN_FREQUENCY);
   pl->hello_delay_task 

-    = GNUNET_SCHEDULER_add_now (sched,
-                               &schedule_next_hello,
+    = GNUNET_SCHEDULER_add_now (&schedule_next_hello,

                                pl);
   return want;
 }
                                pl);
   return want;
 }


@@ -1335,14 +1318,12 @@ cleaning_task (void *cls,
  * Main function that will be run.
  *
  * @param cls closure
  * Main function that will be run.
  *
  * @param cls closure

- * @param s the scheduler to use

  * @param args remaining command-line arguments
  * @param cfgfile name of the configuration file used (for saving, can be NULL!)
  * @param c configuration
  */
 static void
 run (void *cls,
  * @param args remaining command-line arguments
  * @param cfgfile name of the configuration file used (for saving, can be NULL!)
  * @param c configuration
  */
 static void
 run (void *cls,

-     struct GNUNET_SCHEDULER_Handle * s,

      char *const *args,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle * c)
      char *const *args,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle * c)


@@ -1354,9 +1335,8 @@ run (void *cls,
     };
   unsigned long long opt;
 
     };
   unsigned long long opt;
 

-  sched = s;

   cfg = c;
   cfg = c;

-  stats = GNUNET_STATISTICS_create (sched, "topology", cfg);
+  stats = GNUNET_STATISTICS_create ("topology", cfg);

   autoconnect = GNUNET_CONFIGURATION_get_value_yesno (cfg,
                                                      "TOPOLOGY",
                                                      "AUTOCONNECT");
   autoconnect = GNUNET_CONFIGURATION_get_value_yesno (cfg,
                                                      "TOPOLOGY",
                                                      "AUTOCONNECT");


@@ -1390,33 +1370,32 @@ run (void *cls,
              autoconnect ? "autoconnect enabled" : "autoconnect disabled");
 #endif       
   if (friend_count < minimum_friend_count) 
              autoconnect ? "autoconnect enabled" : "autoconnect disabled");
 #endif       
   if (friend_count < minimum_friend_count) 

-    blacklist = GNUNET_TRANSPORT_blacklist (sched, cfg,
+    blacklist = GNUNET_TRANSPORT_blacklist (cfg,

                                            &blacklist_check, NULL);
                                            &blacklist_check, NULL);

-  transport = GNUNET_TRANSPORT_connect (sched,
-                                       cfg,
+  transport = GNUNET_TRANSPORT_connect (cfg,
+                                       NULL,

                                        NULL,
                                        NULL,
                                        NULL,
                                        NULL);
                                        NULL,
                                        NULL,
                                        NULL,
                                        NULL);

-  handle = GNUNET_CORE_connect (sched,
-                               cfg,
-                               GNUNET_TIME_UNIT_FOREVER_REL,
+  handle = GNUNET_CORE_connect (cfg,
+                               1,

                                NULL,
                                &core_init,
                                &connect_notify,
                                NULL,
                                &core_init,
                                &connect_notify,

-                               &disconnect_notify,
+                               &disconnect_notify, 
+                               NULL,

                                NULL, GNUNET_NO,
                                NULL, GNUNET_NO,
                                handlers);
                                NULL, GNUNET_NO,
                                NULL, GNUNET_NO,
                                handlers);

-  GNUNET_SCHEDULER_add_delayed (sched,
-                                GNUNET_TIME_UNIT_FOREVER_REL,
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,

                                 &cleaning_task, NULL);
   if (NULL == transport)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                  _("Failed to connect to `%s' service.\n"),
                  "transport");
                                 &cleaning_task, NULL);
   if (NULL == transport)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                  _("Failed to connect to `%s' service.\n"),
                  "transport");

-      GNUNET_SCHEDULER_shutdown (sched);
+      GNUNET_SCHEDULER_shutdown ();

       return;
     }
   if (NULL == handle)
       return;
     }
   if (NULL == handle)


@@ -1424,20 +1403,12 @@ run (void *cls,
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                  _("Failed to connect to `%s' service.\n"),
                  "core");
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                  _("Failed to connect to `%s' service.\n"),
                  "core");

-      GNUNET_SCHEDULER_shutdown (sched);
+      GNUNET_SCHEDULER_shutdown ();

       return;
     }
 }
 
 
       return;
     }
 }
 
 

-/**
- * gnunet-daemon-topology command line options.
- */
-static struct GNUNET_GETOPT_CommandLineOption options[] = {
-  GNUNET_GETOPT_OPTION_END
-};
-
-

 /**
  * The main function for the topology daemon.
  *
 /**
  * The main function for the topology daemon.
  *


@@ -1448,6 +1419,9 @@ static struct GNUNET_GETOPT_CommandLineOption options[] = {
 int
 main (int argc, char *const *argv)
 {
 int
 main (int argc, char *const *argv)
 {

+  static const struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_OPTION_END
+  };

   int ret;
 
   ret = (GNUNET_OK ==
   int ret;
 
   ret = (GNUNET_OK ==