summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Schanzenbach <schanzen@gnunet.org>2020-11-13 23:46:16 +0900
committerMartin Schanzenbach <schanzen@gnunet.org>2020-11-13 23:46:16 +0900
commite19e93df13a84b26db9f129f509ecb74a1b93145 (patch)
tree264e99934d1661e1d83508c3434c5d00e33a6ee1 /src
parentc185348b6784a80bb8b394e34e3bf447d8dd1f57 (diff)
-warnings mostly format
Diffstat (limited to 'src')
-rw-r--r--src/ats-tests/ats-testing-log.c9
-rw-r--r--src/auction/gnunet-service-auction.c4
-rw-r--r--src/cadet/gnunet-service-cadet_channel.c2
-rw-r--r--src/cadet/gnunet-service-cadet_tunnels.c5
-rw-r--r--src/dht/dht_api.c4
-rw-r--r--src/dns/gnunet-dns-monitor.c2
-rw-r--r--src/dns/gnunet-service-dns.c2
-rw-r--r--src/fs/fs_uri.c2
-rw-r--r--src/include/Makefile.am1
-rw-r--r--src/nse/gnunet-nse-profiler.c4
-rw-r--r--src/set/gnunet-service-set_union.c2
-rw-r--r--src/setu/gnunet-service-setu.c2
-rw-r--r--src/testbed/gnunet-service-testbed_oc.c71
-rw-r--r--src/testbed/testbed_api.c3
-rw-r--r--src/transport/gnunet-helper-transport-wlan.c2
-rw-r--r--src/transport/gnunet-service-transport.c3
-rw-r--r--src/transport/plugin_transport_wlan.c9
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,
for (c_m = 0; c_m < l->num_masters; c_m++)
{
GNUNET_asprintf (&filename_master, "%s_%llu_master%u_%s",
- experiment_name, timestamp.abs_value_us, c_m, l->name);
+ experiment_name,
+ (unsigned long long) timestamp.abs_value_us, c_m, l->name);
fprintf (stderr, "Writing data for master %u to file `%s'\n",
c_m, filename_master);
@@ -495,7 +496,9 @@ GNUNET_ATS_TEST_logging_write_to_file (struct LoggingHandle *l,
for (c_s = 0; c_s < l->lp[c_m].peer->num_partners; c_s++)
{
GNUNET_asprintf (&filename_slaves[c_s], "%s_%llu_master%u_slave_%u_%s",
- tmp_exp_name, timestamp.abs_value_us, c_m, c_s, l->name);
+ tmp_exp_name,
+ (unsigned long long) timestamp.abs_value_us,
+ c_m, c_s, l->name);
fprintf (stderr, "Writing data for master %u slave %u to file `%s'\n",
c_m, c_s, filename_slaves[c_s]);
@@ -593,7 +596,7 @@ GNUNET_ATS_TEST_logging_write_to_file (struct LoggingHandle *l,
(double) plt->app_rtt / 1000,
plt->bandwidth_in,
plt->bandwidth_out,
- plt->ats_delay.rel_value_us,
+ (unsigned long long) plt->ats_delay.rel_value_us,
plt->ats_distance,
plt->ats_network_type,
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)
// struct GNUNET_MQ_Handle *mq;
// struct GNUNET_MQ_Envelope *env;
// struct GNUNET_AUCTION_blabla em;
- uint16_t size;
+ //uint16_t size;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received CREATE message from client\n");
- size = ntohs (msg->header.size);
+ //size = ntohs (msg->header.size);
/**TODO: create auction and return auction object */
// 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 (
(1LLU << delta),
mid_msg,
mid_min,
- ch->mid_futures);
+ (unsigned long long) ch->mid_futures);
}
}
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,
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Do not begin KX for %s if WE have no channels waiting. Retrying after %llu\n",
GCT_2s (t),
- GNUNET_TIME_absolute_get_remaining (t->next_kx_attempt).rel_value_us);
+ (unsigned long long) GNUNET_TIME_absolute_get_remaining (
+ t->next_kx_attempt).rel_value_us);
/* Do not begin KX if WE have no channels waiting! */
if (0 != GNUNET_TIME_absolute_get_remaining (
t->next_kx_attempt).rel_value_us)
@@ -3279,7 +3280,7 @@ GCT_handle_encrypted (struct CadetTConnection *ct,
{
struct CadetTunnel *t = ct->t;
uint16_t size = ntohs (msg->header.size);
- char cbuf [size] GNUNET_ALIGN;
+ char cbuf[size] GNUNET_ALIGN;
ssize_t decrypted_size;
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,
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Ignoring reply for %s: UID mismatch: %llu/%llu\n",
GNUNET_h2s (key),
- crm->unique_id,
- get_handle->unique_id);
+ (unsigned long long) crm->unique_id,
+ (unsigned long long) get_handle->unique_id);
return GNUNET_YES;
}
/* 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)
GNUNET_asprintf (&tmp,
"%.*s",
(unsigned int) record->data.raw.data_len,
- record->data.raw.data);
+ (char*) record->data.raw.data);
format = tmp;
break;
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)
/* done with current phase, advance! */
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Request %llu now in phase %d\n",
- rr->request_id,
+ (unsigned long long) rr->request_id,
rr->phase);
switch (rr->phase)
{
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)
GNUNET_FS_URI_CHK_INFIX,
(const char *) &keyhash,
(const char *) &queryhash,
- GNUNET_ntohll (fi->file_length));
+ (unsigned long long) GNUNET_ntohll (fi->file_length));
return ret;
}
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 = \
gnunet_getopt_lib.h \
gnunet_gns_service.h \
gnunet_gnsrecord_lib.h \
+ gnunet_gnsrecord_json_lib.h \
gnunet_gnsrecord_plugin.h \
gnunet_hello_lib.h \
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,
flag = 1;
size = GNUNET_asprintf (&output_buffer,
"%llu %llu %u\n",
- now.abs_value_us / 1000LL / 1000LL,
- value,
+ (unsigned long long) now.abs_value_us / 1000LL / 1000LL,
+ (unsigned long long) value,
flag);
if (0 > size)
{
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,
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Deciding to go for full set transmission (diff=%d, own set=%llu)\n",
diff,
- op->state->initial_size);
+ (unsigned long long) op->state->initial_size);
GNUNET_STATISTICS_update (_GSS_statistics,
"# of full sends",
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,
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Deciding to go for full set transmission (diff=%d, own set=%llu)\n",
diff,
- op->initial_size);
+ (unsigned long long) op->initial_size);
GNUNET_STATISTICS_update (_GSS_statistics,
"# of full sends",
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)
struct Peer *peer2;
LOG_DEBUG ("0x%llx: Cleaning up occ\n",
- occ->op_id);
+ (unsigned long long) occ->op_id);
GNUNET_free (occ->emsg);
GNUNET_free (occ->hello);
if (NULL != occ->send_hello_task)
@@ -656,7 +656,7 @@ send_overlay_connect_success_msg (struct OverlayConnectContext *occ)
struct GNUNET_TESTBED_ConnectionEventMessage *msg;
LOG_DEBUG ("0x%llx: Peers connected - Sending overlay connect success\n",
- occ->op_id);
+ (unsigned long long) occ->op_id);
env = GNUNET_MQ_msg (msg,
GNUNET_MESSAGE_TYPE_TESTBED_PEER_CONNECT_EVENT);
msg->event_type = htonl (GNUNET_TESTBED_ET_CONNECT);
@@ -704,7 +704,7 @@ overlay_connect_notify (void *cls,
}
GNUNET_free (new_peer_str);
LOG_DEBUG ("0x%llx: Peer %s connected to peer %s\n",
- occ->op_id,
+ (unsigned long long) occ->op_id,
other_peer_str,
GNUNET_i2s (&occ->peer_identity));
GNUNET_free (other_peer_str);
@@ -763,7 +763,7 @@ occ_cache_get_handle_ats_occ_cb (void *cls,
{
GNUNET_asprintf (&occ->emsg,
"0x%llx: Failed to connect to ATS of peer with id: %u",
- occ->op_id,
+ (unsigned long long) occ->op_id,
occ->peer->id);
GNUNET_SCHEDULER_cancel (occ->timeout_task);
occ->timeout_task =
@@ -775,7 +775,7 @@ occ_cache_get_handle_ats_occ_cb (void *cls,
GNUNET_asprintf (&occ->emsg,
"0x%llx: Timeout during GNUNET_ATS_connectivity_suggest() at peer %s",
- occ->op_id,
+ (unsigned long long) occ->op_id,
GNUNET_i2s (&occ->other_peer_identity));
lp2c = &occ->p2ctx.local;
@@ -846,7 +846,7 @@ occ_hello_sent_cb (void *cls)
GNUNET_asprintf (&occ->emsg,
"0x%llx: Timeout while acquiring ATS of %s from cache",
- occ->op_id,
+ (unsigned long long) occ->op_id,
GNUNET_i2s (&occ->other_peer_identity));
GNUNET_assert (NULL != (peer2 = GST_peer_list[occ->other_peer_id]));
lp2c->tcc.cgh_p2_ats =
@@ -878,7 +878,7 @@ send_hello_thru_rocc (struct OverlayConnectContext *occ)
other_peer_str = GNUNET_strdup (GNUNET_i2s (&occ->other_peer_identity));
LOG_DEBUG (
"0x%llx: Offering HELLO of %s (size: %u) to %s via Remote Overlay Request\n",
- occ->op_id,
+ (unsigned long long) occ->op_id,
GNUNET_i2s (&occ->peer_identity),
ntohs (occ->hello->size),
other_peer_str);
@@ -926,7 +926,7 @@ send_hello (void *cls)
lp2c = &occ->p2ctx.local;
other_peer_str = GNUNET_strdup (GNUNET_i2s (&occ->other_peer_identity));
LOG_DEBUG ("0x%llx: Offering HELLO of %s to %s\n",
- occ->op_id,
+ (unsigned long long) occ->op_id,
GNUNET_i2s (&occ->peer_identity),
other_peer_str);
GNUNET_free (other_peer_str);
@@ -975,7 +975,7 @@ p2_transport_connect_cache_callback (void *cls,
{
GNUNET_asprintf (&occ->emsg,
"0x%llx: Cannot connect to TRANSPORT of %s",
- occ->op_id,
+ (unsigned long long) occ->op_id,
GNUNET_i2s (&occ->other_peer_identity));
GNUNET_SCHEDULER_cancel (occ->timeout_task);
occ->timeout_task =
@@ -986,7 +986,7 @@ p2_transport_connect_cache_callback (void *cls,
occ->p2ctx.local.tcc.cfg = cfg;
GNUNET_asprintf (&occ->emsg,
"0x%llx: Timeout while offering HELLO to %s",
- occ->op_id,
+ (unsigned long long) occ->op_id,
GNUNET_i2s (&occ->other_peer_identity));
occ->send_hello_task = GNUNET_SCHEDULER_add_now (&send_hello, occ);
}
@@ -1026,7 +1026,7 @@ p2_transport_connect (struct OverlayConnectContext *occ)
}
GNUNET_asprintf (&occ->emsg,
"0x%llx: Timeout while offering HELLO to %s",
- occ->op_id,
+ (unsigned long long) occ->op_id,
GNUNET_i2s (&occ->other_peer_identity));
occ->send_hello_task = GNUNET_SCHEDULER_add_now (&send_hello, occ);
}
@@ -1077,12 +1077,12 @@ hello_update_cb (void *cls,
if (GNUNET_YES == empty)
{
LOG_DEBUG ("0x%llx: HELLO of %s is empty\n",
- occ->op_id,
+ (unsigned long long) occ->op_id,
GNUNET_i2s (&occ->peer_identity));
return;
}
LOG_DEBUG ("0x%llx: Received HELLO of %s\n",
- occ->op_id,
+ (unsigned long long) occ->op_id,
GNUNET_i2s (&occ->peer_identity));
occ->hello = GNUNET_malloc (msize);
GST_cache_add_hello (occ->peer->id, hello);
@@ -1124,7 +1124,7 @@ p1_transport_connect_cache_callback (void *cls,
{
GNUNET_asprintf (&occ->emsg,
"0x%llx: Cannot connect to TRANSPORT of %s",
- occ->op_id,
+ (unsigned long long) occ->op_id,
GNUNET_i2s (&occ->peer_identity));
GNUNET_SCHEDULER_cancel (occ->timeout_task);
occ->timeout_task =
@@ -1136,7 +1136,7 @@ p1_transport_connect_cache_callback (void *cls,
occ->p1th_ = th;
GNUNET_asprintf (&occ->emsg,
"0x%llx: Timeout while acquiring HELLO of peer %s",
- occ->op_id,
+ (unsigned long long) occ->op_id,
GNUNET_i2s (&occ->peer_identity));
occ->ghh = GNUNET_TRANSPORT_hello_get (cfg,
GNUNET_TRANSPORT_AC_ANY,
@@ -1172,7 +1172,7 @@ occ_cache_get_handle_core_cb (void *cls,
GNUNET_asprintf (&occ->emsg,
"0x%llx: Failed to connect to CORE of peer with "
"id: %u",
- occ->op_id,
+ (unsigned long long) occ->op_id,
occ->peer->id);
GNUNET_SCHEDULER_cancel (occ->timeout_task);
occ->timeout_task =
@@ -1185,7 +1185,7 @@ occ_cache_get_handle_core_cb (void *cls,
&occ->other_peer_identity))
{
LOG_DEBUG ("0x%llx: Target peer already connected\n",
- occ->op_id);
+ (unsigned long long) occ->op_id);
GNUNET_SCHEDULER_cancel (occ->timeout_task);
occ->timeout_task = NULL;
send_overlay_connect_success_msg (occ);
@@ -1194,13 +1194,13 @@ occ_cache_get_handle_core_cb (void *cls,
}
occ->peer_identity = *my_identity;
LOG_DEBUG ("0x%llx: Acquiring HELLO of peer %s\n",
- occ->op_id,
+ (unsigned long long) occ->op_id,
GNUNET_i2s (&occ->peer_identity));
/* Lookup for HELLO in hello cache */
if (NULL != (hello = GST_cache_lookup_hello (occ->peer->id)))
{
LOG_DEBUG ("0x%llx: HELLO of peer %s found in cache\n",
- occ->op_id,
+ (unsigned long long) occ->op_id,
GNUNET_i2s (&occ->peer_identity));
occ->hello = GNUNET_copy_message (hello);
p2_transport_connect (occ);
@@ -1208,7 +1208,7 @@ occ_cache_get_handle_core_cb (void *cls,
}
GNUNET_asprintf (&occ->emsg,
"0x%llx: Timeout while acquiring TRANSPORT of %s from cache",
- occ->op_id,
+ (unsigned long long) occ->op_id,
GNUNET_i2s (&occ->peer_identity));
occ->cgh_p1th =
GST_connection_pool_get_handle (occ->peer->id,
@@ -1253,7 +1253,7 @@ overlay_connect_get_config (void *cls,
GNUNET_asprintf (&occ->emsg,
"0x%llx: Timeout while connecting to CORE of peer with "
"id: %u",
- occ->op_id,
+ (unsigned long long) occ->op_id,
occ->peer->id);
occ->cgh_ch =
GST_connection_pool_get_handle (occ->peer->id,
@@ -1425,7 +1425,8 @@ forward_overlay_connect (const struct GNUNET_TESTBED_OverlayConnectMessage *msg,
GNUNET_assert (VALID_HOST_ID (peer2_host_id));
peer = GST_peer_list[p1];
GNUNET_assert (GNUNET_YES == peer->is_remote);
- LOG_DEBUG ("0x%llx: Forwarding overlay connect\n", op_id);
+ LOG_DEBUG ("0x%llx: Forwarding overlay connect\n",
+ (unsigned long long) op_id);
route_to_peer2_host = GST_find_dest_route (peer2_host_id);
route_to_peer1_host = GST_find_dest_route
(peer->details.remote.remote_host_id);
@@ -1512,7 +1513,7 @@ p2_controller_connect_cb (void *cls,
GNUNET_asprintf (&occ->emsg,
"0x%llx: Timeout while getting peer identity of peer "
"with id: %u",
- occ->op_id,
+ (unsigned long long) occ->op_id,
occ->other_peer_id);
}
@@ -1551,7 +1552,7 @@ handle_overlay_connect (void *cls,
("Received overlay connect for peers %u and %u with op id: 0x%llx\n",
p1,
p2,
- operation_id);
+ (unsigned long long) operation_id);
peer2_host_id = ntohl (msg->peer2_host_id);
if (GNUNET_YES == peer->is_remote)
{
@@ -1577,7 +1578,7 @@ handle_overlay_connect (void *cls,
GNUNET_break (0);
LOG (GNUNET_ERROR_TYPE_WARNING,
"0x%llx: Peer %u's host not in our neighbours list\n",
- operation_id, p2);
+ (unsigned long long) operation_id, p2);
GNUNET_SERVICE_client_drop (client);
GNUNET_free (occ);
return;
@@ -1611,7 +1612,7 @@ handle_overlay_connect (void *cls,
GNUNET_asprintf (&occ->emsg,
"0x%llx: Timeout while acquiring connection to peer %u's "
"host: %u\n",
- occ->op_id,
+ (unsigned long long) occ->op_id,
occ->other_peer_id,
peer2_host_id);
occ->p2ctx.remote.ncn
@@ -1633,7 +1634,7 @@ handle_overlay_connect (void *cls,
GNUNET_asprintf (&occ->emsg,
"0x%llx: Timeout while connecting to CORE of peer with "
"id: %u",
- occ->op_id,
+ (unsigned long long) occ->op_id,
occ->peer->id);
occ->cgh_ch =
GST_connection_pool_get_handle (occ->peer->id,
@@ -1658,7 +1659,7 @@ static void
cleanup_rocc (struct RemoteOverlayConnectCtx *rocc)
{
LOG_DEBUG ("0x%llx: Cleaning up rocc\n",
- rocc->op_id);
+ (unsigned long long) rocc->op_id);
if (NULL != rocc->attempt_connect_task_id)
GNUNET_SCHEDULER_cancel (rocc->attempt_connect_task_id);
if (NULL != rocc->timeout_rocc_task_id)
@@ -1695,7 +1696,7 @@ timeout_rocc_task (void *cls)
GNUNET_assert (rocc->timeout_rocc_task_id != NULL);
rocc->timeout_rocc_task_id = NULL;
LOG_DEBUG ("0x%llx: rocc timed out\n",
- rocc->op_id);
+ (unsigned long long) rocc->op_id);
cleanup_rocc (rocc);
}
@@ -1714,12 +1715,12 @@ cache_transport_peer_connect_notify (void *cls,
struct RemoteOverlayConnectCtx *rocc = cls;
LOG_DEBUG ("0x%llx: Request Overlay connect notify\n",
- rocc->op_id);
+ (unsigned long long) rocc->op_id);
GNUNET_assert (0 ==
memcmp (new_peer, &rocc->a_id,
sizeof(struct GNUNET_PeerIdentity)));
LOG_DEBUG ("0x%llx: Peer %s connected\n",
- rocc->op_id,
+ (unsigned long long) rocc->op_id,
GNUNET_i2s (&rocc->a_id));
cleanup_rocc (rocc);
}
@@ -1750,7 +1751,7 @@ rocc_hello_sent_cb (void *cls)
rocc->ohh = NULL;
GNUNET_assert (NULL == rocc->attempt_connect_task_id);
LOG_DEBUG ("0x%llx: HELLO of peer %s delivered to local peer with id: %u\n",
- rocc->op_id,
+ (unsigned long long) rocc->op_id,
GNUNET_i2s (&rocc->a_id),
rocc->peer->id);
rocc->tcc.cgh_p2_ats =
@@ -1776,7 +1777,7 @@ attempt_connect_task (void *cls)
GNUNET_assert (NULL != rocc->attempt_connect_task_id);
rocc->attempt_connect_task_id = NULL;
LOG_DEBUG ("0x%llx: Offering HELLO of peer %s to remote peer with id: %u\n",
- rocc->op_id,
+ (unsigned long long) rocc->op_id,
GNUNET_i2s (&rocc->a_id),
rocc->peer->id);
rocc->ohh =
@@ -1828,7 +1829,7 @@ rocc_cache_get_handle_transport_cb (void *cls,
&rocc->a_id))
{
LOG_DEBUG ("0x%llx: Target peer %s already connected to local peer: %u\n",
- rocc->op_id,
+ (unsigned long long) rocc->op_id,
GNUNET_i2s (&rocc->a_id),
rocc->peer->id);
cleanup_rocc (rocc);
@@ -1924,7 +1925,7 @@ handle_remote_overlay_connect (void *cls,
sizeof(pid_str));
LOG_DEBUG (
"0x%llx: Remote overlay connect %s to peer %s with hello size: %u\n",
- rocc->op_id,
+ (unsigned long long) rocc->op_id,
pid_str,
GNUNET_i2s (&rocc->a_id),
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 (
uint64_t op_id;
op_id = GNUNET_ntohll (msg->operation_id);
- LOG_DEBUG ("Operation %llu successful\n", op_id);
+ LOG_DEBUG ("Operation %llu successful\n",
+ (unsigned long long) op_id);
if (NULL == (opc = find_opc (c, op_id)))
{
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[])
(void) close (dev.fd_raw);
return 1;
}
- strncpy (dev.iface, argv[1], IFNAMSIZ);
+ memcpy (dev.iface, argv[1], IFNAMSIZ);
if (0 != open_device_raw (&dev))
{
(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,
{
struct SendTransmitContinuationContext *stcc = cls;
struct SendOkMessage send_ok_msg;
+#ifdef ENABLE_TTD
struct GNUNET_TIME_Relative delay;
const struct GNUNET_HELLO_Address *addr;
delay = GNUNET_TIME_absolute_get_duration (stcc->send_time);
addr = GST_neighbour_get_current_address (&stcc->target);
-#ifdef ENABLE_TTD
+
if (delay.rel_value_us > GNUNET_CONSTANTS_LATENCY_WARN.rel_value_us)
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"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,
char buf[size] GNUNET_ALIGN;
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Transmitting %u bytes of payload to peer `%s' (starting with %u byte message of type %u)\n",
- msgbuf_size,
+ "Transmitting %llu bytes of payload to peer `%s' (starting with %u byte message of type %u)\n",
+ (unsigned long long) msgbuf_size,
GNUNET_i2s (&session->target),
(unsigned int) ntohs (((struct GNUNET_MessageHeader*) msgbuf)->size),
(unsigned int) ntohs (((struct GNUNET_MessageHeader*) msgbuf)->type));
@@ -1871,8 +1871,9 @@ handle_helper_message (void *cls,
if (msize < sizeof(struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage))
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Size of packet is too small (%u bytes < %u)\n",
- msize, sizeof(struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage));
+ "Size of packet is too small (%llu bytes < %llu)\n",
+ (unsigned long long) msize,
+ (unsigned long long) sizeof(struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage));
break;
}
rxinfo = (const struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage *) hdr;