use new SCHEDULER_add_at API where applicable
[oweals/gnunet.git] / src / topology / gnunet-daemon-topology.c
index 36860215b5e4645b6c96a4be2f192aeee91a154c..067ebce238890b34cbaffd2abb3c3890065bea5c 100644 (file)
@@ -1,10 +1,10 @@
 /*
      This file is part of GNUnet.
-     (C) 2007, 2008, 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2007-2016 GNUnet e.V.
 
      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
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
  * @file topology/gnunet-daemon-topology.c
- * @brief code for bootstrapping via topology servers
+ * @brief code for maintaining the overlay topology
  * @author Christian Grothoff
+ *
+ * This daemon combines three functions:
+ * - suggesting to ATS which peers we might want to connect to
+ * - enforcing the F2F restrictions (by blacklisting)
+ * - gossping HELLOs
+ *
+ * All three require similar information (who are our friends
+ * impacts connectivity suggestions; connectivity suggestions
+ * should consider blacklisting; connectivity suggestions
+ * should consider available/known HELLOs; gossip requires
+ * connectivity data; connectivity suggestions require
+ * connectivity data), which is why they are combined in this
+ * program.
  */
-
-#include <stdlib.h>
 #include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_friends_lib.h"
+#include "gnunet_constants.h"
 #include "gnunet_core_service.h"
 #include "gnunet_protocols.h"
 #include "gnunet_peerinfo_service.h"
+#include "gnunet_statistics_service.h"
 #include "gnunet_transport_service.h"
-#include "gnunet_util_lib.h"
-
-
-#define DEBUG_TOPOLOGY GNUNET_NO
-
-/**
- * For how long do we blacklist a peer after a failed
- * connection attempt?
- */
-#define BLACKLIST_AFTER_ATTEMPT GNUNET_TIME_UNIT_HOURS
+#include "gnunet_ats_service.h"
 
-/**
- * For how long do we blacklist a friend after a failed
- * connection attempt?
- */
-#define BLACKLIST_AFTER_ATTEMPT_FRIEND GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15)
 
 /**
- * How frequently are we allowed to ask PEERINFO for more
- * HELLO's to advertise (at most)?
+ * At what frequency do we sent HELLOs to a peer?
  */
-#define MIN_HELLO_GATHER_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 27)
+#define HELLO_ADVERTISEMENT_MIN_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5)
 
 /**
- * How often do we at most advertise the same HELLO to the same peer?
- * Also used to remove HELLOs of peers that PEERINFO no longer lists
- * from our cache.
+ * After what time period do we expire the HELLO Bloom filter?
  */
-#define HELLO_ADVERTISEMENT_MIN_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 12)
+#define HELLO_ADVERTISEMENT_MIN_REPEAT_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 4)
 
 
 /**
- * List of neighbours, friends and blacklisted peers.
+ * Record for neighbours, friends and blacklisted peers.
  */
-struct PeerList
+struct Peer
 {
-
   /**
-   * This is a linked list.
+   * Which peer is this entry about?
    */
-  struct PeerList *next;
+  struct GNUNET_PeerIdentity pid;
 
   /**
-   * Is this peer listed here because he is a friend?
+   * Our handle for transmitting to this peer; NULL
+   * if peer is not connected.
    */
-  int is_friend;
+  struct GNUNET_MQ_Handle *mq;
 
   /**
-   * Are we connected to this peer right now?
+   * Pointer to the HELLO message of this peer; can be NULL.
    */
-  int is_connected;
+  struct GNUNET_HELLO_Message *hello;
 
   /**
-   * Until what time should we not try to connect again
-   * to this peer?
+   * Bloom filter used to mark which peers already got the HELLO
+   * from this peer.
    */
-  struct GNUNET_TIME_Absolute blacklisted_until;
+  struct GNUNET_CONTAINER_BloomFilter *filter;
 
   /**
-   * Last time we transmitted a HELLO to this peer?
+   * Next time we are allowed to transmit a HELLO to this peer?
    */
-  struct GNUNET_TIME_Absolute last_hello_sent;
+  struct GNUNET_TIME_Absolute next_hello_allowed;
 
   /**
-   * ID of the peer.
+   * When should we reset the bloom filter of this entry?
    */
-  struct GNUNET_PeerIdentity id;
-
-};
-
+  struct GNUNET_TIME_Absolute filter_expiration;
 
-/**
- * List of HELLOs we may consider for advertising.
- */
-struct HelloList
-{
   /**
-   * This is a linked list.
+   * ID of task we use to wait for the time to send the next HELLO
+   * to this peer.
    */
-  struct HelloList *next;
+  struct GNUNET_SCHEDULER_Task *hello_delay_task;
 
   /**
-   * Pointer to the HELLO message.  Memory allocated as part
-   * of the "struct HelloList" --- do not free!
+   * Handle for our connectivity suggestion for this peer.
    */
-  struct GNUNET_HELLO_Message *msg;
+  struct GNUNET_ATS_ConnectivitySuggestHandle *sh;
 
   /**
-   * Bloom filter used to mark which peers already got
-   * this HELLO.
+   * How much would we like to connect to this peer?
    */
-  struct GNUNET_CONTAINER_BloomFilter *filter;
+  uint32_t strength;
 
   /**
-   * What peer is this HELLO for?
+   * Is this peer listed here because he is a friend?
    */
-  struct GNUNET_PeerIdentity id;
+  int is_friend;
 
-  /**
-   * When should we remove this entry from the linked list (either
-   * resetting the filter or possibly eliminating it for good because
-   * we no longer consider the peer to be participating in the
-   * network)?
-   */
-  struct GNUNET_TIME_Absolute expiration;
 };
 
 
 /**
- * Linked list of HELLOs for advertising.
+ * Our peerinfo notification context.  We use notification
+ * to instantly learn about new peers as they are discovered.
  */
-static struct HelloList *hellos;
-
-/**
- * Our scheduler.
- */
-static struct GNUNET_SCHEDULER_Handle * sched;
+static struct GNUNET_PEERINFO_NotifyContext *peerinfo_notify;
 
 /**
  * Our configuration.
  */
-static const struct GNUNET_CONFIGURATION_Handle * cfg;
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
 
 /**
- * Handle to the core API.
+ * Handle to the CORE service.
  */
 static struct GNUNET_CORE_Handle *handle;
 
 /**
- * Handle to the transport API.
+ * Handle to the ATS service.
  */
-static struct GNUNET_TRANSPORT_Handle *transport;
+static struct GNUNET_ATS_ConnectivityHandle *ats;
 
 /**
  * Identity of this peer.
@@ -169,15 +147,32 @@ static struct GNUNET_TRANSPORT_Handle *transport;
 static struct GNUNET_PeerIdentity my_identity;
 
 /**
- * Linked list of all of our friends and all of our current
- * neighbours.
+ * All of our friends, all of our current neighbours and all peers for
+ * which we have HELLOs.  So pretty much everyone.  Maps peer identities
+ * to `struct Peer *` values.
  */
-static struct PeerList *friends;
+static struct GNUNET_CONTAINER_MultiPeerMap *peers;
 
 /**
- * Timestamp from the last time we tried to gather HELLOs.
+ * Handle for reporting statistics.
  */
-static struct GNUNET_TIME_Absolute last_hello_gather_time;
+static struct GNUNET_STATISTICS_Handle *stats;
+
+/**
+ * Blacklist (NULL if we have none).
+ */
+static struct GNUNET_TRANSPORT_Blacklist *blacklist;
+
+/**
+ * Task scheduled to asynchronously reconsider adding/removing
+ * peer connectivity suggestions.
+ */
+static struct GNUNET_SCHEDULER_Task *add_task;
+
+/**
+ * Active HELLO offering to transport service.
+ */
+static struct GNUNET_TRANSPORT_OfferHelloHandle *oh;
 
 /**
  * Flag to disallow non-friend connections (pure F2F mode).
@@ -205,520 +200,764 @@ static unsigned int target_connection_count;
  */
 static unsigned int friend_count;
 
