commit d3f8c3d03f1efd2978bf0ad8260916336fd7662e
parent 48cac91e0937ffdcf641306489cf7b90132f42cf
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date: Wed, 28 Aug 2024 20:38:01 +0200
-fix more logging
Diffstat:
4 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/src/lib/util/nat.c b/src/lib/util/nat.c
@@ -101,10 +101,10 @@ GNUNET_is_burst_ready (struct GNUNET_TIME_Relative rtt_avarage,
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"other sync ready %u, other rtt %lu and rtt %lu rel1 %lu rel2 %lu\n",
burst_sync->sync_ready,
- other_rtt.rel_value_us,
- rtt_avarage.rel_value_us,
- rel1.rel_value_us,
- rel2.rel_value_us);
+ (unsigned long) other_rtt.rel_value_us,
+ (unsigned long) rtt_avarage.rel_value_us,
+ (unsigned long) rel1.rel_value_us,
+ (unsigned long) rel2.rel_value_us);
if ((other_rtt.rel_value_us != GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us &&
rtt_avarage.rel_value_us != GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us) &&
rel1.rel_value_us < RTT_DIFF.rel_value_us &&
diff --git a/src/service/transport/gnunet-communicator-http3.c b/src/service/transport/gnunet-communicator-http3.c
@@ -3885,6 +3885,7 @@ run (void *cls,
&mq_init,
NULL,
¬ify_cb,
+ NULL,
NULL);
if (NULL == ch)
{
diff --git a/src/service/transport/gnunet-service-transport.c b/src/service/transport/gnunet-service-transport.c
@@ -5508,7 +5508,7 @@ consider_sending_fc (void *cls)
(unsigned int) vl->fc_seq_gen,
GNUNET_i2s (&vl->target),
(unsigned long long) vl->incoming_fc_window_size,
- rtt_avarage.rel_value_us,
+ (unsigned long) rtt_avarage.rel_value_us,
vl->sync_ready);
monotime = GNUNET_TIME_absolute_get_monotonic (GST_cfg);
vl->last_fc_transmission = monotime;
@@ -7472,7 +7472,7 @@ learn_dv_path (const struct GNUNET_PeerIdentity *path,
q_timeout = GNUNET_TIME_absolute_max (q_timeout, q->validated_until);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"remainig %lu to %s\n",
- GNUNET_TIME_absolute_get_remaining (q_timeout).rel_value_us,
+ (unsigned long) GNUNET_TIME_absolute_get_remaining (q_timeout).rel_value_us,
GNUNET_i2s (&n->pid));
if (0 != GNUNET_TIME_absolute_get_remaining (q_timeout).rel_value_us)
{
@@ -9781,7 +9781,7 @@ calculate_rtt (struct DistanceVector *dv)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"calculate_rtt %lu\n",
- pos->pd.aged_rtt.rel_value_us);
+ (unsigned long) pos->pd.aged_rtt.rel_value_us);
n_hops++;
ret = GNUNET_TIME_relative_add (GNUNET_TIME_relative_multiply (pos->pd.aged_rtt, pos->distance + 2), ret);
}
@@ -9912,7 +9912,7 @@ start_burst (void *cls)
uri_without_port,
strlen (uri_without_port),
ntohs (sb->header.size),
- sb_cls->rtt.rel_value_us);
+ (unsigned long) sb_cls->rtt.rel_value_us);
GNUNET_MQ_send (tc->mq, env);
burst_running = GNUNET_YES;
burst_timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
@@ -10018,7 +10018,7 @@ handle_flow_control (void *cls, const struct TransportFlowControlMessage *fc)
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"remaining %lu timeout for neighbour %p\n",
- GNUNET_TIME_absolute_get_remaining (q_timeout).rel_value_us,
+ (unsigned long) GNUNET_TIME_absolute_get_remaining (q_timeout).rel_value_us,
vl->n);
if (NULL == vl->n ||
0 == GNUNET_TIME_absolute_get_remaining (q_timeout).rel_value_us)
diff --git a/src/service/transport/transport_api2_communication.c b/src/service/transport/transport_api2_communication.c
@@ -781,7 +781,7 @@ handle_backchannel_incoming (
static int
check_start_burst (void *cls,
- const struct GNUNET_TRANSPORT_StartBurst *sb)
+ const struct GNUNET_TRANSPORT_StartBurst *sb)
{
(void) cls;
const char *str = (const char *) &sb[1];
@@ -797,7 +797,7 @@ check_start_burst (void *cls,
static void
handle_start_burst (void *cls,
- const struct GNUNET_TRANSPORT_StartBurst *sb)
+ const struct GNUNET_TRANSPORT_StartBurst *sb)
{
struct GNUNET_TRANSPORT_CommunicatorHandle *ch = cls;
const char *addr = (const char *) &sb[1];
@@ -807,10 +807,12 @@ handle_start_burst (void *cls,
"Calling communicator to start burst to %s is %s rtt %lu\n",
addr,
NULL == sb ? "not possible" : "possible",
- rtt.rel_value_us);
-
+ (unsigned long) rtt.rel_value_us);
+
if (NULL != ch->sb)
- ch->sb (addr, GNUNET_TIME_relative_ntoh (sb->rtt), (struct GNUNET_PeerIdentity *) &sb->pid);
+ ch->sb (addr, GNUNET_TIME_relative_ntoh (sb->rtt), (struct
+ GNUNET_PeerIdentity *) &
+ sb->pid);
}
@@ -1166,17 +1168,21 @@ GNUNET_TRANSPORT_communicator_notify (
env =
GNUNET_MQ_msg_extra (cb,
slen + mlen,
- GNUNET_MESSAGE_TYPE_TRANSPORT_COMMUNICATOR_BACKCHANNEL);
+ GNUNET_MESSAGE_TYPE_TRANSPORT_COMMUNICATOR_BACKCHANNEL)
+ ;
cb->pid = *pid;
memcpy (&cb[1], header, mlen);
memcpy (((char *) &cb[1]) + mlen, comm, slen);
GNUNET_MQ_send (ch->mq, env);
}
+
/* ************************* Burst *************************** */
void
-GNUNET_TRANSPORT_communicator_burst_finished (struct GNUNET_TRANSPORT_CommunicatorHandle *ch)
+GNUNET_TRANSPORT_communicator_burst_finished (struct
+ GNUNET_TRANSPORT_CommunicatorHandle
+ *ch)
{
struct GNUNET_MQ_Envelope *env;
struct GNUNET_TRANSPORT_BurstFinished *bf;
@@ -1185,4 +1191,5 @@ GNUNET_TRANSPORT_communicator_burst_finished (struct GNUNET_TRANSPORT_Communicat
GNUNET_MQ_send (ch->mq, env);
}
+
/* end of transport_api2_communication.c */
