-revert of address_bw addition

[oweals/gnunet.git] / src / ats / test_ats_mlp_averaging.c

diff --git a/src/ats/test_ats_mlp_averaging.c b/src/ats/test_ats_mlp_averaging.c
index 1de254bb5f6788ce3d60866663f252ffc4fce0af..45e9388dcdbbdf0cd00f3ecae07d38ae02cceb25 100644 (file)
--- a/src/ats/test_ats_mlp_averaging.c
+++ b/src/ats/test_ats_mlp_averaging.c
@@ -46,7 +46,7 @@ struct GAS_MLP_Handle *mlp;
 static void
 create_address (struct ATS_Address *addr, char * plugin, int ats_count, struct GNUNET_ATS_Information *ats)
 {
-  addr->mlp_information = NULL;
+  addr->solver_information = NULL;
   addr->next = NULL;
   addr->prev = NULL;
   addr->plugin = GNUNET_strdup (plugin);
@@ -136,7 +136,7 @@ load_quotas (const struct GNUNET_CONFIGURATION_Handle *cfg, unsigned long long *
     {
         in_dest[c] = UINT32_MAX;
     }
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Loaded quota: %s %u, %s %u\n", entry_in, in_dest[c], entry_out, out_dest[c]);
+    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;
@@ -152,7 +152,7 @@ check (void *cls, char *const *args, const char *cfgfile,
   return;
 #endif
   struct ATS_Address addr[10];
-  struct ATS_PreferedAddress *res[10];
+  struct ATS_Address *res[10];
   int quotas[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkType;
   unsigned long long  quotas_in[GNUNET_ATS_NetworkTypeCount];
   unsigned long long  quotas_out[GNUNET_ATS_NetworkTypeCount];
@@ -189,28 +189,28 @@ check (void *cls, char *const *args, const char *cfgfile,
   // mlpi = addr[0].mlp_information;
 
   GNUNET_assert (mlp != NULL);
-  GNUNET_assert (mlp->addr_in_problem == 1);
+  GNUNET_assert (mlp->addresses_in_problem == 1);
 
   /* Update an peer 1 address 1  */
   set_ats (&a1_ats[1], GNUNET_ATS_QUALITY_NET_DELAY, 20);
   GAS_mlp_address_update (mlp, addresses, &addr[0]);
-  GNUNET_assert (mlp->addr_in_problem == 1);
+  GNUNET_assert (mlp->addresses_in_problem == 1);
 
 
   /* Update an peer 1 address 1  */
   set_ats (&a1_ats[1], GNUNET_ATS_QUALITY_NET_DELAY, 10);
   GAS_mlp_address_update (mlp, addresses, &addr[0]);
-  GNUNET_assert (mlp->addr_in_problem == 1);
+  GNUNET_assert (mlp->addresses_in_problem == 1);
 
   /* Update an peer 1 address 1  */
   set_ats (&a1_ats[1], GNUNET_ATS_QUALITY_NET_DELAY, 10);
   GAS_mlp_address_update (mlp, addresses, &addr[0]);
-  GNUNET_assert (mlp->addr_in_problem == 1);
+  GNUNET_assert (mlp->addresses_in_problem == 1);
 
   /* Update an peer 1 address 1  */
   set_ats (&a1_ats[1], GNUNET_ATS_QUALITY_NET_DELAY, 30);
   GAS_mlp_address_update (mlp, addresses, &addr[0]);
-  GNUNET_assert (mlp->addr_in_problem == 1);
+  GNUNET_assert (mlp->addresses_in_problem == 1);
 
 
   GNUNET_assert (GNUNET_OK == GAS_mlp_solve_problem(mlp, &ctx));
@@ -218,14 +218,16 @@ check (void *cls, char *const *args, const char *cfgfile,
   GNUNET_assert (GNUNET_OK == ctx.mlp_result);
 
   res[0] = GAS_mlp_get_preferred_address(mlp, addresses, &p[0]);
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Preferred address `%s' outbound bandwidth: %u Bps\n",res[0]->address->plugin, res[0]->bandwidth_out);
-  GNUNET_free (res[0]);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Preferred address `%s' outbound bandwidth: %u Bps\n",
+              res[0]->plugin,
+              (unsigned int) ntohl (res[0]->assigned_bw_out.value__));
 
   /* Delete an address */
   GNUNET_CONTAINER_multihashmap_remove (addresses, &addr[0].peer.hashPubKey, &addr[0]);
   GAS_mlp_address_delete (mlp, addresses, &addr[0]);
 
-  GNUNET_assert (mlp->addr_in_problem == 0);
+  GNUNET_assert (mlp->addresses_in_problem == 0);
 
   GAS_mlp_done (mlp);
 
@@ -234,7 +236,6 @@ check (void *cls, char *const *args, const char *cfgfile,
   GNUNET_STATISTICS_destroy(stats, GNUNET_NO);
 
   ret = 0;
-  return;
 }