diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-02-08 13:05:58 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-02-08 13:05:58 +0000 |
commit | aa42cd5e2a145b6a66cdc62051b50274109cff42 (patch) | |
tree | 5dfcc7e5d5f684aaea2cbc1a7f3a777534be2672 /src/ats/perf_ats_solver.c | |
parent | b644458a5800a53f3b0196fe559d51a21dca70b9 (diff) | |
download | gnunet-aa42cd5e2a145b6a66cdc62051b50274109cff42.tar.gz gnunet-aa42cd5e2a145b6a66cdc62051b50274109cff42.zip |
fix testcase FTBFS
Diffstat (limited to 'src/ats/perf_ats_solver.c')
-rw-r--r-- | src/ats/perf_ats_solver.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/ats/perf_ats_solver.c b/src/ats/perf_ats_solver.c index ed3fc21ac..ef4c3ec5a 100644 --- a/src/ats/perf_ats_solver.c +++ b/src/ats/perf_ats_solver.c | |||
@@ -415,21 +415,13 @@ bandwidth_changed_cb (void *cls, | |||
415 | } | 415 | } |
416 | 416 | ||
417 | 417 | ||
418 | const double * | 418 | static const double * |
419 | get_preferences_cb (void *cls, const struct GNUNET_PeerIdentity *id) | 419 | get_preferences_cb (void *cls, const struct GNUNET_PeerIdentity *id) |
420 | { | 420 | { |
421 | return GAS_normalization_get_preferences_by_peer (NULL, id); | 421 | return GAS_normalization_get_preferences_by_peer (NULL, id); |
422 | } | 422 | } |
423 | 423 | ||
424 | 424 | ||
425 | const double * | ||
426 | get_property_cb (void *cls, const struct ATS_Address *address) | ||
427 | { | ||
428 | return GAS_normalization_get_properties (NULL, | ||
429 | address); | ||
430 | } | ||
431 | |||
432 | |||
433 | static void | 425 | static void |
434 | perf_address_initial_update (void *dead, | 426 | perf_address_initial_update (void *dead, |
435 | struct GNUNET_CONTAINER_MultiPeerMap * addresses, | 427 | struct GNUNET_CONTAINER_MultiPeerMap * addresses, |
@@ -1235,17 +1227,14 @@ run (void *cls, char * const *args, const char *cfgfile, | |||
1235 | 1227 | ||
1236 | if (0 == strcmp(solver, "proportional")) | 1228 | if (0 == strcmp(solver, "proportional")) |
1237 | { | 1229 | { |
1238 | ph.ats_mode = MODE_PROPORTIONAL; | ||
1239 | ph.ats_string = "proportional"; | 1230 | ph.ats_string = "proportional"; |
1240 | } | 1231 | } |
1241 | else if (0 == strcmp(solver, "mlp")) | 1232 | else if (0 == strcmp(solver, "mlp")) |
1242 | { | 1233 | { |
1243 | ph.ats_mode = MODE_MLP; | ||
1244 | ph.ats_string = "mlp"; | 1234 | ph.ats_string = "mlp"; |
1245 | } | 1235 | } |
1246 | else if ((0 == strcmp(solver, "ril"))) | 1236 | else if ((0 == strcmp(solver, "ril"))) |
1247 | { | 1237 | { |
1248 | ph.ats_mode = MODE_RIL; | ||
1249 | ph.ats_string = "ril"; | 1238 | ph.ats_string = "ril"; |
1250 | } | 1239 | } |
1251 | else | 1240 | else |
@@ -1304,7 +1293,6 @@ run (void *cls, char * const *args, const char *cfgfile, | |||
1304 | ph.env.addresses = ph.addresses; | 1293 | ph.env.addresses = ph.addresses; |
1305 | ph.env.bandwidth_changed_cb = bandwidth_changed_cb; | 1294 | ph.env.bandwidth_changed_cb = bandwidth_changed_cb; |
1306 | ph.env.get_preferences = &get_preferences_cb; | 1295 | ph.env.get_preferences = &get_preferences_cb; |
1307 | ph.env.get_property = &get_property_cb; | ||
1308 | ph.env.network_count = GNUNET_ATS_NetworkTypeCount; | 1296 | ph.env.network_count = GNUNET_ATS_NetworkTypeCount; |
1309 | ph.env.info_cb = &solver_info_cb; | 1297 | ph.env.info_cb = &solver_info_cb; |
1310 | 1298 | ||