first batch of license fixes (boring)
[oweals/gnunet.git] / src / transport / gnunet-service-transport_neighbours.c
index 0e53f9b6f1a79d47c725e79616dfb06537f21a93..3757c0ee32e2a71bdc9486c8552601f8749d1491 100644 (file)
@@ -1,21 +1,16 @@
 /*
      This file is part of GNUnet.
-     Copyright (C) 2010-2015 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2010-2015 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 3, or (at your
-     option) any later version.
+     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 3 of the License,
+     or (at your option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     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., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
+     Affero General Public License for more details.
 */
 
 /**
@@ -26,8 +21,6 @@
 #include "platform.h"
 #include "gnunet_ats_service.h"
 #include "gnunet-service-transport_ats.h"
-#include "gnunet-service-transport_blacklist.h"
-#include "gnunet-service-transport_clients.h"
 #include "gnunet-service-transport_neighbours.h"
 #include "gnunet-service-transport_manipulation.h"
 #include "gnunet-service-transport_plugins.h"
@@ -461,52 +454,11 @@ struct NeighbourMapEntry
 };
 
 
-/**
- * Context for blacklist checks and the #try_connect_bl_check_cont()
- * function.  Stores information about ongoing blacklist checks.
- */
-struct BlackListCheckContext
-{
-
-  /**
-   * We keep blacklist checks in a DLL.
-   */
-  struct BlackListCheckContext *next;
-
-  /**
-   * We keep blacklist checks in a DLL.
-   */
-  struct BlackListCheckContext *prev;
-
-  /**
-   * Address that is being checked.
-   */
-  struct NeighbourAddress na;
-
-  /**
-   * Handle to the ongoing blacklist check.
-   */
-  struct GST_BlacklistCheck *bc;
-};
-
-
 /**
  * Hash map from peer identities to the respective `struct NeighbourMapEntry`.
  */
 static struct GNUNET_CONTAINER_MultiPeerMap *neighbours;
 
-/**
- * We keep blacklist checks in a DLL so that we can find
- * the 'sessions' in their 'struct NeighbourAddress' if
- * a session goes down.
- */
-static struct BlackListCheckContext *bc_head;
-
-/**
- * We keep blacklist checks in a DLL.
- */
-static struct BlackListCheckContext *bc_tail;
-
 /**
  * List of pending blacklist checks: head
  */
@@ -556,6 +508,41 @@ print_ack_state (enum GST_ACK_State s)
 }
 
 
+/**
+ * Send information about a new outbound quota to our clients.
+ * Note that the outbound quota is enforced client-side (i.e.
+ * in libgnunettransport).
+ *
+ * @param n affected peer
+ */
+static void
+send_outbound_quota_to_clients (struct NeighbourMapEntry *n)
+{
+  struct QuotaSetMessage q_msg;
+  struct GNUNET_BANDWIDTH_Value32NBO bandwidth_min;
+
+  if (! GNUNET_TRANSPORT_is_connected (n->state))
+    return;
+#if IGNORE_INBOUND_QUOTA
+  bandwidth_min = n->primary_address.bandwidth_out;
+#else
+  bandwidth_min = GNUNET_BANDWIDTH_value_min (n->primary_address.bandwidth_out,
+                                              n->neighbour_receive_quota);
+#endif
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Sending outbound quota of %u Bps for peer `%s' to all clients\n",
+              ntohl (bandwidth_min.value__),
+              GNUNET_i2s (&n->id));
+  q_msg.header.size = htons (sizeof (struct QuotaSetMessage));
+  q_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA);
+  q_msg.quota = bandwidth_min;
+  q_msg.peer = n->id;
+  GST_clients_broadcast (&q_msg.header,
+                        GNUNET_NO);
+}
+
+
 /**
  * Notify our clients that another peer connected to us.
  *
@@ -624,6 +611,8 @@ neighbours_changed_notification (const struct GNUNET_PeerIdentity *peer,
                                  struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
                                  struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out)
 {
+  (void) bandwidth_in;
+  (void) bandwidth_out;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Notifying about change for peer `%s' with address `%s' in state `%s' timing out at %s\n",
               GNUNET_i2s (peer),
@@ -668,40 +657,6 @@ test_connected (struct NeighbourMapEntry *n)
 }
 
 
-/**
- * Send information about a new outbound quota to our clients.
- * Note that the outbound quota is enforced client-side (i.e.
- * in libgnunettransport).
- *
- * @param n affected peer
- */
-static void
-send_outbound_quota_to_clients (struct NeighbourMapEntry *n)
-{
-  struct QuotaSetMessage q_msg;
-  struct GNUNET_BANDWIDTH_Value32NBO bandwidth_min;
-
-  if (! GNUNET_TRANSPORT_is_connected (n->state))
-    return;
-#if IGNORE_INBOUND_QUOTA
-  bandwidth_min = n->primary_address.bandwidth_out;
-#else
-  bandwidth_min = GNUNET_BANDWIDTH_value_min (n->primary_address.bandwidth_out,
-                                              n->neighbour_receive_quota);
-#endif
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Sending outbound quota of %u Bps for peer `%s' to all clients\n",
-              ntohl (bandwidth_min.value__),
-              GNUNET_i2s (&n->id));
-  q_msg.header.size = htons (sizeof (struct QuotaSetMessage));
-  q_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA);
-  q_msg.quota = bandwidth_min;
-  q_msg.peer = n->id;
-  GST_clients_broadcast (&q_msg.header, GNUNET_NO);
-}
-
-
 /**
  * We don't need a given neighbour address any more.
  * Release its resources and give appropriate notifications
@@ -736,11 +691,9 @@ free_address (struct NeighbourAddress *na)
  * clean up after disconnect).
  *
  * @param cls the `struct NeighbourMapEntry` for which we are running
- * @param tc scheduler context (unused)
  */
 static void
