Merge branch 'master' of ssh://gnunet.org/gnunet

[oweals/gnunet.git] / src / transport / gnunet-service-transport_ats.c

diff --git a/src/transport/gnunet-service-transport_ats.c b/src/transport/gnunet-service-transport_ats.c
index faf97c8fe089a8f8b71ea990050735e4f409091c..01e115bfca35fbab6d8b8a7840534480ec0ff9c4 100644 (file)
--- a/src/transport/gnunet-service-transport_ats.c
+++ b/src/transport/gnunet-service-transport_ats.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     Copyright (C) 2015 Christian Grothoff (and other contributing authors)
+     Copyright (C) 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
@@ -294,11 +294,9 @@ GST_ats_is_known_no_session (const struct GNUNET_HELLO_Address *address)
  * suggest it again.
  *
  * @param cls the `struct AddressInfo` of the address to unblock
- * @param tc unused
  */
 static void
-unblock_address (void *cls,
-                 const struct GNUNET_SCHEDULER_TaskContext *tc)
+unblock_address (void *cls)
 {
   struct AddressInfo *ai = cls;
 
@@ -339,15 +337,10 @@ GST_ats_block_address (const struct GNUNET_HELLO_Address *address,
     return; /* our own, ignore! */
   ai = find_ai (address,
                 session);
-  if (NULL == ai)
+  if (NULL == ai || NULL == ai->ar)
   {
-    GNUNET_assert (0);
-    return;
-  }
-  if (NULL == ai->ar)
-  {
-    /* already blocked, how did it get used!? */
-    GNUNET_break (0);
+    /* The address is already gone/blocked, this can happen during a blacklist
+     * callback. */
     return;
   }
   ai->back_off = GNUNET_TIME_STD_BACKOFF (ai->back_off);