-/**
- * Should the topology daemon try to establish connections?
- */
-static int autoconnect;
 
 /**
- * Are we currently having a request pending with
- * PEERINFO asking for HELLOs for advertising?
+ * Function that decides if a connection is acceptable or not.
+ * If we have a blacklist, only friends are allowed, so the check
+ * is rather simple.
+ *
+ * @param cls closure
+ * @param pid peer to approve or disapprove
+ * @return #GNUNET_OK if the connection is allowed
  */
-static int hello_gathering_active;
+static int
+blacklist_check (void *cls,
+                 const struct GNUNET_PeerIdentity *pid)
+{
+  struct Peer *pos;
 
+  pos = GNUNET_CONTAINER_multipeermap_get (peers,
+                                           pid);
+  if ( (NULL != pos) &&
+       (GNUNET_YES == pos->is_friend))
+    return GNUNET_OK;
+  GNUNET_STATISTICS_update (stats,
+                            gettext_noop ("# peers blacklisted"),
+                            1,
+                            GNUNET_NO);
+  return GNUNET_SYSERR;
+}
 
 
 /**
- * Force a disconnect from the specified peer.
+ * Whitelist all peers that we blacklisted; we've passed
+ * the minimum number of friends.
  */
 static void
-force_disconnect (const struct GNUNET_PeerIdentity *peer)
+whitelist_peers ()
 {
-  GNUNET_CORE_peer_configure (handle,
-                             peer,
-                             GNUNET_TIME_UNIT_FOREVER_REL,
-                             0,
-                             0,
-                             0,
-                             NULL,
-                             NULL);
+  if (NULL != blacklist)
+  {
+    GNUNET_TRANSPORT_blacklist_cancel (blacklist);
+    blacklist = NULL;
+  }
 }
 
 
 /**
- * Function called by core when our attempt to connect
- * succeeded.  Does nothing.
+ * Free all resources associated with the given peer.
+ *
+ * @param cls closure (not used)
+ * @param pid identity of the peer
+ * @param value peer to free
+ * @return #GNUNET_YES (always: continue to iterate)
  */
-static size_t
-ready_callback (void *cls,
-               size_t size, void *buf)
+static int
+free_peer (void *cls,
+           const struct GNUNET_PeerIdentity * pid,
+           void *value)
 {
-  return 0;
+  struct Peer *pos = value;
+
+  GNUNET_break (NULL == pos->mq);
+  GNUNET_break (GNUNET_OK ==
+                GNUNET_CONTAINER_multipeermap_remove (peers,
+                                                      pid,
+                                                      pos));
+  if (NULL != pos->hello_delay_task)
+  {
+    GNUNET_SCHEDULER_cancel (pos->hello_delay_task);
+    pos->hello_delay_task = NULL;
+  }
+  if (NULL != pos->sh)
+  {
+    GNUNET_ATS_connectivity_suggest_cancel (pos->sh);
+    pos->sh = NULL;
+  }
+  if (NULL != pos->hello)
+  {
+    GNUNET_free_non_null (pos->hello);
+    pos->hello = NULL;
+  }
+  if (NULL != pos->filter)
+  {
+    GNUNET_CONTAINER_bloomfilter_free (pos->filter);
+    pos->filter = NULL;
+  }
+  GNUNET_free (pos);
+  return GNUNET_YES;
 }
 
 
 /**
- * Try to connect to the specified peer.
+ * Recalculate how much we want to be connected to the specified peer
+ * and let ATS know about the result.
  *
- * @param pos NULL if not in friend list yet
+ * @param pos peer to consider connecting to
  */
 static void
