[GNUnet-SVN] r25427 - gnunet/src/ats

[gnunet]

Author: wachs
Date: 2012-12-12 17:15:20 +0100 (Wed, 12 Dec 2012)
New Revision: 25427

Added:
   gnunet/src/ats/test_ats_api_scheduling_switch_network.c
Modified:
   gnunet/src/ats/Makefile.am
   gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c
Log:
changes and test


Modified: gnunet/src/ats/Makefile.am
===================================================================
--- gnunet/src/ats/Makefile.am  2012-12-12 15:52:24 UTC (rev 25426)
+++ gnunet/src/ats/Makefile.am  2012-12-12 16:15:20 UTC (rev 25427)
@@ -63,6 +63,7 @@
  test_ats_api_scheduling_add_address \
  test_ats_api_scheduling_add_session \
  test_ats_api_scheduling_update_address \
+ test_ats_api_scheduling_switch_network \
  test_ats_api_scheduling_destroy_address \
  test_ats_api_scheduling_destroy_session \
  test_ats_api_scheduling_destroy_inbound_connection \
@@ -107,6 +108,15 @@
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/ats/libgnunetats.la  
 
+test_ats_api_scheduling_switch_network_SOURCES = \
+ test_ats_api_scheduling_switch_network.c test_ats_api_common.c
+test_ats_api_scheduling_switch_network_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/ats/libgnunetats.la  
+
+  
+
 test_ats_api_scheduling_destroy_address_SOURCES = \
  test_ats_api_scheduling_destroy_address.c test_ats_api_common.c
 test_ats_api_scheduling_destroy_address_LDADD = \

Modified: gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c    2012-12-12 
15:52:24 UTC (rev 25426)
+++ gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c    2012-12-12 
16:15:20 UTC (rev 25427)
@@ -327,8 +327,88 @@
               cur->active_addresses);
 }
 
