- log

2 files changed, 11 insertions, 4 deletions

diff --git a/src/cadet/gnunet-service-cadet_tunnel.c b/src/cadet/gnunet-service-cadet_tunnel.c
index ac24ecfaf..8efdfc2e0 100644
--- a/src/cadet/gnunet-service-cadet_tunnel.c
+++ b/src/cadet/gnunet-service-cadet_tunnel.c
@@ -1766,6 +1766,7 @@ handle_ephemeral (struct CadetTunnel *t,
     GNUNET_break_op (0);
     return;
   }
+
   if (NULL == t->kx_ctx)
     create_kx_ctx (t);
   if (0 != memcmp (&t->peers_ephemeral_key, &msg->ephemeral_key,
diff --git a/src/cadet/test_cadet.c b/src/cadet/test_cadet.c
index 251858ebd..1b5d2dca3 100644
--- a/src/cadet/test_cadet.c
+++ b/src/cadet/test_cadet.c
@@ -33,7 +33,7 @@
 /**
  * How namy messages to send
  */
-#define TOTAL_PACKETS 1000
+#define TOTAL_PACKETS 2000
 
 /**
  * How long until we give up on connecting the peers?
@@ -249,9 +249,14 @@ disconnect_cadet_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc
   long line = (long) cls;
   unsigned int i;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "disconnecting cadet service of peers, called from line %ld\n",
-              line);
+  if ((GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason) != 0)
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "disconnecting cadet peers due to SHUTDOWN! called from %ld\n",
+                line);
+  else
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "disconnecting cadet service of peers, called from line %ld\n",
+                line);
   disconnect_task = GNUNET_SCHEDULER_NO_TASK;
   for (i = 0; i < 2; i++)
   {
@@ -436,6 +441,7 @@ data_callback (void *cls, struct GNUNET_CADET_Channel *channel,
   {
     if (GNUNET_SCHEDULER_NO_TASK != disconnect_task)
     {
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO, " reschedule timeout\n");
       GNUNET_SCHEDULER_cancel (disconnect_task);
       disconnect_task = GNUNET_SCHEDULER_add_delayed (SHORT_TIME,
                                                       &disconnect_cadet_peers,