-attempt_connect (const struct GNUNET_PeerIdentity *peer,
-                struct PeerList *pos)
+attempt_connect (struct Peer *pos)
 {
-  if (pos == NULL)
-    {
-      pos = friends;
-      while (pos != NULL)
-       {
-         if (0 == memcmp (&pos->id, peer, sizeof (struct GNUNET_PeerIdentity)))
-           break;
-       }
-    }
-  if (pos == NULL)
-    {
-      pos = GNUNET_malloc (sizeof(struct PeerList));
-      pos->id = *peer;
-      pos->next = friends;
-      friends = pos;
-    }
-  if (GNUNET_YES == pos->is_friend)
-    pos->blacklisted_until = GNUNET_TIME_relative_to_absolute (BLACKLIST_AFTER_ATTEMPT_FRIEND);
+  uint32_t strength;
+
+  if (0 ==
+      memcmp (&my_identity,
+              &pos->pid,
+              sizeof (struct GNUNET_PeerIdentity)))
+    return; /* This is myself, nothing to do. */
+  if (connection_count < target_connection_count)
+    strength = 1;
   else
-    pos->blacklisted_until = GNUNET_TIME_relative_to_absolute (BLACKLIST_AFTER_ATTEMPT);
-  GNUNET_CORE_notify_transmit_ready (handle,
-                                    0 /* priority */,
-                                    GNUNET_TIME_UNIT_MINUTES,
-                                    peer,
-                                    sizeof(struct GNUNET_MessageHeader),
-                                    &ready_callback,
-                                    NULL);
+    strength = 0;
+  if ( (friend_count < minimum_friend_count) ||
+       (GNUNET_YES == friends_only) )
+  {
+    if (pos->is_friend)
+      strength += 10; /* urgently needed */
+    else
+      strength = 0; /* disallowed */
+  }
+  if (pos->is_friend)
+    strength *= 2; /* friends always count more */
+  if (NULL != pos->mq)
+    strength *= 2; /* existing connections preferred */
+  if (strength == pos->strength)
+    return; /* nothing to do */
+  if (NULL != pos->sh)
+  {
+    GNUNET_ATS_connectivity_suggest_cancel (pos->sh);
+    pos->sh = NULL;
+  }
+  pos->strength = strength;
+  if (0 != strength)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Asking to connect to `%s' with strength %u\n",
+                GNUNET_i2s (&pos->pid),
+                (unsigned int) strength);
+    GNUNET_STATISTICS_update (stats,
+                              gettext_noop ("# connect requests issued to ATS"),
+                              1,
+                              GNUNET_NO);
+    pos->sh = GNUNET_ATS_connectivity_suggest (ats,
+                                               &pos->pid,
+                                               strength);
+  }
 }
 
 
 /**
- * Is this peer one of our friends?
+ * Create a new entry in the peer list.
+ *
+ * @param peer identity of the new entry
+ * @param hello hello message, can be NULL
+ * @param is_friend is the new entry for a friend?
+ * @return the new entry
  */
-static int
-is_friend (const struct GNUNET_PeerIdentity * peer)
+static struct Peer *
+make_peer (const struct GNUNET_PeerIdentity *peer,
+           const struct GNUNET_HELLO_Message *hello,
+           int is_friend)
 {
-  struct PeerList *pos;
-
-  pos = friends;
-  while (pos != NULL)
-    {
-      if ( (GNUNET_YES == pos->is_friend) &&
-          (0 == memcmp (&pos->id, peer, sizeof (struct GNUNET_PeerIdentity))) )
-       return GNUNET_YES;
-      pos = pos->next;
-    }
-  return GNUNET_NO;
+  struct Peer *ret;
+
+  ret = GNUNET_new (struct Peer);
+  ret->pid = *peer;
+  ret->is_friend = is_friend;
+  if (NULL != hello)
+  {
+    ret->hello = GNUNET_malloc (GNUNET_HELLO_size (hello));
+    GNUNET_memcpy (ret->hello,
+                  hello,
+                  GNUNET_HELLO_size (hello));
+  }
+  GNUNET_break (GNUNET_OK ==
+                GNUNET_CONTAINER_multipeermap_put (peers,
+                                                   peer,
+                                                   ret,
+                                                   GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+  return ret;
 }
 
 
 /**
- * Check if an additional connection from the given peer is allowed.
+ * Setup bloom filter for the given peer entry.
+ *
+ * @param peer entry to initialize
  */
-static int
-is_connection_allowed (const struct GNUNET_PeerIdentity * peer)
+static void
+setup_filter (struct Peer *peer)
 {
-  if (0 == memcmp (&my_identity, peer, sizeof (struct GNUNET_PeerIdentity)))
-    return GNUNET_SYSERR;       /* disallow connections to self */
-  if (is_friend (peer))
-    return GNUNET_OK;
-  if (GNUNET_YES == friends_only)
-    return GNUNET_SYSERR;
-  if (friend_count >= minimum_friend_count)
-    return GNUNET_OK;
-  return GNUNET_SYSERR;
+  struct GNUNET_HashCode hc;
+
+  /* 2^{-5} chance of not sending a HELLO to a peer is
+   * acceptably small (if the filter is 50% full);
+   * 64 bytes of memory are small compared to the rest
+   * of the data structure and would only really become
+   * "useless" once a HELLO has been passed on to ~100
+   * other peers, which is likely more than enough in
+   * any case; hence 64, 5 as bloomfilter parameters. */
+  peer->filter = GNUNET_CONTAINER_bloomfilter_init (NULL, 64, 5);
+  peer->filter_expiration =
+      GNUNET_TIME_relative_to_absolute
+      (HELLO_ADVERTISEMENT_MIN_REPEAT_FREQUENCY);
+  /* never send a peer its own HELLO */
+  GNUNET_CRYPTO_hash (&peer->pid,
+                      sizeof (struct GNUNET_PeerIdentity),
+                      &hc);
+  GNUNET_CONTAINER_bloomfilter_add (peer->filter, &hc);
 }
 
 
 /**
- * Method called whenever a peer connects.
+ * Closure for #find_advertisable_hello().
+ */
+struct FindAdvHelloContext
+{
+
+  /**
+   * Peer we want to advertise to.
+   */
+  struct Peer *peer;
+
+  /**
+   * Where to store the result (peer selected for advertising).
+   */
+  struct Peer *result;
+
+  /**
+   * Maximum HELLO size we can use right now.
+   */
+  size_t max_size;
+
+  struct GNUNET_TIME_Relative next_adv;
+};
+
+
+/**
+ * Find a peer that would be reasonable for advertising.
  *
  * @param cls closure
- * @param peer peer identity this notification is about
+ * @param pid identity of a peer
+ * @param value 'struct Peer*' for the peer we are considering
+ * @return #GNUNET_YES (continue iteration)
  */
-static void connect_notify (void *cls,
-                           const struct
-                           GNUNET_PeerIdentity * peer)
+static int
+find_advertisable_hello (void *cls,
+                         const struct GNUNET_PeerIdentity *pid,
+                         void *value)
 {
-  struct PeerList *pos;
-
-  connection_count++;
-  pos = friends;
-  while (pos != NULL)
-    {
-      if ( (GNUNET_YES == pos->is_friend) &&
-          (0 == memcmp (&pos->id, peer, sizeof (struct GNUNET_PeerIdentity))) )
-       {
-         GNUNET_assert (GNUNET_NO == pos->is_connected);
-         pos->is_connected = GNUNET_YES;
-         pos->blacklisted_until.value = 0; /* remove blacklisting */
-         friend_count++;
-         return;
-       }
-      pos = pos->next;
-    }
-  pos = GNUNET_malloc (sizeof(struct PeerList));
-  pos->id = *peer;
-  pos->is_connected = GNUNET_YES;
-  pos->next = friends;
-  friends = pos;
-  if (GNUNET_OK != is_connection_allowed (peer))
-    force_disconnect (peer);
+  struct FindAdvHelloContext *fah = cls;
+  struct Peer *pos = value;
+  struct GNUNET_TIME_Relative rst_time;
+  struct GNUNET_HashCode hc;
+  size_t hs;
+
+  if (pos == fah->peer)
+    return GNUNET_YES;
+  if (pos->hello == NULL)
+    return GNUNET_YES;
+  rst_time = GNUNET_TIME_absolute_get_remaining (pos->filter_expiration);
+  if (0 == rst_time.rel_value_us)
+  {
+    /* time to discard... */
+    GNUNET_CONTAINER_bloomfilter_free (pos->filter);
+    setup_filter (pos);
+  }
+  fah->next_adv = GNUNET_TIME_relative_min (rst_time, fah->next_adv);
+  hs = GNUNET_HELLO_size (pos->hello);
+  if (hs > fah->max_size)
+    return GNUNET_YES;
+  GNUNET_CRYPTO_hash (&fah->peer->pid,
+                     sizeof (struct GNUNET_PeerIdentity), &hc);
+  if (GNUNET_NO ==
+      GNUNET_CONTAINER_bloomfilter_test (pos->filter,
+                                         &hc))
+    fah->result = pos;
+  return GNUNET_YES;
 }
 
 
 /**
- * Disconnect from all non-friends (we're below quota).
+ * Calculate when we would like to send the next HELLO to this
+ * peer and ask for it.
+ *
+ * @param cls for which peer to schedule the HELLO
  */
 static void
-drop_non_friends ()
+schedule_next_hello (void *cls)
 {
-  struct PeerList *pos;
+  struct Peer *pl = cls;
+  struct FindAdvHelloContext fah;
+  struct GNUNET_MQ_Envelope *env;
+  size_t want;
+  struct GNUNET_TIME_Relative delay;
+  struct GNUNET_HashCode hc;
 
-  pos = friends;
-  while (pos != NULL)
-    {
-      if (GNUNET_NO == pos->is_friend)
-       {
-         GNUNET_assert (GNUNET_YES == pos->is_connected);
-         force_disconnect (&pos->id);
-       }
-      pos = pos->next;
-    }
+  pl->hello_delay_task = NULL;
+  GNUNET_assert (NULL != pl->mq);
+  /* find applicable HELLOs */
+  fah.peer = pl;
+  fah.result = NULL;
+  fah.max_size = GNUNET_SERVER_MAX_MESSAGE_SIZE - 1;
+  fah.next_adv = GNUNET_TIME_UNIT_FOREVER_REL;
+  GNUNET_CONTAINER_multipeermap_iterate (peers,
+                                         &find_advertisable_hello,
+                                         &fah);
+  pl->hello_delay_task =
+      GNUNET_SCHEDULER_add_delayed (fah.next_adv,
+                                    &schedule_next_hello,
+                                    pl);
+  if (NULL == fah.result)
+    return;
+  delay = GNUNET_TIME_absolute_get_remaining (pl->next_hello_allowed);
+  if (0 != delay.rel_value_us)
+    return;
+
+  want = GNUNET_HELLO_size (fah.result->hello);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Sending HELLO with %u bytes",
+             (unsigned int) want);
+  env = GNUNET_MQ_msg_copy (&fah.result->hello->header);
+  GNUNET_MQ_send (pl->mq,
+                 env);
+
+  /* avoid sending this one again soon */
+  GNUNET_CRYPTO_hash (&pl->pid,
+                     sizeof (struct GNUNET_PeerIdentity),
+                     &hc);
+  GNUNET_CONTAINER_bloomfilter_add (fah.result->filter,
+                                   &hc);
+
+  GNUNET_STATISTICS_update (stats,
+                           gettext_noop ("# HELLO messages gossipped"),
+                           1,
+                           GNUNET_NO);
+  /* prepare to send the next one */
+  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);
 }
 
 
 /**
- * Method called whenever a peer disconnects.
+ * Cancel existing requests for sending HELLOs to this peer
+ * and recalculate when we should send HELLOs to it based
+ * on our current state (something changed!).
+ *
+ * @param cls closure `struct Peer` to skip, or NULL
+ * @param pid identity of a peer
+ * @param value `struct Peer *` for the peer
+ * @return #GNUNET_YES (always)
+ */
+static int
+reschedule_hellos (void *cls,
+                   const struct GNUNET_PeerIdentity *pid,
+                   void *value)
+{
+  struct Peer *peer = value;
+  struct Peer *skip = cls;
+
+  if (skip == peer)
+    return GNUNET_YES;
+  if (NULL == peer->mq)
+    return GNUNET_YES;
+  if (NULL != peer->hello_delay_task)
+  {
+    GNUNET_SCHEDULER_cancel (peer->hello_delay_task);
+    peer->hello_delay_task = NULL;
+  }
+  peer->hello_delay_task =
+      GNUNET_SCHEDULER_add_now (&schedule_next_hello, peer);
+  return GNUNET_YES;
+}
+
+
+/**
+ * Method called whenever a peer connects.
  *
  * @param cls closure
  * @param peer peer identity this notification is about
+ * @param mq message queue for communicating with @a peer
+ * @return our `struct Peer` for @a peer
  */
-static void disconnect_notify (void *cls,
-                              const struct
-                              GNUNET_PeerIdentity * peer)
+static void *
+connect_notify (void *cls,
+                const struct GNUNET_PeerIdentity *peer,
+               struct GNUNET_MQ_Handle *mq)
 {
-  struct PeerList *pos;
-  struct PeerList *prev;
+  struct Peer *pos;
+  uint64_t flags;
+  const void *extra;
 
-  connection_count--;
-  pos = friends;
-  prev = NULL;
-  while (pos != NULL)
-    {
-      if (0 == memcmp (&pos->id, peer, sizeof (struct GNUNET_PeerIdentity)))
-       {
-         GNUNET_assert (GNUNET_YES == pos->is_connected);
-         pos->is_connected = GNUNET_NO;
-         if (GNUNET_YES == pos->is_friend)
-           {
-             friend_count--;
-             if (friend_count < minimum_friend_count)
-               {
-                 /* disconnect from all non-friends */
-                 drop_non_friends ();
-                 attempt_connect (peer, pos);
-               }
-           }
-         else
-           {
-             /* free entry */
-             if (prev == NULL)
-               friends = pos->next;
-             else
-               prev->next = pos->next;
-             GNUNET_free (pos);
-           }
-         return;
-       }
-      prev = pos;
-      pos = pos->next;
-    }
-  GNUNET_break (0);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Core told us that we are connecting to `%s'\n",
+              GNUNET_i2s (peer));
+  if (0 == memcmp (&my_identity,
+                   peer,
+                   sizeof (struct GNUNET_PeerIdentity)))
+    return NULL;
+  extra = GNUNET_CORE_get_mq_options (GNUNET_YES,
+                                     GNUNET_CORE_PRIO_BEST_EFFORT,
+                                     &flags);
+  GNUNET_MQ_set_options (mq,
+                        flags,
+                        extra);
+  connection_count++;
+  GNUNET_STATISTICS_set (stats,
+                         gettext_noop ("# peers connected"),
+                         connection_count,
+                         GNUNET_NO);
+  pos = GNUNET_CONTAINER_multipeermap_get (peers,
+                                           peer);
+  if (NULL == pos)
+  {
+    pos = make_peer (peer,
+                     NULL,
+                     GNUNET_NO);
+  }
+  else
+  {
+    GNUNET_assert (NULL == pos->mq);
+  }
+  pos->mq = mq;
+  if (pos->is_friend)
+  {
+    friend_count++;
+    if ( (friend_count == minimum_friend_count) &&
+         (GNUNET_YES != friends_only) )
+      whitelist_peers ();
+    GNUNET_STATISTICS_set (stats,
+                           gettext_noop ("# friends connected"),
+                           friend_count,
+                           GNUNET_NO);
+  }
+  reschedule_hellos (NULL,
+                     peer,
+                     pos);
+  return pos;
 }
 
 
 /**
- * Find more peers that we should connect to and ask the
- * core to establish connections.
+ * Try to add more peers to our connection set.
+ *
+ * @param cls closure, not used
+ * @param pid identity of a peer
+ * @param value `struct Peer *` for the peer
+ * @return #GNUNET_YES (continue to iterate)
  */
