[GNUnet-SVN] r32913 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2014-04-07 14:00:39 +0200 (Mon, 07 Apr 2014)
New Revision: 32913

Modified:
   gnunet/src/mesh/gnunet-service-mesh_channel.c
   gnunet/src/mesh/gnunet-service-mesh_connection.c
Log:
- log

Modified: gnunet/src/mesh/gnunet-service-mesh_channel.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_channel.c       2014-04-07 12:00:36 UTC 
(rev 32912)
+++ gnunet/src/mesh/gnunet-service-mesh_channel.c       2014-04-07 12:00:39 UTC 
(rev 32913)
@@ -1128,19 +1128,17 @@
     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",
+    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));
-    rel->expected_delay = rel->retry_timer;
     if (GMT_get_connections_buffer (ch->t) > 0 || GMT_is_loopback (ch->t))
       send_client_ack (ch, fwd);
 

Modified: gnunet/src/mesh/gnunet-service-mesh_connection.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_connection.c    2014-04-07 12:00:36 UTC 
(rev 32912)
+++ gnunet/src/mesh/gnunet-service-mesh_connection.c    2014-04-07 12:00:39 UTC 
(rev 32913)
@@ -1937,6 +1937,8 @@
   /* 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 @@
   {
     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;
   }