+/**
+ * Remove an address from the solver
+ *
+ * @param solver the solver handle
+ * @param addresses the address hashmap containing all addresses
+ * @param address the address to remove
+ * @param session_only delete only session not whole address
+ */
+void
+GAS_simplistic_address_delete (void *solver,
+    struct GNUNET_CONTAINER_MultiHashMap * addresses,
+    struct ATS_Address *address, int session_only)
+{
+  struct GAS_SIMPLISTIC_Handle *s = solver;
+  struct Network *net;
+  struct AddressWrapper *aw;
 
+  /* Remove an adress completely, we have to:
+   * - Remove from specific network
+   * - Decrease number of total addresses
+   * - If active:
+   *   - decrease number of active addreses
+   *   - update quotas
+   */
 
+  net = (struct Network *) address->solver_information;
+
+  if (GNUNET_NO == session_only)
+  {
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "Deleting %s address %p for peer `%s' from 
network `%s' (total: %u/ active: %u)\n",
+        (GNUNET_NO == address->active) ? "inactive" : "active",
+        address, GNUNET_i2s (&address->peer),
+        net->desc, net->total_addresses, net->active_addresses);
+
+    /* Remove address */
+    if (net->total_addresses < 1)
+      GNUNET_break (0);
+    else
+      net->total_addresses --;
+    if (s->total_addresses < 1)
+      GNUNET_break (0);
+    else
+      s->total_addresses --;
+
+    for (aw = net->head; NULL != aw; aw = aw->next)
+    {
+        if (aw->addr == address)
+          break;
+    }
+    if (NULL == aw )
+    {
+        GNUNET_break (0);
+        return;
+    }
+    GNUNET_CONTAINER_DLL_remove (net->head, net->tail, aw);
+    GNUNET_free (aw);
+  }
+  else
+  {
+      /* Remove session only: remove if active and update */
+      LOG (GNUNET_ERROR_TYPE_DEBUG, "Deleting %s session %p for peer `%s' from 
network `%s' (total: %u/ active: %u)\n",
+          (GNUNET_NO == address->active) ? "inactive" : "active",
+          address, GNUNET_i2s (&address->peer),
+          net->desc, net->total_addresses, net->active_addresses);
+  }
+
+  if (GNUNET_YES == address->active)
+  {
+      /* Address was active, remove from network and update quotas*/
+      address->active = GNUNET_NO;
+      if (net->active_addresses < 1)
+        GNUNET_break (0);
+      else
+        net->active_addresses --;
+      if (s->active_addresses < 1)
+        GNUNET_break (0);
+      else
+        s->active_addresses --;
+      update_quota_per_network (s, net, NULL);
+  }
+}
+
 /**
  * Updates a single address in the solve
  *
@@ -384,9 +464,23 @@
       break;
     case GNUNET_ATS_NETWORK_TYPE:
       if (address->atsp_network_type != value)
-        LOG (GNUNET_ERROR_TYPE_ERROR, "Network changed from `%s' to `%s'\n",
+      {
+
+        LOG (GNUNET_ERROR_TYPE_DEBUG, "Network changed from `%s' to `%s'\n",
             GNUNET_ATS_print_network_type(address->atsp_network_type),
             GNUNET_ATS_print_network_type(value));
+#if 0
+        /* FIXME */
+        int active = address->active;
+        address->atsp_network_type = value;
+        /* Remove address from old network */
+        GAS_simplistic_address_delete (solver, addresses, address, GNUNET_NO);
+        /* Add to new network */
+        GAS_simplistic_address_add (solver, addresses, address);
+        address->active = active;
+        update_quota_per_network(solver, address->solver_information, NULL);
+#endif
+      }
       break;
     case GNUNET_ATS_ARRAY_TERMINATOR:
       break;
@@ -417,90 +511,7 @@
 }
 
 
-/**
- * Remove an address from the solver
- *
- * @param solver the solver handle
- * @param addresses the address hashmap containing all addresses
- * @param address the address to remove
- * @param session_only delete only session not whole address
- */
-void
-GAS_simplistic_address_delete (void *solver,
-    struct GNUNET_CONTAINER_MultiHashMap * addresses,
-    struct ATS_Address *address, int session_only)
-{
-  struct GAS_SIMPLISTIC_Handle *s = solver;
-  struct Network *net;
-  struct AddressWrapper *aw;
 
-  /* Remove an adress completely, we have to:
-   * - Remove from specific network
-   * - Decrease number of total addresses
-   * - If active:
-   *   - decrease number of active addreses
-   *   - update quotas
-   */
-
-  net = (struct Network *) address->solver_information;
-
-  if (GNUNET_NO == session_only)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "Deleting %s address %p for peer `%s' from 
network `%s' (total: %u/ active: %u)\n",
-        (GNUNET_NO == address->active) ? "inactive" : "active",
-        address, GNUNET_i2s (&address->peer),
-        net->desc, net->total_addresses, net->active_addresses);
-
-    /* Remove address */
-    if (net->total_addresses < 1)
-      GNUNET_break (0);
-    else
-      net->total_addresses --;
-    if (s->total_addresses < 1)
-      GNUNET_break (0);
-    else
-      s->total_addresses --;
-
-    for (aw = net->head; NULL != aw; aw = aw->next)
-    {
-        if (aw->addr == address)
-          break;
-    }
-    if (NULL == aw )
-    {
-        GNUNET_break (0);
-        return;
-    }
-    GNUNET_CONTAINER_DLL_remove (net->head, net->tail, aw);
-    GNUNET_free (aw);
-  }
-  else
-  {
-      /* Remove session only: remove if active and update */
-      LOG (GNUNET_ERROR_TYPE_DEBUG, "Deleting %s session %p for peer `%s' from 
network `%s' (total: %u/ active: %u)\n",
-          (GNUNET_NO == address->active) ? "inactive" : "active",
-          address, GNUNET_i2s (&address->peer),
-          net->desc, net->total_addresses, net->active_addresses);
-  }
-
-  if (GNUNET_YES == address->active)
-  {
-      /* Address was active, remove from network and update quotas*/
-      address->active = GNUNET_NO;
-      if (net->active_addresses < 1)
-        GNUNET_break (0);
-      else
-        net->active_addresses --;
-      if (s->active_addresses < 1)
-        GNUNET_break (0);
-      else
-        s->active_addresses --;
-      update_quota_per_network (s, net, NULL);
-  }
-}
-
-
-
 /**
  * Find a "good" address to use for a peer.  If we already have an existing
  * address, we stick to it.  Otherwise, we pick by lowest distance and then

Added: gnunet/src/ats/test_ats_api_scheduling_switch_network.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling_switch_network.c                     
        (rev 0)
+++ gnunet/src/ats/test_ats_api_scheduling_switch_network.c     2012-12-12 
16:15:20 UTC (rev 25427)
@@ -0,0 +1,372 @@
+/*
+     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_update_address.c
+ * @brief test updating an address: add address, get and compare it, update it
+ *        get it again and compre
+ * @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"
+
+#define BIG_M_STRING "unlimited"
+
+
+static GNUNET_SCHEDULER_TaskIdentifier die_task;
+
+/**
+ * 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 test address
+ */
+
+struct GNUNET_HELLO_Address test_hello_address;
+
+/**
+ * Test session
+ */
+static void *test_session;
+
+/**
+ * Test ats info
+ */
+struct GNUNET_ATS_Information test_ats_info[3];
+
+/**
+ * Test ats count
+ */
+uint32_t test_ats_count;
+
+unsigned long long int quota_out[GNUNET_ATS_NetworkTypeCount];
+unsigned long long int quota_in[GNUNET_ATS_NetworkTypeCount];
+
+static void
+end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  die_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");
+  if (die_task != GNUNET_SCHEDULER_NO_TASK)
+  {
+    GNUNET_SCHEDULER_cancel (die_task);
+    die_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+  GNUNET_ATS_scheduling_done (sched_ats);
+  sched_ats = NULL;
+  free_test_address (&test_addr);
+}
+
+
+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_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 %u: Callback for correct 
address `%s'\n",
+                  stage, GNUNET_i2s (&address->peer));
+      ret = 0;
+    }
+    else
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage %u: Callback with incorrect 
address `%s'\n",
+                  stage, GNUNET_i2s (&address->peer));
+      ret = 1;
+      GNUNET_SCHEDULER_add_now (&end, NULL);
+      return;
+    }
+
+    if (GNUNET_OK != compare_ats(atsi, ats_count, test_ats_info, 
test_ats_count))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage %u: Callback with incorrect 
ats info \n", stage);
+      ret = 1;
+      GNUNET_SCHEDULER_add_now (&end, NULL);
+      return;
+    }
+
+    if (ntohl(bandwidth_out.value__) == quota_out[GNUNET_ATS_NET_WAN])
+    {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage %u: WAN quota out correct 
\n", stage);
+    }
+    else
+    {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage %u: WAN quota out wrong 
\n", stage);
+    }
+    if (ntohl(bandwidth_in.value__) == quota_in[GNUNET_ATS_NET_WAN])
+    {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage %u: WAN quota in correct 
\n", stage);
+    }
+    else
+    {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage %u: WAN quota in wrong 
\n", stage);
+    }
+
+    /* Update address */
+    /* Prepare ATS Information: change network */
+    test_ats_info[0].type = htonl (GNUNET_ATS_NETWORK_TYPE);
+    test_ats_info[0].value = htonl(GNUNET_ATS_NET_LAN);
+    test_ats_info[1].type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE);
+    test_ats_info[1].value = htonl(3);
+    test_ats_info[1].type = htonl (GNUNET_ATS_QUALITY_NET_DELAY);
+    test_ats_info[1].value = htonl(30);
+    test_ats_count = 2;
+
+    GNUNET_ATS_address_update (sched_ats, &test_hello_address, test_session, 
test_ats_info, test_ats_count);
+
+    /* Request address */
+    GNUNET_ATS_suggest_address (sched_ats, &p.id);
+    stage ++;
+  }
+  else if (1 == stage)
+  {
+      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 %u: Callback with correct 
address `%s'\n", stage,
+                    GNUNET_i2s (&address->peer));
+        ret = 0;
+      }
+      else
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage %u: Callback with 
incorrect address `%s'\n", stage,
+                    GNUNET_i2s (&address->peer));
+        ret = 1;
+      }
+
+      if (GNUNET_OK != compare_ats(atsi, ats_count, test_ats_info, 
test_ats_count))
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage %u: Callback with 
incorrect ats info \n");
+        ret = 1;
+        GNUNET_SCHEDULER_add_now (&end, NULL);
+        return;
+      }
+
+      if (ntohl(bandwidth_out.value__) == quota_out[GNUNET_ATS_NET_LAN])
+      {
+          GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage %u: LAN quota out 
correct \n", stage);
+          ret = 0;
+      }
+      else
+      {
+          GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage %u: LAN quota out wrong 
\n", stage);
+          ret = 1;
+      }
+      if (ntohl(bandwidth_in.value__) == quota_in[GNUNET_ATS_NET_LAN])
+      {
+          GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage %u: LAN quota in correct 
\n", stage);
+      }
+      else
+      {
+          GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Stage %u: LAN quota in wrong 
\n", stage);
+          ret = 1;
+      }
+
+      GNUNET_SCHEDULER_add_now (&end, NULL);
+  }
+}
+
+static unsigned int
+load_quotas (const struct GNUNET_CONFIGURATION_Handle *cfg, unsigned long long 
*out_dest, unsigned long long *in_dest, int dest_length)
+{
+  int quotas[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkType;
+  char * entry_in = NULL;
+  char * entry_out = NULL;
+  char * quota_out_str;
+  char * quota_in_str;
+  int c;
+
+  for (c = 0; (c < GNUNET_ATS_NetworkTypeCount) && (c < dest_length); c++)
+  {
+    in_dest[c] = 0;
+    out_dest[c] = 0;
+    switch (quotas[c]) {
+      case GNUNET_ATS_NET_UNSPECIFIED:
+        entry_out = "UNSPECIFIED_QUOTA_OUT";
+        entry_in = "UNSPECIFIED_QUOTA_IN";
+        break;
+      case GNUNET_ATS_NET_LOOPBACK:
+        entry_out = "LOOPBACK_QUOTA_OUT";
+        entry_in = "LOOPBACK_QUOTA_IN";
+        break;
+      case GNUNET_ATS_NET_LAN:
+        entry_out = "LAN_QUOTA_OUT";
+        entry_in = "LAN_QUOTA_IN";
+        break;
+      case GNUNET_ATS_NET_WAN:
+        entry_out = "WAN_QUOTA_OUT";
+        entry_in = "WAN_QUOTA_IN";
+        break;
+      case GNUNET_ATS_NET_WLAN:
+        entry_out = "WLAN_QUOTA_OUT";
+        entry_in = "WLAN_QUOTA_IN";
+        break;
+      default:
+        break;
+    }
+
+    if ((entry_in == NULL) || (entry_out == NULL))
+      continue;
+
+    /* quota out */
+    if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string(cfg, "ats", 
entry_out, &quota_out_str))
+    {
+      if (0 == strcmp(quota_out_str, BIG_M_STRING) ||
+          (GNUNET_SYSERR == GNUNET_STRINGS_fancy_size_to_bytes (quota_out_str, 
&out_dest[c])))
+        out_dest[c] = UINT32_MAX;
+
+      GNUNET_free (quota_out_str);
+      quota_out_str = NULL;
+    }
+    else if (GNUNET_ATS_NET_UNSPECIFIED == quotas[c])
+      out_dest[c] = UINT32_MAX;
+    else
+      out_dest[c] = UINT32_MAX;
+
+    /* quota in */
+    if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string(cfg, "ats", 
entry_in, &quota_in_str))
+    {
+      if (0 == strcmp(quota_in_str, BIG_M_STRING) ||
+          (GNUNET_SYSERR == GNUNET_STRINGS_fancy_size_to_bytes (quota_in_str, 
&in_dest[c])))
+        in_dest[c] = UINT32_MAX;
+
+      GNUNET_free (quota_in_str);
+      quota_in_str = NULL;
+    }
+    else if (GNUNET_ATS_NET_UNSPECIFIED == quotas[c])
+    {
+      in_dest[c] = UINT32_MAX;
+    }
+    else
+    {
+        in_dest[c] = UINT32_MAX;
+    }
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Loaded quota: %s %u, %s %u\n", 
entry_in, in_dest[c], entry_out, out_dest[c]);
+
+  }
+  return GNUNET_ATS_NetworkTypeCount;
+}
+
+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);
+
+  load_quotas (cfg, quota_out, quota_in, GNUNET_ATS_NetworkTypeCount);
+
+  /* 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_assert (0 == strcmp (PEERID0, GNUNET_i2s_full (&p.id)));
+
+  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_info[1].type = htonl (GNUNET_ATS_QUALITY_NET_DELAY);
+  test_ats_info[1].value = htonl(10);
+  test_ats_count = 2;
+
+  /* Adding address without session */
+  test_session = &test_addr;
+  create_test_address (&test_addr, "test", &test_addr, "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_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_update_address",
+                                    "test_ats_api.conf",
+                                    &run, NULL))
+    return 1;
+  return ret;
+}
+
+/* end of file test_ats_api_scheduling_update_address.c */