-static void
-find_more_peers (void *cls,
-                const struct GNUNET_SCHEDULER_TaskContext *tc);
+static int
+try_add_peers (void *cls,
+               const struct GNUNET_PeerIdentity *pid,
+               void *value)
+{
+  struct Peer *pos = value;
+
+  attempt_connect (pos);
+  return GNUNET_YES;
+}
 
 
 /**
- * Determine when we should try again to find more peers and
- * schedule the task.
+ * Add peers and schedule connection attempt
+ *
+ * @param cls unused, NULL
  */
 static void
-schedule_peer_search ()
+add_peer_task (void *cls)
 {
-  struct GNUNET_TIME_Relative delay;
+  add_task = NULL;
 
-  /* Typically, we try again every 15 minutes; the minimum period is
-     15s; if we are above the connection target, we reduce re-trying
-     by the square of how much we are above; so for example, with 200%
-     of the connection target we would only look for more peers once
-     every hour (after all, we're quite busy processing twice as many
-     connections as we intended to have); similarly, if we are at only
-     25% of our connectivity goal, we will try 16x as hard to connect
-     (so roughly once a minute, plus the 15s minimum delay */
-  delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
-                                        15 + 15 * 60 * connection_count * connection_count / target_connection_count / target_connection_count);
-  GNUNET_SCHEDULER_add_delayed (sched,
-                               GNUNET_NO,
-                               GNUNET_SCHEDULER_PRIORITY_DEFAULT,
-                               GNUNET_SCHEDULER_NO_TASK,
-                               delay,
-                               &find_more_peers,
-                               NULL);
+  GNUNET_CONTAINER_multipeermap_iterate (peers,
+                                         &try_add_peers,
+                                         NULL);
 }
 
 
