diff options
-rw-r--r-- | src/ats/gnunet-service-ats_addresses.c | 14 | ||||
-rw-r--r-- | src/ats/gnunet-service-ats_performance.c | 14 | ||||
-rw-r--r-- | src/ats/gnunet-service-ats_scheduling.c | 2 | ||||
-rw-r--r-- | src/ats/perf_ats_solver.c | 2 | ||||
-rw-r--r-- | src/ats/test_ats_mlp_averaging.c | 2 | ||||
-rw-r--r-- | src/ats/test_ats_simplistic_pref_aging.c | 12 | ||||
-rw-r--r-- | src/ats/test_ats_solver_request_and_delete_address.c | 2 |
7 files changed, 24 insertions, 24 deletions
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c index f52d1d7fd..8e47ae74c 100644 --- a/src/ats/gnunet-service-ats_addresses.c +++ b/src/ats/gnunet-service-ats_addresses.c | |||
@@ -1384,10 +1384,10 @@ eval_sum_bw_used (void *cls, const struct GNUNET_PeerIdentity *id, void *obj) | |||
1384 | } | 1384 | } |
1385 | } | 1385 | } |
1386 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 1386 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
1387 | "Active address in %s with (in/out) %u/%u Bps\n", | 1387 | "Active address in %s with (in/out) %lu/%lu Bps\n", |
1388 | GNUNET_ATS_print_network_type (net), | 1388 | GNUNET_ATS_print_network_type (net), |
1389 | (unsigned int) ntohl (addr->assigned_bw_in.value__), | 1389 | ntohl (addr->assigned_bw_in.value__), |
1390 | (unsigned int) ntohl (addr->assigned_bw_out.value__)); | 1390 | ntohl (addr->assigned_bw_out.value__)); |
1391 | } | 1391 | } |
1392 | return GNUNET_OK; | 1392 | return GNUNET_OK; |
1393 | } | 1393 | } |
@@ -2060,9 +2060,9 @@ bandwidth_changed_cb (void *cls, struct ATS_Address *address) | |||
2060 | else | 2060 | else |
2061 | { | 2061 | { |
2062 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, | 2062 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, |
2063 | "Sending bandwidth update for peer `%s': %llu %llu\n", | 2063 | "Sending bandwidth update for peer `%s': %lu %lu\n", |
2064 | GNUNET_i2s (&address->peer), address->assigned_bw_out, | 2064 | GNUNET_i2s (&address->peer), address->assigned_bw_out.value__, |
2065 | address->assigned_bw_out); | 2065 | address->assigned_bw_out.value__); |
2066 | } | 2066 | } |
2067 | 2067 | ||
2068 | /* *Notify scheduling clients about suggestion */ | 2068 | /* *Notify scheduling clients about suggestion */ |
diff --git a/src/ats/gnunet-service-ats_performance.c b/src/ats/gnunet-service-ats_performance.c index a9673821a..6509dbe9d 100644 --- a/src/ats/gnunet-service-ats_performance.c +++ b/src/ats/gnunet-service-ats_performance.c | |||
@@ -261,7 +261,7 @@ peerinfo_it (void *cls, | |||
261 | return; | 261 | return; |
262 | 262 | ||
263 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 263 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
264 | "Callback for peer `%s' plugin `%s' BW out %llu, BW in %llu \n", | 264 | "Callback for peer `%s' plugin `%s' BW out %lu, BW in %lu \n", |
265 | GNUNET_i2s (id), | 265 | GNUNET_i2s (id), |
266 | plugin_name, | 266 | plugin_name, |
267 | ntohl (bandwidth_out.value__), | 267 | ntohl (bandwidth_out.value__), |
@@ -405,23 +405,23 @@ req_addr_peerinfo_it (void *cls, | |||
405 | return; | 405 | return; |
406 | } | 406 | } |
407 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 407 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
408 | "Callback for %s peer `%s' plugin `%s' BW out %u, BW in %u \n", | 408 | "Callback for %s peer `%s' plugin `%s' BW out %lu, BW in %lu \n", |
409 | (active == GNUNET_YES) ? "ACTIVE" : "INACTIVE", | 409 | (active == GNUNET_YES) ? "ACTIVE" : "INACTIVE", |
410 | GNUNET_i2s (id), | 410 | GNUNET_i2s (id), |
411 | plugin_name, | 411 | plugin_name, |
412 | (unsigned int) ntohl (bandwidth_out.value__), | 412 | ntohl (bandwidth_out.value__), |
413 | (unsigned int) ntohl (bandwidth_in.value__)); | 413 | ntohl (bandwidth_in.value__)); |
414 | 414 | ||
415 | /* Transmit result */ | 415 | /* Transmit result */ |
416 | if ((GNUNET_YES == ai->all) || (GNUNET_YES == active)) | 416 | if ((GNUNET_YES == ai->all) || (GNUNET_YES == active)) |
417 | { | 417 | { |
418 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 418 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
419 | "Sending result for %s peer `%s' plugin `%s' BW out %u, BW in %u \n", | 419 | "Sending result for %s peer `%s' plugin `%s' BW out %lu, BW in %lu \n", |
420 | (active == GNUNET_YES) ? "ACTIVE" : "INACTIVE", | 420 | (active == GNUNET_YES) ? "ACTIVE" : "INACTIVE", |
421 | GNUNET_i2s (id), | 421 | GNUNET_i2s (id), |
422 | plugin_name, | 422 | plugin_name, |
423 | (unsigned int) ntohl (bandwidth_out.value__), | 423 | ntohl (bandwidth_out.value__), |
424 | (unsigned int) ntohl (bandwidth_in.value__)); | 424 | ntohl (bandwidth_in.value__)); |
425 | transmit_req_addr (cls, | 425 | transmit_req_addr (cls, |
426 | id, | 426 | id, |
427 | plugin_name, | 427 | plugin_name, |
diff --git a/src/ats/gnunet-service-ats_scheduling.c b/src/ats/gnunet-service-ats_scheduling.c index 8a0cf0a8e..13aeb2f02 100644 --- a/src/ats/gnunet-service-ats_scheduling.c +++ b/src/ats/gnunet-service-ats_scheduling.c | |||
@@ -146,7 +146,7 @@ GAS_scheduling_transmit_address_suggestion (const struct GNUNET_PeerIdentity | |||
146 | strcpy (&addrp[plugin_addr_len], plugin_name); | 146 | strcpy (&addrp[plugin_addr_len], plugin_name); |
147 | 147 | ||
148 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 148 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
149 | "ATS sends quota for peer `%s': (in/out) %u/%u\n", | 149 | "ATS sends quota for peer `%s': (in/out) %lu/%lu\n", |
150 | GNUNET_i2s (peer), ntohl (bandwidth_in.value__), | 150 | GNUNET_i2s (peer), ntohl (bandwidth_in.value__), |
151 | ntohl (bandwidth_out.value__)); | 151 | ntohl (bandwidth_out.value__)); |
152 | 152 | ||
diff --git a/src/ats/perf_ats_solver.c b/src/ats/perf_ats_solver.c index 89d0d82e2..92dfcc0c8 100644 --- a/src/ats/perf_ats_solver.c +++ b/src/ats/perf_ats_solver.c | |||
@@ -300,7 +300,7 @@ bandwidth_changed_cb (void *cls, struct ATS_Address *address) | |||
300 | return; | 300 | return; |
301 | 301 | ||
302 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, | 302 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, |
303 | "Bandwidth changed addresses %s %p to %llu Bps out / %llu Bps in\n", | 303 | "Bandwidth changed addresses %s %p to %lu Bps out / %lu Bps in\n", |
304 | GNUNET_i2s (&address->peer), | 304 | GNUNET_i2s (&address->peer), |
305 | address, | 305 | address, |
306 | ntohl(address->assigned_bw_out.value__), | 306 | ntohl(address->assigned_bw_out.value__), |
diff --git a/src/ats/test_ats_mlp_averaging.c b/src/ats/test_ats_mlp_averaging.c index 390f380ea..4843e1114 100644 --- a/src/ats/test_ats_mlp_averaging.c +++ b/src/ats/test_ats_mlp_averaging.c | |||
@@ -218,7 +218,7 @@ check (void *cls, char *const *args, const char *cfgfile, | |||
218 | GNUNET_assert (GNUNET_OK == ctx.mlp_result); | 218 | GNUNET_assert (GNUNET_OK == ctx.mlp_result); |
219 | 219 | ||
220 | res[0] = GAS_mlp_get_preferred_address(mlp, addresses, &p[0]); | 220 | res[0] = GAS_mlp_get_preferred_address(mlp, addresses, &p[0]); |
221 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Preferred address `%s' outbound bandwidth: %u Bps\n",res[0]->plugin, ntohl(res[0]->assigned_bw_out.value__)); | 221 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Preferred address `%s' outbound bandwidth: %lu Bps\n",res[0]->plugin, ntohl(res[0]->assigned_bw_out.value__)); |
222 | 222 | ||
223 | /* Delete an address */ | 223 | /* Delete an address */ |
224 | GNUNET_CONTAINER_multihashmap_remove (addresses, &addr[0].peer.hashPubKey, &addr[0]); | 224 | GNUNET_CONTAINER_multihashmap_remove (addresses, &addr[0].peer.hashPubKey, &addr[0]); |
diff --git a/src/ats/test_ats_simplistic_pref_aging.c b/src/ats/test_ats_simplistic_pref_aging.c index 0dc89d8ba..a741ad6bb 100644 --- a/src/ats/test_ats_simplistic_pref_aging.c +++ b/src/ats/test_ats_simplistic_pref_aging.c | |||
@@ -169,7 +169,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address, | |||
169 | /* Callback for initial suggestion */ | 169 | /* Callback for initial suggestion */ |
170 | if (0 == memcmp (&address->peer, &p[0].id, sizeof (p[0].id))) | 170 | if (0 == memcmp (&address->peer, &p[0].id, sizeof (p[0].id))) |
171 | { | 171 | { |
172 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stage %u: Callback for peer 0 `%s': (in/out) %llu/%llu\n", | 172 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stage %u: Callback for peer 0 `%s': (in/out) %lu/%lu\n", |
173 | stage, | 173 | stage, |
174 | GNUNET_i2s (&address->peer), | 174 | GNUNET_i2s (&address->peer), |
175 | ntohl (bandwidth_in.value__), | 175 | ntohl (bandwidth_in.value__), |
@@ -180,7 +180,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address, | |||
180 | } | 180 | } |
181 | if (0 == memcmp (&address->peer, &p[1].id, sizeof (p[1].id))) | 181 | if (0 == memcmp (&address->peer, &p[1].id, sizeof (p[1].id))) |
182 | { | 182 | { |
183 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stage %u: Callback for peer 1 `%s': (in/out) %llu/%llu\n", | 183 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stage %u: Callback for peer 1 `%s': (in/out) %lu/%lu\n", |
184 | stage, | 184 | stage, |
185 | GNUNET_i2s (&address->peer), | 185 | GNUNET_i2s (&address->peer), |
186 | ntohl (bandwidth_in.value__), | 186 | ntohl (bandwidth_in.value__), |
@@ -205,7 +205,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address, | |||
205 | /* Callback due to preference change */ | 205 | /* Callback due to preference change */ |
206 | if (0 == memcmp (&address->peer, &p[0].id, sizeof (p[0].id))) | 206 | if (0 == memcmp (&address->peer, &p[0].id, sizeof (p[0].id))) |
207 | { | 207 | { |
208 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stage %u: Callback for peer 0 `%s': (in/out) %llu/%llu\n", | 208 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stage %u: Callback for peer 0 `%s': (in/out) %lu/%lu\n", |
209 | stage, | 209 | stage, |
210 | GNUNET_i2s (&address->peer), | 210 | GNUNET_i2s (&address->peer), |
211 | ntohl (bandwidth_in.value__), | 211 | ntohl (bandwidth_in.value__), |
@@ -222,7 +222,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address, | |||
222 | } | 222 | } |
223 | if (0 == memcmp (&address->peer, &p[1].id, sizeof (p[1].id))) | 223 | if (0 == memcmp (&address->peer, &p[1].id, sizeof (p[1].id))) |
224 | { | 224 | { |
225 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stage %u: Callback for peer 1 `%s': (in/out) %llu/%llu\n", | 225 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stage %u: Callback for peer 1 `%s': (in/out) %lu/%lu\n", |
226 | stage, | 226 | stage, |
227 | GNUNET_i2s (&address->peer), | 227 | GNUNET_i2s (&address->peer), |
228 | ntohl (bandwidth_in.value__), | 228 | ntohl (bandwidth_in.value__), |
@@ -256,7 +256,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address, | |||
256 | /* Callback due to preference aging */ | 256 | /* Callback due to preference aging */ |
257 | if (0 == memcmp (&address->peer, &p[0].id, sizeof (p[0].id))) | 257 | if (0 == memcmp (&address->peer, &p[0].id, sizeof (p[0].id))) |
258 | { | 258 | { |
259 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stage %u: Callback for peer 0 `%s': (in/out) %llu/%llu\n", | 259 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stage %u: Callback for peer 0 `%s': (in/out) %lu/%lu\n", |
260 | stage, | 260 | stage, |
261 | GNUNET_i2s (&address->peer), | 261 | GNUNET_i2s (&address->peer), |
262 | ntohl (bandwidth_in.value__), | 262 | ntohl (bandwidth_in.value__), |
@@ -273,7 +273,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address, | |||
273 | } | 273 | } |
274 | if (0 == memcmp (&address->peer, &p[1].id, sizeof (p[1].id))) | 274 | if (0 == memcmp (&address->peer, &p[1].id, sizeof (p[1].id))) |
275 | { | 275 | { |
276 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stage %u: Callback for peer 1 `%s': (in/out) %llu/%llu\n", | 276 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stage %u: Callback for peer 1 `%s': (in/out) %lu/%lu\n", |
277 | stage, | 277 | stage, |
278 | GNUNET_i2s (&address->peer), | 278 | GNUNET_i2s (&address->peer), |
279 | ntohl (bandwidth_in.value__), | 279 | ntohl (bandwidth_in.value__), |
diff --git a/src/ats/test_ats_solver_request_and_delete_address.c b/src/ats/test_ats_solver_request_and_delete_address.c index 312a3f2ef..e0b879433 100644 --- a/src/ats/test_ats_solver_request_and_delete_address.c +++ b/src/ats/test_ats_solver_request_and_delete_address.c | |||
@@ -159,7 +159,7 @@ address_suggest_cb (void *cls, const struct GNUNET_HELLO_Address *address, | |||
159 | /* Expecting disconnect */ | 159 | /* Expecting disconnect */ |
160 | 160 | ||
161 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 161 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
162 | "Received sugggestion for peer `%s': %llu %llu\n", | 162 | "Received sugggestion for peer `%s': %lu %lu\n", |
163 | GNUNET_i2s (&address->peer), | 163 | GNUNET_i2s (&address->peer), |
164 | ntohl(bandwidth_in.value__), | 164 | ntohl(bandwidth_in.value__), |
165 | ntohl(bandwidth_out.value__)); | 165 | ntohl(bandwidth_out.value__)); |