aboutsummaryrefslogtreecommitdiff
path: root/src/ats
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2015-02-11 16:43:13 +0000
committerChristian Grothoff <christian@grothoff.org>2015-02-11 16:43:13 +0000
commit50e17d63c37dc0b35b6b7302144e47659653c058 (patch)
tree259410f7e8178d7bcc9444990b42451c5195121b /src/ats
parentbacbc6b3e515738e73860ce12d397567cfdba010 (diff)
downloadgnunet-50e17d63c37dc0b35b6b7302144e47659653c058.tar.gz
gnunet-50e17d63c37dc0b35b6b7302144e47659653c058.zip
-fix badness
Diffstat (limited to 'src/ats')
-rw-r--r--src/ats/test_ats_mlp_averaging.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/ats/test_ats_mlp_averaging.c b/src/ats/test_ats_mlp_averaging.c
index c935dd7e8..1a2333fac 100644
--- a/src/ats/test_ats_mlp_averaging.c
+++ b/src/ats/test_ats_mlp_averaging.c
@@ -36,9 +36,9 @@
36 36
37static int ret; 37static int ret;
38 38
39struct GNUNET_STATISTICS_Handle * stats; 39struct GNUNET_STATISTICS_Handle *stats;
40 40
41struct GNUNET_CONTAINER_MultiHashMap * addresses; 41struct GNUNET_CONTAINER_MultiPeerMap *addresses;
42 42
43struct GAS_MLP_Handle *mlp; 43struct GAS_MLP_Handle *mlp;
44 44
@@ -142,6 +142,7 @@ load_quotas (const struct GNUNET_CONFIGURATION_Handle *cfg, unsigned long long *
142 return GNUNET_ATS_NetworkTypeCount; 142 return GNUNET_ATS_NetworkTypeCount;
143} 143}
144 144
145
145static void 146static void
146check (void *cls, char *const *args, const char *cfgfile, 147check (void *cls, char *const *args, const char *cfgfile,
147 const struct GNUNET_CONFIGURATION_Handle *cfg) 148 const struct GNUNET_CONFIGURATION_Handle *cfg)
@@ -162,7 +163,7 @@ check (void *cls, char *const *args, const char *cfgfile,
162 163
163 stats = GNUNET_STATISTICS_create("ats", cfg); 164 stats = GNUNET_STATISTICS_create("ats", cfg);
164 165
165 addresses = GNUNET_CONTAINER_multihashmap_create (10, GNUNET_NO); 166 addresses = GNUNET_CONTAINER_multipeermap_create (10, GNUNET_NO);
166 167
167 quota_count = load_quotas(cfg, quotas_in, quotas_out, GNUNET_ATS_NetworkTypeCount); 168 quota_count = load_quotas(cfg, quotas_in, quotas_out, GNUNET_ATS_NetworkTypeCount);
168 mlp = GAS_mlp_init (cfg, NULL, quotas, quotas_in, quotas_out, quota_count); 169 mlp = GAS_mlp_init (cfg, NULL, quotas, quotas_in, quotas_out, quota_count);
@@ -182,7 +183,7 @@ check (void *cls, char *const *args, const char *cfgfile,
182 create_address (&addr[0], "dummy", 3, &a1_ats[0]); 183 create_address (&addr[0], "dummy", 3, &a1_ats[0]);
183 addr[0].atsp_network_type = GNUNET_ATS_NET_LAN; 184 addr[0].atsp_network_type = GNUNET_ATS_NET_LAN;
184 185
185 GNUNET_CONTAINER_multihashmap_put(addresses, &addr[0].peer.hashPubKey, &addr[0], GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); 186 GNUNET_CONTAINER_multipeermap_put(addresses, &addr[0].peer, &addr[0], GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
186 187
187 /* Add peer 1 address 1 */ 188 /* Add peer 1 address 1 */
188 GAS_mlp_address_update (mlp, addresses, &addr[0]); 189 GAS_mlp_address_update (mlp, addresses, &addr[0]);
@@ -224,7 +225,7 @@ check (void *cls, char *const *args, const char *cfgfile,
224 (unsigned int) ntohl (res[0]->assigned_bw_out.value__)); 225 (unsigned int) ntohl (res[0]->assigned_bw_out.value__));
225 226
226 /* Delete an address */ 227 /* Delete an address */
227 GNUNET_CONTAINER_multihashmap_remove (addresses, &addr[0].peer.hashPubKey, &addr[0]); 228 GNUNET_CONTAINER_multipeermap_remove (addresses, &addr[0].peer, &addr[0]);
228 GAS_mlp_address_delete (mlp, addresses, &addr[0]); 229 GAS_mlp_address_delete (mlp, addresses, &addr[0]);
229 230
230 GNUNET_assert (mlp->addresses_in_problem == 0); 231 GNUNET_assert (mlp->addresses_in_problem == 0);
@@ -255,11 +256,11 @@ main (int argc, char *argv[])
255 }; 256 };
256 257
257 GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2, 258 GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2,
258 "test_ats_mlp", "nohelp", options, 259 "test_ats_mlp_averaging", "nohelp", options,
259 &check, NULL); 260 &check, NULL);
260 261
261 262
262 return ret; 263 return ret;
263} 264}
264 265
265/* end of file test_ats_api_bandwidth_consumption.c */ 266/* end of file test_ats_mlp_averaging.c */