+/**
+ * Method called whenever a peer disconnects.
+ *
+ * @param cls closure
+ * @param peer peer identity this notification is about
+ * @param internal_cls the `struct Peer` for this peer
+ */
+static void
+disconnect_notify (void *cls,
+                   const struct GNUNET_PeerIdentity *peer,
+                  void *internal_cls)
+{
+  struct Peer *pos = internal_cls;
+
+  if (NULL == pos)
+    return; /* myself, we're shutting down */
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Core told us that we disconnected from `%s'\n",
+              GNUNET_i2s (peer));
+  if (NULL == pos->mq)
+  {
+    GNUNET_break (0);
+    return;
+  }
+  pos->mq = NULL;
+  connection_count--;
+  if (NULL != pos->hello_delay_task)
+  {
+    GNUNET_SCHEDULER_cancel (pos->hello_delay_task);
+    pos->hello_delay_task = NULL;
+  }
+  GNUNET_STATISTICS_set (stats,
+                         gettext_noop ("# peers connected"),
+                         connection_count,
+                         GNUNET_NO);
+  if (pos->is_friend)
+  {
+    friend_count--;
+    GNUNET_STATISTICS_set (stats,
+                           gettext_noop ("# friends connected"),
+                           friend_count,
+                           GNUNET_NO);
+  }
+  if ( ( (connection_count < target_connection_count) ||
+         (friend_count < minimum_friend_count)) &&
+       (NULL == add_task) )
+    add_task = GNUNET_SCHEDULER_add_now (&add_peer_task,
+                                         NULL);
+  if ( (friend_count < minimum_friend_count) &&
+       (NULL == blacklist))
+    blacklist = GNUNET_TRANSPORT_blacklist (cfg,
+                                            &blacklist_check,
+                                            NULL);
+}
 
 
 /**
  * Iterator called on each address.
  *
- * @param cls flag that we will set if we see any addresses.
+ * @param cls flag that we will set if we see any addresses
+ * @param address the address of the peer
+ * @param expiration when will the given address expire
+ * @return #GNUNET_SYSERR always, to terminate iteration
  */
 static int
 address_iterator (void *cls,
-                 const char *tname,
-                 struct GNUNET_TIME_Absolute expiration,
-                 const void *addr, size_t addrlen)
+                  const struct GNUNET_HELLO_Address *address,
+                  struct GNUNET_TIME_Absolute expiration)
 {
   int *flag = cls;
+
   *flag = GNUNET_YES;
   return GNUNET_SYSERR;
 }
 
 
 /**
- * We've gotten a HELLO from another peer.
- * Consider it for advertising.
+ * We've gotten a HELLO from another peer.  Consider it for
+ * advertising.
+ *
+ * @param hello the HELLO we got
  */
 static void
 consider_for_advertising (const struct GNUNET_HELLO_Message *hello)
 {
   int have_address;
   struct GNUNET_PeerIdentity pid;
-  struct HelloList *pos;
+  struct GNUNET_TIME_Absolute dt;
+  struct GNUNET_HELLO_Message *nh;
+  struct Peer *peer;
   uint16_t size;
 
+  if (GNUNET_OK != GNUNET_HELLO_get_id (hello, &pid))
+  {
+    GNUNET_break (0);
+    return;
+  }
+  if (0 == memcmp (&pid,
+                   &my_identity,
+                   sizeof (struct GNUNET_PeerIdentity)))
+    return;                     /* that's me! */
   have_address = GNUNET_NO;
   GNUNET_HELLO_iterate_addresses (hello,
-                                 GNUNET_NO,
-                                 &address_iterator,
-                                 &have_address);
+                                  GNUNET_NO,
+                                  &address_iterator,
+                                  &have_address);
   if (GNUNET_NO == have_address)
-    return; /* no point in advertising this one... */
-  GNUNET_break (GNUNET_OK == GNUNET_HELLO_get_id (hello, &pid));
-  pos = hellos;
-  while (pos != NULL)
-    {
-      if (0 == memcmp (&pos->id,
-                      &pid,
-                      sizeof(struct GNUNET_PeerIdentity)))
-       return; /* duplicate, at least "mostly" */
-      pos = pos->next;
-    }
-  size = GNUNET_HELLO_size (hello);
-  pos = GNUNET_malloc (sizeof(struct HelloList) + size);
-  pos->msg = (struct GNUNET_HELLO_Message*) &pos[1];
-  memcpy (&pos->msg, hello, size);
-  pos->id = pid;
-  pos->expiration = GNUNET_TIME_relative_to_absolute (HELLO_ADVERTISEMENT_MIN_FREQUENCY);
-  /* 2^{-5} chance of not sending a HELLO to a peer is
-     acceptably small (if the filter is 50% full);
-     64 bytes of memory are small compared to the rest
-     of the data structure and would only really become
-     "useless" once a HELLO has been passed on to ~100
-     other peers, which is likely more than enough in
-     any case; hence 64, 5 as bloomfilter parameters. */
-  pos->filter = GNUNET_CONTAINER_bloomfilter_load (NULL, 64, 5);
-  /* never send a peer its own HELLO */
-  GNUNET_CONTAINER_bloomfilter_add (pos->filter, &pos->id.hashPubKey);
-  pos->next = hellos;
-  hellos = pos;
+    return;                     /* no point in advertising this one... */
+  peer = GNUNET_CONTAINER_multipeermap_get (peers, &pid);
+  if (NULL == peer)
+  {
+    peer = make_peer (&pid,
+                      hello,
+                      GNUNET_NO);
+  }
+  else if (NULL != peer->hello)
+  {
+    dt = GNUNET_HELLO_equals (peer->hello,
+                              hello,
+                              GNUNET_TIME_absolute_get ());
+    if (dt.abs_value_us == GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us)
+      return;                   /* nothing new here */
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Found HELLO from peer `%s' for advertising\n",
+              GNUNET_i2s (&pid));
+  if (NULL != peer->hello)
+  {
+    nh = GNUNET_HELLO_merge (peer->hello,
+                             hello);
+    GNUNET_free (peer->hello);
+    peer->hello = nh;
+  }
+  else
+  {
+    size = GNUNET_HELLO_size (hello);
+    peer->hello = GNUNET_malloc (size);
+    GNUNET_memcpy (peer->hello,
+            hello,
+            size);
+  }
+  if (NULL != peer->filter)
+  {
+    GNUNET_CONTAINER_bloomfilter_free (peer->filter);
+    peer->filter = NULL;
+  }
+  setup_filter (peer);
+  /* since we have a new HELLO to pick from, re-schedule all
+   * HELLO requests that are not bound by the HELLO send rate! */
+  GNUNET_CONTAINER_multipeermap_iterate (peers,
+                                         &reschedule_hellos,
+                                         peer);
 }
 
 
 /**
- * Peerinfo calls this function to let us know about a
- * possible peer that we might want to connect to.
+ * PEERINFO calls this function to let us know about a possible peer
+ * that we might want to connect to.
+ *
+ * @param cls closure (not used)
+ * @param peer potential peer to connect to
+ * @param hello HELLO for this peer (or NULL)
+ * @param err_msg NULL if successful, otherwise contains error message
  */
 static void
 process_peer (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 PeerList *pos;
-
-  if (peer == NULL)
-    {
-      /* last call, schedule 'find_more_peers' again... */
-      schedule_peer_search ();
-      return;
-    }
-  if (hello == NULL)
-    {
-      /* no HELLO known; can not connect, ignore! */
-      return;
-    }
+  struct Peer *pos;
+
+  if (NULL != err_msg)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                _("Error in communication with PEERINFO service: %s\n"),
+                err_msg);
+    GNUNET_PEERINFO_notify_cancel (peerinfo_notify);
+    peerinfo_notify = GNUNET_PEERINFO_notify (cfg,
+                                              GNUNET_NO,
+                                              &process_peer,
+                                              NULL);
+    return;
+  }
+  GNUNET_assert (NULL != peer);
   if (0 == memcmp (&my_identity,
-                   peer, sizeof (struct GNUNET_PeerIdentity)))
-    return;  /* that's me! */
-
-  consider_for_advertising (hello);
-  pos = friends;
-  while (pos != NULL)
+                   peer,
+                   sizeof (struct GNUNET_PeerIdentity)))
+    return;                     /* that's me! */
+  if (NULL == hello)
+  {
+    /* free existing HELLO, if any */
+    pos = GNUNET_CONTAINER_multipeermap_get (peers,
+                                             peer);
+    if (NULL != pos)
     {
-      if (0 == memcmp (&pos->id, peer, sizeof (struct GNUNET_PeerIdentity)))
-       {
-         if (GNUNET_YES == pos->is_connected)
-           return;
-         if (GNUNET_TIME_absolute_get_remaining (pos->blacklisted_until).value > 0)
-           return; /* peer still blacklisted */
-         if (GNUNET_YES == pos->is_friend)
-           {
-             attempt_connect (peer, pos);
-             return;
-           }
-       }
-      pos = pos->next;
+      GNUNET_free_non_null (pos->hello);
+      pos->hello = NULL;
+      if (NULL != pos->filter)
+      {
+        GNUNET_CONTAINER_bloomfilter_free (pos->filter);
+        pos->filter = NULL;
+      }
+      if ( (NULL == pos->mq) &&
+           (GNUNET_NO == pos->is_friend) )
+        free_peer (NULL,
+                   &pos->pid,
+                   pos);
     }
-  if (GNUNET_YES == friends_only)
-    return;
-  if (friend_count < minimum_friend_count)
     return;
-  attempt_connect (peer, NULL);
-}
-
-
-/**
- * Try to add more friends to our connection set.
- */
-static void
-try_add_friends ()
-{
-  struct PeerList *pos;
-
-  pos = friends;
-  while (pos != NULL)
-    {
-      if ( (GNUNET_TIME_absolute_get_remaining (pos->blacklisted_until).value == 0) &&
-          (GNUNET_YES == pos->is_friend) &&
-          (GNUNET_YES != pos->is_connected) )
-       attempt_connect (&pos->id, pos);
-      pos = pos->next;
-    }
-}
-
-
-/**
- * Discard peer entries for blacklisted peers
- * where the blacklisting has expired.
- */
-static void
-discard_old_blacklist_entries ()
-{
-  struct PeerList *pos;
-  struct PeerList *next;
-  struct PeerList *prev;
-
-  next = friends;
-  prev = NULL;
-  while (NULL != (pos = next))
-    {
-      next = pos->next;
-      if ( (GNUNET_NO == pos->is_friend) &&
-          (GNUNET_NO == pos->is_connected) &&
-          (0 == GNUNET_TIME_absolute_get_remaining (pos->blacklisted_until).value) )
-       {
-         /* delete 'pos' from list */
-         if (prev == NULL)
-           friends = next;
-         else
-           prev->next = next;
-         GNUNET_free (pos);
-       }
-      else
-       {
-         prev = pos;
-       }
-    }
-}
-
-
-/**
- * Find more peers that we should connect to and ask the
- * core to establish connections.
- */
-static void
-find_more_peers (void *cls,
-                const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  discard_old_blacklist_entries ();
-  if (target_connection_count <= connection_count)
-    {
-      schedule_peer_search ();
-      return;
-    }
-  if ( (GNUNET_YES == friends_only) ||
-       (friend_count < minimum_friend_count) )
-    {
-      try_add_friends ();
-      schedule_peer_search ();
-      return;
-    }
-  GNUNET_PEERINFO_for_all (cfg,
-                          sched,
-                          NULL,
-                          0, GNUNET_TIME_UNIT_FOREVER_REL,
-                          &process_peer, NULL);
+  }
+  consider_for_advertising (hello);
+  pos = GNUNET_CONTAINER_multipeermap_get (peers,
+                                           peer);
+  if (NULL == pos)
+    pos = make_peer (peer,
+                     hello,
+                     GNUNET_NO);
+  attempt_connect (pos);
 }
 
 
 /**
- * Function called after GNUNET_CORE_connect has succeeded
+ * Function called after #GNUNET_CORE_connect has succeeded
  * (or failed for good).
  *
  * @param cls closure
- * @param server handle to the server, NULL if we failed
  * @param my_id ID of this peer, NULL if we failed
- * @param publicKey public key of this peer, NULL if we failed
  */
 static void
 core_init (void *cls,
-          struct GNUNET_CORE_Handle * server,
-          const struct GNUNET_PeerIdentity *
-          my_id,
-          const struct
-          GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *
-          publicKey)
+           const struct GNUNET_PeerIdentity *my_id)
 {
-  if (server == NULL)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                 _("Failed to connect to core service, can not manage topology!\n"));
-      return;
-    }
-  handle = server;
+  if (NULL == my_id)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Failed to connect to core service, can not manage topology!\n"));
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
   my_identity = *my_id;
