diff options
author | Bart Polot <bart@net.in.tum.de> | 2014-04-07 12:00:39 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2014-04-07 12:00:39 +0000 |
commit | ed384707e9017c9e34b0c59b4763d8ac4ccb9931 (patch) | |
tree | c4ca72dc2a861e9236c744940122e7515b3f14c0 | |
parent | 2e94b00f26a68fd728c65b080f5232108758c64b (diff) |
- log
-rw-r--r-- | src/mesh/gnunet-service-mesh_channel.c | 10 | ||||
-rw-r--r-- | src/mesh/gnunet-service-mesh_connection.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/mesh/gnunet-service-mesh_channel.c b/src/mesh/gnunet-service-mesh_channel.c index 0f6592267f..b2330c5921 100644 --- a/src/mesh/gnunet-service-mesh_channel.c +++ b/src/mesh/gnunet-service-mesh_channel.c @@ -1128,19 +1128,17 @@ channel_confirm (struct MeshChannel *ch, int fwd) GNUNET_break (GNUNET_NO != ch->destroy); return; } - LOG (GNUNET_ERROR_TYPE_DEBUG, - " channel confirm %s %s\n", - GM_f2s (fwd), GMCH_2s (ch)); + LOG (GNUNET_ERROR_TYPE_DEBUG, " channel confirm %s %s\n", + GM_f2s (fwd), GMCH_2s (ch)); oldstate = ch->state; ch->state = MESH_CHANNEL_READY; if (MESH_CHANNEL_READY != oldstate || GNUNET_YES == is_loopback (ch)) { rel->client_ready = GNUNET_YES; - LOG (GNUNET_ERROR_TYPE_DEBUG, - " !! retry timer confirm %s\n", - GNUNET_STRINGS_relative_time_to_string (rel->retry_timer, GNUNET_NO)); rel->expected_delay = rel->retry_timer; + LOG (GNUNET_ERROR_TYPE_DEBUG, " !! retry timer confirm %s\n", + GNUNET_STRINGS_relative_time_to_string (rel->retry_timer, GNUNET_NO)); if (GMT_get_connections_buffer (ch->t) > 0 || GMT_is_loopback (ch->t)) send_client_ack (ch, fwd); diff --git a/src/mesh/gnunet-service-mesh_connection.c b/src/mesh/gnunet-service-mesh_connection.c index adc5320dc3..5d1a32a44e 100644 --- a/src/mesh/gnunet-service-mesh_connection.c +++ b/src/mesh/gnunet-service-mesh_connection.c @@ -1937,6 +1937,8 @@ handle_mesh_encrypted (const struct GNUNET_PeerIdentity *peer, /* Check PID */ fc = fwd ? &c->bck_fc : &c->fwd_fc; pid = ntohl (msg->pid); + LOG (GNUNET_ERROR_TYPE_DEBUG, " PID %u (expected %u+)\n", + pid, fc->last_pid_recv + 1); if (GM_is_pid_bigger (pid, fc->last_ack_sent)) { GNUNET_STATISTICS_update (stats, "# unsolicited message", 1, GNUNET_NO); @@ -1949,7 +1951,7 @@ handle_mesh_encrypted (const struct GNUNET_PeerIdentity *peer, { GNUNET_STATISTICS_update (stats, "# duplicate PID", 1, GNUNET_NO); LOG (GNUNET_ERROR_TYPE_DEBUG, - " Pid %u not expected (%u+), dropping!\n", + " PID %u not expected (%u+), dropping!\n", pid, fc->last_pid_recv + 1); return GNUNET_OK; } |