-master_task (void *cls,
-            const struct GNUNET_SCHEDULER_TaskContext *tc);
+master_task (void *cls);
 
 
 /**
@@ -779,9 +732,9 @@ set_state_and_timeout (struct NeighbourMapEntry *n,
   {
     /* new timeout is earlier, reschedule master task */
     GNUNET_SCHEDULER_cancel (n->task);
-    n->task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining (timeout),
-                                            &master_task,
-                                            n);
+    n->task = GNUNET_SCHEDULER_add_at (timeout,
+                                       &master_task,
+                                       n);
   }
   n->timeout = timeout;
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -1037,6 +990,10 @@ send_disconnect_cont (void *cls,
 {
   struct NeighbourMapEntry *n;
 
+  (void) cls;
+  (void) result;
+  (void) payload;
+  (void) physical;
   n = lookup_neighbour (target);
   if (NULL == n)
     return; /* already gone */
@@ -1175,10 +1132,12 @@ disconnect_neighbour (struct NeighbourMapEntry *n)
  * our own receive rate and informs the neighbour about
  * the new quota.
  *
- * @param n neighbour entry to change qutoa for
+ * @param n neighbour entry to change quota for
  * @param quota new quota
+ * @return #GNUNET_YES if @a n is still valid, #GNUNET_NO if
+ *   @a n was freed
  */
-static void
+static int
 set_incoming_quota (struct NeighbourMapEntry *n,
                     struct GNUNET_BANDWIDTH_Value32NBO quota)
 {
@@ -1194,23 +1153,25 @@ set_incoming_quota (struct NeighbourMapEntry *n,
     sqm.header.size = htons (sizeof (struct GNUNET_ATS_SessionQuotaMessage));
     sqm.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_QUOTA);
     sqm.quota = quota.value__;
-    (void) send_with_session (n,
-                              &sqm,
-                              sizeof (sqm),
-                              UINT32_MAX - 1,
-                              GNUNET_TIME_UNIT_FOREVER_REL,
-                              GNUNET_NO,
-                              NULL, NULL);
-    return;
+    if (NULL != n->primary_address.session)
+      (void) send_with_session (n,
+                                &sqm,
+                                sizeof (sqm),
+                                UINT32_MAX - 1,
+                                GNUNET_TIME_UNIT_FOREVER_REL,
+                                GNUNET_NO,
+                                NULL, NULL);
+    return GNUNET_YES;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Disconnecting peer `%4s' due to SET_QUOTA\n",
+              "Disconnecting peer `%s' due to SET_QUOTA\n",
               GNUNET_i2s (&n->id));
   if (GNUNET_YES == test_connected (n))
     GNUNET_STATISTICS_update (GST_stats,
                               gettext_noop ("# disconnects due to quota of 0"),
                               1, GNUNET_NO);
   disconnect_neighbour (n);
+  return GNUNET_NO;
 }
 
 
@@ -1239,8 +1200,10 @@ set_primary_address (struct NeighbourMapEntry *n,
     if (n->primary_address.bandwidth_in.value__ != bandwidth_in.value__)
     {
       n->primary_address.bandwidth_in = bandwidth_in;
-      set_incoming_quota (n,
-                          bandwidth_in);
+      if (GNUNET_YES !=
+         set_incoming_quota (n,
+                             bandwidth_in))
+       return;
     }
     if (n->primary_address.bandwidth_out.value__ != bandwidth_out.value__)
     {
@@ -1280,8 +1243,10 @@ set_primary_address (struct NeighbourMapEntry *n,
   /* subsystems about address use */
   GST_validation_set_address_use (n->primary_address.address,
                                   GNUNET_YES);
-  set_incoming_quota (n,
-                      bandwidth_in);
+  if (GNUNET_YES !=
+      set_incoming_quota (n,
+                         bandwidth_in))
+    return;
   send_outbound_quota_to_clients (n);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Neighbour `%s' switched to address `%s'\n",
@@ -1339,12 +1304,12 @@ transmit_send_continuation (void *cls,
   if (bytes_in_send_queue < mq->message_buf_size)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Bytes_in_send_queue `%u', Message_size %u, result: %s, payload %u, on wire %u\n",
+                "Bytes_in_send_queue `%llu', Message_size %u, result: %s, payload %u, on wire %u\n",
                 bytes_in_send_queue,
-                mq->message_buf_size,
+                (unsigned int) mq->message_buf_size,
                 (GNUNET_OK == success) ? "OK" : "FAIL",
-                size_payload,
-                physical);
+                (unsigned int) size_payload,
+                (unsigned int) physical);
     GNUNET_break (0);
   }
 
@@ -1368,7 +1333,7 @@ transmit_send_continuation (void *cls,
              "Sending message to `%s' of type %u with %u bytes was a %s\n",
              GNUNET_i2s (receiver),
               ntohs (((struct GNUNET_MessageHeader *) mq->message_buf)->type),
-              mq->message_buf_size,
+              (unsigned int) mq->message_buf_size,
               (success == GNUNET_OK) ? "success" : "FAILURE");
   if (NULL != mq->cont)
     mq->cont (mq->cont_cls,
@@ -1437,6 +1402,14 @@ try_transmission_to_peer (struct NeighbourMapEntry *n)
   }
   if (NULL == mq)
     return;                     /* no more messages */
+  if (NULL == n->primary_address.address)
+  {
+    /* transmit_send_continuation() caused us to drop session,
+       can't try transmission anymore. */
+    return;
+  }
+
+
   GNUNET_CONTAINER_DLL_remove (n->messages_head,
                                n->messages_tail,
                                mq);
@@ -1444,7 +1417,7 @@ try_transmission_to_peer (struct NeighbourMapEntry *n)
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Giving message with %u bytes to plugin session %p\n",
-              mq->message_buf_size,
+              (unsigned int) mq->message_buf_size,
               n->primary_address.session);
   (void) send_with_session (n,
                            mq->message_buf,
@@ -1700,16 +1673,12 @@ GST_neighbours_calculate_receive_delay (const struct GNUNET_PeerIdentity *sender
   }
   if (NULL == (n = lookup_neighbour (sender)))
   {
-    GST_neighbours_try_connect (sender);
-    if (NULL == (n = lookup_neighbour (sender)))
-    {
-      GNUNET_STATISTICS_update (GST_stats,
-                                gettext_noop
-                                ("# messages discarded due to lack of neighbour record"),
-                                1, GNUNET_NO);
-      *do_forward = GNUNET_NO;
-      return GNUNET_TIME_UNIT_ZERO;
-    }
+    GNUNET_STATISTICS_update (GST_stats,
+                              gettext_noop ("# messages discarded due to lack of neighbour record"),
+                              1,
+                              GNUNET_NO);
+    *do_forward = GNUNET_NO;
+    return GNUNET_TIME_UNIT_ZERO;
   }
   if (! test_connected (n))
   {
@@ -1813,14 +1782,14 @@ GST_neighbours_send (const struct GNUNET_PeerIdentity *target,
   mq = GNUNET_malloc (sizeof (struct MessageQueue) + msg_size);
   mq->cont = cont;
   mq->cont_cls = cont_cls;
-  memcpy (&mq[1], msg, msg_size);
+  GNUNET_memcpy (&mq[1], msg, msg_size);
   mq->message_buf = (const char *) &mq[1];
   mq->message_buf_size = msg_size;
   mq->timeout = GNUNET_TIME_relative_to_absolute (timeout);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Enqueueing %u bytes to send to peer %s\n",
-              msg_size,
+              (unsigned int) msg_size,
               GNUNET_i2s (target));
   GNUNET_CONTAINER_DLL_insert_tail (n->messages_head,
                                     n->messages_tail,
@@ -1852,6 +1821,9 @@ send_session_syn_cont (void *cls,
 {
   struct NeighbourMapEntry *n;
 
+  (void) cls;
+  (void) size_payload;
+  (void) size_on_wire;
   n = lookup_neighbour (target);
   if (NULL == n)
   {
@@ -2025,6 +1997,9 @@ send_session_syn_ack_cont (void *cls,
 {
   struct NeighbourMapEntry *n;
 
+  (void) cls;
+  (void) size_payload;
+  (void) size_on_wire;
   n = lookup_neighbour (target);
   if (NULL == n)
   {
@@ -2164,7 +2139,9 @@ inbound_bw_tracker_update (void *cls)
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "New inbound delay for peer `%s' is %llu ms\n",
               GNUNET_i2s (&n->id),
-              delay.rel_value_us / 1000);
+              (unsigned long long) delay.rel_value_us / 1000LL);
+  if (NULL == n->primary_address.session)
+    return;
   papi->update_inbound_delay (papi->cls,
                               &n->id,
                               n->primary_address.session,
@@ -2183,13 +2160,18 @@ setup_neighbour (const struct GNUNET_PeerIdentity *peer)
 {
   struct NeighbourMapEntry *n;
 
+  if (0 ==
+      memcmp (&GST_my_identity,
+              peer,
+              sizeof (struct GNUNET_PeerIdentity)))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Cowardly refusing to consider myself my neighbour!\n");
+    return NULL;
+  }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Creating new neighbour entry for `%s'\n",
              GNUNET_i2s (peer));
-  GNUNET_assert (0 !=
-                 memcmp (&GST_my_identity,
-                         peer,
-                         sizeof (struct GNUNET_PeerIdentity)));
   n = GNUNET_new (struct NeighbourMapEntry);
   n->id = *peer;
   n->ack_state = ACK_UNDEFINED;
@@ -2249,139 +2231,6 @@ struct BlacklistCheckSwitchContext
 };
 
 
-/**
- * Black list check result for try_connect call
- * If connection to the peer is allowed request adddress and
- *
- * @param cls blc_ctx bl context
- * @param peer the peer
- * @param address address associated with the request
- * @param session session associated with the request
- * @param result #GNUNET_OK if the connection is allowed,
- *               #GNUNET_NO if not,
- *               #GNUNET_SYSERR if operation was aborted
- */
-static void
-try_connect_bl_check_cont (void *cls,
-                           const struct GNUNET_PeerIdentity *peer,
-                          const struct GNUNET_HELLO_Address *address,
-                          struct GNUNET_ATS_Session *session,
-                           int result)
-{
-  struct BlacklistCheckSwitchContext *blc_ctx = cls;
-  struct NeighbourMapEntry *n;
-
-  GNUNET_CONTAINER_DLL_remove (pending_bc_head,
-                               pending_bc_tail,
-                               blc_ctx);
-  GNUNET_free (blc_ctx);
-  if (GNUNET_OK != result)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                _("Blacklisting disapproved to connect to peer `%s'\n"),
-                GNUNET_i2s (peer));
-    return;
-  }
-
-  /* Setup a new neighbour */
-  if (NULL != lookup_neighbour(peer))
-    return; /* The neighbor was created in the meantime while waited for BL clients */
-
-  n = setup_neighbour (peer);
-
-  /* Request address suggestions for this peer */
-  set_state_and_timeout (n,
-                         GNUNET_TRANSPORT_PS_INIT_ATS,
-                         GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
-}
-
-
-/**
- * Try to create a connection to the given target (eventually).
- *
- * @param target peer to try to connect to
- */
-void
-GST_neighbours_try_connect (const struct GNUNET_PeerIdentity *target)
-{
-  struct NeighbourMapEntry *n;
-  struct GST_BlacklistCheck *blc;
-  struct BlacklistCheckSwitchContext *blc_ctx;
-
-  if (NULL == neighbours)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Asked to connect to peer `%s' during shutdown\n",
-                GNUNET_i2s (target));
-    return; /* during shutdown, do nothing */
-  }
-  n = lookup_neighbour (target);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-             "Asked to connect to peer `%s' (state: %s)\n",
-              GNUNET_i2s (target),
-              (NULL != n) ? GNUNET_TRANSPORT_ps2s(n->state) : "NEW PEER");
-  if (NULL != n)
-  {
-    switch (n->state)
-    {
-    case GNUNET_TRANSPORT_PS_NOT_CONNECTED:
-      /* this should not be possible */
-      GNUNET_break (0);
-      free_neighbour (n);
-      break;
-    case GNUNET_TRANSPORT_PS_INIT_ATS:
-    case GNUNET_TRANSPORT_PS_SYN_SENT:
-    case GNUNET_TRANSPORT_PS_SYN_RECV_ATS:
-    case GNUNET_TRANSPORT_PS_SYN_RECV_ACK:
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Ignoring request to try to connect to `%s', already trying!\n",
-                 GNUNET_i2s (target));
-      return; /* already trying */
-    case GNUNET_TRANSPORT_PS_CONNECTED:
-    case GNUNET_TRANSPORT_PS_RECONNECT_ATS:
-    case GNUNET_TRANSPORT_PS_RECONNECT_SENT:
-    case GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT:
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                  "Ignoring request to try to connect, already connected to `%s'!\n",
-                 GNUNET_i2s (target));
-      return; /* already connected */
-    case GNUNET_TRANSPORT_PS_DISCONNECT:
-      /* get rid of remains, ready to re-try immediately */
-      free_neighbour (n);
-      break;
-    case GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED:
-      /* should not be possible */
-      GNUNET_assert (0);
-      return;
-    default:
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Unhandled state `%s'\n",
-                  GNUNET_TRANSPORT_ps2s (n->state));
-      GNUNET_break (0);
-      free_neighbour (n);
-      break;
-    }
-  }
-
-  /* Do blacklist check if connecting to this peer is allowed */
-  blc_ctx = GNUNET_new (struct BlacklistCheckSwitchContext);
-  GNUNET_CONTAINER_DLL_insert (pending_bc_head,
-                               pending_bc_tail,
-                               blc_ctx);
-
-  if (NULL !=
-      (blc = GST_blacklist_test_allowed (target,
-                                         NULL,
-                                         &try_connect_bl_check_cont,
-                                         blc_ctx,
-                                        NULL,
-                                        NULL)))
-  {
-    blc_ctx->blc = blc;
-  }
-}
-
-
 /**
  * We received a 'SYN' message from the other peer.
  * Consider switching to it.
@@ -2417,11 +2266,20 @@ GST_neighbours_handle_session_syn (const struct GNUNET_MessageHeader *message,
   scm = (const struct TransportSynMessage *) message;
   GNUNET_break_op (0 == ntohl (scm->reserved));
   ts = GNUNET_TIME_absolute_ntoh (scm->timestamp);
+  if (0 ==
+      memcmp (&GST_my_identity,
+              peer,
+              sizeof (struct GNUNET_PeerIdentity)))
+  {
+    /* loopback connection-to-self, ignore */
+    return GNUNET_SYSERR;
+  }
   n = lookup_neighbour (peer);
   if (NULL == n)
   {
     /* This is a new neighbour and set to not connected */
     n = setup_neighbour (peer);
+    GNUNET_assert (NULL != n);
   }
 
   /* Remember this SYN message in neighbour */
@@ -2491,6 +2349,7 @@ GST_neighbours_handle_session_syn (const struct GNUNET_MessageHeader *message,
     /* Get rid of remains and re-try */
     free_neighbour (n);
     n = setup_neighbour (peer);
+    GNUNET_assert (NULL != n);
     /* Remember the SYN time stamp for ACK message */
     n->ack_state = ACK_SEND_SYN_ACK;
     n->connect_ack_timestamp = ts;
@@ -2558,8 +2417,10 @@ try_run_fast_ats_update (const struct GNUNET_HELLO_Address *address,
   if (n->primary_address.bandwidth_in.value__ != bandwidth_in.value__)
   {
     n->primary_address.bandwidth_in = bandwidth_in;
-    set_incoming_quota (n,
-                        bandwidth_in);
+    if (GNUNET_YES !=
+       set_incoming_quota (n,
+                           bandwidth_in))
+      return GNUNET_NO;
   }
   if (n->primary_address.bandwidth_out.value__ != bandwidth_out.value__)
   {
@@ -2598,7 +2459,10 @@ switch_address_bl_check_cont (void *cls,
     goto cleanup;
 
   papi = GST_plugins_find (address->transport_name);
-  GNUNET_assert (NULL != papi);
+  if (NULL == papi) {
+    /* This can happen during shutdown. */
+    goto cleanup;
+  }
 
   if (GNUNET_NO == result)
   {
@@ -2668,6 +2532,12 @@ switch_address_bl_check_cont (void *cls,
   if (NULL == (n = lookup_neighbour (peer)))
   {
     n = setup_neighbour (peer);
+    if (NULL == n)
+    {
+      /* not sure how this can happen... */
+      GNUNET_break (0);
+      goto cleanup;
+    }
     n->state = GNUNET_TRANSPORT_PS_INIT_ATS;
   }
 
@@ -2961,6 +2831,7 @@ send_utilization_data (void *cls,
   uint32_t bps_out;
   struct GNUNET_TIME_Relative delta;
 
+  (void) cls;
   if ( (GNUNET_YES != test_connected (n)) ||
        (NULL == n->primary_address.address) )
     return GNUNET_OK;
@@ -2991,13 +2862,12 @@ send_utilization_data (void *cls,
 /**
  * Task transmitting utilization in a regular interval
  *
- * @param cls the 'struct NeighbourMapEntry' for which we are running
- * @param tc scheduler context (unused)
+ * @param cls the `struct NeighbourMapEntry` for which we are running
  */
 static void
-utilization_transmission (void *cls,
-                          const struct GNUNET_SCHEDULER_TaskContext *tc)
+utilization_transmission (void *cls)
 {
+  (void) cls;
   util_transmission_tk = NULL;
   GNUNET_CONTAINER_multipeermap_iterate (neighbours,
                                          &send_utilization_data,
@@ -3061,11 +2931,9 @@ GST_neighbours_notify_data_sent (const struct GNUNET_HELLO_Address *address,
  * clean up after disconnect).
  *
  * @param cls the 'struct NeighbourMapEntry' for which we are running
- * @param tc scheduler context (unused)
  */
 static void
-master_task (void *cls,
-            const struct GNUNET_SCHEDULER_TaskContext *tc)
+master_task (void *cls)
 {
   struct NeighbourMapEntry *n = cls;
   struct GNUNET_TIME_Relative delay;
@@ -3255,6 +3123,7 @@ GST_neighbours_handle_session_syn_ack (const struct GNUNET_MessageHeader *messag
   struct GNUNET_TIME_Absolute ts;
   struct NeighbourMapEntry *n;
 
+  (void) session;
   if (ntohs (message->size) != sizeof (struct TransportSynMessage))
   {
     GNUNET_break_op (0);
@@ -3393,25 +3262,7 @@ GST_neighbours_session_terminated (const struct GNUNET_PeerIdentity *peer,
                                    struct GNUNET_ATS_Session *session)
 {
   struct NeighbourMapEntry *n;
-  struct BlackListCheckContext *bcc;
-  struct BlackListCheckContext *bcc_next;
 
-  /* make sure to cancel all ongoing blacklist checks involving 'session' */
-  bcc_next = bc_head;
-  while (NULL != (bcc = bcc_next))
-  {
-    bcc_next = bcc->next;
-    if (bcc->na.session == session)
-    {
-      if (NULL != bcc->bc)
-        GST_blacklist_test_cancel (bcc->bc);
-      GNUNET_HELLO_address_free (bcc->na.address);
-      GNUNET_CONTAINER_DLL_remove (bc_head,
-                                  bc_tail,
-                                  bcc);
-      GNUNET_free (bcc);
-    }
-  }
   if (NULL == (n = lookup_neighbour (peer)))
     return GNUNET_NO; /* can't affect us */
   if (session != n->primary_address.session)
@@ -3446,11 +3297,9 @@ GST_neighbours_session_terminated (const struct GNUNET_PeerIdentity *peer,
     /* The session used to send the SYN terminated:
      * this implies a connect error*/
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Failed to send SYN in %s with `%s' %p: session terminated\n",
-                "CONNECT_SENT",
+                "Failed to send SYN in CONNECT_SENT with `%s' %p: session terminated\n",
                 GST_plugins_a2s (n->primary_address.address),
-                n->primary_address.session,
-                GNUNET_i2s (peer));
+                n->primary_address.session);
 
     /* Destroy the address since it cannot be used */
     unset_primary_address (n);
@@ -3476,11 +3325,9 @@ GST_neighbours_session_terminated (const struct GNUNET_PeerIdentity *peer,
     break;
   case GNUNET_TRANSPORT_PS_RECONNECT_SENT:
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Failed to send SYN in %s with `%s' %p: session terminated\n",
-                "RECONNECT_SENT",
+                "Failed to send SYN in RECONNECT_SENT with `%s' %p: session terminated\n",
                 GST_plugins_a2s (n->primary_address.address),
-                n->primary_address.session,
-                GNUNET_i2s (peer));
+                n->primary_address.session);
     /* Destroy the address since it cannot be used */
     unset_primary_address (n);
     set_state_and_timeout (n,
@@ -3550,6 +3397,7 @@ GST_neighbours_handle_session_ack (const struct GNUNET_MessageHeader *message,
 {
   struct NeighbourMapEntry *n;
 
+  (void) session;
   if (ntohs (message->size) != sizeof (struct GNUNET_MessageHeader))
   {
     GNUNET_break_op (0);
@@ -3644,11 +3492,9 @@ GST_neighbours_test_connected (const struct GNUNET_PeerIdentity *target)
  * Task to asynchronously run #free_neighbour().
  *
  * @param cls the `struct NeighbourMapEntry` to free
- * @param tc unused
  */
 static void
-delayed_disconnect (void *cls,
-                    const struct GNUNET_SCHEDULER_TaskContext* tc)
+delayed_disconnect (void *cls)
 {
   struct NeighbourMapEntry *n = cls;
 
@@ -3825,6 +3671,7 @@ neighbours_iterate (void *cls,
   struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in;
   struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out;
 
+  (void) key;
   if (NULL != n->primary_address.address)
   {
     bandwidth_in = n->primary_address.bandwidth_in;
@@ -3917,6 +3764,7 @@ GST_neighbour_get_current_address (const struct GNUNET_PeerIdentity *peer)
 void
 GST_neighbours_start (unsigned int max_fds)
 {
+  (void) max_fds;
   neighbours = GNUNET_CONTAINER_multipeermap_create (NEIGHBOUR_TABLE_SIZE,
                                                      GNUNET_NO);
   util_transmission_tk = GNUNET_SCHEDULER_add_delayed (UTIL_TRANSMISSION_INTERVAL,
@@ -3940,6 +3788,8 @@ disconnect_all_neighbours (void *cls,
 {
   struct NeighbourMapEntry *n = value;
 
+  (void) cls;
+  (void) key;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Disconnecting peer `%4s' during shutdown\n",
               GNUNET_i2s (&n->id));
@@ -3954,9 +3804,6 @@ disconnect_all_neighbours (void *cls,
 void
 GST_neighbours_stop ()
 {
-  struct BlacklistCheckSwitchContext *cur;
-  struct BlacklistCheckSwitchContext *next;
-
   if (NULL == neighbours)
     return;
   if (NULL != util_transmission_tk)
@@ -3969,21 +3816,6 @@ GST_neighbours_stop ()
                                          NULL);
   GNUNET_CONTAINER_multipeermap_destroy (neighbours);
   neighbours = NULL;
-  next = pending_bc_head;
-  for (cur = next; NULL != cur; cur = next)
-  {
-    next = cur->next;
-    GNUNET_CONTAINER_DLL_remove (pending_bc_head,
-                                 pending_bc_tail,
-                                 cur);
-
-    if (NULL != cur->blc)
-    {
-      GST_blacklist_test_cancel (cur->blc);
-      cur->blc = NULL;
-    }
-    GNUNET_free (cur);
-  }
 }