-  if (autoconnect)
-    GNUNET_SCHEDULER_add_delayed (sched,
-                                 GNUNET_NO,
-                                 GNUNET_SCHEDULER_PRIORITY_DEFAULT,
-                                 GNUNET_SCHEDULER_NO_TASK,
-                                 GNUNET_TIME_UNIT_SECONDS /* give core time to tell us about existing connections */,
-                                 &find_more_peers,
-                                 NULL);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "I am peer `%s'\n",
+             GNUNET_i2s (my_id));
+  peerinfo_notify = GNUNET_PEERINFO_notify (cfg,
+                                            GNUNET_NO,
+                                           &process_peer,
+                                            NULL);
 }
 
 
 /**
- * gnunet-daemon-topology command line options.
+ * Process friend found in FRIENDS file.
+ *
+ * @param cls pointer to an `unsigned int` to be incremented per friend found
+ * @param pid identity of the friend
  */
-static struct GNUNET_GETOPT_CommandLineOption options[] = {
-  GNUNET_GETOPT_OPTION_END
-};
+static void
+handle_friend (void *cls,
+               const struct GNUNET_PeerIdentity *pid)
+{
+  unsigned int *entries_found = cls;
+  struct Peer *fl;
+
+  if (0 == memcmp (pid,
+                   &my_identity,
+                   sizeof (struct GNUNET_PeerIdentity)))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                _("Found myself `%s' in friend list (useless, ignored)\n"),
+                GNUNET_i2s (pid));
+    return;
+  }
+  (*entries_found)++;
+  fl = make_peer (pid, NULL, GNUNET_YES);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              _("Found friend `%s' in configuration\n"),
+              GNUNET_i2s (&fl->pid));
+}
 
 
 /**
@@ -727,268 +966,170 @@ static struct GNUNET_GETOPT_CommandLineOption options[] = {
 static void
 read_friends_file (const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  char *fn;
-  char *data;
-  size_t pos;
-  GNUNET_HashCode hc;
-  struct stat frstat;
-  struct GNUNET_CRYPTO_HashAsciiEncoded enc;
   unsigned int entries_found;
-  struct PeerList *fl;
 
+  entries_found = 0;
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_filename (cfg,
-                                              "TOPOLOGY",
-                                              "FRIENDS",
-                                              &fn))
-    {
+      GNUNET_FRIENDS_parse (cfg,
+                            &handle_friend,
+                            &entries_found))
+  {
+    if ( (GNUNET_YES == friends_only) ||
+         (minimum_friend_count > 0))
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                 _("Option `%s' in section `%s' not specified!\n"),
-                 "FRIENDS",
-                 "TOPOLOGY");
-      return;
-    }
-  if (GNUNET_OK != GNUNET_DISK_file_test (fn))
-    GNUNET_DISK_fn_write (fn, NULL, 0, GNUNET_DISK_PERM_USER_READ
-        | GNUNET_DISK_PERM_USER_WRITE);
-  if (0 != STAT (fn, &frstat))
-    {
-      if ((friends_only) || (minimum_friend_count > 0))
-        {
-          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                     _("Could not read friends list `%s'\n"), fn);
-         GNUNET_free (fn);
-          return;
-        }
-    }
-  if (frstat.st_size == 0)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                 _("Friends file `%s' is empty.\n"),
-                 fn);
-      GNUNET_free (fn);
-      return;
-    }
-  data = GNUNET_malloc_large (frstat.st_size);
-  if (frstat.st_size !=
-      GNUNET_DISK_fn_read (fn, data, frstat.st_size))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                 _("Failed to read friends list from `%s'\n"), fn);
-      GNUNET_free (fn);
-      GNUNET_free (data);
-      return;
-    }
-  entries_found = 0;
-  pos = 0;
-  while ((pos < frstat.st_size) && isspace (data[pos]))
-    pos++;
-  while ((frstat.st_size >= sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)) &&
-        (pos <= frstat.st_size - sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)))
-    {
-      memcpy (&enc, &data[pos], sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded));
-      if (!isspace (enc.encoding[sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) - 1]))
-       {
-         GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                     _("Syntax error in topology specification at offset %llu, skipping bytes.\n"),
-                     (unsigned long long) pos);
-         pos++;
-         while ((pos < frstat.st_size) && (!isspace (data[pos])))
-           pos++;
-         continue;
-       }
-      enc.encoding[sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) - 1] = '\0';
-      if (GNUNET_OK != GNUNET_CRYPTO_hash_from_string ((char *) &enc, &hc))
-       {
-         GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                     _("Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"),
-                     (unsigned long long) pos,
-                     &enc);
-       }
-      else
-       {
-         entries_found++;
-         fl = GNUNET_malloc (sizeof(struct PeerList));
-         fl->is_friend = GNUNET_YES;
-         fl->id.hashPubKey = hc;
-         fl->next = friends;
-         friends = fl;
-       }
-      pos = pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded);
-      while ((pos < frstat.st_size) && isspace (data[pos]))
-       pos++;
-    }
-  GNUNET_free (data);
-  GNUNET_free (fn);
+                  _("Encountered errors parsing friends list!\n"));
+  }
+  GNUNET_STATISTICS_update (stats,
+                            gettext_noop ("# friends in configuration"),
+                            entries_found,
+                            GNUNET_NO);
   if ( (minimum_friend_count > entries_found) &&
-       (friends_only == GNUNET_NO) )
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                 _("Fewer friends specified than required by minimum friend count. Will only connect to friends.\n"));
-    }
+       (GNUNET_NO == friends_only) )
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                _("Fewer friends specified than required by minimum friend count. Will only connect to friends.\n"));
+  }
   if ( (minimum_friend_count > target_connection_count) &&
-       (friends_only == GNUNET_NO) )
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                 _("More friendly connections required than target total number of connections.\n"));
-    }
+       (GNUNET_NO == friends_only))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                _("More friendly connections required than target total number of connections.\n"));
+  }
 }
 
 
 /**
- * This function is called whenever an encrypted HELLO message is
- * received.
- *
- * @param cls closure
- * @param peer the other peer involved (sender or receiver, NULL
- *        for loopback messages where we are both sender and receiver)
- * @param message the actual HELLO message
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
+ * Hello offer complete. Clean up.
  */
