- changes

git-svn-id: https://gnunet.org/svn/gnunet@25397 140774ce-b5e7-0310-ab8b-a85725594a96

3 files changed, 318 insertions, 27 deletions

diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index 1419b6d988..70b7a57786 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -64,6 +64,7 @@ check_PROGRAMS = \
  test_ats_api_scheduling_update_address \
  test_ats_api_scheduling_destroy_address \
  test_ats_api_scheduling_destroy_session \
+ test_ats_api_scheduling_destroy_inbound_connection \
  test_ats_api_scheduling_block_and_reset \
  test_ats_simplistic \
  test_ats_api_performance
@@ -119,6 +120,13 @@ test_ats_api_scheduling_destroy_session_LDADD = \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la
   
+test_ats_api_scheduling_destroy_inbound_connection_SOURCES = \
+ test_ats_api_scheduling_destroy_inbound_connection.c  
+test_ats_api_scheduling_destroy_inbound_connection_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/ats/libgnunetats.la
+  
 test_ats_api_scheduling_block_and_reset_SOURCES = \
  test_ats_api_scheduling_block_and_reset.c
 test_ats_api_scheduling_block_and_reset_LDADD = \
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index 9cf6dcb5fc..85ff1404ce 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -648,41 +648,42 @@ destroy_by_session_id (void *cls, const struct GNUNET_HashCode * key, void *valu
     if (aa->session_id != des->session_id)
       return GNUNET_OK; /* irrelevant */
 
-    if (aa->session_id != 0)
-      GNUNET_break (0 == strcmp (des->plugin, aa->plugin));
-
-    /* Session died */
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Deleting session for peer `%s': `%s' %u\n",
-                GNUNET_i2s (&aa->peer), aa->plugin, aa->session_id);
-    aa->session_id = 0;
-  }
+    if ((aa->session_id != 0) &&
+        (0 != strcmp (des->plugin, aa->plugin)))
+    {
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                    "Different plugins during removal: `%s' vs `%s' \n",
+                    des->plugin, aa->plugin);
+        GNUNET_break (0);
+        return GNUNET_OK;
+    }
 
-#if 0
-/* Old code */
-    /*
-    if (GNUNET_YES == aa->active)
-      aa->active = GNUNET_NO;
-  */
-    /* session == 0 and addrlen == 0 : destroy address */
     if (aa->addr_len == 0)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Deleting session and address for peer `%s': `%s' %u\n",
-                  GNUNET_i2s (&aa->peer), aa->plugin, aa->session_id);
-      (void) destroy_address (aa);
+        /* Inbound connection died, delete full address */
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                    "Deleting inbound address for peer `%s': `%s' session %u\n",
+                    GNUNET_i2s (&aa->peer), aa->plugin, aa->session_id);
+
+        /* Notify solver about deletion */
+        handle->s_del (handle->solver, handle->addresses, aa);
+        destroy_address (aa);
+        dc->result = GNUNET_NO;
+        return GNUNET_OK; /* Continue iteration */
     }
     else
     {
-      /* session was set to 0, update address */
-  #if HAVE_LIBGLPK
-    if (handle->ats_mode == MODE_MLP)
-      GAS_mlp_address_update (handle->solver, handle->addresses, aa);
-  #endif
-    }
+        /* Session died */
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                    "Deleting session for peer `%s': `%s' %u\n",
+                    GNUNET_i2s (&aa->peer), aa->plugin, aa->session_id);
+        aa->session_id = 0;
+
+        /* update address */
 
+        return GNUNET_OK;
+    }
   }
-#endif
   return GNUNET_OK;
 }
 
