diff options
Diffstat (limited to 'src/ats/test_ats_mlp_update.c')
-rw-r--r-- | src/ats/test_ats_mlp_update.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/src/ats/test_ats_mlp_update.c b/src/ats/test_ats_mlp_update.c index e806bd85d..c13261e9d 100644 --- a/src/ats/test_ats_mlp_update.c +++ b/src/ats/test_ats_mlp_update.c | |||
@@ -81,7 +81,7 @@ int addr_it (void *cls, | |||
81 | void *value) | 81 | void *value) |
82 | { | 82 | { |
83 | struct ATS_Address *address = (struct ATS_Address *) value; | 83 | struct ATS_Address *address = (struct ATS_Address *) value; |
84 | GAS_mlp_address_delete (mlp, addresses, address, GNUNET_NO); | 84 | GAS_mlp_address_delete (mlp, address, GNUNET_NO); |
85 | GNUNET_CONTAINER_multihashmap_remove (addresses, key, value); | 85 | GNUNET_CONTAINER_multihashmap_remove (addresses, key, value); |
86 | GNUNET_free (address); | 86 | GNUNET_free (address); |
87 | return GNUNET_OK; | 87 | return GNUNET_OK; |
@@ -139,6 +139,12 @@ get_preferences_cb (void *cls, const struct GNUNET_PeerIdentity *id) | |||
139 | return GAS_normalization_get_preferences (id); | 139 | return GAS_normalization_get_preferences (id); |
140 | } | 140 | } |
141 | 141 | ||
142 | const double * | ||
143 | get_property_cb (void *cls, const struct ATS_Address *address) | ||
144 | { | ||
145 | return GAS_normalization_get_properties ((struct ATS_Address *) address); | ||
146 | } | ||
147 | |||
142 | static void | 148 | static void |
143 | normalized_property_changed_cb (void *cls, | 149 | normalized_property_changed_cb (void *cls, |
144 | const struct ATS_Address *peer, | 150 | const struct ATS_Address *peer, |
@@ -210,8 +216,12 @@ check (void *cls, char *const *args, const char *cfgfile, | |||
210 | addresses = GNUNET_CONTAINER_multihashmap_create (10, GNUNET_NO); | 216 | addresses = GNUNET_CONTAINER_multihashmap_create (10, GNUNET_NO); |
211 | 217 | ||
212 | /* Init MLP solver */ | 218 | /* Init MLP solver */ |
213 | mlp = GAS_mlp_init (cfg, stats, quotas, quotas_out, quotas_in, | 219 | mlp = GAS_mlp_init (cfg, stats, addresses, |
214 | GNUNET_ATS_NetworkTypeCount, &bandwidth_changed_cb, NULL, &get_preferences_cb, NULL); | 220 | quotas, quotas_out, quotas_in, |
221 | GNUNET_ATS_NetworkTypeCount, | ||
222 | &bandwidth_changed_cb, NULL, | ||
223 | &get_preferences_cb, NULL, | ||
224 | &get_property_cb, NULL); | ||
215 | if (NULL == mlp) | 225 | if (NULL == mlp) |
216 | { | 226 | { |
217 | GNUNET_break (0); | 227 | GNUNET_break (0); |
@@ -239,13 +249,13 @@ check (void *cls, char *const *args, const char *cfgfile, | |||
239 | GNUNET_CONTAINER_multihashmap_put (addresses, &p[0].hashPubKey, address[0], | 249 | GNUNET_CONTAINER_multihashmap_put (addresses, &p[0].hashPubKey, address[0], |
240 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST); | 250 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST); |
241 | /* Adding address 0 */ | 251 | /* Adding address 0 */ |
242 | GAS_mlp_address_add (mlp, addresses, address[0], GNUNET_ATS_NET_UNSPECIFIED); | 252 | GAS_mlp_address_add (mlp, address[0], GNUNET_ATS_NET_UNSPECIFIED); |
243 | 253 | ||
244 | /* Retrieving preferred address for peer and wait for callback */ | 254 | /* Retrieving preferred address for peer and wait for callback */ |
245 | GAS_mlp_get_preferred_address (mlp, addresses, &p[0]); | 255 | GAS_mlp_get_preferred_address (mlp, &p[0]); |
246 | 256 | ||
247 | /* Solve problem to build matrix */ | 257 | /* Solve problem to build matrix */ |
248 | GAS_mlp_solve_problem (mlp, addresses); | 258 | GAS_mlp_solve_problem (mlp); |
249 | 259 | ||
250 | address[0]->atsi = ats; | 260 | address[0]->atsi = ats; |
251 | address[0]->atsi_count = 4; | 261 | address[0]->atsi_count = 4; |
@@ -268,10 +278,10 @@ check (void *cls, char *const *args, const char *cfgfile, | |||
268 | ats_prev[3].type = htonl (GNUNET_ATS_ARRAY_TERMINATOR); | 278 | ats_prev[3].type = htonl (GNUNET_ATS_ARRAY_TERMINATOR); |
269 | ats_prev[3].value = htonl (GNUNET_ATS_VALUE_UNDEFINED); | 279 | ats_prev[3].value = htonl (GNUNET_ATS_VALUE_UNDEFINED); |
270 | 280 | ||
271 | GAS_mlp_address_update (mlp, addresses, address[0], 1, GNUNET_NO, ats_prev, 4); | 281 | GAS_mlp_address_update (mlp, address[0], 1, GNUNET_NO, ats_prev, 4); |
272 | 282 | ||
273 | /* Solve problem to build matrix */ | 283 | /* Solve problem to build matrix */ |
274 | GAS_mlp_solve_problem (mlp, addresses); | 284 | GAS_mlp_solve_problem (mlp); |
275 | } | 285 | } |
276 | 286 | ||
277 | 287 | ||