-static int
-handle_encrypted_hello (void *cls,
-                       const struct GNUNET_PeerIdentity * other,
-                       const struct GNUNET_MessageHeader *
-                       message)
+static void
+done_offer_hello (void *cls)
 {
-  if (transport != NULL)
-    GNUNET_TRANSPORT_offer_hello (transport,
-                                 message);
-  return GNUNET_OK;
+  oh = NULL;
 }
 
 
 /**
- * Peerinfo calls this function to let us know about a
- * possible peer that we might want to connect to.
+ * This function is called whenever an encrypted HELLO message is
+ * received.
+ *
+ * @param cls closure with the peer identity of the sender
+ * @param message the actual HELLO message
+ * @return #GNUNET_OK if @a message is well-formed
+ *         #GNUNET_SYSERR if @a message is invalid
  */
-static void
-gather_hello_callback (void *cls,
-                      const struct GNUNET_PeerIdentity *peer,
-                      const struct GNUNET_HELLO_Message *hello,
-                      uint32_t trust)
+static int
+check_hello (void *cls,
+            const struct GNUNET_HELLO_Message *message)
 {
-  if (peer == NULL)
-    {
-      hello_gathering_active = GNUNET_NO;
-      return;
-    }
-  if (hello != NULL)
-    consider_for_advertising (hello);
+  struct GNUNET_PeerIdentity pid;
+
+  if (GNUNET_OK !=
+      GNUNET_HELLO_get_id (message,
+                          &pid))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
 }
 
 
 /**
- * Function to fill send buffer with HELLO.
+ * This function is called whenever an encrypted HELLO message is
+ * received.
  *
- * @param receiver the receiver of the message
- * @param position is the reference to the
- *        first unused position in the buffer where GNUnet is building
- *        the message
- * @param padding is the number of bytes left in that buffer.
- * @return the number of bytes written to
- *   that buffer (must be a positive number).
+ * @param cls closure with the peer identity of the sender
+ * @param message the actual HELLO message
  */
