X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fats%2Ftest_ats_api_scheduling_destroy_session.c;h=ae236ea327c750da8e22c7551953762202ffad24;hb=62d484942e7d01314972d25b93aa7b1ba50e3add;hp=61737e9e3f644b1b0ee409d00da33e2a4f942d6f;hpb=d9a76929fee0ba3d159b754a5d04afbb4a712a9c;p=oweals%2Fgnunet.git

diff --git a/src/ats/test_ats_api_scheduling_destroy_session.c b/src/ats/test_ats_api_scheduling_destroy_session.c
index 61737e9e3..ae236ea32 100644
--- a/src/ats/test_ats_api_scheduling_destroy_session.c
+++ b/src/ats/test_ats_api_scheduling_destroy_session.c
@@ -29,16 +29,19 @@
  */
 #include "platform.h"
 #include "gnunet_ats_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
 #include "ats.h"
 #include "test_ats_api_common.h"
 
+/**
+ * Timeout task
+ */
 static GNUNET_SCHEDULER_TaskIdentifier die_task;
 
-static GNUNET_SCHEDULER_TaskIdentifier wait_task;
-
-#define WAIT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
-
+/**
+ * Statistics handle
+ */
+struct GNUNET_STATISTICS_Handle *stats;
 
 /**
  * Scheduling handle
@@ -70,219 +73,172 @@ struct GNUNET_HELLO_Address test_hello_address;
  */
 static void *test_session;
 
-static void
-create_test_address (struct Test_Address *dest, char * plugin, void *session, void *addr, size_t addrlen)
-{
+/**
+ * Test ats info
+ */
+struct GNUNET_ATS_Information test_ats_info[2];
 
-  dest->plugin = GNUNET_strdup (plugin);
-  dest->session = session;
-  dest->addr = GNUNET_malloc (addrlen);
-  memcpy (dest->addr, addr, addrlen);
-  dest->addr_len = addrlen;
-}
+/**
+ * Test ats count
+ */
+uint32_t test_ats_count;
 
-static void
-free_test_address (struct Test_Address *dest)
-{
-  GNUNET_free (dest->plugin);
-  GNUNET_free (dest->addr);
-}
 
+static void end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+static void end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
 
-static void
-end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+static int
+stat_cb(void *cls, const char *subsystem,
+        const char *name, uint64_t value,
+        int is_persistent)
 {
-  die_task = GNUNET_SCHEDULER_NO_TASK;
-  if (wait_task != GNUNET_SCHEDULER_NO_TASK)
+  static int first_stat_cb = GNUNET_YES;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "ATS statistics: `%s' `%s' %llu\n",
+      subsystem,name, value);
+  if ((GNUNET_YES == first_stat_cb) && (1 == value))
   {
-    GNUNET_SCHEDULER_cancel (wait_task);
-    wait_task = GNUNET_SCHEDULER_NO_TASK;
+    GNUNET_ATS_address_add (sched_ats, &test_hello_address, (struct Session *) &test_session, test_ats_info, test_ats_count);
+    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &end, NULL);
   }
-  if (sched_ats != NULL)
-    GNUNET_ATS_scheduling_done (sched_ats);
-  free_test_address (&test_addr);
-  ret = GNUNET_SYSERR;
+  if ((GNUNET_NO == first_stat_cb) && (1 == value))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "ATS updated existing address\n");
+  }
+  if (value > 1)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "ATS did not update existing address, but added 2nd address!\n");
+    GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+  }
+
+  return GNUNET_OK;
 }
 
 
 static void
-end ()
+end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   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)))
+  if (NULL != sched_ats)
   {
-      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;
+    GNUNET_ATS_scheduling_done (sched_ats);
+    sched_ats = NULL;
   }
-  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_STATISTICS_watch_cancel (stats, "ats", "# addresses", &stat_cb, NULL);
+  if (NULL != stats)
   {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Suggestion with invalid address'\n");
-      return GNUNET_SYSERR;
+    GNUNET_STATISTICS_destroy (stats, GNUNET_NO);
+    stats = NULL;
   }
-  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;
+  free_test_address (&test_addr);
+
+  ret = 0;
 }
 
+static void
+end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  die_task = GNUNET_SCHEDULER_NO_TASK;
+  end ( NULL, NULL);
+  ret = GNUNET_SYSERR;
+}
 
 static void
-address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address,
+address_suggest_cb (void *cls,
+                    const struct GNUNET_PeerIdentity *peer,
+                    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);
-    return;
-  }
-  else if (1 == stage)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage 1: 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 1: Callback with correct address `%s'\n",
-                    GNUNET_i2s (&address->peer));
-    }
-    else
-    {
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stage 1: 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 complete address */
-    GNUNET_ATS_address_destroyed (sched_ats, &test_hello_address, session);
-    /* Request address */
-    GNUNET_ATS_suggest_address (sched_ats, &p.id);
-    wait_task = GNUNET_SCHEDULER_add_delayed (WAIT_TIMEOUT, &end, NULL);
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage 1: Unexpected address suggestion\n");
-  ret = 1;
-
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Did not expect suggestion callback!\n");
+  GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+  return;
 }
 
-
 static void
-run (void *cls, 
-     const struct GNUNET_CONFIGURATION_Handle *cfg,
-     struct GNUNET_TESTING_Peer *peer)
+got_initial_value (void *cls, int success)
 {
-  die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
+  struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Got initial value\n");
 
   /* 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 ();
+    GNUNET_SCHEDULER_add_now (&end_badly, NULL);
     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));
-
-  /* Adding address with session */
-  create_test_address (&test_addr, "test", &test_addr, "test", strlen ("test") + 1);
-  test_session = &test_addr;
+  memset (&p.id, '1', sizeof (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 without session */
+  create_test_address (&test_addr, "test", test_session, "test", strlen ("test") + 1);
   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, NULL, 0);
 
-  /* Request address */
-  GNUNET_ATS_suggest_address (sched_ats, &p.id);
+  /* Adding address */
+  GNUNET_ATS_address_add (sched_ats, &test_hello_address, NULL, test_ats_info, test_ats_count);
+
+}
+
+static int
+dummy_stat (void *cls, const char *subsystem, const char *name, uint64_t value,
+            int is_persistent)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Got dummy stat %s%s:%s = %llu\n",
+              is_persistent ? "!" : " ", subsystem, name, value);
+  return GNUNET_OK;
+}
+
+
+
+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);
+  stats = GNUNET_STATISTICS_create ("ats", cfg);
+  GNUNET_STATISTICS_watch (stats, "ats", "# addresses", &stat_cb, NULL);
+
+
+  GNUNET_STATISTICS_get (stats, "ats", "# addresses", TIMEOUT,
+                                       &got_initial_value, &dummy_stat,
+                                       GNUNET_CONFIGURATION_dup (cfg));
 }
 
 
 int
 main (int argc, char *argv[])
 {
-  if (0 != GNUNET_TESTING_peer_run ("test_ats_api_scheduling_add_address",
+  ret = 0;
+  if (0 != GNUNET_TESTING_peer_run ("test-ats-api",
                                     "test_ats_api.conf",
                                     &run, NULL))
     return 1;
   return ret;
 }
-
 /* end of file test_ats_api_scheduling_destroy_session.c */