REST/NAMESTORE: rework API

[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 87d05b200ad7d4a3b84a7a460bd4db45813e8797..f8756c750804e28547b115ccd71037ec9f866fc3 100644 (file)
--- a/src/transport/gnunet-service-transport_ats.c
+++ b/src/transport/gnunet-service-transport_ats.c
@@ -2,20 +2,20 @@
      This file is part of GNUnet.
      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
-     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 Affero 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.
+     Affero General Public License for more details.
+    
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-     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.
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file transport/gnunet-service-transport_ats.c
@@ -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);
@@ -451,7 +444,7 @@ GST_ats_add_inbound_address (const struct GNUNET_HELLO_Address *address,
     GNUNET_break(0);
     return;
   }
-  GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != prop->scope);
+  GNUNET_break (GNUNET_NT_UNSPECIFIED != prop->scope);
   GNUNET_assert (GNUNET_YES ==
                  GNUNET_HELLO_address_check_option (address,
                                                     GNUNET_HELLO_ADDRESS_INFO_INBOUND));
@@ -470,7 +463,7 @@ GST_ats_add_inbound_address (const struct GNUNET_HELLO_Address *address,
        GNUNET_i2s (&address->peer),
        GST_plugins_a2s (address),
        session,
-       GNUNET_ATS_print_network_type (prop->scope));
+       GNUNET_NT_to_string (prop->scope));
   ar = GNUNET_ATS_address_add (GST_ats,
                                address,
                                session,
@@ -519,7 +512,7 @@ GST_ats_add_address (const struct GNUNET_HELLO_Address *address,
                                                     GNUNET_HELLO_ADDRESS_INFO_INBOUND));
   ai = find_ai_no_session (address);
   GNUNET_assert (NULL == ai);
-  GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != prop->scope);
+  GNUNET_break (GNUNET_NT_UNSPECIFIED != prop->scope);
 
   /* address seems sane, let's tell ATS */
   LOG (GNUNET_ERROR_TYPE_INFO,