-static unsigned int
-hello_advertising (void *cls,
-                  const struct GNUNET_PeerIdentity *
-                  receiver,
-                  void *position, 
-                  xsize_t padding)
+static void
+handle_hello (void *cls,
+             const struct GNUNET_HELLO_Message *message)
 {
-  struct PeerList *pl;
-  struct HelloList *pos;
-  struct HelloList *prev;
-  struct HelloList *next;
-  uint16_t size;
+  const struct GNUNET_PeerIdentity *other = cls;
+  struct Peer *peer;
+  struct GNUNET_PeerIdentity pid;
 
-  pl = friends;
-  while (pl != NULL)
-    {
-      if (0 == memcmp (&pl->id, receiver, sizeof (struct GNUNET_PeerIdentity)))
-       break;
-      pl = pl->next;
-    }
-  if (pl == NULL)
-    {
-      GNUNET_break (0);
-      return 0;
-    }
-  /* find applicable HELLOs */
-  prev = NULL;
-  next = hellos;
-  while (NULL != (pos = next))
-    {
-      next = pos->next;
-      if (GNUNET_NO ==
-         GNUNET_CONTAINER_bloomfilter_test (pos->filter,
-                                            &receiver->hashPubKey))
-       break;
-      if (0 == GNUNET_TIME_absolute_get_remaining (pos->expiration).value)
-       {
-         /* time to discard... */
-         if (prev != NULL)
-           prev->next = next;
-         else
-           hellos = next;
-         GNUNET_CONTAINER_bloomfilter_free (pos->filter);
-         GNUNET_free (pos);
-       }
-      else
-       {
-         prev = pos;
-       }
-    }
-  if (pos != NULL)
-    {
-      size = GNUNET_HELLO_size (pos->msg);
-      if (size < padding)
-       {
-         memcpy (position, pos->msg, size);
-         GNUNET_CONTAINER_bloomfilter_add (pos->filter,
-                                           &receiver->hashPubKey);
-       }
-      else
-       {
-         size = 0;
-       }
-      return size;
-    }
-  if ( (GNUNET_NO == hello_gathering_active) &&
-       (GNUNET_TIME_absolute_get_duration (last_hello_gather_time).value >
-       MIN_HELLO_GATHER_DELAY.value) )
-    {
-      hello_gathering_active = GNUNET_YES;
-      last_hello_gather_time = GNUNET_TIME_absolute_get();
-      GNUNET_PEERINFO_for_all (cfg,
-                              sched,
-                              NULL,
-                              0, GNUNET_TIME_UNIT_FOREVER_REL,
-                              &gather_hello_callback, NULL);
-    }
-  return 0;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Received encrypted HELLO from peer `%s'",
+              GNUNET_i2s (other));
+  GNUNET_assert (GNUNET_OK ==
+                GNUNET_HELLO_get_id (message,
+                                     &pid));
+  GNUNET_STATISTICS_update (stats,
+                            gettext_noop ("# HELLO messages received"),
+                            1,
+                            GNUNET_NO);
+  peer = GNUNET_CONTAINER_multipeermap_get (peers,
+                                           &pid);
+  if (NULL == peer)
+  {
+    if ( (GNUNET_YES == friends_only) ||
+         (friend_count < minimum_friend_count) )
+      return;
+  }
+  else
+  {
+    if ( (GNUNET_YES != peer->is_friend) &&
+         (GNUNET_YES == friends_only) )
+      return;
+    if ((GNUNET_YES != peer->is_friend) &&
+        (friend_count < minimum_friend_count))
+      return;
+  }
+  if (NULL != oh)
+    GNUNET_TRANSPORT_offer_hello_cancel (oh);
+  oh = GNUNET_TRANSPORT_offer_hello (cfg,
+                                     &message->header,
+                                     &done_offer_hello,
+                                     NULL);
 }
 
 
 /**
  * Last task run during shutdown.  Disconnects us from
  * the transport and core.
+ *
+ * @param cls unused, NULL
  */
 static void
-cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+cleaning_task (void *cls)
 {
-  struct PeerList *pl;
-
-  GNUNET_TRANSPORT_disconnect (transport);
-  transport = NULL;
-  GNUNET_CORE_disconnect (handle);
-  handle = NULL;
-  while (NULL != (pl = friends))
-    {
-      friends = pl->next;
-      GNUNET_free (pl);
-    }
+  if (NULL != peerinfo_notify)
+  {
+    GNUNET_PEERINFO_notify_cancel (peerinfo_notify);
+    peerinfo_notify = NULL;
+  }
+  if (NULL != handle)
+  {
+    GNUNET_CORE_disconnect (handle);
+    handle = NULL;
+  }
+  whitelist_peers ();
+  if (NULL != add_task)
+  {
+    GNUNET_SCHEDULER_cancel (add_task);
+    add_task = NULL;
+  }
+  if (NULL != oh)
+  {
+    GNUNET_TRANSPORT_offer_hello_cancel (oh);
+    oh = NULL;
+  }
+  GNUNET_CONTAINER_multipeermap_iterate (peers,
+                                         &free_peer,
+                                         NULL);
+  GNUNET_CONTAINER_multipeermap_destroy (peers);
+  peers = NULL;
+  if (NULL != ats)
+  {
+    GNUNET_ATS_connectivity_done (ats);
+    ats = NULL;
+  }
+  if (NULL != stats)
+  {
+    GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
+    stats = NULL;
+  }
 }
 
 
@@ -996,76 +1137,74 @@ cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * 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,
-     struct GNUNET_SCHEDULER_Handle * s,
      char *const *args,
      const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle * c)
+     const struct GNUNET_CONFIGURATION_Handle *c)
 {
-  struct GNUNET_CORE_MessageHandler handlers[] =
-    {
-      { &handle_encrypted_hello, GNUNET_MESSAGE_TYPE_HELLO, 0},
-      { NULL, 0, 0 }
-    };
+  struct GNUNET_MQ_MessageHandler handlers[] = {
+    GNUNET_MQ_hd_var_size (hello,
+                           GNUNET_MESSAGE_TYPE_HELLO,
+                           struct GNUNET_HELLO_Message,
+                           NULL),
+    GNUNET_MQ_handler_end ()
+  };
   unsigned long long opt;
 
-  sched = s;
   cfg = c;
-  autoconnect = GNUNET_CONFIGURATION_get_value_yesno (cfg,
-                                                     "TOPOLOGY",
-                                                     "AUTOCONNECT");
-  friends_only = GNUNET_CONFIGURATION_get_value_yesno (cfg,
-                                                      "TOPOLOGY",
-                                                      "FRIENDS-ONLY");
+  stats = GNUNET_STATISTICS_create ("topology", cfg);
+  friends_only =
+      GNUNET_CONFIGURATION_get_value_yesno (cfg,
+                                            "TOPOLOGY",
+                                            "FRIENDS-ONLY");
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_number (cfg,
-                                            "TOPOLOGY",
-                                            "MINIMUM-FRIENDS",
-                                            &opt))
+                                             "TOPOLOGY",
+                                             "MINIMUM-FRIENDS",
+                                             &opt))
     opt = 0;
   minimum_friend_count = (unsigned int) opt;
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_number (cfg,
-                                            "TOPOLOGY",
-                                            "TARGET-CONNECTION-COUNT",
-                                            &opt))
+                                             "TOPOLOGY",
+                                             "TARGET-CONNECTION-COUNT",
+                                             &opt))
     opt = 16;
   target_connection_count = (unsigned int) opt;
-
-  if ( (friends_only == GNUNET_YES) ||
-       (minimum_friend_count > 0) )
-    read_friends_file (cfg);
-
-  transport = GNUNET_TRANSPORT_connect (sched,
-                                       cfg,
-                                       NULL,
-                                       NULL,
-                                       NULL,
-                                       NULL);
-  GNUNET_CORE_connect (sched,
-                      cfg,
-                      GNUNET_TIME_UNIT_FOREVER_REL,
-                      NULL,
-                      &core_init,
-                      &connect_notify,
-                      &disconnect_notify,
-                      &hello_advertising,
-                      NULL, GNUNET_NO,
-                      NULL, GNUNET_NO,
-                      handlers);
-
-  GNUNET_SCHEDULER_add_delayed (sched,
-                                GNUNET_YES,
-                                GNUNET_SCHEDULER_PRIORITY_IDLE,
-                                GNUNET_SCHEDULER_NO_TASK,
-                                GNUNET_TIME_UNIT_FOREVER_REL,
-                                &cleaning_task, NULL);
+  peers = GNUNET_CONTAINER_multipeermap_create (target_connection_count * 2,
+                                                GNUNET_NO);
+  read_friends_file (cfg);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Topology would like %u connections with at least %u friends\n",
+              target_connection_count,
+              minimum_friend_count);
+  if ( (friend_count < minimum_friend_count) &&
+       (NULL == blacklist))
+    blacklist = GNUNET_TRANSPORT_blacklist (cfg,
+                                            &blacklist_check,
+                                            NULL);
+  ats = GNUNET_ATS_connectivity_init (cfg);
+  handle = GNUNET_CORE_connect (cfg,
+                               NULL,
+                               &core_init,
+                               &connect_notify,
+                               &disconnect_notify,
+                               handlers);
+  GNUNET_SCHEDULER_add_shutdown (&cleaning_task,
+                                NULL);
+  if (NULL == handle)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Failed to connect to `%s' service.\n"),
+                "core");
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
 }
 
 
@@ -1079,16 +1218,38 @@ run (void *cls,
 int
 main (int argc, char *const *argv)
 {
+  static const struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_OPTION_END
+  };
   int ret;
 
-  ret = (GNUNET_OK ==
-         GNUNET_PROGRAM_run (argc,
-                             argv,
-                             "topology",
-                            _("GNUnet topology control (maintaining P2P mesh and F2F constraints)"),
-                            options,
-                            &run, NULL)) ? 0 : 1;
+  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
+    return 2;
+
+  ret =
+      (GNUNET_OK ==
+       GNUNET_PROGRAM_run (argc, argv,
+                           "gnunet-daemon-topology",
+                           _("GNUnet topology control"),
+                           options, &run, NULL)) ? 0 : 1;
+  GNUNET_free ((void*) argv);
   return ret;
 }
 
+
+#if defined(LINUX) && defined(__GLIBC__)
+#include <malloc.h>
+
+/**
+ * MINIMIZE heap size (way below 128k) since this process doesn't need much.
+ */
+void __attribute__ ((constructor))
+GNUNET_ARM_memory_init ()
+{
+  mallopt (M_TRIM_THRESHOLD, 4 * 1024);
+  mallopt (M_TOP_PAD, 1 * 1024);
+  malloc_trim (0);
+}
+#endif
+
 /* end of gnunet-daemon-topology.c */