diff options
52 files changed, 364 insertions, 255 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index f0822c03c..d98e3458f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in | |||
@@ -214,6 +214,10 @@ src/identity-provider/identity_provider_api.c | |||
214 | src/identity-provider/identity_token.c | 214 | src/identity-provider/identity_token.c |
215 | src/identity-provider/plugin_rest_identity_provider.c | 215 | src/identity-provider/plugin_rest_identity_provider.c |
216 | src/jsonapi/jsonapi.c | 216 | src/jsonapi/jsonapi.c |
217 | src/jsonapi/jsonapi_document.c | ||
218 | src/jsonapi/jsonapi_error.c | ||
219 | src/jsonapi/jsonapi_relationship.c | ||
220 | src/jsonapi/jsonapi_resource.c | ||
217 | src/json/json.c | 221 | src/json/json.c |
218 | src/json/json_generator.c | 222 | src/json/json_generator.c |
219 | src/json/json_helper.c | 223 | src/json/json_helper.c |
@@ -322,6 +326,7 @@ src/set/ibf.c | |||
322 | src/set/ibf_sim.c | 326 | src/set/ibf_sim.c |
323 | src/set/set_api.c | 327 | src/set/set_api.c |
324 | src/social/gnunet-service-social.c | 328 | src/social/gnunet-service-social.c |
329 | src/social/gnunet-social.c | ||
325 | src/social/social_api.c | 330 | src/social/social_api.c |
326 | src/statistics/gnunet-service-statistics.c | 331 | src/statistics/gnunet-service-statistics.c |
327 | src/statistics/gnunet-statistics.c | 332 | src/statistics/gnunet-statistics.c |
diff --git a/src/ats-tests/ats-testing-log.c b/src/ats-tests/ats-testing-log.c index 5e22d4b47..87af31f5f 100644 --- a/src/ats-tests/ats-testing-log.c +++ b/src/ats-tests/ats-testing-log.c | |||
@@ -698,12 +698,13 @@ GNUNET_ATS_TEST_logging_now (struct LoggingHandle *l) | |||
698 | if (GNUNET_YES == l->verbose) | 698 | if (GNUNET_YES == l->verbose) |
699 | { | 699 | { |
700 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 700 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
701 | "Master[%u] delta: %llu us, bytes (sent/received): %u / %u; throughput send/recv: %u / %u\n", c_m, | 701 | "Master[%u] delta: %llu us, bytes (sent/received): %u / %u; throughput send/recv: %u / %u\n", |
702 | delta.rel_value_us, | 702 | c_m, |
703 | mlt->total_bytes_sent, | 703 | (unsigned long long) delta.rel_value_us, |
704 | mlt->total_bytes_received, | 704 | mlt->total_bytes_sent, |
705 | mlt->total_throughput_send, | 705 | mlt->total_bytes_received, |
706 | mlt->total_throughput_recv); | 706 | mlt->total_throughput_send, |
707 | mlt->total_throughput_recv); | ||
707 | } | 708 | } |
708 | 709 | ||
709 | mlt->slaves_log = GNUNET_malloc (bp->peer->num_partners * | 710 | mlt->slaves_log = GNUNET_malloc (bp->peer->num_partners * |
@@ -783,13 +784,13 @@ GNUNET_ATS_TEST_logging_now (struct LoggingHandle *l) | |||
783 | if (GNUNET_YES == l->verbose) | 784 | if (GNUNET_YES == l->verbose) |
784 | { | 785 | { |
785 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 786 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
786 | "Master [%u] -> Slave [%u]: delta: %llu us, bytes (sent/received): %u / %u; throughput send/recv: %u / %u\n", | 787 | "Master [%u] -> Slave [%u]: delta: %llu us, bytes (sent/received): %u / %u; throughput send/recv: %u / %u\n", |
787 | c_m, c_s, | 788 | c_m, c_s, |
788 | delta.rel_value_us, | 789 | (unsigned long long) delta.rel_value_us, |
789 | mlt->total_bytes_sent, | 790 | mlt->total_bytes_sent, |
790 | mlt->total_bytes_received, | 791 | mlt->total_bytes_received, |
791 | slt->throughput_sent, | 792 | slt->throughput_sent, |
792 | slt->throughput_recv); | 793 | slt->throughput_recv); |
793 | } | 794 | } |
794 | else | 795 | else |
795 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, | 796 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, |
diff --git a/src/ats-tests/ats-testing-preferences.c b/src/ats-tests/ats-testing-preferences.c index 856c8de4b..256fa844b 100644 --- a/src/ats-tests/ats-testing-preferences.c +++ b/src/ats-tests/ats-testing-preferences.c | |||
@@ -143,13 +143,13 @@ set_pref_task (void *cls) | |||
143 | */ | 143 | */ |
144 | struct PreferenceGenerator * | 144 | struct PreferenceGenerator * |
145 | GNUNET_ATS_TEST_generate_preferences_start (struct BenchmarkPeer *src, | 145 | GNUNET_ATS_TEST_generate_preferences_start (struct BenchmarkPeer *src, |
146 | struct BenchmarkPartner *dest, | 146 | struct BenchmarkPartner *dest, |
147 | enum GeneratorType type, | 147 | enum GeneratorType type, |
148 | long int base_value, | 148 | unsigned int base_value, |
149 | long int value_rate, | 149 | unsigned int value_rate, |
150 | struct GNUNET_TIME_Relative period, | 150 | struct GNUNET_TIME_Relative period, |
151 | struct GNUNET_TIME_Relative frequency, | 151 | struct GNUNET_TIME_Relative frequency, |
152 | enum GNUNET_ATS_PreferenceKind kind) | 152 | enum GNUNET_ATS_PreferenceKind kind) |
153 | { | 153 | { |
154 | struct PreferenceGenerator *pg; | 154 | struct PreferenceGenerator *pg; |
155 | 155 | ||
@@ -174,31 +174,31 @@ GNUNET_ATS_TEST_generate_preferences_start (struct BenchmarkPeer *src, | |||
174 | switch (type) { | 174 | switch (type) { |
175 | case GNUNET_ATS_TEST_TG_CONSTANT: | 175 | case GNUNET_ATS_TEST_TG_CONSTANT: |
176 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 176 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
177 | "Setting up constant preference generator master[%u] `%s' and slave [%u] `%s' max %u Bips\n", | 177 | "Setting up constant preference generator master[%u] `%s' and slave [%u] `%s' max %u Bips\n", |
178 | dest->me->no, GNUNET_i2s (&dest->me->id), | 178 | dest->me->no, GNUNET_i2s (&dest->me->id), |
179 | dest->dest->no, GNUNET_i2s (&dest->dest->id), | 179 | dest->dest->no, GNUNET_i2s (&dest->dest->id), |
180 | base_value); | 180 | base_value); |
181 | break; | 181 | break; |
182 | case GNUNET_ATS_TEST_TG_LINEAR: | 182 | case GNUNET_ATS_TEST_TG_LINEAR: |
183 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 183 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
184 | "Setting up linear preference generator master[%u] `%s' and slave [%u] `%s' min %u Bips max %u Bips\n", | 184 | "Setting up linear preference generator master[%u] `%s' and slave [%u] `%s' min %u Bips max %u Bips\n", |
185 | dest->me->no, GNUNET_i2s (&dest->me->id), | 185 | dest->me->no, GNUNET_i2s (&dest->me->id), |
186 | dest->dest->no, GNUNET_i2s (&dest->dest->id), | 186 | dest->dest->no, GNUNET_i2s (&dest->dest->id), |
187 | base_value, value_rate); | 187 | base_value, value_rate); |
188 | break; | 188 | break; |
189 | case GNUNET_ATS_TEST_TG_SINUS: | 189 | case GNUNET_ATS_TEST_TG_SINUS: |
190 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 190 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
191 | "Setting up sinus preference generator master[%u] `%s' and slave [%u] `%s' baserate %u Bips, amplitude %u Bps\n", | 191 | "Setting up sinus preference generator master[%u] `%s' and slave [%u] `%s' baserate %u Bips, amplitude %u Bps\n", |
192 | dest->me->no, GNUNET_i2s (&dest->me->id), | 192 | dest->me->no, GNUNET_i2s (&dest->me->id), |
193 | dest->dest->no, GNUNET_i2s (&dest->dest->id), | 193 | dest->dest->no, GNUNET_i2s (&dest->dest->id), |
194 | base_value, value_rate); | 194 | base_value, value_rate); |
195 | break; | 195 | break; |
196 | case GNUNET_ATS_TEST_TG_RANDOM: | 196 | case GNUNET_ATS_TEST_TG_RANDOM: |
197 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 197 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
198 | "Setting up random preference generator master[%u] `%s' and slave [%u] `%s' min %u Bips max %u Bps\n", | 198 | "Setting up random preference generator master[%u] `%s' and slave [%u] `%s' min %u Bips max %u Bps\n", |
199 | dest->me->no, GNUNET_i2s (&dest->me->id), | 199 | dest->me->no, GNUNET_i2s (&dest->me->id), |
200 | dest->dest->no, GNUNET_i2s (&dest->dest->id), | 200 | dest->dest->no, GNUNET_i2s (&dest->dest->id), |
201 | base_value, value_rate); | 201 | base_value, value_rate); |
202 | break; | 202 | break; |
203 | default: | 203 | default: |
204 | break; | 204 | break; |
diff --git a/src/ats-tests/ats-testing-traffic.c b/src/ats-tests/ats-testing-traffic.c index 5eb01bd55..f0bab7367 100644 --- a/src/ats-tests/ats-testing-traffic.c +++ b/src/ats-tests/ats-testing-traffic.c | |||
@@ -93,8 +93,9 @@ get_delay (struct TrafficGenerator *tg) | |||
93 | delay.rel_value_us = GNUNET_TIME_UNIT_SECONDS.rel_value_us * TEST_MESSAGE_SIZE / cur_rate; | 93 | delay.rel_value_us = GNUNET_TIME_UNIT_SECONDS.rel_value_us * TEST_MESSAGE_SIZE / cur_rate; |
94 | 94 | ||
95 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 95 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
96 | "Current rate is %u, calculated delay is %u \n", | 96 | "Current rate is %lld, calculated delay is %llu\n", |
97 | cur_rate, delay.rel_value_us); | 97 | cur_rate, |
98 | (unsigned long long) delay.rel_value_us); | ||
98 | return delay; | 99 | return delay; |
99 | } | 100 | } |
100 | 101 | ||
@@ -308,12 +309,12 @@ GNUNET_ATS_TEST_traffic_handle_pong (struct BenchmarkPartner *p) | |||
308 | */ | 309 | */ |
309 | struct TrafficGenerator * | 310 | struct TrafficGenerator * |
310 | GNUNET_ATS_TEST_generate_traffic_start (struct BenchmarkPeer *src, | 311 | GNUNET_ATS_TEST_generate_traffic_start (struct BenchmarkPeer *src, |
311 | struct BenchmarkPartner *dest, | 312 | struct BenchmarkPartner *dest, |
312 | enum GeneratorType type, | 313 | enum GeneratorType type, |
313 | long int base_rate, | 314 | unsigned int base_rate, |
314 | long int max_rate, | 315 | unsigned int max_rate, |
315 | struct GNUNET_TIME_Relative period, | 316 | struct GNUNET_TIME_Relative period, |
316 | struct GNUNET_TIME_Relative duration) | 317 | struct GNUNET_TIME_Relative duration) |
317 | { | 318 | { |
318 | struct TrafficGenerator *tg; | 319 | struct TrafficGenerator *tg; |
319 | 320 | ||
@@ -337,31 +338,32 @@ GNUNET_ATS_TEST_generate_traffic_start (struct BenchmarkPeer *src, | |||
337 | switch (type) { | 338 | switch (type) { |
338 | case GNUNET_ATS_TEST_TG_CONSTANT: | 339 | case GNUNET_ATS_TEST_TG_CONSTANT: |
339 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 340 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
340 | "Setting up constant traffic generator master[%u] `%s' and slave [%u] `%s' max %u Bips\n", | 341 | "Setting up constant traffic generator master[%u] `%s' and slave [%u] `%s' max %u Bips\n", |
341 | dest->me->no, GNUNET_i2s (&dest->me->id), | 342 | dest->me->no, GNUNET_i2s (&dest->me->id), |
342 | dest->dest->no, GNUNET_i2s (&dest->dest->id), | 343 | dest->dest->no, GNUNET_i2s (&dest->dest->id), |
343 | base_rate); | 344 | base_rate); |
344 | break; | 345 | break; |
345 | case GNUNET_ATS_TEST_TG_LINEAR: | 346 | case GNUNET_ATS_TEST_TG_LINEAR: |
346 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 347 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
347 | "Setting up linear traffic generator master[%u] `%s' and slave [%u] `%s' min %u Bips max %u Bips\n", | 348 | "Setting up linear traffic generator master[%u] `%s' and slave [%u] `%s' min %u Bips max %u Bips\n", |
348 | dest->me->no, GNUNET_i2s (&dest->me->id), | 349 | dest->me->no, GNUNET_i2s (&dest->me->id), |
349 | dest->dest->no, GNUNET_i2s (&dest->dest->id), | 350 | dest->dest->no, GNUNET_i2s (&dest->dest->id), |
350 | base_rate, max_rate); | 351 | base_rate, |
352 | max_rate); | ||
351 | break; | 353 | break; |
352 | case GNUNET_ATS_TEST_TG_SINUS: | 354 | case GNUNET_ATS_TEST_TG_SINUS: |
353 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 355 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
354 | "Setting up sinus traffic generator master[%u] `%s' and slave [%u] `%s' baserate %u Bips, amplitude %u Bps\n", | 356 | "Setting up sinus traffic generator master[%u] `%s' and slave [%u] `%s' baserate %u Bips, amplitude %u Bps\n", |
355 | dest->me->no, GNUNET_i2s (&dest->me->id), | 357 | dest->me->no, GNUNET_i2s (&dest->me->id), |
356 | dest->dest->no, GNUNET_i2s (&dest->dest->id), | 358 | dest->dest->no, GNUNET_i2s (&dest->dest->id), |
357 | base_rate, max_rate); | 359 | base_rate, max_rate); |
358 | break; | 360 | break; |
359 | case GNUNET_ATS_TEST_TG_RANDOM: | 361 | case GNUNET_ATS_TEST_TG_RANDOM: |
360 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 362 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
361 | "Setting up random traffic generator master[%u] `%s' and slave [%u] `%s' min %u Bips max %u Bps\n", | 363 | "Setting up random traffic generator master[%u] `%s' and slave [%u] `%s' min %u Bips max %u Bps\n", |
362 | dest->me->no, GNUNET_i2s (&dest->me->id), | 364 | dest->me->no, GNUNET_i2s (&dest->me->id), |
363 | dest->dest->no, GNUNET_i2s (&dest->dest->id), | 365 | dest->dest->no, GNUNET_i2s (&dest->dest->id), |
364 | base_rate, max_rate); | 366 | base_rate, max_rate); |
365 | break; | 367 | break; |
366 | default: | 368 | default: |
367 | break; | 369 | break; |
diff --git a/src/ats-tests/ats-testing.c b/src/ats-tests/ats-testing.c index 49aa5a052..24d464424 100644 --- a/src/ats-tests/ats-testing.c +++ b/src/ats-tests/ats-testing.c | |||
@@ -243,8 +243,9 @@ comm_connect_cb (void *cls, const struct GNUNET_PeerIdentity * peer) | |||
243 | 243 | ||
244 | if (me->core_slave_connections == top->num_slaves) | 244 | if (me->core_slave_connections == top->num_slaves) |
245 | { | 245 | { |
246 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Master [%u] connected all slaves\n", | 246 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, |
247 | me->no); | 247 | "Master [%u] connected all slaves\n", |
248 | me->no); | ||
248 | } | 249 | } |
249 | completed = GNUNET_YES; | 250 | completed = GNUNET_YES; |
250 | for (c = 0; c < top->num_masters; c++) | 251 | for (c = 0; c < top->num_masters; c++) |
@@ -254,9 +255,8 @@ comm_connect_cb (void *cls, const struct GNUNET_PeerIdentity * peer) | |||
254 | } | 255 | } |
255 | if (GNUNET_YES == completed) | 256 | if (GNUNET_YES == completed) |
256 | { | 257 | { |
257 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, | 258 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
258 | "All master peers connected all slave peers\n", id, | 259 | "All master peers connected all slave peers\n"); |
259 | GNUNET_i2s (peer)); | ||
260 | top->state.connected_CORE = GNUNET_YES; | 260 | top->state.connected_CORE = GNUNET_YES; |
261 | /* Notify about setup done */ | 261 | /* Notify about setup done */ |
262 | if (NULL != top->done_cb) | 262 | if (NULL != top->done_cb) |
diff --git a/src/ats-tests/ats-testing.h b/src/ats-tests/ats-testing.h index f0770d6ae..74da0f78c 100644 --- a/src/ats-tests/ats-testing.h +++ b/src/ats-tests/ats-testing.h | |||
@@ -591,12 +591,13 @@ GNUNET_ATS_TEST_traffic_handle_pong (struct BenchmarkPartner *p); | |||
591 | */ | 591 | */ |
592 | struct TrafficGenerator * | 592 | struct TrafficGenerator * |
593 | GNUNET_ATS_TEST_generate_traffic_start (struct BenchmarkPeer *src, | 593 | GNUNET_ATS_TEST_generate_traffic_start (struct BenchmarkPeer *src, |
594 | struct BenchmarkPartner *dest, | 594 | struct BenchmarkPartner *dest, |
595 | enum GeneratorType type, | 595 | enum GeneratorType type, |
596 | long int base_rate, | 596 | unsigned int base_rate, |
597 | long int max_rate, | 597 | unsigned int max_rate, |
598 | struct GNUNET_TIME_Relative period, | 598 | struct GNUNET_TIME_Relative period, |
599 | struct GNUNET_TIME_Relative duration); | 599 | struct GNUNET_TIME_Relative duration); |
600 | |||
600 | 601 | ||
601 | void | 602 | void |
602 | GNUNET_ATS_TEST_generate_traffic_stop (struct TrafficGenerator *tg); | 603 | GNUNET_ATS_TEST_generate_traffic_stop (struct TrafficGenerator *tg); |
@@ -623,13 +624,13 @@ GNUNET_ATS_TEST_generate_traffic_stop_all (); | |||
623 | */ | 624 | */ |
624 | struct PreferenceGenerator * | 625 | struct PreferenceGenerator * |
625 | GNUNET_ATS_TEST_generate_preferences_start (struct BenchmarkPeer *src, | 626 | GNUNET_ATS_TEST_generate_preferences_start (struct BenchmarkPeer *src, |
626 | struct BenchmarkPartner *dest, | 627 | struct BenchmarkPartner *dest, |
627 | enum GeneratorType type, | 628 | enum GeneratorType type, |
628 | long int base_value, | 629 | unsigned int base_value, |
629 | long int value_rate, | 630 | unsigned int value_rate, |
630 | struct GNUNET_TIME_Relative period, | 631 | struct GNUNET_TIME_Relative period, |
631 | struct GNUNET_TIME_Relative frequency, | 632 | struct GNUNET_TIME_Relative frequency, |
632 | enum GNUNET_ATS_PreferenceKind kind); | 633 | enum GNUNET_ATS_PreferenceKind kind); |
633 | 634 | ||
634 | void | 635 | void |
635 | GNUNET_ATS_TEST_generate_preferences_stop (struct PreferenceGenerator *pg); | 636 | GNUNET_ATS_TEST_generate_preferences_stop (struct PreferenceGenerator *pg); |
diff --git a/src/ats/gnunet-service-ats_plugins.c b/src/ats/gnunet-service-ats_plugins.c index a753d6a8c..c2388e28b 100644 --- a/src/ats/gnunet-service-ats_plugins.c +++ b/src/ats/gnunet-service-ats_plugins.c | |||
@@ -132,8 +132,7 @@ solver_info_cb (void *cls, | |||
132 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 132 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
133 | "Solver notifies `%s' with result `%s'\n", | 133 | "Solver notifies `%s' with result `%s'\n", |
134 | "GAS_OP_SOLVE_STOP", | 134 | "GAS_OP_SOLVE_STOP", |
135 | (GAS_STAT_SUCCESS == status) ? "SUCCESS" : "FAIL", | 135 | (GAS_STAT_SUCCESS == status) ? "SUCCESS" : "FAIL"); |
136 | add_info); | ||
137 | return; | 136 | return; |
138 | case GAS_OP_SOLVE_SETUP_START: | 137 | case GAS_OP_SOLVE_SETUP_START: |
139 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 138 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
@@ -306,7 +305,7 @@ parse_quota (const char *quota_str, | |||
306 | direction, | 305 | direction, |
307 | GNUNET_ATS_print_network_type (network), | 306 | GNUNET_ATS_print_network_type (network), |
308 | quota_str, | 307 | quota_str, |
309 | GNUNET_ATS_DefaultBandwidth); | 308 | (unsigned long long) GNUNET_ATS_DefaultBandwidth); |
310 | ret = GNUNET_ATS_DefaultBandwidth; | 309 | ret = GNUNET_ATS_DefaultBandwidth; |
311 | } | 310 | } |
312 | else | 311 | else |
@@ -360,7 +359,7 @@ load_quota (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
360 | _("No %s-quota configured for network `%s', assigning default bandwidth %llu\n"), | 359 | _("No %s-quota configured for network `%s', assigning default bandwidth %llu\n"), |
361 | direction, | 360 | direction, |
362 | GNUNET_ATS_print_network_type (type), | 361 | GNUNET_ATS_print_network_type (type), |
363 | GNUNET_ATS_DefaultBandwidth); | 362 | (unsigned long long) GNUNET_ATS_DefaultBandwidth); |
364 | ret = GNUNET_ATS_DefaultBandwidth; | 363 | ret = GNUNET_ATS_DefaultBandwidth; |
365 | } | 364 | } |
366 | GNUNET_free (entry); | 365 | GNUNET_free (entry); |
diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c index d5b0688e6..960f4788c 100644 --- a/src/cadet/cadet_api.c +++ b/src/cadet/cadet_api.c | |||
@@ -1105,7 +1105,10 @@ process_get_peer (struct GNUNET_CADET_Handle *h, | |||
1105 | if (msize != esize) | 1105 | if (msize != esize) |
1106 | { | 1106 | { |
1107 | GNUNET_break_op (0); | 1107 | GNUNET_break_op (0); |
1108 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "m:%u, e: %u\n", msize, esize); | 1108 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
1109 | "m:%u, e: %u\n", | ||
1110 | (unsigned int) msize, | ||
1111 | (unsigned int) esize); | ||
1109 | h->info_cb.peer_cb (h->info_cls, NULL, 0, 0, 0, NULL); | 1112 | h->info_cb.peer_cb (h->info_cls, NULL, 0, 0, 0, NULL); |
1110 | goto clean_cls; | 1113 | goto clean_cls; |
1111 | } | 1114 | } |
@@ -1212,11 +1215,17 @@ process_get_tunnel (struct GNUNET_CADET_Handle *h, | |||
1212 | if (msize != esize) | 1215 | if (msize != esize) |
1213 | { | 1216 | { |
1214 | GNUNET_break_op (0); | 1217 | GNUNET_break_op (0); |
1215 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "m:%u, e: %u (%u ch, %u conn)\n", | 1218 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1216 | msize, esize, ch_n, c_n); | 1219 | "m:%u, e: %u (%u ch, %u conn)\n", |
1217 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%u (%u ch, %u conn)\n", | 1220 | (unsigned int) msize, |
1218 | sizeof (struct GNUNET_CADET_LocalInfoTunnel), | 1221 | (unsigned int) esize, |
1219 | sizeof (CADET_ChannelNumber), sizeof (struct GNUNET_HashCode)); | 1222 | ch_n, |
1223 | c_n); | ||
1224 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1225 | "%u (%u ch, %u conn)\n", | ||
1226 | (unsigned int) sizeof (struct GNUNET_CADET_LocalInfoTunnel), | ||
1227 | (unsigned int) sizeof (CADET_ChannelNumber), | ||
1228 | (unsigned int) sizeof (struct GNUNET_HashCode)); | ||
1220 | h->info_cb.tunnel_cb (h->info_cls, NULL, 0, 0, NULL, NULL, 0, 0); | 1229 | h->info_cb.tunnel_cb (h->info_cls, NULL, 0, 0, NULL, NULL, 0, 0); |
1221 | goto clean_cls; | 1230 | goto clean_cls; |
1222 | } | 1231 | } |
diff --git a/src/cadet/gnunet-cadet-profiler.c b/src/cadet/gnunet-cadet-profiler.c index b2a07cb0c..aa095d190 100644 --- a/src/cadet/gnunet-cadet-profiler.c +++ b/src/cadet/gnunet-cadet-profiler.c | |||
@@ -453,8 +453,10 @@ stats_iterator (void *cls, | |||
453 | uint32_t i; | 453 | uint32_t i; |
454 | 454 | ||
455 | i = GNUNET_TESTBED_get_index (peer); | 455 | i = GNUNET_TESTBED_get_index (peer); |
456 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " STATS %u - %s [%s]: %llu\n", | 456 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
457 | i, subsystem, name, value); | 457 | " STATS %u - %s [%s]: %llu\n", |
458 | i, subsystem, name, | ||
459 | (unsigned long long) value); | ||
458 | 460 | ||
459 | return GNUNET_OK; | 461 | return GNUNET_OK; |
460 | } | 462 | } |
@@ -569,7 +571,9 @@ adjust_running_peers (unsigned int target) | |||
569 | static void | 571 | static void |
570 | next_rnd (void *cls) | 572 | next_rnd (void *cls) |
571 | { | 573 | { |
572 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "ROUND %ld\n", current_round); | 574 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
575 | "ROUND %u\n", | ||
576 | current_round); | ||
573 | if (0.0 == rounds[current_round]) | 577 | if (0.0 == rounds[current_round]) |
574 | { | 578 | { |
575 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Finishing\n"); | 579 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Finishing\n"); |
@@ -680,7 +684,7 @@ pong (struct GNUNET_CADET_Channel *channel, | |||
680 | static size_t | 684 | static size_t |
681 | tmt_rdy_ping (void *cls, size_t size, void *buf) | 685 | tmt_rdy_ping (void *cls, size_t size, void *buf) |
682 | { | 686 | { |
683 | struct CadetPeer *peer = (struct CadetPeer *) cls; | 687 | struct CadetPeer *peer = cls; |
684 | struct CadetPingMessage *msg = buf; | 688 | struct CadetPingMessage *msg = buf; |
685 | 689 | ||
686 | peer->ping_ntr = NULL; | 690 | peer->ping_ntr = NULL; |
@@ -691,11 +695,16 @@ tmt_rdy_ping (void *cls, size_t size, void *buf) | |||
691 | GNUNET_break (GNUNET_YES == test_finished); | 695 | GNUNET_break (GNUNET_YES == test_finished); |
692 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 696 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
693 | "size %u, buf %p, data_sent %u, data_received %u\n", | 697 | "size %u, buf %p, data_sent %u, data_received %u\n", |
694 | size, buf, peer->data_sent, peer->data_received); | 698 | (unsigned int) size, |
699 | buf, | ||
700 | peer->data_sent, | ||
701 | peer->data_received); | ||
695 | 702 | ||
696 | return 0; | 703 | return 0; |
697 | } | 704 | } |
698 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending: msg %d\n", peer->data_sent); | 705 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
706 | "Sending: msg %d\n", | ||
707 | peer->data_sent); | ||
699 | msg->header.size = htons (size); | 708 | msg->header.size = htons (size); |
700 | msg->header.type = htons (PING); | 709 | msg->header.type = htons (PING); |
701 | msg->counter = htonl (peer->data_sent++); | 710 | msg->counter = htonl (peer->data_sent++); |
@@ -726,7 +735,9 @@ ping_handler (void *cls, struct GNUNET_CADET_Channel *channel, | |||
726 | { | 735 | { |
727 | long n = (long) cls; | 736 | long n = (long) cls; |
728 | 737 | ||
729 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%u got PING\n", n); | 738 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
739 | "%u got PING\n", | ||
740 | (unsigned int) n); | ||
730 | GNUNET_CADET_receive_done (channel); | 741 | GNUNET_CADET_receive_done (channel); |
731 | if (GNUNET_NO == test_finished) | 742 | if (GNUNET_NO == test_finished) |
732 | pong (channel, (struct CadetPingMessage *) message); | 743 | pong (channel, (struct CadetPingMessage *) message); |
@@ -814,8 +825,11 @@ incoming_channel (void *cls, struct GNUNET_CADET_Channel *channel, | |||
814 | GNUNET_assert (NULL != peer); | 825 | GNUNET_assert (NULL != peer); |
815 | if (NULL == peers[n].incoming) | 826 | if (NULL == peers[n].incoming) |
816 | { | 827 | { |
817 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "WARMUP %3u: %u <= %u\n", | 828 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
818 | peers_warmup, n, get_index (peer)); | 829 | "WARMUP %3u: %u <= %u\n", |
830 | peers_warmup, | ||
831 | (unsigned int) n, | ||
832 | get_index (peer)); | ||
819 | peers_warmup++; | 833 | peers_warmup++; |
820 | if (peers_warmup < peers_total) | 834 | if (peers_warmup < peers_total) |
821 | return NULL; | 835 | return NULL; |
@@ -829,8 +843,11 @@ incoming_channel (void *cls, struct GNUNET_CADET_Channel *channel, | |||
829 | } | 843 | } |
830 | GNUNET_assert (peer == peers[n].incoming); | 844 | GNUNET_assert (peer == peers[n].incoming); |
831 | GNUNET_assert (peer->dest == &peers[n]); | 845 | GNUNET_assert (peer->dest == &peers[n]); |
832 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "%u <= %u %p\n", | 846 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
833 | n, get_index (peer), channel); | 847 | "%u <= %u %p\n", |
848 | (unsigned int) n, | ||
849 | get_index (peer), | ||
850 | channel); | ||
834 | peers[n].incoming_ch = channel; | 851 | peers[n].incoming_ch = channel; |
835 | 852 | ||
836 | return NULL; | 853 | return NULL; |
@@ -911,8 +928,11 @@ start_test (void *cls) | |||
911 | GNUNET_CADET_TEST_cleanup (test_ctx); | 928 | GNUNET_CADET_TEST_cleanup (test_ctx); |
912 | return; | 929 | return; |
913 | } | 930 | } |
914 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "%u => %u %p\n", | 931 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
915 | i, get_index (peers[i].dest), peers[i].ch); | 932 | "%lu => %u %p\n", |
933 | i, | ||
934 | get_index (peers[i].dest), | ||
935 | peers[i].ch); | ||
916 | peers[i].ping_task = GNUNET_SCHEDULER_add_delayed (delay_ms_rnd (2000), | 936 | peers[i].ping_task = GNUNET_SCHEDULER_add_delayed (delay_ms_rnd (2000), |
917 | &ping, &peers[i]); | 937 | &ping, &peers[i]); |
918 | } | 938 | } |
@@ -981,8 +1001,10 @@ peer_id_cb (void *cls, | |||
981 | return; | 1001 | return; |
982 | } | 1002 | } |
983 | peers[n].id = *(pinfo->result.id); | 1003 | peers[n].id = *(pinfo->result.id); |
984 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, " %u id: %s\n", | 1004 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
985 | n, GNUNET_i2s (&peers[n].id)); | 1005 | "%ld id: %s\n", |
1006 | n, | ||
1007 | GNUNET_i2s (&peers[n].id)); | ||
986 | GNUNET_break (GNUNET_OK == | 1008 | GNUNET_break (GNUNET_OK == |
987 | GNUNET_CONTAINER_multipeermap_put (ids, &peers[n].id, &peers[n], | 1009 | GNUNET_CONTAINER_multipeermap_put (ids, &peers[n].id, &peers[n], |
988 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST)); | 1010 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST)); |
diff --git a/src/cadet/gnunet-cadet.c b/src/cadet/gnunet-cadet.c index 6453392d8..f24975203 100644 --- a/src/cadet/gnunet-cadet.c +++ b/src/cadet/gnunet-cadet.c | |||
@@ -266,7 +266,9 @@ data_ready (void *cls, size_t size, void *buf) | |||
266 | } | 266 | } |
267 | 267 | ||
268 | total_size = data_size + sizeof (struct GNUNET_MessageHeader); | 268 | total_size = data_size + sizeof (struct GNUNET_MessageHeader); |
269 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending %u bytes\n", data_size); | 269 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
270 | "sending %u bytes\n", | ||
271 | (unsigned int) data_size); | ||
270 | GNUNET_assert (size >= total_size); | 272 | GNUNET_assert (size >= total_size); |
271 | 273 | ||
272 | msg = buf; | 274 | msg = buf; |
@@ -297,7 +299,9 @@ read_stdio (void *cls) | |||
297 | static char buf[60000]; | 299 | static char buf[60000]; |
298 | 300 | ||
299 | data_size = read (0, buf, 60000); | 301 | data_size = read (0, buf, 60000); |
300 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "stdio read %u bytes\n", data_size); | 302 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
303 | "stdio read %u bytes\n", | ||
304 | (unsigned int) data_size); | ||
301 | if (data_size < 1) | 305 | if (data_size < 1) |
302 | { | 306 | { |
303 | GNUNET_SCHEDULER_shutdown(); | 307 | GNUNET_SCHEDULER_shutdown(); |
diff --git a/src/conversation/gnunet-helper-audio-playback.c b/src/conversation/gnunet-helper-audio-playback.c index 7b9589181..77529e3b5 100644 --- a/src/conversation/gnunet-helper-audio-playback.c +++ b/src/conversation/gnunet-helper-audio-playback.c | |||
@@ -173,15 +173,15 @@ process_header (ogg_packet *op) | |||
173 | dec = opus_decoder_create (SAMPLING_RATE, channels, &err); | 173 | dec = opus_decoder_create (SAMPLING_RATE, channels, &err); |
174 | if (OPUS_OK != err) | 174 | if (OPUS_OK != err) |
175 | { | 175 | { |
176 | fprintf (stderr, | 176 | fprintf (stderr, |
177 | "Cannot create encoder: %s\n", | 177 | "Cannot create encoder: %s\n", |
178 | opus_strerror (err)); | 178 | opus_strerror (err)); |
179 | return NULL; | 179 | return NULL; |
180 | } | 180 | } |
181 | if (! dec) | 181 | if (! dec) |
182 | { | 182 | { |
183 | fprintf (stderr, | 183 | fprintf (stderr, |
184 | "Decoder initialization failed: %s\n", | 184 | "Decoder initialization failed: %s\n", |
185 | opus_strerror (err)); | 185 | opus_strerror (err)); |
186 | return NULL; | 186 | return NULL; |
187 | } | 187 | } |
@@ -209,7 +209,7 @@ process_header (ogg_packet *op) | |||
209 | 209 | ||
210 | 210 | ||
211 | #ifdef DEBUG_DUMP_DECODED_OGG | 211 | #ifdef DEBUG_DUMP_DECODED_OGG |
212 | static size_t | 212 | static size_t |
213 | fwrite_le32(opus_int32 i32, FILE *file) | 213 | fwrite_le32(opus_int32 i32, FILE *file) |
214 | { | 214 | { |
215 | unsigned char buf[4]; | 215 | unsigned char buf[4]; |
@@ -221,7 +221,7 @@ fwrite_le32(opus_int32 i32, FILE *file) | |||
221 | } | 221 | } |
222 | 222 | ||
223 | 223 | ||
224 | static size_t | 224 | static size_t |
225 | fwrite_le16(int i16, FILE *file) | 225 | fwrite_le16(int i16, FILE *file) |
226 | { | 226 | { |
227 | unsigned char buf[2]; | 227 | unsigned char buf[2]; |
@@ -292,9 +292,11 @@ audio_write (int64_t maxout) | |||
292 | int64_t wrote = 0; | 292 | int64_t wrote = 0; |
293 | wrote = to_write; | 293 | wrote = to_write; |
294 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 294 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
295 | "Writing %u * %u * %u = %u bytes into PA\n", | 295 | "Writing %u * %u * %u = %llu bytes into PA\n", |
296 | to_write, channels, sizeof (float), | 296 | to_write, |
297 | to_write * channels * sizeof (float)); | 297 | channels, |
298 | (unsigned int) sizeof (float), | ||
299 | (unsigned long long) (to_write * channels * sizeof (float))); | ||
298 | #ifdef DEBUG_DUMP_DECODED_OGG | 300 | #ifdef DEBUG_DUMP_DECODED_OGG |
299 | if (dump_to_stdout) | 301 | if (dump_to_stdout) |
300 | { | 302 | { |
@@ -453,12 +455,14 @@ ogg_demux_and_decode () | |||
453 | so that we can adjust the timestamp counting.*/ | 455 | so that we can adjust the timestamp counting.*/ |
454 | gran_offset = preskip; | 456 | gran_offset = preskip; |
455 | 457 | ||
456 | if (!pcm_buffer) | 458 | if (! pcm_buffer) |
457 | { | 459 | { |
458 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 460 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
459 | "Allocating %u * %u * %u = %u bytes of buffer space\n", | 461 | "Allocating %u * %u * %u = %llu bytes of buffer space\n", |
460 | MAX_FRAME_SIZE, channels, sizeof (float), | 462 | MAX_FRAME_SIZE, |
461 | MAX_FRAME_SIZE * channels * sizeof (float)); | 463 | channels, |
464 | (unsigned int) sizeof (float), | ||
465 | (unsigned long long) (MAX_FRAME_SIZE * channels * sizeof (float))); | ||
462 | pcm_buffer = pa_xmalloc (sizeof (float) * MAX_FRAME_SIZE * channels); | 466 | pcm_buffer = pa_xmalloc (sizeof (float) * MAX_FRAME_SIZE * channels); |
463 | } | 467 | } |
464 | } | 468 | } |
@@ -501,7 +505,9 @@ ogg_demux_and_decode () | |||
501 | frame_size = ret; | 505 | frame_size = ret; |
502 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 506 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
503 | "Decoded %d bytes/channel (%d bytes) from %u compressed bytes\n", | 507 | "Decoded %d bytes/channel (%d bytes) from %u compressed bytes\n", |
504 | ret, ret * channels, op.bytes); | 508 | ret, |
509 | ret * channels, | ||
510 | (unsigned int) op.bytes); | ||
505 | 511 | ||
506 | /*Apply header gain, if we're not using an opus library new | 512 | /*Apply header gain, if we're not using an opus library new |
507 | enough to do this internally.*/ | 513 | enough to do this internally.*/ |
diff --git a/src/conversation/gnunet-helper-audio-record.c b/src/conversation/gnunet-helper-audio-record.c index 31943810f..73f4cfda3 100644 --- a/src/conversation/gnunet-helper-audio-record.c +++ b/src/conversation/gnunet-helper-audio-record.c | |||
@@ -405,8 +405,8 @@ stream_read_callback (pa_stream * s, | |||
405 | const void *data; | 405 | const void *data; |
406 | 406 | ||
407 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 407 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
408 | "Got %u/%u bytes of PCM data\n", | 408 | "Got %u/%d bytes of PCM data\n", |
409 | length, | 409 | (unsigned int) length, |
410 | pcm_length); | 410 | pcm_length); |
411 | 411 | ||
412 | GNUNET_assert (NULL != s); | 412 | GNUNET_assert (NULL != s); |
@@ -718,8 +718,8 @@ ogg_init () | |||
718 | if (NULL == commentspacket) | 718 | if (NULL == commentspacket) |
719 | { | 719 | { |
720 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 720 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
721 | _("Failed to allocate %d bytes for second packet\n"), | 721 | _("Failed to allocate %u bytes for second packet\n"), |
722 | commentspacket_len); | 722 | (unsigned int) commentspacket_len); |
723 | exit (5); | 723 | exit (5); |
724 | } | 724 | } |
725 | 725 | ||
diff --git a/src/conversation/gnunet-service-conversation.c b/src/conversation/gnunet-service-conversation.c index 10f169105..d12fbdc56 100644 --- a/src/conversation/gnunet-service-conversation.c +++ b/src/conversation/gnunet-service-conversation.c | |||
@@ -779,7 +779,9 @@ transmit_line_audio (void *cls, | |||
779 | ch->audio_data = NULL; | 779 | ch->audio_data = NULL; |
780 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 780 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
781 | "Sending %u bytes of audio data from line %u to remote line %u via cadet\n", | 781 | "Sending %u bytes of audio data from line %u to remote line %u via cadet\n", |
782 | ch->audio_size, ch->line->local_line, ch->remote_line); | 782 | (unsigned int) ch->audio_size, |
783 | ch->line->local_line, | ||
784 | ch->remote_line); | ||
783 | return sizeof (struct CadetAudioMessage) + ch->audio_size; | 785 | return sizeof (struct CadetAudioMessage) + ch->audio_size; |
784 | } | 786 | } |
785 | 787 | ||
@@ -1291,21 +1293,25 @@ handle_cadet_audio_message (void *cls, | |||
1291 | { | 1293 | { |
1292 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1294 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1293 | "Received %u bytes of AUDIO data for non-existing line %u, dropping.\n", | 1295 | "Received %u bytes of AUDIO data for non-existing line %u, dropping.\n", |
1294 | msize, ntohl (msg->remote_line)); | 1296 | (unsigned int) msize, |
1297 | ntohl (msg->remote_line)); | ||
1295 | return GNUNET_SYSERR; | 1298 | return GNUNET_SYSERR; |
1296 | } | 1299 | } |
1297 | if (NULL == ch) | 1300 | if (NULL == ch) |
1298 | { | 1301 | { |
1299 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1302 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1300 | "Received %u bytes of AUDIO data for unknown sender.\n", | 1303 | "Received %u bytes of AUDIO data for unknown sender.\n", |
1301 | msize); | 1304 | (unsigned int) msize); |
1302 | return GNUNET_SYSERR; | 1305 | return GNUNET_SYSERR; |
1303 | } | 1306 | } |
1304 | if ((GNUNET_YES == ch->suspended_local) || (GNUNET_YES == ch->suspended_remote)) | 1307 | if ((GNUNET_YES == ch->suspended_local) || (GNUNET_YES == ch->suspended_remote)) |
1305 | { | 1308 | { |
1306 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1309 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1307 | "Received %u bytes of AUDIO data on suspended channel CID %u:(%u:%u); dropping\n", | 1310 | "Received %u bytes of AUDIO data on suspended channel CID %u:(%u:%u); dropping\n", |
1308 | msize, ch->cid, ch->remote_line, line->local_line); | 1311 | (unsigned int) msize, |
1312 | ch->cid, | ||
1313 | ch->remote_line, | ||
1314 | line->local_line); | ||
1309 | GNUNET_CADET_receive_done (channel); | 1315 | GNUNET_CADET_receive_done (channel); |
1310 | return GNUNET_OK; | 1316 | return GNUNET_OK; |
1311 | } | 1317 | } |
@@ -1315,7 +1321,10 @@ handle_cadet_audio_message (void *cls, | |||
1315 | GNUNET_CADET_receive_done (channel); | 1321 | GNUNET_CADET_receive_done (channel); |
1316 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1322 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1317 | "Forwarding %u bytes of AUDIO data to client CID %u:(%u:%u)\n", | 1323 | "Forwarding %u bytes of AUDIO data to client CID %u:(%u:%u)\n", |
1318 | msize, ch->cid, ch->remote_line, ch->line->local_line); | 1324 | (unsigned int) msize, |
1325 | ch->cid, | ||
1326 | ch->remote_line, | ||
1327 | ch->line->local_line); | ||
1319 | cam = (struct ClientAudioMessage *) buf; | 1328 | cam = (struct ClientAudioMessage *) buf; |
1320 | cam->header.size = htons (sizeof (buf)); | 1329 | cam->header.size = htons (sizeof (buf)); |
1321 | cam->header.type = htons (GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO); | 1330 | cam->header.type = htons (GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO); |
diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c index 9bb5af100..6a1924e54 100644 --- a/src/core/gnunet-service-core_kx.c +++ b/src/core/gnunet-service-core_kx.c | |||
@@ -916,9 +916,9 @@ GSC_KX_handle_ephemeral_key (struct GSC_KeyExchangeInfo *kx, | |||
916 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 916 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
917 | _("Ephemeral key message from peer `%s' rejected as its validity range does not match our system time (%llu not in [%llu,%llu]).\n"), | 917 | _("Ephemeral key message from peer `%s' rejected as its validity range does not match our system time (%llu not in [%llu,%llu]).\n"), |
918 | GNUNET_i2s (&kx->peer), | 918 | GNUNET_i2s (&kx->peer), |
919 | now.abs_value_us, | 919 | (unsigned long long) now.abs_value_us, |
920 | start_t.abs_value_us, | 920 | (unsigned long long) start_t.abs_value_us, |
921 | end_t.abs_value_us); | 921 | (unsigned long long) end_t.abs_value_us); |
922 | return; | 922 | return; |
923 | } | 923 | } |
924 | kx->other_ephemeral_key = m->ephemeral_key; | 924 | kx->other_ephemeral_key = m->ephemeral_key; |
@@ -1395,7 +1395,7 @@ GSC_KX_encrypt_and_transmit (struct GSC_KeyExchangeInfo *kx, | |||
1395 | used - ENCRYPTED_HEADER_SIZE)); | 1395 | used - ENCRYPTED_HEADER_SIZE)); |
1396 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1396 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1397 | "Encrypted %u bytes for %s\n", | 1397 | "Encrypted %u bytes for %s\n", |
1398 | used - ENCRYPTED_HEADER_SIZE, | 1398 | (unsigned int) (used - ENCRYPTED_HEADER_SIZE), |
1399 | GNUNET_i2s (&kx->peer)); | 1399 | GNUNET_i2s (&kx->peer)); |
1400 | derive_auth_key (&auth_key, | 1400 | derive_auth_key (&auth_key, |
1401 | &kx->encrypt_key, | 1401 | &kx->encrypt_key, |
@@ -1517,7 +1517,7 @@ GSC_KX_handle_encrypted_message (struct GSC_KeyExchangeInfo *kx, | |||
1517 | return; | 1517 | return; |
1518 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1518 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1519 | "Decrypted %u bytes from %s\n", | 1519 | "Decrypted %u bytes from %s\n", |
1520 | size - ENCRYPTED_HEADER_SIZE, | 1520 | (unsigned int) (size - ENCRYPTED_HEADER_SIZE), |
1521 | GNUNET_i2s (&kx->peer)); | 1521 | GNUNET_i2s (&kx->peer)); |
1522 | pt = (struct EncryptedMessage *) buf; | 1522 | pt = (struct EncryptedMessage *) buf; |
1523 | 1523 | ||
diff --git a/src/core/gnunet-service-core_sessions.c b/src/core/gnunet-service-core_sessions.c index 890499394..0a547be1b 100644 --- a/src/core/gnunet-service-core_sessions.c +++ b/src/core/gnunet-service-core_sessions.c | |||
@@ -706,7 +706,7 @@ try_transmission (struct Session *session) | |||
706 | "Soliciting messages (excess %d, maxpc %d, message size %u, deadline %s)\n", | 706 | "Soliciting messages (excess %d, maxpc %d, message size %u, deadline %s)\n", |
707 | excess, | 707 | excess, |
708 | maxpc, | 708 | maxpc, |
709 | msize, | 709 | (unsigned int) msize, |
710 | GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_remaining (min_deadline), | 710 | GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_remaining (min_deadline), |
711 | GNUNET_YES)); | 711 | GNUNET_YES)); |
712 | solicit_messages (session, | 712 | solicit_messages (session, |
diff --git a/src/datastore/gnunet-service-datastore.c b/src/datastore/gnunet-service-datastore.c index 6ebfba7fc..64c3640ad 100644 --- a/src/datastore/gnunet-service-datastore.c +++ b/src/datastore/gnunet-service-datastore.c | |||
@@ -1400,7 +1400,8 @@ process_stat_in (void *cls, | |||
1400 | payload += value; | 1400 | payload += value; |
1401 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1401 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1402 | "Notification from statistics about existing payload (%llu), new payload is %llu\n", | 1402 | "Notification from statistics about existing payload (%llu), new payload is %llu\n", |
1403 | value, payload); | 1403 | (unsigned long long) value, |
1404 | (unsigned long long) payload); | ||
1404 | return GNUNET_OK; | 1405 | return GNUNET_OK; |
1405 | } | 1406 | } |
1406 | 1407 | ||
diff --git a/src/dht/gnunet-service-dht_clients.c b/src/dht/gnunet-service-dht_clients.c index a5757c25a..942bf5785 100644 --- a/src/dht/gnunet-service-dht_clients.c +++ b/src/dht/gnunet-service-dht_clients.c | |||
@@ -926,13 +926,18 @@ send_reply_to_client (void *cls, size_t size, void *buf) | |||
926 | reply); | 926 | reply); |
927 | memcpy (&cbuf[off], reply->msg, msize); | 927 | memcpy (&cbuf[off], reply->msg, msize); |
928 | GNUNET_free (reply); | 928 | GNUNET_free (reply); |
929 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transmitting %u bytes to client %p\n", | 929 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
930 | msize, client->client_handle); | 930 | "Transmitting %u bytes to client %p\n", |
931 | (unsigned int) msize, | ||
932 | client->client_handle); | ||
931 | off += msize; | 933 | off += msize; |
932 | } | 934 | } |
933 | process_pending_messages (client); | 935 | process_pending_messages (client); |
934 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transmitted %u/%u bytes to client %p\n", | 936 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
935 | (unsigned int) off, (unsigned int) size, client->client_handle); | 937 | "Transmitted %u/%u bytes to client %p\n", |
938 | (unsigned int) off, | ||
939 | (unsigned int) size, | ||
940 | client->client_handle); | ||
936 | return off; | 941 | return off; |
937 | } | 942 | } |
938 | 943 | ||
diff --git a/src/dht/gnunet-service-wdht_clients.c b/src/dht/gnunet-service-wdht_clients.c index 8eb114660..3d2eba460 100644 --- a/src/dht/gnunet-service-wdht_clients.c +++ b/src/dht/gnunet-service-wdht_clients.c | |||
@@ -318,13 +318,18 @@ send_reply_to_client (void *cls, size_t size, void *buf) | |||
318 | reply); | 318 | reply); |
319 | memcpy (&cbuf[off], reply->msg, msize); | 319 | memcpy (&cbuf[off], reply->msg, msize); |
320 | GNUNET_free (reply); | 320 | GNUNET_free (reply); |
321 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transmitting %u bytes to client %p\n", | 321 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
322 | msize, client->client_handle); | 322 | "Transmitting %u bytes to client %p\n", |
323 | (unsigned int) msize, | ||
324 | client->client_handle); | ||
323 | off += msize; | 325 | off += msize; |
324 | } | 326 | } |
325 | process_pending_messages (client); | 327 | process_pending_messages (client); |
326 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transmitted %u/%u bytes to client %p\n", | 328 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
327 | (unsigned int) off, (unsigned int) size, client->client_handle); | 329 | "Transmitted %u/%u bytes to client %p\n", |
330 | (unsigned int) off, | ||
331 | (unsigned int) size, | ||
332 | client->client_handle); | ||
328 | return off; | 333 | return off; |
329 | } | 334 | } |
330 | 335 | ||
diff --git a/src/dht/gnunet-service-xdht_clients.c b/src/dht/gnunet-service-xdht_clients.c index 3475d00c9..bc5504ebe 100644 --- a/src/dht/gnunet-service-xdht_clients.c +++ b/src/dht/gnunet-service-xdht_clients.c | |||
@@ -318,13 +318,18 @@ send_reply_to_client (void *cls, size_t size, void *buf) | |||
318 | reply); | 318 | reply); |
319 | memcpy (&cbuf[off], reply->msg, msize); | 319 | memcpy (&cbuf[off], reply->msg, msize); |
320 | GNUNET_free (reply); | 320 | GNUNET_free (reply); |
321 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transmitting %u bytes to client %p\n", | 321 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
322 | msize, client->client_handle); | 322 | "Transmitting %u bytes to client %p\n", |
323 | (unsigned int) msize, | ||
324 | client->client_handle); | ||
323 | off += msize; | 325 | off += msize; |
324 | } | 326 | } |
325 | process_pending_messages (client); | 327 | process_pending_messages (client); |
326 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transmitted %u/%u bytes to client %p\n", | 328 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
327 | (unsigned int) off, (unsigned int) size, client->client_handle); | 329 | "Transmitted %u/%u bytes to client %p\n", |
330 | (unsigned int) off, | ||
331 | (unsigned int) size, | ||
332 | client->client_handle); | ||
328 | return off; | 333 | return off; |
329 | } | 334 | } |
330 | 335 | ||
diff --git a/src/dht/gnunet-service-xdht_neighbours.c b/src/dht/gnunet-service-xdht_neighbours.c index c6de94a5a..6f3137f8a 100644 --- a/src/dht/gnunet-service-xdht_neighbours.c +++ b/src/dht/gnunet-service-xdht_neighbours.c | |||
@@ -3309,8 +3309,10 @@ send_verify_successor_message (void *cls) | |||
3309 | trail_id = trail->trail_id; | 3309 | trail_id = trail->trail_id; |
3310 | if (NULL == GDS_ROUTING_get_next_hop(trail_id,GDS_ROUTING_SRC_TO_DEST)) | 3310 | if (NULL == GDS_ROUTING_get_next_hop(trail_id,GDS_ROUTING_SRC_TO_DEST)) |
3311 | { | 3311 | { |
3312 | DEBUG(" NO ENTRY FOUND IN %s ROUTING TABLE for trail id %s, line", | 3312 | DEBUG(" NO ENTRY FOUND IN %s ROUTING TABLE for trail id %s, line %u", |
3313 | GNUNET_i2s(&my_identity), GNUNET_h2s(&trail->trail_id), __LINE__); | 3313 | GNUNET_i2s (&my_identity), |
3314 | GNUNET_h2s (&trail->trail_id), | ||
3315 | __LINE__); | ||
3314 | GNUNET_break(0); | 3316 | GNUNET_break(0); |
3315 | return; | 3317 | return; |
3316 | } | 3318 | } |
@@ -5352,8 +5354,10 @@ handle_dht_p2p_verify_successor_result(void *cls, | |||
5352 | { | 5354 | { |
5353 | /* Here it may happen that source peer has found a new successor, and removed | 5355 | /* Here it may happen that source peer has found a new successor, and removed |
5354 | the trail, Hence no entry found in the routing table. Fail silently.*/ | 5356 | the trail, Hence no entry found in the routing table. Fail silently.*/ |
5355 | DEBUG(" NO ENTRY FOUND IN %s ROUTING TABLE for trail id %s, line", | 5357 | DEBUG (" NO ENTRY FOUND IN %s ROUTING TABLE for trail id %s, line %u", |
5356 | GNUNET_i2s(&my_identity), GNUNET_h2s(&trail_id), __LINE__); | 5358 | GNUNET_i2s (&my_identity), |
5359 | GNUNET_h2s (&trail_id), | ||
5360 | __LINE__); | ||
5357 | GNUNET_break_op(0); | 5361 | GNUNET_break_op(0); |
5358 | return GNUNET_OK; | 5362 | return GNUNET_OK; |
5359 | } | 5363 | } |
@@ -5773,8 +5777,10 @@ handle_dht_p2p_trail_teardown (void *cls, const struct GNUNET_PeerIdentity *peer | |||
5773 | next_hop = GDS_ROUTING_get_next_hop (trail_id, trail_direction); | 5777 | next_hop = GDS_ROUTING_get_next_hop (trail_id, trail_direction); |
5774 | if (NULL == next_hop) | 5778 | if (NULL == next_hop) |
5775 | { | 5779 | { |
5776 | DEBUG(" NO ENTRY FOUND IN %s ROUTING TABLE for trail id %s, line", | 5780 | DEBUG(" NO ENTRY FOUND IN %s ROUTING TABLE for trail id %s, line %u", |
5777 | GNUNET_i2s(&my_identity), GNUNET_h2s(&trail_id), __LINE__); | 5781 | GNUNET_i2s (&my_identity), |
5782 | GNUNET_h2s(&trail_id), | ||
5783 | __LINE__); | ||
5778 | GNUNET_break (0); | 5784 | GNUNET_break (0); |
5779 | return GNUNET_SYSERR; | 5785 | return GNUNET_SYSERR; |
5780 | } | 5786 | } |
diff --git a/src/dht/gnunet_dht_profiler.c b/src/dht/gnunet_dht_profiler.c index 03ea62152..065ea5d1b 100644 --- a/src/dht/gnunet_dht_profiler.c +++ b/src/dht/gnunet_dht_profiler.c | |||
@@ -494,8 +494,10 @@ bandwidth_stats_cont (void *cls, | |||
494 | struct GNUNET_TESTBED_Operation *op, | 494 | struct GNUNET_TESTBED_Operation *op, |
495 | const char *emsg) | 495 | const char *emsg) |
496 | { | 496 | { |
497 | INFO ("# Outgoing bandwidth: %u\n", outgoing_bandwidth); | 497 | INFO ("# Outgoing bandwidth: %llu\n", |
498 | INFO ("# Incoming bandwidth: %u\n", incoming_bandwidth); | 498 | (unsigned long long) outgoing_bandwidth); |
499 | INFO ("# Incoming bandwidth: %llu\n", | ||
500 | (unsigned long long) incoming_bandwidth); | ||
499 | GNUNET_SCHEDULER_shutdown (); | 501 | GNUNET_SCHEDULER_shutdown (); |
500 | } | 502 | } |
501 | 503 | ||
@@ -508,8 +510,8 @@ bandwidth_stats_cont (void *cls, | |||
508 | * @param subsystem name of subsystem that created the statistic | 510 | * @param subsystem name of subsystem that created the statistic |
509 | * @param name the name of the datum | 511 | * @param name the name of the datum |
510 | * @param value the current value | 512 | * @param value the current value |
511 | * @param is_persistent GNUNET_YES if the value is persistent, GNUNET_NO if not | 513 | * @param is_persistent #GNUNET_YES if the value is persistent, #GNUNET_NO if not |
512 | * @return GNUNET_OK to continue, GNUNET_SYSERR to abort iteration | 514 | * @return #GNUNET_OK to continue, #GNUNET_SYSERR to abort iteration |
513 | */ | 515 | */ |
514 | static int | 516 | static int |
515 | bandwidth_stats_iterator (void *cls, | 517 | bandwidth_stats_iterator (void *cls, |
@@ -635,7 +637,8 @@ get_iter (void *cls, | |||
635 | 637 | ||
636 | total_put_path_length = total_put_path_length + (double)put_path_length; | 638 | total_put_path_length = total_put_path_length + (double)put_path_length; |
637 | total_get_path_length = total_get_path_length + (double)get_path_length; | 639 | total_get_path_length = total_get_path_length + (double)get_path_length; |
638 | DEBUG ("total_put_path_length = %f,put_path \n",total_put_path_length); | 640 | DEBUG ("total_put_path_length = %u,put_path \n", |
641 | total_put_path_length); | ||
639 | /* Summarize if profiling is complete */ | 642 | /* Summarize if profiling is complete */ |
640 | if (n_active == n_gets_fail + n_gets_ok) | 643 | if (n_active == n_gets_fail + n_gets_ok) |
641 | { | 644 | { |
diff --git a/src/dns/dnsstub.c b/src/dns/dnsstub.c index c1e7b5f61..50a3320fb 100644 --- a/src/dns/dnsstub.c +++ b/src/dns/dnsstub.c | |||
@@ -436,7 +436,7 @@ do_dns_read (struct GNUNET_DNSSTUB_RequestSocket *rs, | |||
436 | { | 436 | { |
437 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 437 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
438 | _("Received DNS response that is too small (%u bytes)"), | 438 | _("Received DNS response that is too small (%u bytes)"), |
439 | r); | 439 | (unsigned int) r); |
440 | return GNUNET_NO; | 440 | return GNUNET_NO; |
441 | } | 441 | } |
442 | dns = (struct GNUNET_TUN_DnsHeader *) buf; | 442 | dns = (struct GNUNET_TUN_DnsHeader *) buf; |
diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c index f31e11d83..7b9f7d5c9 100644 --- a/src/exit/gnunet-daemon-exit.c +++ b/src/exit/gnunet-daemon-exit.c | |||
@@ -1181,7 +1181,7 @@ tcp_from_helper (const struct GNUNET_TUN_TcpHeader *tcp, | |||
1181 | char dbuf[INET6_ADDRSTRLEN]; | 1181 | char dbuf[INET6_ADDRSTRLEN]; |
1182 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1182 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1183 | "Received TCP packet with %u bytes going from %s:%u to %s:%u\n", | 1183 | "Received TCP packet with %u bytes going from %s:%u to %s:%u\n", |
1184 | pktlen - sizeof (struct GNUNET_TUN_TcpHeader), | 1184 | (unsigned int) (pktlen - sizeof (struct GNUNET_TUN_TcpHeader)), |
1185 | inet_ntop (af, | 1185 | inet_ntop (af, |
1186 | source_ip, | 1186 | source_ip, |
1187 | sbuf, sizeof (sbuf)), | 1187 | sbuf, sizeof (sbuf)), |
diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c index e8b632a3f..42677af8a 100644 --- a/src/fs/fs_download.c +++ b/src/fs/fs_download.c | |||
@@ -2096,7 +2096,7 @@ create_download_context (struct GNUNET_FS_Handle *h, | |||
2096 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 2096 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
2097 | "Starting download %p, %u bytes at offset %llu\n", | 2097 | "Starting download %p, %u bytes at offset %llu\n", |
2098 | dc, | 2098 | dc, |
2099 | (unsigned long long) length, | 2099 | (unsigned int) length, |
2100 | (unsigned long long) offset); | 2100 | (unsigned long long) offset); |
2101 | dc->h = h; | 2101 | dc->h = h; |
2102 | dc->uri = GNUNET_FS_uri_dup (uri); | 2102 | dc->uri = GNUNET_FS_uri_dup (uri); |
diff --git a/src/fs/fs_namespace.c b/src/fs/fs_namespace.c index 07f4a5653..69876b8b5 100644 --- a/src/fs/fs_namespace.c +++ b/src/fs/fs_namespace.c | |||
@@ -204,7 +204,9 @@ write_update_information_graph (struct GNUNET_FS_UpdateInformationGraph *uig) | |||
204 | if (NULL == wh) | 204 | if (NULL == wh) |
205 | { | 205 | { |
206 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 206 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
207 | _("Failed to open `%s' for writing: %s\n"), STRERROR (errno)); | 207 | _("Failed to open `%s' for writing: %s\n"), |
208 | fn, | ||
209 | STRERROR (errno)); | ||
208 | GNUNET_free (fn); | 210 | GNUNET_free (fn); |
209 | return; | 211 | return; |
210 | } | 212 | } |
@@ -226,7 +228,9 @@ write_update_information_graph (struct GNUNET_FS_UpdateInformationGraph *uig) | |||
226 | } | 228 | } |
227 | END: | 229 | END: |
228 | if (GNUNET_OK != GNUNET_BIO_write_close (wh)) | 230 | if (GNUNET_OK != GNUNET_BIO_write_close (wh)) |
229 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Failed to write `%s': %s\n"), | 231 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
232 | _("Failed to write `%s': %s\n"), | ||
233 | fn, | ||
230 | STRERROR (errno)); | 234 | STRERROR (errno)); |
231 | GNUNET_free (fn); | 235 | GNUNET_free (fn); |
232 | } | 236 | } |
diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c index 80843006e..530a7ac9b 100644 --- a/src/fs/fs_publish.c +++ b/src/fs/fs_publish.c | |||
@@ -508,8 +508,9 @@ block_proc (void *cls, | |||
508 | { | 508 | { |
509 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 509 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
510 | "Indexing block `%s' for offset %llu with index size %u\n", | 510 | "Indexing block `%s' for offset %llu with index size %u\n", |
511 | GNUNET_h2s (&chk->query), (unsigned long long) offset, | 511 | GNUNET_h2s (&chk->query), |
512 | sizeof (struct OnDemandBlock)); | 512 | (unsigned long long) offset, |
513 | (unsigned int) sizeof (struct OnDemandBlock)); | ||
513 | odb.offset = GNUNET_htonll (offset); | 514 | odb.offset = GNUNET_htonll (offset); |
514 | odb.file_id = p->data.file.file_id; | 515 | odb.file_id = p->data.file.file_id; |
515 | GNUNET_assert (pc->qre == NULL); | 516 | GNUNET_assert (pc->qre == NULL); |
diff --git a/src/fs/gnunet-service-fs_lc.c b/src/fs/gnunet-service-fs_lc.c index 2706aea30..e61442aa3 100644 --- a/src/fs/gnunet-service-fs_lc.c +++ b/src/fs/gnunet-service-fs_lc.c | |||
@@ -279,7 +279,7 @@ client_response_handler (void *cls, | |||
279 | } | 279 | } |
280 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 280 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
281 | "Queued reply to query `%s' for local client\n", | 281 | "Queued reply to query `%s' for local client\n", |
282 | GNUNET_h2s (&prd->query), (unsigned int) prd->type); | 282 | GNUNET_h2s (&prd->query)); |
283 | if (GNUNET_BLOCK_EVALUATION_OK_LAST != eval) | 283 | if (GNUNET_BLOCK_EVALUATION_OK_LAST != eval) |
284 | { | 284 | { |
285 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 285 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
diff --git a/src/fs/gnunet-service-fs_push.c b/src/fs/gnunet-service-fs_push.c index a76a3827c..d7a15fad6 100644 --- a/src/fs/gnunet-service-fs_push.c +++ b/src/fs/gnunet-service-fs_push.c | |||
@@ -296,7 +296,7 @@ transmit_content (struct MigrationReadyPeer *peer, | |||
296 | } | 296 | } |
297 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 297 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
298 | "Asking for transmission of %u bytes to %s for migration\n", | 298 | "Asking for transmission of %u bytes to %s for migration\n", |
299 | msize, | 299 | (unsigned int) msize, |
300 | GNUNET_i2s (GSF_connected_peer_get_identity2_(peer->peer))); | 300 | GNUNET_i2s (GSF_connected_peer_get_identity2_(peer->peer))); |
301 | peer->th = GSF_peer_transmit_ (peer->peer, | 301 | peer->th = GSF_peer_transmit_ (peer->peer, |
302 | GNUNET_NO, 0 /* priority */ , | 302 | GNUNET_NO, 0 /* priority */ , |
diff --git a/src/gns/gnunet-bcd.c b/src/gns/gnunet-bcd.c index 284804175..21471350d 100644 --- a/src/gns/gnunet-bcd.c +++ b/src/gns/gnunet-bcd.c | |||
@@ -354,12 +354,12 @@ server_start () | |||
354 | if ((0 == port) || (port > UINT16_MAX)) | 354 | if ((0 == port) || (port > UINT16_MAX)) |
355 | { | 355 | { |
356 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 356 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
357 | _("Invalid port number %llu. Exiting.\n"), | 357 | _("Invalid port number %u. Exiting.\n"), |
358 | port); | 358 | port); |
359 | return GNUNET_SYSERR; | 359 | return GNUNET_SYSERR; |
360 | } | 360 | } |
361 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 361 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
362 | _("Businesscard HTTP server starts on %llu\n"), | 362 | _("Businesscard HTTP server starts on %u\n"), |
363 | port); | 363 | port); |
364 | daemon_handle = MHD_start_daemon (MHD_USE_DUAL_STACK | MHD_USE_DEBUG, | 364 | daemon_handle = MHD_start_daemon (MHD_USE_DUAL_STACK | MHD_USE_DEBUG, |
365 | (uint16_t) port, | 365 | (uint16_t) port, |
diff --git a/src/hostlist/gnunet-daemon-hostlist_server.c b/src/hostlist/gnunet-daemon-hostlist_server.c index 5b45af831..5c7b8887e 100644 --- a/src/hostlist/gnunet-daemon-hostlist_server.c +++ b/src/hostlist/gnunet-daemon-hostlist_server.c | |||
@@ -479,8 +479,8 @@ adv_transmit_ready (void *cls, | |||
479 | (unsigned int) transmission_size); | 479 | (unsigned int) transmission_size); |
480 | hostlist_adv_count++; | 480 | hostlist_adv_count++; |
481 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 481 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
482 | " # Sent advertisement message: %u\n", | 482 | " # Sent advertisement message: %llu\n", |
483 | hostlist_adv_count); | 483 | (unsigned long long) hostlist_adv_count); |
484 | GNUNET_STATISTICS_update (stats, | 484 | GNUNET_STATISTICS_update (stats, |
485 | gettext_noop ("# hostlist advertisements send"), 1, | 485 | gettext_noop ("# hostlist advertisements send"), 1, |
486 | GNUNET_NO); | 486 | GNUNET_NO); |
@@ -520,7 +520,7 @@ connect_handler (void *cls, | |||
520 | } | 520 | } |
521 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 521 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
522 | "Asked CORE to transmit advertisement message with a size of %u bytes to peer `%s'\n", | 522 | "Asked CORE to transmit advertisement message with a size of %u bytes to peer `%s'\n", |
523 | size, | 523 | (unsigned int) size, |
524 | GNUNET_i2s (peer)); | 524 | GNUNET_i2s (peer)); |
525 | if (NULL == | 525 | if (NULL == |
526 | (th = GNUNET_CORE_notify_transmit_ready (core, GNUNET_YES, | 526 | (th = GNUNET_CORE_notify_transmit_ready (core, GNUNET_YES, |
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h index 855d151cd..1e42af95c 100644 --- a/src/include/gnunet_common.h +++ b/src/include/gnunet_common.h | |||
@@ -692,7 +692,7 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind); | |||
692 | * a failure of the command 'cmd' with the message given | 692 | * a failure of the command 'cmd' with the message given |
693 | * by strerror(errno). | 693 | * by strerror(errno). |
694 | */ | 694 | */ |
695 | #define GNUNET_log_strerror_file(level, cmd, filename) do { GNUNET_log(level, _("`%s' failed on file `%s' at %s:%d with error: %s\n"), cmd, filename,__FILE__, __LINE__, STRERROR(errno)); } while(0) | 695 | #define GNUNET_log_strerror_file(level, cmd, filename) do { GNUNET_log(level, _("`%s' failed on file `%s' at %s:%d with error: %s\n"), cmd, filename, __FILE__, __LINE__, STRERROR(errno)); } while(0) |
696 | 696 | ||
697 | 697 | ||
698 | /** | 698 | /** |
diff --git a/src/nat/nat_auto.c b/src/nat/nat_auto.c index 4611edc62..6d5b82cc9 100644 --- a/src/nat/nat_auto.c +++ b/src/nat/nat_auto.c | |||
@@ -522,7 +522,7 @@ test_stun (struct GNUNET_NAT_AutoHandle *ah) | |||
522 | 522 | ||
523 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 523 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
524 | "STUN service listens on port %u\n", | 524 | "STUN service listens on port %u\n", |
525 | port); | 525 | (unsigned int) port); |
526 | if (GNUNET_NO == | 526 | if (GNUNET_NO == |
527 | GNUNET_NAT_stun_make_request (stun_server, stun_port, | 527 | GNUNET_NAT_stun_make_request (stun_server, stun_port, |
528 | lsock4, | 528 | lsock4, |
diff --git a/src/nse/gnunet-service-nse.c b/src/nse/gnunet-service-nse.c index d4098d1bc..4d920465c 100644 --- a/src/nse/gnunet-service-nse.c +++ b/src/nse/gnunet-service-nse.c | |||
@@ -648,7 +648,7 @@ transmit_ready (void *cls, | |||
648 | return 0; | 648 | return 0; |
649 | } | 649 | } |
650 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 650 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
651 | "In round s, sending to `%s' estimate with %u bits\n", | 651 | "In round %s, sending to `%s' estimate with %u bits\n", |
652 | GNUNET_STRINGS_absolute_time_to_string (GNUNET_TIME_absolute_ntoh (size_estimate_messages[idx].timestamp)), | 652 | GNUNET_STRINGS_absolute_time_to_string (GNUNET_TIME_absolute_ntoh (size_estimate_messages[idx].timestamp)), |
653 | GNUNET_i2s (&peer_entry->id), | 653 | GNUNET_i2s (&peer_entry->id), |
654 | (unsigned int) ntohl (size_estimate_messages[idx].matching_bits)); | 654 | (unsigned int) ntohl (size_estimate_messages[idx].matching_bits)); |
@@ -784,7 +784,7 @@ schedule_current_round (void *cls, | |||
784 | delay = | 784 | delay = |
785 | get_transmit_delay ((peer_entry->previous_round == GNUNET_NO) ? -1 : 0); | 785 | get_transmit_delay ((peer_entry->previous_round == GNUNET_NO) ? -1 : 0); |
786 | peer_entry->transmit_task = | 786 | peer_entry->transmit_task = |
787 | GNUNET_SCHEDULER_add_delayed (delay, | 787 | GNUNET_SCHEDULER_add_delayed (delay, |
788 | &transmit_task_cb, | 788 | &transmit_task_cb, |
789 | peer_entry); | 789 | peer_entry); |
790 | return GNUNET_OK; | 790 | return GNUNET_OK; |
diff --git a/src/peerstore/peerstore_common.c b/src/peerstore/peerstore_common.c index 617a0a8e0..5a008ca62 100644 --- a/src/peerstore/peerstore_common.c +++ b/src/peerstore/peerstore_common.c | |||
@@ -196,8 +196,9 @@ PEERSTORE_parse_record_message (const struct GNUNET_MessageHeader *message) | |||
196 | if (req_size < sizeof (struct StoreRecordMessage)) | 196 | if (req_size < sizeof (struct StoreRecordMessage)) |
197 | { | 197 | { |
198 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 198 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
199 | "Received message with invalid size: (%d < %d).\n", req_size, | 199 | "Received message with invalid size: (%d < %d).\n", |
200 | sizeof (struct StoreRecordMessage)); | 200 | (int) req_size, |
201 | (int) sizeof (struct StoreRecordMessage)); | ||
201 | return NULL; | 202 | return NULL; |
202 | } | 203 | } |
203 | srm = (struct StoreRecordMessage *) message; | 204 | srm = (struct StoreRecordMessage *) message; |
@@ -209,8 +210,11 @@ PEERSTORE_parse_record_message (const struct GNUNET_MessageHeader *message) | |||
209 | { | 210 | { |
210 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 211 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
211 | "Received message with invalid sizes: (%d + %d + %d + %d != %d).\n", | 212 | "Received message with invalid sizes: (%d + %d + %d + %d != %d).\n", |
212 | ss_size, key_size, value_size, | 213 | ss_size, |
213 | sizeof (struct StoreRecordMessage), req_size); | 214 | key_size, |
215 | value_size, | ||
216 | (int) sizeof (struct StoreRecordMessage), | ||
217 | req_size); | ||
214 | return NULL; | 218 | return NULL; |
215 | } | 219 | } |
216 | record = GNUNET_new (struct GNUNET_PEERSTORE_Record); | 220 | record = GNUNET_new (struct GNUNET_PEERSTORE_Record); |
diff --git a/src/psyc/gnunet-service-psyc.c b/src/psyc/gnunet-service-psyc.c index 0f2216428..3edc0295c 100644 --- a/src/psyc/gnunet-service-psyc.c +++ b/src/psyc/gnunet-service-psyc.c | |||
@@ -1790,7 +1790,10 @@ client_recv_slave_join (void *cls, struct GNUNET_SERVER_Client *client, | |||
1790 | { | 1790 | { |
1791 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1791 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
1792 | "%u + %u + %u != %u\n", | 1792 | "%u + %u + %u != %u\n", |
1793 | sizeof (*req), relay_size, join_msg_size, req_size); | 1793 | (unsigned int) sizeof (*req), |
1794 | relay_size, | ||
1795 | join_msg_size, | ||
1796 | req_size); | ||
1794 | GNUNET_break (0); | 1797 | GNUNET_break (0); |
1795 | GNUNET_SERVER_client_disconnect (client); | 1798 | GNUNET_SERVER_client_disconnect (client); |
1796 | GNUNET_free (slv); | 1799 | GNUNET_free (slv); |
@@ -2261,7 +2264,9 @@ client_recv_psyc_message (void *cls, struct GNUNET_SERVER_Client *client, | |||
2261 | { | 2264 | { |
2262 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 2265 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
2263 | "%p Message payload too large: %u < %u.\n", | 2266 | "%p Message payload too large: %u < %u.\n", |
2264 | chn, GNUNET_MULTICAST_FRAGMENT_MAX_PAYLOAD, size - sizeof (*msg)); | 2267 | chn, |
2268 | GNUNET_MULTICAST_FRAGMENT_MAX_PAYLOAD, | ||
2269 | (unsigned int) (size - sizeof (*msg))); | ||
2265 | GNUNET_break (0); | 2270 | GNUNET_break (0); |
2266 | transmit_cancel (chn, client); | 2271 | transmit_cancel (chn, client); |
2267 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); | 2272 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); |
@@ -2298,13 +2303,18 @@ client_recv_psyc_message (void *cls, struct GNUNET_SERVER_Client *client, | |||
2298 | * Received result of GNUNET_PSYCSTORE_membership_store() | 2303 | * Received result of GNUNET_PSYCSTORE_membership_store() |
2299 | */ | 2304 | */ |
2300 | static void | 2305 | static void |
2301 | store_recv_membership_store_result (void *cls, int64_t result, | 2306 | store_recv_membership_store_result (void *cls, |
2302 | const char *err_msg, uint16_t err_msg_size) | 2307 | int64_t result, |
2308 | const char *err_msg, | ||
2309 | uint16_t err_msg_size) | ||
2303 | { | 2310 | { |
2304 | struct Operation *op = cls; | 2311 | struct Operation *op = cls; |
2305 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 2312 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
2306 | "%p GNUNET_PSYCSTORE_membership_store() returned %" PRId64 " (%.s)\n", | 2313 | "%p GNUNET_PSYCSTORE_membership_store() returned %" PRId64 " (%.s)\n", |
2307 | op->chn, result, err_msg_size, err_msg); | 2314 | op->chn, |
2315 | result, | ||
2316 | (int) err_msg_size, | ||
2317 | err_msg); | ||
2308 | 2318 | ||
2309 | if (NULL != op->client) | 2319 | if (NULL != op->client) |
2310 | client_send_result (op->client, op->op_id, result, err_msg, err_msg_size); | 2320 | client_send_result (op->client, op->op_id, result, err_msg, err_msg_size); |
@@ -2432,7 +2442,10 @@ client_recv_history_replay (void *cls, struct GNUNET_SERVER_Client *client, | |||
2432 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 2442 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
2433 | "%p History replay #%" PRIu64 ": " | 2443 | "%p History replay #%" PRIu64 ": " |
2434 | "invalid method prefix. size: %u < %u?\n", | 2444 | "invalid method prefix. size: %u < %u?\n", |
2435 | chn, GNUNET_ntohll (req->op_id), size, sizeof (*req) + 1); | 2445 | chn, |
2446 | GNUNET_ntohll (req->op_id), | ||
2447 | size, | ||
2448 | (unsigned int) sizeof (*req) + 1); | ||
2436 | GNUNET_break (0); | 2449 | GNUNET_break (0); |
2437 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); | 2450 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); |
2438 | return; | 2451 | return; |
diff --git a/src/psycstore/gnunet-service-psycstore.c b/src/psycstore/gnunet-service-psycstore.c index e02f77714..801ea628d 100644 --- a/src/psycstore/gnunet-service-psycstore.c +++ b/src/psycstore/gnunet-service-psycstore.c | |||
@@ -383,7 +383,8 @@ handle_message_get (void *cls, | |||
383 | { | 383 | { |
384 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 384 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
385 | "Message get: invalid method prefix. size: %u < %u?\n", | 385 | "Message get: invalid method prefix. size: %u < %u?\n", |
386 | size, sizeof (*req) + 1); | 386 | size, |
387 | (unsigned int) (sizeof (*req) + 1)); | ||
387 | GNUNET_break (0); | 388 | GNUNET_break (0); |
388 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); | 389 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); |
389 | return; | 390 | return; |
diff --git a/src/psycutil/psyc_message.c b/src/psycutil/psyc_message.c index e16a4e859..3dba05b3f 100644 --- a/src/psycutil/psyc_message.c +++ b/src/psycutil/psyc_message.c | |||
@@ -282,7 +282,10 @@ GNUNET_PSYC_log_message (enum GNUNET_ErrorType kind, | |||
282 | { | 282 | { |
283 | struct GNUNET_PSYC_MessageMethod *meth | 283 | struct GNUNET_PSYC_MessageMethod *meth |
284 | = (struct GNUNET_PSYC_MessageMethod *) msg; | 284 | = (struct GNUNET_PSYC_MessageMethod *) msg; |
285 | GNUNET_log (kind, "\t%.*s\n", size - sizeof (*meth), &meth[1]); | 285 | GNUNET_log (kind, |
286 | "\t%.*s\n", | ||
287 | (int) (size - sizeof (*meth)), | ||
288 | &meth[1]); | ||
286 | break; | 289 | break; |
287 | } | 290 | } |
288 | case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_MODIFIER: | 291 | case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_MODIFIER: |
@@ -291,8 +294,12 @@ GNUNET_PSYC_log_message (enum GNUNET_ErrorType kind, | |||
291 | = (struct GNUNET_PSYC_MessageModifier *) msg; | 294 | = (struct GNUNET_PSYC_MessageModifier *) msg; |
292 | uint16_t name_size = ntohs (mod->name_size); | 295 | uint16_t name_size = ntohs (mod->name_size); |
293 | char oper = ' ' < mod->oper ? mod->oper : ' '; | 296 | char oper = ' ' < mod->oper ? mod->oper : ' '; |
294 | GNUNET_log (kind, "\t%c%.*s\t%.*s\n", oper, name_size, &mod[1], | 297 | GNUNET_log (kind, |
295 | size - sizeof (*mod) - name_size, | 298 | "\t%c%.*s\t%.*s\n", |
299 | oper, | ||
300 | (int) name_size, | ||
301 | &mod[1], | ||
302 | (int) (size - sizeof (*mod) - name_size), | ||
296 | ((char *) &mod[1]) + name_size); | 303 | ((char *) &mod[1]) + name_size); |
297 | break; | 304 | break; |
298 | } | 305 | } |
diff --git a/src/regex/gnunet-regex-profiler.c b/src/regex/gnunet-regex-profiler.c index db5432845..f65681848 100644 --- a/src/regex/gnunet-regex-profiler.c +++ b/src/regex/gnunet-regex-profiler.c | |||
@@ -559,7 +559,10 @@ stats_iterator (void *cls, | |||
559 | { | 559 | { |
560 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 560 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
561 | "%p -> %s [%s]: %llu\n", | 561 | "%p -> %s [%s]: %llu\n", |
562 | peer, subsystem, name, value); | 562 | peer, |
563 | subsystem, | ||
564 | name, | ||
565 | (unsigned long long) value); | ||
563 | return GNUNET_OK; | 566 | return GNUNET_OK; |
564 | } | 567 | } |
565 | size = | 568 | size = |
@@ -569,7 +572,8 @@ stats_iterator (void *cls, | |||
569 | peer, | 572 | peer, |
570 | subsystem, value, name); | 573 | subsystem, value, name); |
571 | if (size != GNUNET_DISK_file_write (data_file, output_buffer, size)) | 574 | if (size != GNUNET_DISK_file_write (data_file, output_buffer, size)) |
572 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Unable to write to file!\n"); | 575 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
576 | "Unable to write to file!\n"); | ||
573 | 577 | ||
574 | return GNUNET_OK; | 578 | return GNUNET_OK; |
575 | } | 579 | } |
diff --git a/src/regex/regex_block_lib.c b/src/regex/regex_block_lib.c index 0ab1aad8f..cd7246957 100644 --- a/src/regex/regex_block_lib.c +++ b/src/regex/regex_block_lib.c | |||
@@ -164,7 +164,7 @@ struct CheckEdgeContext | |||
164 | * @param len Lenght of token. | 164 | * @param len Lenght of token. |
165 | * @param key Hash of next state. | 165 | * @param key Hash of next state. |
166 | * | 166 | * |
167 | * @return GNUNET_YES, to keep iterating | 167 | * @return #GNUNET_YES, to keep iterating |
168 | */ | 168 | */ |
169 | static int | 169 | static int |
170 | check_edge (void *cls, | 170 | check_edge (void *cls, |
@@ -175,8 +175,11 @@ check_edge (void *cls, | |||
175 | struct CheckEdgeContext *ctx = cls; | 175 | struct CheckEdgeContext *ctx = cls; |
176 | 176 | ||
177 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 177 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
178 | "edge %.*s [%u]: %s->%s\n", | 178 | "edge %.*s [%u]: %sn", |
179 | (int) len, token, len, GNUNET_h2s(key)); | 179 | (int) len, |
180 | token, | ||
181 | (unsigned int) len, | ||
182 | GNUNET_h2s (key)); | ||
180 | if (NULL == ctx->xquery) | 183 | if (NULL == ctx->xquery) |
181 | return GNUNET_YES; | 184 | return GNUNET_YES; |
182 | if (strlen (ctx->xquery) < len) | 185 | if (strlen (ctx->xquery) < len) |
@@ -209,7 +212,8 @@ REGEX_BLOCK_check (const struct RegexBlock *block, | |||
209 | struct CheckEdgeContext ctx; | 212 | struct CheckEdgeContext ctx; |
210 | int res; | 213 | int res; |
211 | 214 | ||
212 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Block check\n"); | 215 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
216 | "Block check\n"); | ||
213 | if (GNUNET_OK != | 217 | if (GNUNET_OK != |
214 | REGEX_BLOCK_get_key (block, size, | 218 | REGEX_BLOCK_get_key (block, size, |
215 | &key)) | 219 | &key)) |
@@ -229,8 +233,9 @@ REGEX_BLOCK_check (const struct RegexBlock *block, | |||
229 | ( (NULL == xquery) || ('\0' == xquery[0]) ) ) | 233 | ( (NULL == xquery) || ('\0' == xquery[0]) ) ) |
230 | { | 234 | { |
231 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 235 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
232 | " out! Is accepting: %u, xquery %p\n", | 236 | " out! Is accepting: %u, xquery %p\n", |
233 | ntohs(block->is_accepting), xquery); | 237 | ntohs(block->is_accepting), |
238 | xquery); | ||
234 | return GNUNET_OK; | 239 | return GNUNET_OK; |
235 | } | 240 | } |
236 | ctx.xquery = xquery; | 241 | ctx.xquery = xquery; |
diff --git a/src/rest/gnunet-rest-server.c b/src/rest/gnunet-rest-server.c index 92d478442..fa17954b4 100644 --- a/src/rest/gnunet-rest-server.c +++ b/src/rest/gnunet-rest-server.c | |||
@@ -410,19 +410,6 @@ kill_httpd () | |||
410 | 410 | ||
411 | 411 | ||
412 | /** | 412 | /** |
413 | * Task run whenever HTTP server is idle for too long. Kill it. | ||
414 | * | ||
415 | * @param cls NULL | ||
416 | */ | ||
417 | static void | ||
418 | kill_httpd_task (void *cls) | ||
419 | { | ||
420 | httpd_task = NULL; | ||
421 | kill_httpd (); | ||
422 | } | ||
423 | |||
424 | |||
425 | /** | ||
426 | * Schedule MHD. This function should be called initially when an | 413 | * Schedule MHD. This function should be called initially when an |
427 | * MHD is first getting its client socket, and will then automatically | 414 | * MHD is first getting its client socket, and will then automatically |
428 | * always be called later whenever there is work to be done. | 415 | * always be called later whenever there is work to be done. |
diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c b/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c index 3162d1252..4a1e9cbd0 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c +++ b/src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c | |||
@@ -1179,8 +1179,7 @@ handle_client_disconnect (void *cls, | |||
1179 | if (NULL == client) | 1179 | if (NULL == client) |
1180 | return; | 1180 | return; |
1181 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1181 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1182 | "Client disconnected from us.\n", | 1182 | "Client disconnected from us.\n"); |
1183 | client); | ||
1184 | s = GNUNET_SERVER_client_get_user_context (client, | 1183 | s = GNUNET_SERVER_client_get_user_context (client, |
1185 | struct BobServiceSession); | 1184 | struct BobServiceSession); |
1186 | if (NULL == s) | 1185 | if (NULL == s) |
diff --git a/src/scalarproduct/gnunet-service-scalarproduct_bob.c b/src/scalarproduct/gnunet-service-scalarproduct_bob.c index 8d97ea1b6..79a0e961a 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct_bob.c +++ b/src/scalarproduct/gnunet-service-scalarproduct_bob.c | |||
@@ -1470,8 +1470,7 @@ handle_client_disconnect (void *cls, | |||
1470 | if (NULL == client) | 1470 | if (NULL == client) |
1471 | return; | 1471 | return; |
1472 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1472 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1473 | "Client disconnected from us.\n", | 1473 | "Client disconnected from us.\n"); |
1474 | client); | ||
1475 | s = GNUNET_SERVER_client_get_user_context (client, | 1474 | s = GNUNET_SERVER_client_get_user_context (client, |
1476 | struct BobServiceSession); | 1475 | struct BobServiceSession); |
1477 | if (NULL == s) | 1476 | if (NULL == s) |
diff --git a/src/set/gnunet-set-profiler.c b/src/set/gnunet-set-profiler.c index 186a2763e..6d97f0bb1 100644 --- a/src/set/gnunet-set-profiler.c +++ b/src/set/gnunet-set-profiler.c | |||
@@ -192,7 +192,10 @@ set_result_cb (void *cls, | |||
192 | 192 | ||
193 | if (element->size != sizeof (struct GNUNET_HashCode)) | 193 | if (element->size != sizeof (struct GNUNET_HashCode)) |
194 | { | 194 | { |
195 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "wrong element size: %u, expected %u\n", element->size, sizeof (struct GNUNET_HashCode)); | 195 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
196 | "wrong element size: %u, expected %u\n", | ||
197 | element->size, | ||
198 | (unsigned int) sizeof (struct GNUNET_HashCode)); | ||
196 | GNUNET_assert (0); | 199 | GNUNET_assert (0); |
197 | } | 200 | } |
198 | 201 | ||
diff --git a/src/statistics/gnunet-service-statistics.c b/src/statistics/gnunet-service-statistics.c index adec5a96d..8d989dafb 100644 --- a/src/statistics/gnunet-service-statistics.c +++ b/src/statistics/gnunet-service-statistics.c | |||
@@ -321,7 +321,7 @@ load (struct GNUNET_SERVER_Handle *server) | |||
321 | } | 321 | } |
322 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 322 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
323 | _("Loading %llu bytes of statistics from `%s'\n"), | 323 | _("Loading %llu bytes of statistics from `%s'\n"), |
324 | fsize, fn); | 324 | (unsigned long long) fsize, fn); |
325 | mst = GNUNET_SERVER_mst_create (&inject_message, | 325 | mst = GNUNET_SERVER_mst_create (&inject_message, |
326 | server); | 326 | server); |
327 | GNUNET_break (GNUNET_OK == | 327 | GNUNET_break (GNUNET_OK == |
@@ -475,7 +475,7 @@ transmit (struct GNUNET_SERVER_Client *client, | |||
475 | e->subsystem->service, | 475 | e->subsystem->service, |
476 | e->name, | 476 | e->name, |
477 | e->persistent, | 477 | e->persistent, |
478 | e->value); | 478 | (unsigned long long) e->value); |
479 | GNUNET_SERVER_notification_context_unicast (nc, client, &m->header, | 479 | GNUNET_SERVER_notification_context_unicast (nc, client, &m->header, |
480 | GNUNET_NO); | 480 | GNUNET_NO); |
481 | GNUNET_free (m); | 481 | GNUNET_free (m); |
@@ -793,7 +793,7 @@ handle_set (void *cls, | |||
793 | "Statistic `%s:%s' updated to value %llu (%d).\n", | 793 | "Statistic `%s:%s' updated to value %llu (%d).\n", |
794 | service, | 794 | service, |
795 | name, | 795 | name, |
796 | pos->value, | 796 | (unsigned long long) pos->value, |
797 | pos->persistent); | 797 | pos->persistent); |
798 | if ( (changed) || | 798 | if ( (changed) || |
799 | (1 == initial_set) ) | 799 | (1 == initial_set) ) |
@@ -829,7 +829,7 @@ handle_set (void *cls, | |||
829 | "New statistic on `%s:%s' with value %llu created.\n", | 829 | "New statistic on `%s:%s' with value %llu created.\n", |
830 | service, | 830 | service, |
831 | name, | 831 | name, |
832 | pos->value); | 832 | (unsigned long long) pos->value); |
833 | GNUNET_SERVER_receive_done (client, | 833 | GNUNET_SERVER_receive_done (client, |
834 | GNUNET_OK); | 834 | GNUNET_OK); |
835 | } | 835 | } |
@@ -907,7 +907,7 @@ handle_watch (void *cls, | |||
907 | "New statistic on `%s:%s' with value %llu created.\n", | 907 | "New statistic on `%s:%s' with value %llu created.\n", |
908 | service, | 908 | service, |
909 | name, | 909 | name, |
910 | pos->value); | 910 | (unsigned long long) pos->value); |
911 | } | 911 | } |
912 | we = GNUNET_new (struct WatchEntry); | 912 | we = GNUNET_new (struct WatchEntry); |
913 | we->client = client; | 913 | we->client = client; |
diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c index e27e21588..f3c56eb9d 100644 --- a/src/testbed/gnunet-helper-testbed.c +++ b/src/testbed/gnunet-helper-testbed.c | |||
@@ -513,7 +513,8 @@ read_task (void *cls) | |||
513 | GNUNET_SCHEDULER_shutdown (); | 513 | GNUNET_SCHEDULER_shutdown (); |
514 | return; | 514 | return; |
515 | } | 515 | } |
516 | LOG_DEBUG ("Read %u bytes\n", sread); | 516 | LOG_DEBUG ("Read %u bytes\n", |
517 | (unsigned int) sread); | ||
517 | if (GNUNET_OK != | 518 | if (GNUNET_OK != |
518 | GNUNET_SERVER_mst_receive (tokenizer, NULL, buf, sread, GNUNET_NO, | 519 | GNUNET_SERVER_mst_receive (tokenizer, NULL, buf, sread, GNUNET_NO, |
519 | GNUNET_NO)) | 520 | GNUNET_NO)) |
diff --git a/src/testbed/gnunet-service-testbed_peers.c b/src/testbed/gnunet-service-testbed_peers.c index ba20d6d6b..9c12c25a6 100644 --- a/src/testbed/gnunet-service-testbed_peers.c +++ b/src/testbed/gnunet-service-testbed_peers.c | |||
@@ -429,14 +429,15 @@ GST_handle_peer_create (void *cls, struct GNUNET_SERVER_Client *client, | |||
429 | 429 | ||
430 | 430 | ||
431 | /** | 431 | /** |
432 | * Message handler for GNUNET_MESSAGE_TYPE_TESTBED_DESTROYPEER messages | 432 | * Message handler for #GNUNET_MESSAGE_TYPE_TESTBED_DESTROYPEER messages |
433 | * | 433 | * |
434 | * @param cls NULL | 434 | * @param cls NULL |
435 | * @param client identification of the client | 435 | * @param client identification of the client |
436 | * @param message the actual message | 436 | * @param message the actual message |
437 | */ | 437 | */ |
438 | void | 438 | void |
439 | GST_handle_peer_destroy (void *cls, struct GNUNET_SERVER_Client *client, | 439 | GST_handle_peer_destroy (void *cls, |
440 | struct GNUNET_SERVER_Client *client, | ||
440 | const struct GNUNET_MessageHeader *message) | 441 | const struct GNUNET_MessageHeader *message) |
441 | { | 442 | { |
442 | const struct GNUNET_TESTBED_PeerDestroyMessage *msg; | 443 | const struct GNUNET_TESTBED_PeerDestroyMessage *msg; |
@@ -446,8 +447,9 @@ GST_handle_peer_destroy (void *cls, struct GNUNET_SERVER_Client *client, | |||
446 | 447 | ||
447 | msg = (const struct GNUNET_TESTBED_PeerDestroyMessage *) message; | 448 | msg = (const struct GNUNET_TESTBED_PeerDestroyMessage *) message; |
448 | peer_id = ntohl (msg->peer_id); | 449 | peer_id = ntohl (msg->peer_id); |
449 | LOG_DEBUG ("Received peer destory on peer: %u and operation id: %ul\n", | 450 | LOG_DEBUG ("Received peer destory on peer: %u and operation id: %llu\n", |
450 | peer_id, GNUNET_ntohll (msg->operation_id)); | 451 | (unsigned int) peer_id, |
452 | (unsigned long long) GNUNET_ntohll (msg->operation_id)); | ||
451 | if (!VALID_PEER_ID (peer_id)) | 453 | if (!VALID_PEER_ID (peer_id)) |
452 | { | 454 | { |
453 | LOG (GNUNET_ERROR_TYPE_ERROR, | 455 | LOG (GNUNET_ERROR_TYPE_ERROR, |
@@ -494,7 +496,7 @@ GST_handle_peer_destroy (void *cls, struct GNUNET_SERVER_Client *client, | |||
494 | * Stats a peer | 496 | * Stats a peer |
495 | * | 497 | * |
496 | * @param peer the peer to start | 498 | * @param peer the peer to start |
497 | * @return GNUNET_OK upon success; GNUNET_SYSERR upon failure | 499 | * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure |
498 | */ | 500 | */ |
499 | static int | 501 | static int |
500 | start_peer (struct Peer *peer) | 502 | start_peer (struct Peer *peer) |
@@ -511,7 +513,7 @@ start_peer (struct Peer *peer) | |||
511 | * Stops a peer | 513 | * Stops a peer |
512 | * | 514 | * |
513 | * @param peer the peer to stop | 515 | * @param peer the peer to stop |
514 | * @return GNUNET_OK upon success; GNUNET_SYSERR upon failure | 516 | * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure |
515 | */ | 517 | */ |
516 | static int | 518 | static int |
517 | stop_peer (struct Peer *peer) | 519 | stop_peer (struct Peer *peer) |
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index 119e5e564..14eefdfb3 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/transport/gnunet-service-transport.c | |||
@@ -224,7 +224,7 @@ process_payload (const struct GNUNET_HELLO_Address *address, | |||
224 | { | 224 | { |
225 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 225 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
226 | "Discarded %u bytes type %u payload from peer `%s'\n", | 226 | "Discarded %u bytes type %u payload from peer `%s'\n", |
227 | msg_size, | 227 | (unsigned int) msg_size, |
228 | ntohs (message->type), | 228 | ntohs (message->type), |
229 | GNUNET_i2s (&address->peer)); | 229 | GNUNET_i2s (&address->peer)); |
230 | GNUNET_STATISTICS_update (GST_stats, gettext_noop | 230 | GNUNET_STATISTICS_update (GST_stats, gettext_noop |
@@ -866,9 +866,9 @@ run (void *cls, | |||
866 | { | 866 | { |
867 | max_fd_rlimit = r_file.rlim_cur; | 867 | max_fd_rlimit = r_file.rlim_cur; |
868 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 868 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
869 | "Maximum number of open files was: %u/%u\n", | 869 | "Maximum number of open files was: %u/%u\n", |
870 | r_file.rlim_cur, | 870 | (unsigned int) r_file.rlim_cur, |
871 | r_file.rlim_max); | 871 | (unsigned int) r_file.rlim_max); |
872 | } | 872 | } |
873 | max_fd_rlimit = (9 * max_fd_rlimit) / 10; /* Keep 10% for rest of transport */ | 873 | max_fd_rlimit = (9 * max_fd_rlimit) / 10; /* Keep 10% for rest of transport */ |
874 | #endif | 874 | #endif |
diff --git a/src/transport/gnunet-service-transport_manipulation.c b/src/transport/gnunet-service-transport_manipulation.c index bd3fed6d7..7620cdbb1 100644 --- a/src/transport/gnunet-service-transport_manipulation.c +++ b/src/transport/gnunet-service-transport_manipulation.c | |||
@@ -350,7 +350,7 @@ GST_manipulation_send (const struct GNUNET_PeerIdentity *target, | |||
350 | } | 350 | } |
351 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 351 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
352 | "Delaying %u byte message to peer `%s' with peer specific delay for %s\n", | 352 | "Delaying %u byte message to peer `%s' with peer specific delay for %s\n", |
353 | msg_size, | 353 | (unsigned int) msg_size, |
354 | GNUNET_i2s (target), | 354 | GNUNET_i2s (target), |
355 | GNUNET_STRINGS_relative_time_to_string (delay, | 355 | GNUNET_STRINGS_relative_time_to_string (delay, |
356 | GNUNET_YES)); | 356 | GNUNET_YES)); |
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c index 65428ef2a..9d1c9459e 100644 --- a/src/transport/gnunet-service-transport_neighbours.c +++ b/src/transport/gnunet-service-transport_neighbours.c | |||
@@ -1296,12 +1296,12 @@ transmit_send_continuation (void *cls, | |||
1296 | if (bytes_in_send_queue < mq->message_buf_size) | 1296 | if (bytes_in_send_queue < mq->message_buf_size) |
1297 | { | 1297 | { |
1298 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1298 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
1299 | "Bytes_in_send_queue `%u', Message_size %u, result: %s, payload %u, on wire %u\n", | 1299 | "Bytes_in_send_queue `%llu', Message_size %u, result: %s, payload %u, on wire %u\n", |
1300 | bytes_in_send_queue, | 1300 | bytes_in_send_queue, |
1301 | mq->message_buf_size, | 1301 | (unsigned int) mq->message_buf_size, |
1302 | (GNUNET_OK == success) ? "OK" : "FAIL", | 1302 | (GNUNET_OK == success) ? "OK" : "FAIL", |
1303 | size_payload, | 1303 | (unsigned int) size_payload, |
1304 | physical); | 1304 | (unsigned int) physical); |
1305 | GNUNET_break (0); | 1305 | GNUNET_break (0); |
1306 | } | 1306 | } |
1307 | 1307 | ||
@@ -1325,7 +1325,7 @@ transmit_send_continuation (void *cls, | |||
1325 | "Sending message to `%s' of type %u with %u bytes was a %s\n", | 1325 | "Sending message to `%s' of type %u with %u bytes was a %s\n", |
1326 | GNUNET_i2s (receiver), | 1326 | GNUNET_i2s (receiver), |
1327 | ntohs (((struct GNUNET_MessageHeader *) mq->message_buf)->type), | 1327 | ntohs (((struct GNUNET_MessageHeader *) mq->message_buf)->type), |
1328 | mq->message_buf_size, | 1328 | (unsigned int) mq->message_buf_size, |
1329 | (success == GNUNET_OK) ? "success" : "FAILURE"); | 1329 | (success == GNUNET_OK) ? "success" : "FAILURE"); |
1330 | if (NULL != mq->cont) | 1330 | if (NULL != mq->cont) |
1331 | mq->cont (mq->cont_cls, | 1331 | mq->cont (mq->cont_cls, |
@@ -1401,7 +1401,7 @@ try_transmission_to_peer (struct NeighbourMapEntry *n) | |||
1401 | 1401 | ||
1402 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1402 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1403 | "Giving message with %u bytes to plugin session %p\n", | 1403 | "Giving message with %u bytes to plugin session %p\n", |
1404 | mq->message_buf_size, | 1404 | (unsigned int) mq->message_buf_size, |
1405 | n->primary_address.session); | 1405 | n->primary_address.session); |
1406 | (void) send_with_session (n, | 1406 | (void) send_with_session (n, |
1407 | mq->message_buf, | 1407 | mq->message_buf, |
@@ -1773,7 +1773,7 @@ GST_neighbours_send (const struct GNUNET_PeerIdentity *target, | |||
1773 | 1773 | ||
1774 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1774 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1775 | "Enqueueing %u bytes to send to peer %s\n", | 1775 | "Enqueueing %u bytes to send to peer %s\n", |
1776 | msg_size, | 1776 | (unsigned int) msg_size, |
1777 | GNUNET_i2s (target)); | 1777 | GNUNET_i2s (target)); |
1778 | GNUNET_CONTAINER_DLL_insert_tail (n->messages_head, | 1778 | GNUNET_CONTAINER_DLL_insert_tail (n->messages_head, |
1779 | n->messages_tail, | 1779 | n->messages_tail, |
@@ -2117,7 +2117,7 @@ inbound_bw_tracker_update (void *cls) | |||
2117 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 2117 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
2118 | "New inbound delay for peer `%s' is %llu ms\n", | 2118 | "New inbound delay for peer `%s' is %llu ms\n", |
2119 | GNUNET_i2s (&n->id), | 2119 | GNUNET_i2s (&n->id), |
2120 | delay.rel_value_us / 1000); | 2120 | (unsigned long long) delay.rel_value_us / 1000LL); |
2121 | papi->update_inbound_delay (papi->cls, | 2121 | papi->update_inbound_delay (papi->cls, |
2122 | &n->id, | 2122 | &n->id, |
2123 | n->primary_address.session, | 2123 | n->primary_address.session, |
@@ -3244,11 +3244,9 @@ GST_neighbours_session_terminated (const struct GNUNET_PeerIdentity *peer, | |||
3244 | /* The session used to send the SYN terminated: | 3244 | /* The session used to send the SYN terminated: |
3245 | * this implies a connect error*/ | 3245 | * this implies a connect error*/ |
3246 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 3246 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
3247 | "Failed to send SYN in %s with `%s' %p: session terminated\n", | 3247 | "Failed to send SYN in CONNECT_SENT with `%s' %p: session terminated\n", |
3248 | "CONNECT_SENT", | ||
3249 | GST_plugins_a2s (n->primary_address.address), | 3248 | GST_plugins_a2s (n->primary_address.address), |
3250 | n->primary_address.session, | 3249 | n->primary_address.session); |
3251 | GNUNET_i2s (peer)); | ||
3252 | 3250 | ||
3253 | /* Destroy the address since it cannot be used */ | 3251 | /* Destroy the address since it cannot be used */ |
3254 | unset_primary_address (n); | 3252 | unset_primary_address (n); |
@@ -3274,11 +3272,9 @@ GST_neighbours_session_terminated (const struct GNUNET_PeerIdentity *peer, | |||
3274 | break; | 3272 | break; |
3275 | case GNUNET_TRANSPORT_PS_RECONNECT_SENT: | 3273 | case GNUNET_TRANSPORT_PS_RECONNECT_SENT: |
3276 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 3274 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
3277 | "Failed to send SYN in %s with `%s' %p: session terminated\n", | 3275 | "Failed to send SYN in RECONNECT_SENT with `%s' %p: session terminated\n", |
3278 | "RECONNECT_SENT", | ||
3279 | GST_plugins_a2s (n->primary_address.address), | 3276 | GST_plugins_a2s (n->primary_address.address), |
3280 | n->primary_address.session, | 3277 | n->primary_address.session); |
3281 | GNUNET_i2s (peer)); | ||
3282 | /* Destroy the address since it cannot be used */ | 3278 | /* Destroy the address since it cannot be used */ |
3283 | unset_primary_address (n); | 3279 | unset_primary_address (n); |
3284 | set_state_and_timeout (n, | 3280 | set_state_and_timeout (n, |
diff --git a/src/transport/transport_api_address_to_string.c b/src/transport/transport_api_address_to_string.c index 2220790be..2b8b426c7 100644 --- a/src/transport/transport_api_address_to_string.c +++ b/src/transport/transport_api_address_to_string.c | |||
@@ -203,7 +203,7 @@ GNUNET_TRANSPORT_address_to_string (const struct GNUNET_CONFIGURATION_Handle *cf | |||
203 | client, | 203 | client, |
204 | GNUNET_i2s (&address->peer), | 204 | GNUNET_i2s (&address->peer), |
205 | address->transport_name, | 205 | address->transport_name, |
206 | address->address_length); | 206 | (unsigned int) address->address_length); |
207 | 207 | ||
208 | msg = GNUNET_malloc (len); | 208 | msg = GNUNET_malloc (len); |
209 | msg->header.size = htons (len); | 209 | msg->header.size = htons (len); |
diff --git a/src/util/gnunet-scrypt.c b/src/util/gnunet-scrypt.c index 6fd871cbe..faf04cf27 100644 --- a/src/util/gnunet-scrypt.c +++ b/src/util/gnunet-scrypt.c | |||
@@ -51,7 +51,7 @@ static char *pwfn; | |||
51 | 51 | ||
52 | /** | 52 | /** |
53 | * Write our current proof to disk. | 53 | * Write our current proof to disk. |
54 | * | 54 | * |
55 | * @param cls closure | 55 | * @param cls closure |
56 | */ | 56 | */ |
57 | static void | 57 | static void |
@@ -65,7 +65,7 @@ shutdown_task (void *cls) | |||
65 | GNUNET_DISK_PERM_USER_WRITE)) | 65 | GNUNET_DISK_PERM_USER_WRITE)) |
66 | GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, | 66 | GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, |
67 | "write", | 67 | "write", |
68 | proof); | 68 | pwfn); |
69 | } | 69 | } |
70 | 70 | ||
71 | 71 | ||
@@ -129,7 +129,7 @@ find_proof (void *cls) | |||
129 | 129 | ||
130 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 130 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
131 | "Got Proof of Work %llu\n", | 131 | "Got Proof of Work %llu\n", |
132 | proof); | 132 | (unsigned long long) proof); |
133 | proof_task = NULL; | 133 | proof_task = NULL; |
134 | memcpy (&buf[sizeof (uint64_t)], &pub, | 134 | memcpy (&buf[sizeof (uint64_t)], &pub, |
135 | sizeof (struct GNUNET_CRYPTO_EddsaPublicKey)); | 135 | sizeof (struct GNUNET_CRYPTO_EddsaPublicKey)); |
@@ -290,7 +290,7 @@ run (void *cls, | |||
290 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 290 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
291 | "Delay between tries: %s\n", | 291 | "Delay between tries: %s\n", |
292 | GNUNET_STRINGS_relative_time_to_string (proof_find_delay, 1)); | 292 | GNUNET_STRINGS_relative_time_to_string (proof_find_delay, 1)); |
293 | proof_task = | 293 | proof_task = |
294 | GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE, | 294 | GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_IDLE, |
295 | &find_proof, | 295 | &find_proof, |
296 | NULL); | 296 | NULL); |
diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c index 2c3ac72fa..8741aa719 100644 --- a/src/vpn/gnunet-service-vpn.c +++ b/src/vpn/gnunet-service-vpn.c | |||
@@ -613,7 +613,7 @@ send_to_peer_notify_callback (void *cls, size_t size, void *buf) | |||
613 | GNUNET_assert (size >= tnq->len); | 613 | GNUNET_assert (size >= tnq->len); |
614 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 614 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
615 | "Sending %u bytes via cadet channel\n", | 615 | "Sending %u bytes via cadet channel\n", |
616 | tnq->len); | 616 | (unsigned int) tnq->len); |
617 | GNUNET_CONTAINER_DLL_remove (ts->tmq_head, | 617 | GNUNET_CONTAINER_DLL_remove (ts->tmq_head, |
618 | ts->tmq_tail, | 618 | ts->tmq_tail, |
619 | tnq); | 619 | tnq); |
@@ -648,7 +648,7 @@ send_to_channel (struct ChannelMessageQueueEntry *tnq, | |||
648 | { | 648 | { |
649 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 649 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
650 | "Queueing %u bytes for transmission via cadet channel\n", | 650 | "Queueing %u bytes for transmission via cadet channel\n", |
651 | tnq->len); | 651 | (unsigned int) tnq->len); |
652 | GNUNET_assert (NULL != ts->channel); | 652 | GNUNET_assert (NULL != ts->channel); |
653 | GNUNET_CONTAINER_DLL_insert_tail (ts->tmq_head, | 653 | GNUNET_CONTAINER_DLL_insert_tail (ts->tmq_head, |
654 | ts->tmq_tail, | 654 | ts->tmq_tail, |