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 5fcd8f4792a5eef37cd59d908883f949e49e2639..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
@@ -50,7 +50,7 @@ struct AddressInfo
   /**
    * Session (can be NULL)
    */
-  struct Session *session;
+  struct GNUNET_ATS_Session *session;
 
   /**
    * Record with ATS API for the address.
@@ -114,7 +114,7 @@ struct FindClosure
   /**
    * Session to look for (only used if the address is inbound).
    */
-  struct Session *session;
+  struct GNUNET_ATS_Session *session;
 
   /**
    * Address to look for.
@@ -188,7 +188,7 @@ find_ai_cb (void *cls,
  */
 static struct AddressInfo *
 find_ai (const struct GNUNET_HELLO_Address *address,
-         struct Session *session)
+         struct GNUNET_ATS_Session *session)
 {
   struct FindClosure fc;
 
@@ -267,7 +267,7 @@ find_ai_no_session (const struct GNUNET_HELLO_Address *address)
  */
 int
 GST_ats_is_known (const struct GNUNET_HELLO_Address *address,
-                  struct Session *session)
+                  struct GNUNET_ATS_Session *session)
 {
   return (NULL != find_ai (address, session)) ? GNUNET_YES : GNUNET_NO;
 }
@@ -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;
 
@@ -328,21 +326,21 @@ unblock_address (void *cls,
  */
 void
 GST_ats_block_address (const struct GNUNET_HELLO_Address *address,
-                       struct Session *session)
+                       struct GNUNET_ATS_Session *session)
 {
   struct AddressInfo *ai;
 
+  if (0 ==
+      memcmp (&GST_my_identity,
+              &address->peer,
+              sizeof (struct GNUNET_PeerIdentity)))
+    return; /* our own, ignore! */
   ai = find_ai (address,
                 session);
-  if (NULL == ai)
-  {
-    GNUNET_assert (0);
-    return;
-  }
-  if (NULL == ai->ar)
+  if (NULL == ai || 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);
@@ -395,10 +393,15 @@ GST_ats_block_address (const struct GNUNET_HELLO_Address *address,
  */
 void
 GST_ats_block_reset (const struct GNUNET_HELLO_Address *address,
-                     struct Session *session)
+                     struct GNUNET_ATS_Session *session)
 {
   struct AddressInfo *ai;
 
+  if (0 ==
+      memcmp (&GST_my_identity,
+              &address->peer,
+              sizeof (struct GNUNET_PeerIdentity)))
+    return; /* our own, ignore! */
   ai = find_ai (address, session);
   if (NULL == ai)
   {
@@ -423,12 +426,18 @@ GST_ats_block_reset (const struct GNUNET_HELLO_Address *address,
  */
 void
 GST_ats_add_inbound_address (const struct GNUNET_HELLO_Address *address,
-                             struct Session *session,
+                             struct GNUNET_ATS_Session *session,
                              const struct GNUNET_ATS_Properties *prop)
 {
   struct GNUNET_ATS_AddressRecord *ar;
   struct AddressInfo *ai;
 
+  if (0 ==
+      memcmp (&GST_my_identity,
+              &address->peer,
+              sizeof (struct GNUNET_PeerIdentity)))
+    return; /* our own, ignore! */
+
   /* Sanity checks for a valid inbound address */
   if (NULL == address->transport_name)
   {
@@ -487,6 +496,11 @@ GST_ats_add_address (const struct GNUNET_HELLO_Address *address,
   struct GNUNET_ATS_AddressRecord *ar;
   struct AddressInfo *ai;
 
+  if (0 ==
+      memcmp (&GST_my_identity,
+              &address->peer,
+              sizeof (struct GNUNET_PeerIdentity)))
+    return; /* our own, ignore! */
   /* validadte address */
   if (NULL == address->transport_name)
   {
@@ -533,10 +547,15 @@ GST_ats_add_address (const struct GNUNET_HELLO_Address *address,
  */
 void
 GST_ats_new_session (const struct GNUNET_HELLO_Address *address,
-                     struct Session *session)
+                     struct GNUNET_ATS_Session *session)
 {
   struct AddressInfo *ai;
 
+  if (0 ==
+      memcmp (&GST_my_identity,
+              &address->peer,
+              sizeof (struct GNUNET_PeerIdentity)))
+    return; /* our own, ignore! */
   ai = find_ai (address, NULL);
   if (NULL == ai)
   {
@@ -611,10 +630,15 @@ destroy_ai (struct AddressInfo *ai)
  */
 void
 GST_ats_del_session (const struct GNUNET_HELLO_Address *address,
-                     struct Session *session)
+                     struct GNUNET_ATS_Session *session)
 {
   struct AddressInfo *ai;
 
+  if (0 ==
+      memcmp (&GST_my_identity,
+              &address->peer,
+              sizeof (struct GNUNET_PeerIdentity)))
+    return; /* our own, ignore! */
   if (NULL == session)
   {
     GNUNET_break (0);
@@ -828,6 +852,11 @@ GST_ats_expire_address (const struct GNUNET_HELLO_Address *address)
 {
   struct AddressInfo *ai;
 
+  if (0 ==
+      memcmp (&GST_my_identity,
+              &address->peer,
+              sizeof (struct GNUNET_PeerIdentity)))
+    return; /* our own, ignore! */
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Address %s of peer %s expired\n",
        GST_plugins_a2s (address),