diff --git a/src/ats/test_ats_api_scheduling_destroy_inbound_connection.c b/src/ats/test_ats_api_scheduling_destroy_inbound_connection.c
new file mode 100644
index 0000000000..8d63dec99a
--- /dev/null
+++ b/src/ats/test_ats_api_scheduling_destroy_inbound_connection.c
@@ -0,0 +1,282 @@
+/*
+     This file is part of GNUnet.
+     (C) 2010,2011 Christian Grothoff (and other contributing authors)
+
+     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 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., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+/**
+ * @file ats/test_ats_api_scheduling_destroy_inbound_connection.c
+ * @brief test destroying sessions for inbound connections: first add an address with a session,
+ *        request the address and compare, delete the session, request and
+ *        compare again, delete whole address, request and wait for timeout,
+ *        shutdown
+ * @author Christian Grothoff
+ * @author Matthias Wachs
+ *
+ */
+#include "platform.h"
+#include "gnunet_ats_service.h"
+#include "gnunet_testing_lib-new.h"
+#include "ats.h"
+#include "test_ats_api_common.h"
+
+static GNUNET_SCHEDULER_TaskIdentifier die_task;
+
+static GNUNET_SCHEDULER_TaskIdentifier wait_task;
+
+#define WAIT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+
+
+/**
+ * Scheduling handle
+ */
+static struct GNUNET_ATS_SchedulingHandle *sched_ats;
+
+/**
+ * Return value
+ */
+static int ret;
+
+/**
+ * Test address
+ */
+static struct Test_Address test_addr;
+
+/**
+ * Test peer
+ */
+static struct PeerContext p;
+
+/**
+ * HELLO address
+ */
+struct GNUNET_HELLO_Address test_hello_address;
+
+/**
+ * Session
+ */
+static void *test_session;
+
+/**
+ * Test ats info
+ */
+struct GNUNET_ATS_Information test_ats_info[2];
+
+/**
+ * Test ats count
+ */
+uint32_t test_ats_count;
+
+static void
+create_test_address (struct Test_Address *dest, char * plugin, void *session, void *addr, size_t addrlen)
+{
+
+  dest->plugin = GNUNET_strdup (plugin);
+  dest->session = session;
+  if (addrlen > 0)
+  {
+    dest->addr = GNUNET_malloc (addrlen);
+    memcpy (dest->addr, addr, addrlen);
+  }
+  else
+      dest->addr = NULL;
+  dest->addr_len = addrlen;
+}
+
+static void
+free_test_address (struct Test_Address *dest)
+{
+  GNUNET_free (dest->plugin);
+  if (NULL != dest->addr)
+    GNUNET_free (dest->addr);
+}
+
+
+static void
+end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  die_task = GNUNET_SCHEDULER_NO_TASK;
+  if (wait_task != GNUNET_SCHEDULER_NO_TASK)
+  {
+    GNUNET_SCHEDULER_cancel (wait_task);
+    wait_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+  if (sched_ats != NULL)
+    GNUNET_ATS_scheduling_done (sched_ats);
+  free_test_address (&test_addr);
+  ret = GNUNET_SYSERR;
+}
+
+
+static void
+end ()
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutting down\n");
+  wait_task = GNUNET_SCHEDULER_NO_TASK;
+  if (die_task != GNUNET_SCHEDULER_NO_TASK)
+  {
+    GNUNET_SCHEDULER_cancel (die_task);
+    die_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+  free_test_address (&test_addr);
+  GNUNET_ATS_scheduling_done (sched_ats);
+  sched_ats = NULL;
+}
+
+static int
+compare_addresses (const struct GNUNET_HELLO_Address *address1, void *session1,
+                   const struct GNUNET_HELLO_Address *address2, void *session2)
+{
+  if (0 != memcmp (&address1->peer, &address2->peer, sizeof (struct GNUNET_PeerIdentity)))
+  {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid peer id'\n");
+      return GNUNET_SYSERR;
+  }
+  if (0 != strcmp (address1->transport_name, address2->transport_name))
+  {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid plugin'\n");
+      return GNUNET_SYSERR;
+  }
+  if (address1->address_length != address2->address_length)
+  {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid address length'\n");
+      return GNUNET_SYSERR;
+
+  }
+  else if (0 != memcmp (address1->address, address2->address, address2->address_length))
+  {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid address'\n");
+      return GNUNET_SYSERR;
+  }
+  if (session1 != session2)
+  {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid session1 %p vs session2 %p'\n",
+                  session1, session2);
+      return GNUNET_SYSERR;
+
+  }
+  return GNUNET_OK;
+}
+
+
+static void
+address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
+                    struct Session *session,
+                    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
+                    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
+                    const struct GNUNET_ATS_Information *atsi,
+                    uint32_t ats_count)
+{
+  static int stage = 0;
+
+  if (0 == stage)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage 0: Received suggestion for peer `%s'\n",
+                GNUNET_i2s(&address->peer));
+
+    GNUNET_ATS_suggest_address_cancel (sched_ats, &p.id);
+    if (GNUNET_OK == compare_addresses (address, session, &test_hello_address, test_session))
+    {
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage 0: Callback with correct address `%s'\n",
+                    GNUNET_i2s (&address->peer));
+    }
+    else
+    {
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage 0: Callback with invalid address `%s'\n",
+                    GNUNET_i2s (&address->peer));
+        GNUNET_SCHEDULER_add_now (&end, NULL);
+        ret = 1;
+        return;
+    }
+    stage ++;
+    ret = 0;
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Destroying address for `%s'\n",
+                GNUNET_i2s (&address->peer));
+    /* Destroying session for address */
+    test_session = NULL;
+    GNUNET_ATS_address_destroyed (sched_ats, &test_hello_address, test_addr.session);
+    /* Request address */
+    GNUNET_ATS_suggest_address (sched_ats, &p.id);
+
+    /* Wait for timeout */
+    wait_task = GNUNET_SCHEDULER_add_delayed (WAIT_TIMEOUT, &end, NULL);
+    return;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage %u: Unexpected address suggestion\n", stage);
+  ret = 1;
+}
+
+
+static void
+run (void *cls, 
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
+{
+  die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
+
+  /* Connect to ATS scheduling */
+  sched_ats = GNUNET_ATS_scheduling_init (cfg, &address_suggest_cb, NULL);
+  if (sched_ats == NULL)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not connect to ATS scheduling!\n");
+    ret = 1;
+    end ();
+    return;
+  }
+
+  /* Set up peer */
+  if (GNUNET_SYSERR == GNUNET_CRYPTO_hash_from_string(PEERID0, &p.id.hashPubKey))
+  {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not setup peer!\n");
+      ret = GNUNET_SYSERR;
+      end ();
+      return;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n",
+              GNUNET_i2s_full(&p.id));
+
+  /* Prepare ATS Information */
+  test_ats_info[0].type = htonl (GNUNET_ATS_NETWORK_TYPE);
+  test_ats_info[0].value = htonl(GNUNET_ATS_NET_WAN);
+  test_ats_info[1].type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE);
+  test_ats_info[1].value = htonl(1);
+  test_ats_count = 2;
+
+  /* Adding address with session */
+  create_test_address (&test_addr, "test", &test_addr, NULL, 0);
+  test_session = &test_addr;
+  test_hello_address.peer = p.id;
+  test_hello_address.transport_name = test_addr.plugin;
+  test_hello_address.address = test_addr.addr;
+  test_hello_address.address_length = test_addr.addr_len;
+  GNUNET_ATS_address_add (sched_ats, &test_hello_address, test_addr.session, test_ats_info, test_ats_count);
+
+  /* Request address */
+  GNUNET_ATS_suggest_address (sched_ats, &p.id);
+}
+
+
+int
+main (int argc, char *argv[])
+{
+  if (0 != GNUNET_TESTING_peer_run ("test_ats_api_scheduling_add_address",
+                                    "test_ats_api.conf",
+                                    &run, NULL))
+    return 1;
+  return ret;
+}
+
+/* end of file test_ats_api_scheduling_destroy_inbound_connection.c */