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

[gnunet]

Author: grothoff
Date: 2015-02-08 14:05:58 +0100 (Sun, 08 Feb 2015)
New Revision: 35151

Modified:
   gnunet/src/ats/perf_ats_solver.c
   gnunet/src/ats/test_ats_api_common.c
Log:
fix testcase FTBFS

Modified: gnunet/src/ats/perf_ats_solver.c
===================================================================
--- gnunet/src/ats/perf_ats_solver.c    2015-02-08 13:04:27 UTC (rev 35150)
+++ gnunet/src/ats/perf_ats_solver.c    2015-02-08 13:05:58 UTC (rev 35151)
@@ -415,21 +415,13 @@
 }
 
 
-const double *
+static const double *
 get_preferences_cb (void *cls, const struct GNUNET_PeerIdentity *id)
 {
   return GAS_normalization_get_preferences_by_peer (NULL, id);
 }
 
 
-const double *
-get_property_cb (void *cls, const struct ATS_Address *address)
-{
-  return GAS_normalization_get_properties (NULL,
-                                          address);
-}
-
-
 static void
 perf_address_initial_update (void *dead,
     struct GNUNET_CONTAINER_MultiPeerMap * addresses,
@@ -1235,17 +1227,14 @@
 
   if (0 == strcmp(solver, "proportional"))
   {
-    ph.ats_mode = MODE_PROPORTIONAL;
     ph.ats_string = "proportional";
   }
   else if (0 == strcmp(solver, "mlp"))
   {
-    ph.ats_mode = MODE_MLP;
     ph.ats_string = "mlp";
   }
   else if ((0 == strcmp(solver, "ril")))
   {
-    ph.ats_mode = MODE_RIL;
     ph.ats_string = "ril";
   }
   else
@@ -1304,7 +1293,6 @@
   ph.env.addresses = ph.addresses;
   ph.env.bandwidth_changed_cb = bandwidth_changed_cb;
   ph.env.get_preferences = &get_preferences_cb;
-  ph.env.get_property = &get_property_cb;
   ph.env.network_count = GNUNET_ATS_NetworkTypeCount;
   ph.env.info_cb = &solver_info_cb;
 

Modified: gnunet/src/ats/test_ats_api_common.c
===================================================================
--- gnunet/src/ats/test_ats_api_common.c        2015-02-08 13:04:27 UTC (rev 
35150)
+++ gnunet/src/ats/test_ats_api_common.c        2015-02-08 13:05:58 UTC (rev 
35151)
@@ -286,11 +286,6 @@
   memcpy (&aa[1], plugin_addr, plugin_addr_len);
   memcpy (aa->plugin, plugin_name, strlen (plugin_name) + 1);
   aa->session_id = session_id;
-  aa->active = GNUNET_NO;
-  aa->used = GNUNET_NO;
-  aa->solver_information = NULL;
-  aa->assigned_bw_in = 0;
-  aa->assigned_bw_out = 0;
   return aa;
 }