diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/ats-tests/ats-testing-log.c | 9 | ||||
-rw-r--r-- | src/auction/gnunet-service-auction.c | 4 | ||||
-rw-r--r-- | src/cadet/gnunet-service-cadet_channel.c | 2 | ||||
-rw-r--r-- | src/cadet/gnunet-service-cadet_tunnels.c | 5 | ||||
-rw-r--r-- | src/dht/dht_api.c | 4 | ||||
-rw-r--r-- | src/dns/gnunet-dns-monitor.c | 2 | ||||
-rw-r--r-- | src/dns/gnunet-service-dns.c | 2 | ||||
-rw-r--r-- | src/fs/fs_uri.c | 2 | ||||
-rw-r--r-- | src/include/Makefile.am | 1 | ||||
-rw-r--r-- | src/nse/gnunet-nse-profiler.c | 4 | ||||
-rw-r--r-- | src/set/gnunet-service-set_union.c | 2 | ||||
-rw-r--r-- | src/setu/gnunet-service-setu.c | 2 | ||||
-rw-r--r-- | src/testbed/gnunet-service-testbed_oc.c | 71 | ||||
-rw-r--r-- | src/testbed/testbed_api.c | 3 | ||||
-rw-r--r-- | src/transport/gnunet-helper-transport-wlan.c | 2 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport.c | 3 | ||||
-rw-r--r-- | src/transport/plugin_transport_wlan.c | 9 |
17 files changed, 68 insertions, 59 deletions
diff --git a/src/ats-tests/ats-testing-log.c b/src/ats-tests/ats-testing-log.c index 955401dd8..dfdfa8a80 100644 --- a/src/ats-tests/ats-testing-log.c +++ b/src/ats-tests/ats-testing-log.c | |||
@@ -467,7 +467,8 @@ GNUNET_ATS_TEST_logging_write_to_file (struct LoggingHandle *l, | |||
467 | for (c_m = 0; c_m < l->num_masters; c_m++) | 467 | for (c_m = 0; c_m < l->num_masters; c_m++) |
468 | { | 468 | { |
469 | GNUNET_asprintf (&filename_master, "%s_%llu_master%u_%s", | 469 | GNUNET_asprintf (&filename_master, "%s_%llu_master%u_%s", |
470 | experiment_name, timestamp.abs_value_us, c_m, l->name); | 470 | experiment_name, |
471 | (unsigned long long) timestamp.abs_value_us, c_m, l->name); | ||
471 | fprintf (stderr, "Writing data for master %u to file `%s'\n", | 472 | fprintf (stderr, "Writing data for master %u to file `%s'\n", |
472 | c_m, filename_master); | 473 | c_m, filename_master); |
473 | 474 | ||
@@ -495,7 +496,9 @@ GNUNET_ATS_TEST_logging_write_to_file (struct LoggingHandle *l, | |||
495 | for (c_s = 0; c_s < l->lp[c_m].peer->num_partners; c_s++) | 496 | for (c_s = 0; c_s < l->lp[c_m].peer->num_partners; c_s++) |
496 | { | 497 | { |
497 | GNUNET_asprintf (&filename_slaves[c_s], "%s_%llu_master%u_slave_%u_%s", | 498 | GNUNET_asprintf (&filename_slaves[c_s], "%s_%llu_master%u_slave_%u_%s", |
498 | tmp_exp_name, timestamp.abs_value_us, c_m, c_s, l->name); | 499 | tmp_exp_name, |
500 | (unsigned long long) timestamp.abs_value_us, | ||
501 | c_m, c_s, l->name); | ||
499 | 502 | ||
500 | fprintf (stderr, "Writing data for master %u slave %u to file `%s'\n", | 503 | fprintf (stderr, "Writing data for master %u slave %u to file `%s'\n", |
501 | c_m, c_s, filename_slaves[c_s]); | 504 | c_m, c_s, filename_slaves[c_s]); |
@@ -593,7 +596,7 @@ GNUNET_ATS_TEST_logging_write_to_file (struct LoggingHandle *l, | |||
593 | (double) plt->app_rtt / 1000, | 596 | (double) plt->app_rtt / 1000, |
594 | plt->bandwidth_in, | 597 | plt->bandwidth_in, |
595 | plt->bandwidth_out, | 598 | plt->bandwidth_out, |
596 | plt->ats_delay.rel_value_us, | 599 | (unsigned long long) plt->ats_delay.rel_value_us, |
597 | plt->ats_distance, | 600 | plt->ats_distance, |
598 | plt->ats_network_type, | 601 | plt->ats_network_type, |
599 | plt->ats_utilization_out, | 602 | plt->ats_utilization_out, |
diff --git a/src/auction/gnunet-service-auction.c b/src/auction/gnunet-service-auction.c index 82519919d..c20f0bdbe 100644 --- a/src/auction/gnunet-service-auction.c +++ b/src/auction/gnunet-service-auction.c | |||
@@ -56,12 +56,12 @@ handle_create (void *cls, const struct GNUNET_AUCTION_ClientCreateMessage *msg) | |||
56 | // struct GNUNET_MQ_Handle *mq; | 56 | // struct GNUNET_MQ_Handle *mq; |
57 | // struct GNUNET_MQ_Envelope *env; | 57 | // struct GNUNET_MQ_Envelope *env; |
58 | // struct GNUNET_AUCTION_blabla em; | 58 | // struct GNUNET_AUCTION_blabla em; |
59 | uint16_t size; | 59 | //uint16_t size; |
60 | 60 | ||
61 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 61 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
62 | "Received CREATE message from client\n"); | 62 | "Received CREATE message from client\n"); |
63 | 63 | ||
64 | size = ntohs (msg->header.size); | 64 | //size = ntohs (msg->header.size); |
65 | 65 | ||
66 | /**TODO: create auction and return auction object */ | 66 | /**TODO: create auction and return auction object */ |
67 | // mq = GNUNET_SERVICE_client_get_mq (client); | 67 | // mq = GNUNET_SERVICE_client_get_mq (client); |
diff --git a/src/cadet/gnunet-service-cadet_channel.c b/src/cadet/gnunet-service-cadet_channel.c index ae6d21452..6b22ae2b4 100644 --- a/src/cadet/gnunet-service-cadet_channel.c +++ b/src/cadet/gnunet-service-cadet_channel.c | |||
@@ -1362,7 +1362,7 @@ GCCH_handle_channel_plaintext_data ( | |||
1362 | (1LLU << delta), | 1362 | (1LLU << delta), |
1363 | mid_msg, | 1363 | mid_msg, |
1364 | mid_min, | 1364 | mid_min, |
1365 | ch->mid_futures); | 1365 | (unsigned long long) ch->mid_futures); |
1366 | } | 1366 | } |
1367 | } | 1367 | } |
1368 | else /* ! ch->reliable */ | 1368 | else /* ! ch->reliable */ |
diff --git a/src/cadet/gnunet-service-cadet_tunnels.c b/src/cadet/gnunet-service-cadet_tunnels.c index 78bc54a5c..c1c511da1 100644 --- a/src/cadet/gnunet-service-cadet_tunnels.c +++ b/src/cadet/gnunet-service-cadet_tunnels.c | |||
@@ -2433,7 +2433,8 @@ connection_ready_cb (void *cls, | |||
2433 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 2433 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
2434 | "Do not begin KX for %s if WE have no channels waiting. Retrying after %llu\n", | 2434 | "Do not begin KX for %s if WE have no channels waiting. Retrying after %llu\n", |
2435 | GCT_2s (t), | 2435 | GCT_2s (t), |
2436 | GNUNET_TIME_absolute_get_remaining (t->next_kx_attempt).rel_value_us); | 2436 | (unsigned long long) GNUNET_TIME_absolute_get_remaining ( |
2437 | t->next_kx_attempt).rel_value_us); | ||
2437 | /* Do not begin KX if WE have no channels waiting! */ | 2438 | /* Do not begin KX if WE have no channels waiting! */ |
2438 | if (0 != GNUNET_TIME_absolute_get_remaining ( | 2439 | if (0 != GNUNET_TIME_absolute_get_remaining ( |
2439 | t->next_kx_attempt).rel_value_us) | 2440 | t->next_kx_attempt).rel_value_us) |
@@ -3279,7 +3280,7 @@ GCT_handle_encrypted (struct CadetTConnection *ct, | |||
3279 | { | 3280 | { |
3280 | struct CadetTunnel *t = ct->t; | 3281 | struct CadetTunnel *t = ct->t; |
3281 | uint16_t size = ntohs (msg->header.size); | 3282 | uint16_t size = ntohs (msg->header.size); |
3282 | char cbuf [size] GNUNET_ALIGN; | 3283 | char cbuf[size] GNUNET_ALIGN; |
3283 | ssize_t decrypted_size; | 3284 | ssize_t decrypted_size; |
3284 | 3285 | ||
3285 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 3286 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
diff --git a/src/dht/dht_api.c b/src/dht/dht_api.c index 1eaed8a5c..ee56c852f 100644 --- a/src/dht/dht_api.c +++ b/src/dht/dht_api.c | |||
@@ -740,8 +740,8 @@ process_client_result (void *cls, | |||
740 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 740 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
741 | "Ignoring reply for %s: UID mismatch: %llu/%llu\n", | 741 | "Ignoring reply for %s: UID mismatch: %llu/%llu\n", |
742 | GNUNET_h2s (key), | 742 | GNUNET_h2s (key), |
743 | crm->unique_id, | 743 | (unsigned long long) crm->unique_id, |
744 | get_handle->unique_id); | 744 | (unsigned long long) get_handle->unique_id); |
745 | return GNUNET_YES; | 745 | return GNUNET_YES; |
746 | } | 746 | } |
747 | /* FIXME: might want to check that type matches */ | 747 | /* FIXME: might want to check that type matches */ |
diff --git a/src/dns/gnunet-dns-monitor.c b/src/dns/gnunet-dns-monitor.c index 836d65c79..48923b613 100644 --- a/src/dns/gnunet-dns-monitor.c +++ b/src/dns/gnunet-dns-monitor.c | |||
@@ -216,7 +216,7 @@ display_record (const struct GNUNET_DNSPARSER_Record *record) | |||
216 | GNUNET_asprintf (&tmp, | 216 | GNUNET_asprintf (&tmp, |
217 | "%.*s", | 217 | "%.*s", |
218 | (unsigned int) record->data.raw.data_len, | 218 | (unsigned int) record->data.raw.data_len, |
219 | record->data.raw.data); | 219 | (char*) record->data.raw.data); |
220 | format = tmp; | 220 | format = tmp; |
221 | break; | 221 | break; |
222 | 222 | ||
diff --git a/src/dns/gnunet-service-dns.c b/src/dns/gnunet-service-dns.c index 1cb238add..4840c0c95 100644 --- a/src/dns/gnunet-service-dns.c +++ b/src/dns/gnunet-service-dns.c | |||
@@ -557,7 +557,7 @@ next_phase (struct RequestRecord *rr) | |||
557 | /* done with current phase, advance! */ | 557 | /* done with current phase, advance! */ |
558 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 558 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
559 | "Request %llu now in phase %d\n", | 559 | "Request %llu now in phase %d\n", |
560 | rr->request_id, | 560 | (unsigned long long) rr->request_id, |
561 | rr->phase); | 561 | rr->phase); |
562 | switch (rr->phase) | 562 | switch (rr->phase) |
563 | { | 563 | { |
diff --git a/src/fs/fs_uri.c b/src/fs/fs_uri.c index 9c430ad9d..a9afff3e8 100644 --- a/src/fs/fs_uri.c +++ b/src/fs/fs_uri.c | |||
@@ -1969,7 +1969,7 @@ uri_chk_to_string (const struct GNUNET_FS_Uri *uri) | |||
1969 | GNUNET_FS_URI_CHK_INFIX, | 1969 | GNUNET_FS_URI_CHK_INFIX, |
1970 | (const char *) &keyhash, | 1970 | (const char *) &keyhash, |
1971 | (const char *) &queryhash, | 1971 | (const char *) &queryhash, |
1972 | GNUNET_ntohll (fi->file_length)); | 1972 | (unsigned long long) GNUNET_ntohll (fi->file_length)); |
1973 | return ret; | 1973 | return ret; |
1974 | } | 1974 | } |
1975 | 1975 | ||
diff --git a/src/include/Makefile.am b/src/include/Makefile.am index fc3d745a6..5569c87ed 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am | |||
@@ -51,6 +51,7 @@ gnunetinclude_HEADERS = \ | |||
51 | gnunet_getopt_lib.h \ | 51 | gnunet_getopt_lib.h \ |
52 | gnunet_gns_service.h \ | 52 | gnunet_gns_service.h \ |
53 | gnunet_gnsrecord_lib.h \ | 53 | gnunet_gnsrecord_lib.h \ |
54 | gnunet_gnsrecord_json_lib.h \ | ||
54 | gnunet_gnsrecord_plugin.h \ | 55 | gnunet_gnsrecord_plugin.h \ |
55 | gnunet_hello_lib.h \ | 56 | gnunet_hello_lib.h \ |
56 | gnunet_helper_lib.h \ | 57 | gnunet_helper_lib.h \ |
diff --git a/src/nse/gnunet-nse-profiler.c b/src/nse/gnunet-nse-profiler.c index f653a716e..4b256bc52 100644 --- a/src/nse/gnunet-nse-profiler.c +++ b/src/nse/gnunet-nse-profiler.c | |||
@@ -391,8 +391,8 @@ stat_iterator (void *cls, | |||
391 | flag = 1; | 391 | flag = 1; |
392 | size = GNUNET_asprintf (&output_buffer, | 392 | size = GNUNET_asprintf (&output_buffer, |
393 | "%llu %llu %u\n", | 393 | "%llu %llu %u\n", |
394 | now.abs_value_us / 1000LL / 1000LL, | 394 | (unsigned long long) now.abs_value_us / 1000LL / 1000LL, |
395 | value, | 395 | (unsigned long long) value, |
396 | flag); | 396 | flag); |
397 | if (0 > size) | 397 | if (0 > size) |
398 | { | 398 | { |
diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c index 931d7e753..c06b7cddf 100644 --- a/src/set/gnunet-service-set_union.c +++ b/src/set/gnunet-service-set_union.c | |||
@@ -931,7 +931,7 @@ handle_union_p2p_strata_estimator (void *cls, | |||
931 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 931 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
932 | "Deciding to go for full set transmission (diff=%d, own set=%llu)\n", | 932 | "Deciding to go for full set transmission (diff=%d, own set=%llu)\n", |
933 | diff, | 933 | diff, |
934 | op->state->initial_size); | 934 | (unsigned long long) op->state->initial_size); |
935 | GNUNET_STATISTICS_update (_GSS_statistics, | 935 | GNUNET_STATISTICS_update (_GSS_statistics, |
936 | "# of full sends", | 936 | "# of full sends", |
937 | 1, | 937 | 1, |
diff --git a/src/setu/gnunet-service-setu.c b/src/setu/gnunet-service-setu.c index d00303ca7..e7f27bd7d 100644 --- a/src/setu/gnunet-service-setu.c +++ b/src/setu/gnunet-service-setu.c | |||
@@ -1431,7 +1431,7 @@ handle_union_p2p_strata_estimator (void *cls, | |||
1431 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1431 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1432 | "Deciding to go for full set transmission (diff=%d, own set=%llu)\n", | 1432 | "Deciding to go for full set transmission (diff=%d, own set=%llu)\n", |
1433 | diff, | 1433 | diff, |
1434 | op->initial_size); | 1434 | (unsigned long long) op->initial_size); |
1435 | GNUNET_STATISTICS_update (_GSS_statistics, | 1435 | GNUNET_STATISTICS_update (_GSS_statistics, |
1436 | "# of full sends", | 1436 | "# of full sends", |
1437 | 1, | 1437 | 1, |
diff --git a/src/testbed/gnunet-service-testbed_oc.c b/src/testbed/gnunet-service-testbed_oc.c index 3d13ac8cc..8a61f72f7 100644 --- a/src/testbed/gnunet-service-testbed_oc.c +++ b/src/testbed/gnunet-service-testbed_oc.c | |||
@@ -535,7 +535,7 @@ cleanup_occ (struct OverlayConnectContext *occ) | |||
535 | struct Peer *peer2; | 535 | struct Peer *peer2; |
536 | 536 | ||
537 | LOG_DEBUG ("0x%llx: Cleaning up occ\n", | 537 | LOG_DEBUG ("0x%llx: Cleaning up occ\n", |
538 | occ->op_id); | 538 | (unsigned long long) occ->op_id); |
539 | GNUNET_free (occ->emsg); | 539 | GNUNET_free (occ->emsg); |
540 | GNUNET_free (occ->hello); | 540 | GNUNET_free (occ->hello); |
541 | if (NULL != occ->send_hello_task) | 541 | if (NULL != occ->send_hello_task) |
@@ -656,7 +656,7 @@ send_overlay_connect_success_msg (struct OverlayConnectContext *occ) | |||
656 | struct GNUNET_TESTBED_ConnectionEventMessage *msg; | 656 | struct GNUNET_TESTBED_ConnectionEventMessage *msg; |
657 | 657 | ||
658 | LOG_DEBUG ("0x%llx: Peers connected - Sending overlay connect success\n", | 658 | LOG_DEBUG ("0x%llx: Peers connected - Sending overlay connect success\n", |
659 | occ->op_id); | 659 | (unsigned long long) occ->op_id); |
660 | env = GNUNET_MQ_msg (msg, | 660 | env = GNUNET_MQ_msg (msg, |
661 | GNUNET_MESSAGE_TYPE_TESTBED_PEER_CONNECT_EVENT); | 661 | GNUNET_MESSAGE_TYPE_TESTBED_PEER_CONNECT_EVENT); |
662 | msg->event_type = htonl (GNUNET_TESTBED_ET_CONNECT); | 662 | msg->event_type = htonl (GNUNET_TESTBED_ET_CONNECT); |
@@ -704,7 +704,7 @@ overlay_connect_notify (void *cls, | |||
704 | } | 704 | } |
705 | GNUNET_free (new_peer_str); | 705 | GNUNET_free (new_peer_str); |
706 | LOG_DEBUG ("0x%llx: Peer %s connected to peer %s\n", | 706 | LOG_DEBUG ("0x%llx: Peer %s connected to peer %s\n", |
707 | occ->op_id, | 707 | (unsigned long long) occ->op_id, |
708 | other_peer_str, | 708 | other_peer_str, |
709 | GNUNET_i2s (&occ->peer_identity)); | 709 | GNUNET_i2s (&occ->peer_identity)); |
710 | GNUNET_free (other_peer_str); | 710 | GNUNET_free (other_peer_str); |
@@ -763,7 +763,7 @@ occ_cache_get_handle_ats_occ_cb (void *cls, | |||
763 | { | 763 | { |
764 | GNUNET_asprintf (&occ->emsg, | 764 | GNUNET_asprintf (&occ->emsg, |
765 | "0x%llx: Failed to connect to ATS of peer with id: %u", | 765 | "0x%llx: Failed to connect to ATS of peer with id: %u", |
766 | occ->op_id, | 766 | (unsigned long long) occ->op_id, |
767 | occ->peer->id); | 767 | occ->peer->id); |
768 | GNUNET_SCHEDULER_cancel (occ->timeout_task); | 768 | GNUNET_SCHEDULER_cancel (occ->timeout_task); |
769 | occ->timeout_task = | 769 | occ->timeout_task = |
@@ -775,7 +775,7 @@ occ_cache_get_handle_ats_occ_cb (void *cls, | |||
775 | 775 | ||
776 | GNUNET_asprintf (&occ->emsg, | 776 | GNUNET_asprintf (&occ->emsg, |
777 | "0x%llx: Timeout during GNUNET_ATS_connectivity_suggest() at peer %s", | 777 | "0x%llx: Timeout during GNUNET_ATS_connectivity_suggest() at peer %s", |
778 | occ->op_id, | 778 | (unsigned long long) occ->op_id, |
779 | GNUNET_i2s (&occ->other_peer_identity)); | 779 | GNUNET_i2s (&occ->other_peer_identity)); |
780 | 780 | ||
781 | lp2c = &occ->p2ctx.local; | 781 | lp2c = &occ->p2ctx.local; |
@@ -846,7 +846,7 @@ occ_hello_sent_cb (void *cls) | |||
846 | 846 | ||
847 | GNUNET_asprintf (&occ->emsg, | 847 | GNUNET_asprintf (&occ->emsg, |
848 | "0x%llx: Timeout while acquiring ATS of %s from cache", | 848 | "0x%llx: Timeout while acquiring ATS of %s from cache", |
849 | occ->op_id, | 849 | (unsigned long long) occ->op_id, |
850 | GNUNET_i2s (&occ->other_peer_identity)); | 850 | GNUNET_i2s (&occ->other_peer_identity)); |
851 | GNUNET_assert (NULL != (peer2 = GST_peer_list[occ->other_peer_id])); | 851 | GNUNET_assert (NULL != (peer2 = GST_peer_list[occ->other_peer_id])); |
852 | lp2c->tcc.cgh_p2_ats = | 852 | lp2c->tcc.cgh_p2_ats = |
@@ -878,7 +878,7 @@ send_hello_thru_rocc (struct OverlayConnectContext *occ) | |||
878 | other_peer_str = GNUNET_strdup (GNUNET_i2s (&occ->other_peer_identity)); | 878 | other_peer_str = GNUNET_strdup (GNUNET_i2s (&occ->other_peer_identity)); |
879 | LOG_DEBUG ( | 879 | LOG_DEBUG ( |
880 | "0x%llx: Offering HELLO of %s (size: %u) to %s via Remote Overlay Request\n", | 880 | "0x%llx: Offering HELLO of %s (size: %u) to %s via Remote Overlay Request\n", |
881 | occ->op_id, | 881 | (unsigned long long) occ->op_id, |
882 | GNUNET_i2s (&occ->peer_identity), | 882 | GNUNET_i2s (&occ->peer_identity), |
883 | ntohs (occ->hello->size), | 883 | ntohs (occ->hello->size), |
884 | other_peer_str); | 884 | other_peer_str); |
@@ -926,7 +926,7 @@ send_hello (void *cls) | |||
926 | lp2c = &occ->p2ctx.local; | 926 | lp2c = &occ->p2ctx.local; |
927 | other_peer_str = GNUNET_strdup (GNUNET_i2s (&occ->other_peer_identity)); | 927 | other_peer_str = GNUNET_strdup (GNUNET_i2s (&occ->other_peer_identity)); |
928 | LOG_DEBUG ("0x%llx: Offering HELLO of %s to %s\n", | 928 | LOG_DEBUG ("0x%llx: Offering HELLO of %s to %s\n", |
929 | occ->op_id, | 929 | (unsigned long long) occ->op_id, |
930 | GNUNET_i2s (&occ->peer_identity), | 930 | GNUNET_i2s (&occ->peer_identity), |
931 | other_peer_str); | 931 | other_peer_str); |
932 | GNUNET_free (other_peer_str); | 932 | GNUNET_free (other_peer_str); |
@@ -975,7 +975,7 @@ p2_transport_connect_cache_callback (void *cls, | |||
975 | { | 975 | { |
976 | GNUNET_asprintf (&occ->emsg, | 976 | GNUNET_asprintf (&occ->emsg, |
977 | "0x%llx: Cannot connect to TRANSPORT of %s", | 977 | "0x%llx: Cannot connect to TRANSPORT of %s", |
978 | occ->op_id, | 978 | (unsigned long long) occ->op_id, |
979 | GNUNET_i2s (&occ->other_peer_identity)); | 979 | GNUNET_i2s (&occ->other_peer_identity)); |
980 | GNUNET_SCHEDULER_cancel (occ->timeout_task); | 980 | GNUNET_SCHEDULER_cancel (occ->timeout_task); |
981 | occ->timeout_task = | 981 | occ->timeout_task = |
@@ -986,7 +986,7 @@ p2_transport_connect_cache_callback (void *cls, | |||
986 | occ->p2ctx.local.tcc.cfg = cfg; | 986 | occ->p2ctx.local.tcc.cfg = cfg; |
987 | GNUNET_asprintf (&occ->emsg, | 987 | GNUNET_asprintf (&occ->emsg, |
988 | "0x%llx: Timeout while offering HELLO to %s", | 988 | "0x%llx: Timeout while offering HELLO to %s", |
989 | occ->op_id, | 989 | (unsigned long long) occ->op_id, |
990 | GNUNET_i2s (&occ->other_peer_identity)); | 990 | GNUNET_i2s (&occ->other_peer_identity)); |
991 | occ->send_hello_task = GNUNET_SCHEDULER_add_now (&send_hello, occ); | 991 | occ->send_hello_task = GNUNET_SCHEDULER_add_now (&send_hello, occ); |
992 | } | 992 | } |
@@ -1026,7 +1026,7 @@ p2_transport_connect (struct OverlayConnectContext *occ) | |||
1026 | } | 1026 | } |
1027 | GNUNET_asprintf (&occ->emsg, | 1027 | GNUNET_asprintf (&occ->emsg, |
1028 | "0x%llx: Timeout while offering HELLO to %s", | 1028 | "0x%llx: Timeout while offering HELLO to %s", |
1029 | occ->op_id, | 1029 | (unsigned long long) occ->op_id, |
1030 | GNUNET_i2s (&occ->other_peer_identity)); | 1030 | GNUNET_i2s (&occ->other_peer_identity)); |
1031 | occ->send_hello_task = GNUNET_SCHEDULER_add_now (&send_hello, occ); | 1031 | occ->send_hello_task = GNUNET_SCHEDULER_add_now (&send_hello, occ); |
1032 | } | 1032 | } |
@@ -1077,12 +1077,12 @@ hello_update_cb (void *cls, | |||
1077 | if (GNUNET_YES == empty) | 1077 | if (GNUNET_YES == empty) |
1078 | { | 1078 | { |
1079 | LOG_DEBUG ("0x%llx: HELLO of %s is empty\n", | 1079 | LOG_DEBUG ("0x%llx: HELLO of %s is empty\n", |
1080 | occ->op_id, | 1080 | (unsigned long long) occ->op_id, |
1081 | GNUNET_i2s (&occ->peer_identity)); | 1081 | GNUNET_i2s (&occ->peer_identity)); |
1082 | return; | 1082 | return; |
1083 | } | 1083 | } |
1084 | LOG_DEBUG ("0x%llx: Received HELLO of %s\n", | 1084 | LOG_DEBUG ("0x%llx: Received HELLO of %s\n", |
1085 | occ->op_id, | 1085 | (unsigned long long) occ->op_id, |
1086 | GNUNET_i2s (&occ->peer_identity)); | 1086 | GNUNET_i2s (&occ->peer_identity)); |
1087 | occ->hello = GNUNET_malloc (msize); | 1087 | occ->hello = GNUNET_malloc (msize); |
1088 | GST_cache_add_hello (occ->peer->id, hello); | 1088 | GST_cache_add_hello (occ->peer->id, hello); |
@@ -1124,7 +1124,7 @@ p1_transport_connect_cache_callback (void *cls, | |||
1124 | { | 1124 | { |
1125 | GNUNET_asprintf (&occ->emsg, | 1125 | GNUNET_asprintf (&occ->emsg, |
1126 | "0x%llx: Cannot connect to TRANSPORT of %s", | 1126 | "0x%llx: Cannot connect to TRANSPORT of %s", |
1127 | occ->op_id, | 1127 | (unsigned long long) occ->op_id, |
1128 | GNUNET_i2s (&occ->peer_identity)); | 1128 | GNUNET_i2s (&occ->peer_identity)); |
1129 | GNUNET_SCHEDULER_cancel (occ->timeout_task); | 1129 | GNUNET_SCHEDULER_cancel (occ->timeout_task); |
1130 | occ->timeout_task = | 1130 | occ->timeout_task = |
@@ -1136,7 +1136,7 @@ p1_transport_connect_cache_callback (void *cls, | |||
1136 | occ->p1th_ = th; | 1136 | occ->p1th_ = th; |
1137 | GNUNET_asprintf (&occ->emsg, | 1137 | GNUNET_asprintf (&occ->emsg, |
1138 | "0x%llx: Timeout while acquiring HELLO of peer %s", | 1138 | "0x%llx: Timeout while acquiring HELLO of peer %s", |
1139 | occ->op_id, | 1139 | (unsigned long long) occ->op_id, |
1140 | GNUNET_i2s (&occ->peer_identity)); | 1140 | GNUNET_i2s (&occ->peer_identity)); |
1141 | occ->ghh = GNUNET_TRANSPORT_hello_get (cfg, | 1141 | occ->ghh = GNUNET_TRANSPORT_hello_get (cfg, |
1142 | GNUNET_TRANSPORT_AC_ANY, | 1142 | GNUNET_TRANSPORT_AC_ANY, |
@@ -1172,7 +1172,7 @@ occ_cache_get_handle_core_cb (void *cls, | |||
1172 | GNUNET_asprintf (&occ->emsg, | 1172 | GNUNET_asprintf (&occ->emsg, |
1173 | "0x%llx: Failed to connect to CORE of peer with " | 1173 | "0x%llx: Failed to connect to CORE of peer with " |
1174 | "id: %u", | 1174 | "id: %u", |
1175 | occ->op_id, | 1175 | (unsigned long long) occ->op_id, |
1176 | occ->peer->id); | 1176 | occ->peer->id); |
1177 | GNUNET_SCHEDULER_cancel (occ->timeout_task); | 1177 | GNUNET_SCHEDULER_cancel (occ->timeout_task); |
1178 | occ->timeout_task = | 1178 | occ->timeout_task = |
@@ -1185,7 +1185,7 @@ occ_cache_get_handle_core_cb (void *cls, | |||
1185 | &occ->other_peer_identity)) | 1185 | &occ->other_peer_identity)) |
1186 | { | 1186 | { |
1187 | LOG_DEBUG ("0x%llx: Target peer already connected\n", | 1187 | LOG_DEBUG ("0x%llx: Target peer already connected\n", |
1188 | occ->op_id); | 1188 | (unsigned long long) occ->op_id); |
1189 | GNUNET_SCHEDULER_cancel (occ->timeout_task); | 1189 | GNUNET_SCHEDULER_cancel (occ->timeout_task); |
1190 | occ->timeout_task = NULL; | 1190 | occ->timeout_task = NULL; |
1191 | send_overlay_connect_success_msg (occ); | 1191 | send_overlay_connect_success_msg (occ); |
@@ -1194,13 +1194,13 @@ occ_cache_get_handle_core_cb (void *cls, | |||
1194 | } | 1194 | } |
1195 | occ->peer_identity = *my_identity; | 1195 | occ->peer_identity = *my_identity; |
1196 | LOG_DEBUG ("0x%llx: Acquiring HELLO of peer %s\n", | 1196 | LOG_DEBUG ("0x%llx: Acquiring HELLO of peer %s\n", |
1197 | occ->op_id, | 1197 | (unsigned long long) occ->op_id, |
1198 | GNUNET_i2s (&occ->peer_identity)); | 1198 | GNUNET_i2s (&occ->peer_identity)); |
1199 | /* Lookup for HELLO in hello cache */ | 1199 | /* Lookup for HELLO in hello cache */ |
1200 | if (NULL != (hello = GST_cache_lookup_hello (occ->peer->id))) | 1200 | if (NULL != (hello = GST_cache_lookup_hello (occ->peer->id))) |
1201 | { | 1201 | { |
1202 | LOG_DEBUG ("0x%llx: HELLO of peer %s found in cache\n", | 1202 | LOG_DEBUG ("0x%llx: HELLO of peer %s found in cache\n", |
1203 | occ->op_id, | 1203 | (unsigned long long) occ->op_id, |
1204 | GNUNET_i2s (&occ->peer_identity)); | 1204 | GNUNET_i2s (&occ->peer_identity)); |
1205 | occ->hello = GNUNET_copy_message (hello); | 1205 | occ->hello = GNUNET_copy_message (hello); |
1206 | p2_transport_connect (occ); | 1206 | p2_transport_connect (occ); |
@@ -1208,7 +1208,7 @@ occ_cache_get_handle_core_cb (void *cls, | |||
1208 | } | 1208 | } |
1209 | GNUNET_asprintf (&occ->emsg, | 1209 | GNUNET_asprintf (&occ->emsg, |
1210 | "0x%llx: Timeout while acquiring TRANSPORT of %s from cache", | 1210 | "0x%llx: Timeout while acquiring TRANSPORT of %s from cache", |
1211 | occ->op_id, | 1211 | (unsigned long long) occ->op_id, |
1212 | GNUNET_i2s (&occ->peer_identity)); | 1212 | GNUNET_i2s (&occ->peer_identity)); |
1213 | occ->cgh_p1th = | 1213 | occ->cgh_p1th = |
1214 | GST_connection_pool_get_handle (occ->peer->id, | 1214 | GST_connection_pool_get_handle (occ->peer->id, |
@@ -1253,7 +1253,7 @@ overlay_connect_get_config (void *cls, | |||
1253 | GNUNET_asprintf (&occ->emsg, | 1253 | GNUNET_asprintf (&occ->emsg, |
1254 | "0x%llx: Timeout while connecting to CORE of peer with " | 1254 | "0x%llx: Timeout while connecting to CORE of peer with " |
1255 | "id: %u", | 1255 | "id: %u", |
1256 | occ->op_id, | 1256 | (unsigned long long) occ->op_id, |
1257 | occ->peer->id); | 1257 | occ->peer->id); |
1258 | occ->cgh_ch = | 1258 | occ->cgh_ch = |
1259 | GST_connection_pool_get_handle (occ->peer->id, | 1259 | GST_connection_pool_get_handle (occ->peer->id, |
@@ -1425,7 +1425,8 @@ forward_overlay_connect (const struct GNUNET_TESTBED_OverlayConnectMessage *msg, | |||
1425 | GNUNET_assert (VALID_HOST_ID (peer2_host_id)); | 1425 | GNUNET_assert (VALID_HOST_ID (peer2_host_id)); |
1426 | peer = GST_peer_list[p1]; | 1426 | peer = GST_peer_list[p1]; |
1427 | GNUNET_assert (GNUNET_YES == peer->is_remote); | 1427 | GNUNET_assert (GNUNET_YES == peer->is_remote); |
1428 | LOG_DEBUG ("0x%llx: Forwarding overlay connect\n", op_id); | 1428 | LOG_DEBUG ("0x%llx: Forwarding overlay connect\n", |
1429 | (unsigned long long) op_id); | ||
1429 | route_to_peer2_host = GST_find_dest_route (peer2_host_id); | 1430 | route_to_peer2_host = GST_find_dest_route (peer2_host_id); |
1430 | route_to_peer1_host = GST_find_dest_route | 1431 | route_to_peer1_host = GST_find_dest_route |
1431 | (peer->details.remote.remote_host_id); | 1432 | (peer->details.remote.remote_host_id); |
@@ -1512,7 +1513,7 @@ p2_controller_connect_cb (void *cls, | |||
1512 | GNUNET_asprintf (&occ->emsg, | 1513 | GNUNET_asprintf (&occ->emsg, |
1513 | "0x%llx: Timeout while getting peer identity of peer " | 1514 | "0x%llx: Timeout while getting peer identity of peer " |
1514 | "with id: %u", | 1515 | "with id: %u", |
1515 | occ->op_id, | 1516 | (unsigned long long) occ->op_id, |
1516 | occ->other_peer_id); | 1517 | occ->other_peer_id); |
1517 | } | 1518 | } |
1518 | 1519 | ||
@@ -1551,7 +1552,7 @@ handle_overlay_connect (void *cls, | |||
1551 | ("Received overlay connect for peers %u and %u with op id: 0x%llx\n", | 1552 | ("Received overlay connect for peers %u and %u with op id: 0x%llx\n", |
1552 | p1, | 1553 | p1, |
1553 | p2, | 1554 | p2, |
1554 | operation_id); | 1555 | (unsigned long long) operation_id); |
1555 | peer2_host_id = ntohl (msg->peer2_host_id); | 1556 | peer2_host_id = ntohl (msg->peer2_host_id); |
1556 | if (GNUNET_YES == peer->is_remote) | 1557 | if (GNUNET_YES == peer->is_remote) |
1557 | { | 1558 | { |
@@ -1577,7 +1578,7 @@ handle_overlay_connect (void *cls, | |||
1577 | GNUNET_break (0); | 1578 | GNUNET_break (0); |
1578 | LOG (GNUNET_ERROR_TYPE_WARNING, | 1579 | LOG (GNUNET_ERROR_TYPE_WARNING, |
1579 | "0x%llx: Peer %u's host not in our neighbours list\n", | 1580 | "0x%llx: Peer %u's host not in our neighbours list\n", |
1580 | operation_id, p2); | 1581 | (unsigned long long) operation_id, p2); |
1581 | GNUNET_SERVICE_client_drop (client); | 1582 | GNUNET_SERVICE_client_drop (client); |
1582 | GNUNET_free (occ); | 1583 | GNUNET_free (occ); |
1583 | return; | 1584 | return; |
@@ -1611,7 +1612,7 @@ handle_overlay_connect (void *cls, | |||
1611 | GNUNET_asprintf (&occ->emsg, | 1612 | GNUNET_asprintf (&occ->emsg, |
1612 | "0x%llx: Timeout while acquiring connection to peer %u's " | 1613 | "0x%llx: Timeout while acquiring connection to peer %u's " |
1613 | "host: %u\n", | 1614 | "host: %u\n", |
1614 | occ->op_id, | 1615 | (unsigned long long) occ->op_id, |
1615 | occ->other_peer_id, | 1616 | occ->other_peer_id, |
1616 | peer2_host_id); | 1617 | peer2_host_id); |
1617 | occ->p2ctx.remote.ncn | 1618 | occ->p2ctx.remote.ncn |
@@ -1633,7 +1634,7 @@ handle_overlay_connect (void *cls, | |||
1633 | GNUNET_asprintf (&occ->emsg, | 1634 | GNUNET_asprintf (&occ->emsg, |
1634 | "0x%llx: Timeout while connecting to CORE of peer with " | 1635 | "0x%llx: Timeout while connecting to CORE of peer with " |
1635 | "id: %u", | 1636 | "id: %u", |
1636 | occ->op_id, | 1637 | (unsigned long long) occ->op_id, |
1637 | occ->peer->id); | 1638 | occ->peer->id); |
1638 | occ->cgh_ch = | 1639 | occ->cgh_ch = |
1639 | GST_connection_pool_get_handle (occ->peer->id, | 1640 | GST_connection_pool_get_handle (occ->peer->id, |
@@ -1658,7 +1659,7 @@ static void | |||
1658 | cleanup_rocc (struct RemoteOverlayConnectCtx *rocc) | 1659 | cleanup_rocc (struct RemoteOverlayConnectCtx *rocc) |
1659 | { | 1660 | { |
1660 | LOG_DEBUG ("0x%llx: Cleaning up rocc\n", | 1661 | LOG_DEBUG ("0x%llx: Cleaning up rocc\n", |
1661 | rocc->op_id); | 1662 | (unsigned long long) rocc->op_id); |
1662 | if (NULL != rocc->attempt_connect_task_id) | 1663 | if (NULL != rocc->attempt_connect_task_id) |
1663 | GNUNET_SCHEDULER_cancel (rocc->attempt_connect_task_id); | 1664 | GNUNET_SCHEDULER_cancel (rocc->attempt_connect_task_id); |
1664 | if (NULL != rocc->timeout_rocc_task_id) | 1665 | if (NULL != rocc->timeout_rocc_task_id) |
@@ -1695,7 +1696,7 @@ timeout_rocc_task (void *cls) | |||
1695 | GNUNET_assert (rocc->timeout_rocc_task_id != NULL); | 1696 | GNUNET_assert (rocc->timeout_rocc_task_id != NULL); |
1696 | rocc->timeout_rocc_task_id = NULL; | 1697 | rocc->timeout_rocc_task_id = NULL; |
1697 | LOG_DEBUG ("0x%llx: rocc timed out\n", | 1698 | LOG_DEBUG ("0x%llx: rocc timed out\n", |
1698 | rocc->op_id); | 1699 | (unsigned long long) rocc->op_id); |
1699 | cleanup_rocc (rocc); | 1700 | cleanup_rocc (rocc); |
1700 | } | 1701 | } |
1701 | 1702 | ||
@@ -1714,12 +1715,12 @@ cache_transport_peer_connect_notify (void *cls, | |||
1714 | struct RemoteOverlayConnectCtx *rocc = cls; | 1715 | struct RemoteOverlayConnectCtx *rocc = cls; |
1715 | 1716 | ||
1716 | LOG_DEBUG ("0x%llx: Request Overlay connect notify\n", | 1717 | LOG_DEBUG ("0x%llx: Request Overlay connect notify\n", |
1717 | rocc->op_id); | 1718 | (unsigned long long) rocc->op_id); |
1718 | GNUNET_assert (0 == | 1719 | GNUNET_assert (0 == |
1719 | memcmp (new_peer, &rocc->a_id, | 1720 | memcmp (new_peer, &rocc->a_id, |
1720 | sizeof(struct GNUNET_PeerIdentity))); | 1721 | sizeof(struct GNUNET_PeerIdentity))); |
1721 | LOG_DEBUG ("0x%llx: Peer %s connected\n", | 1722 | LOG_DEBUG ("0x%llx: Peer %s connected\n", |
1722 | rocc->op_id, | 1723 | (unsigned long long) rocc->op_id, |
1723 | GNUNET_i2s (&rocc->a_id)); | 1724 | GNUNET_i2s (&rocc->a_id)); |
1724 | cleanup_rocc (rocc); | 1725 | cleanup_rocc (rocc); |
1725 | } | 1726 | } |
@@ -1750,7 +1751,7 @@ rocc_hello_sent_cb (void *cls) | |||
1750 | rocc->ohh = NULL; | 1751 | rocc->ohh = NULL; |
1751 | GNUNET_assert (NULL == rocc->attempt_connect_task_id); | 1752 | GNUNET_assert (NULL == rocc->attempt_connect_task_id); |
1752 | LOG_DEBUG ("0x%llx: HELLO of peer %s delivered to local peer with id: %u\n", | 1753 | LOG_DEBUG ("0x%llx: HELLO of peer %s delivered to local peer with id: %u\n", |
1753 | rocc->op_id, | 1754 | (unsigned long long) rocc->op_id, |
1754 | GNUNET_i2s (&rocc->a_id), | 1755 | GNUNET_i2s (&rocc->a_id), |
1755 | rocc->peer->id); | 1756 | rocc->peer->id); |
1756 | rocc->tcc.cgh_p2_ats = | 1757 | rocc->tcc.cgh_p2_ats = |
@@ -1776,7 +1777,7 @@ attempt_connect_task (void *cls) | |||
1776 | GNUNET_assert (NULL != rocc->attempt_connect_task_id); | 1777 | GNUNET_assert (NULL != rocc->attempt_connect_task_id); |
1777 | rocc->attempt_connect_task_id = NULL; | 1778 | rocc->attempt_connect_task_id = NULL; |
1778 | LOG_DEBUG ("0x%llx: Offering HELLO of peer %s to remote peer with id: %u\n", | 1779 | LOG_DEBUG ("0x%llx: Offering HELLO of peer %s to remote peer with id: %u\n", |
1779 | rocc->op_id, | 1780 | (unsigned long long) rocc->op_id, |
1780 | GNUNET_i2s (&rocc->a_id), | 1781 | GNUNET_i2s (&rocc->a_id), |
1781 | rocc->peer->id); | 1782 | rocc->peer->id); |
1782 | rocc->ohh = | 1783 | rocc->ohh = |
@@ -1828,7 +1829,7 @@ rocc_cache_get_handle_transport_cb (void *cls, | |||
1828 | &rocc->a_id)) | 1829 | &rocc->a_id)) |
1829 | { | 1830 | { |
1830 | LOG_DEBUG ("0x%llx: Target peer %s already connected to local peer: %u\n", | 1831 | LOG_DEBUG ("0x%llx: Target peer %s already connected to local peer: %u\n", |
1831 | rocc->op_id, | 1832 | (unsigned long long) rocc->op_id, |
1832 | GNUNET_i2s (&rocc->a_id), | 1833 | GNUNET_i2s (&rocc->a_id), |
1833 | rocc->peer->id); | 1834 | rocc->peer->id); |
1834 | cleanup_rocc (rocc); | 1835 | cleanup_rocc (rocc); |
@@ -1924,7 +1925,7 @@ handle_remote_overlay_connect (void *cls, | |||
1924 | sizeof(pid_str)); | 1925 | sizeof(pid_str)); |
1925 | LOG_DEBUG ( | 1926 | LOG_DEBUG ( |
1926 | "0x%llx: Remote overlay connect %s to peer %s with hello size: %u\n", | 1927 | "0x%llx: Remote overlay connect %s to peer %s with hello size: %u\n", |
1927 | rocc->op_id, | 1928 | (unsigned long long) rocc->op_id, |
1928 | pid_str, | 1929 | pid_str, |
1929 | GNUNET_i2s (&rocc->a_id), | 1930 | GNUNET_i2s (&rocc->a_id), |
1930 | hsize); | 1931 | hsize); |
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c index 09752ba28..f291892c6 100644 --- a/src/testbed/testbed_api.c +++ b/src/testbed/testbed_api.c | |||
@@ -448,7 +448,8 @@ handle_opsuccess ( | |||
448 | uint64_t op_id; | 448 | uint64_t op_id; |
449 | 449 | ||
450 | op_id = GNUNET_ntohll (msg->operation_id); | 450 | op_id = GNUNET_ntohll (msg->operation_id); |
451 | LOG_DEBUG ("Operation %llu successful\n", op_id); | 451 | LOG_DEBUG ("Operation %llu successful\n", |
452 | (unsigned long long) op_id); | ||
452 | if (NULL == (opc = find_opc (c, op_id))) | 453 | if (NULL == (opc = find_opc (c, op_id))) |
453 | { | 454 | { |
454 | LOG_DEBUG ("Operation not found\n"); | 455 | LOG_DEBUG ("Operation not found\n"); |
diff --git a/src/transport/gnunet-helper-transport-wlan.c b/src/transport/gnunet-helper-transport-wlan.c index 83ade115b..f1b190993 100644 --- a/src/transport/gnunet-helper-transport-wlan.c +++ b/src/transport/gnunet-helper-transport-wlan.c | |||
@@ -2004,7 +2004,7 @@ main (int argc, char *argv[]) | |||
2004 | (void) close (dev.fd_raw); | 2004 | (void) close (dev.fd_raw); |
2005 | return 1; | 2005 | return 1; |
2006 | } | 2006 | } |
2007 | strncpy (dev.iface, argv[1], IFNAMSIZ); | 2007 | memcpy (dev.iface, argv[1], IFNAMSIZ); |
2008 | if (0 != open_device_raw (&dev)) | 2008 | if (0 != open_device_raw (&dev)) |
2009 | { | 2009 | { |
2010 | (void) close (dev.fd_raw); | 2010 | (void) close (dev.fd_raw); |
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index 92e37a91c..a819d82a5 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/transport/gnunet-service-transport.c | |||
@@ -695,12 +695,13 @@ handle_send_transmit_continuation (void *cls, | |||
695 | { | 695 | { |
696 | struct SendTransmitContinuationContext *stcc = cls; | 696 | struct SendTransmitContinuationContext *stcc = cls; |
697 | struct SendOkMessage send_ok_msg; | 697 | struct SendOkMessage send_ok_msg; |
698 | #ifdef ENABLE_TTD | ||
698 | struct GNUNET_TIME_Relative delay; | 699 | struct GNUNET_TIME_Relative delay; |
699 | const struct GNUNET_HELLO_Address *addr; | 700 | const struct GNUNET_HELLO_Address *addr; |
700 | 701 | ||
701 | delay = GNUNET_TIME_absolute_get_duration (stcc->send_time); | 702 | delay = GNUNET_TIME_absolute_get_duration (stcc->send_time); |
702 | addr = GST_neighbour_get_current_address (&stcc->target); | 703 | addr = GST_neighbour_get_current_address (&stcc->target); |
703 | #ifdef ENABLE_TTD | 704 | |
704 | if (delay.rel_value_us > GNUNET_CONSTANTS_LATENCY_WARN.rel_value_us) | 705 | if (delay.rel_value_us > GNUNET_CONSTANTS_LATENCY_WARN.rel_value_us) |
705 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 706 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
706 | "It took us %s to send %u/%u bytes to %s (%d, %s)\n", | 707 | "It took us %s to send %u/%u bytes to %s (%d, %s)\n", |
diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c index 74b8d5a8a..1b2b6d0d2 100644 --- a/src/transport/plugin_transport_wlan.c +++ b/src/transport/plugin_transport_wlan.c | |||
@@ -1436,8 +1436,8 @@ wlan_plugin_send (void *cls, | |||
1436 | char buf[size] GNUNET_ALIGN; | 1436 | char buf[size] GNUNET_ALIGN; |
1437 | 1437 | ||
1438 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1438 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1439 | "Transmitting %u bytes of payload to peer `%s' (starting with %u byte message of type %u)\n", | 1439 | "Transmitting %llu bytes of payload to peer `%s' (starting with %u byte message of type %u)\n", |
1440 | msgbuf_size, | 1440 | (unsigned long long) msgbuf_size, |
1441 | GNUNET_i2s (&session->target), | 1441 | GNUNET_i2s (&session->target), |
1442 | (unsigned int) ntohs (((struct GNUNET_MessageHeader*) msgbuf)->size), | 1442 | (unsigned int) ntohs (((struct GNUNET_MessageHeader*) msgbuf)->size), |
1443 | (unsigned int) ntohs (((struct GNUNET_MessageHeader*) msgbuf)->type)); | 1443 | (unsigned int) ntohs (((struct GNUNET_MessageHeader*) msgbuf)->type)); |
@@ -1871,8 +1871,9 @@ handle_helper_message (void *cls, | |||
1871 | if (msize < sizeof(struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage)) | 1871 | if (msize < sizeof(struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage)) |
1872 | { | 1872 | { |
1873 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1873 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1874 | "Size of packet is too small (%u bytes < %u)\n", | 1874 | "Size of packet is too small (%llu bytes < %llu)\n", |
1875 | msize, sizeof(struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage)); | 1875 | (unsigned long long) msize, |
1876 | (unsigned long long) sizeof(struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage)); | ||
1876 | break; | 1877 | break; |
1877 | } | 1878 | } |
1878 | rxinfo = (const struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage *) hdr; | 1879 | rxinfo = (const struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage *) hdr; |