[GNUnet-SVN] r34619 - gnunet/src/cadet

[gnunet]

Author: bartpolot
Date: 2014-12-15 08:18:31 +0100 (Mon, 15 Dec 2014)
New Revision: 34619

Modified:
   gnunet/src/cadet/gnunet-service-cadet_tunnel.c
Log:
- signal wrong tunnel encryption state

Modified: gnunet/src/cadet/gnunet-service-cadet_tunnel.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2014-12-15 07:18:30 UTC 
(rev 34618)
+++ gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2014-12-15 07:18:31 UTC 
(rev 34619)
@@ -922,6 +922,8 @@
     t->kx_ctx->d_key_old = t->d_key;
     t->kx_ctx->e_key_old = t->e_key;
   }
+  else
+    LOG (GNUNET_ERROR_TYPE_INFO, "  old keys not valid, not saving\n");
   t->kx_ctx->rekey_start_time = GNUNET_TIME_absolute_get ();
   create_keys (t);
 }
@@ -1450,6 +1452,11 @@
       break;
 
     case CADET_TUNNEL_KEY_OK:
+      /* Inconsistent!
+       * - state should have changed during rekey_iterator
+       * - task should have been canceled at pong_handle
+       */
+      GNUNET_break (0);
       GCT_change_estate (t, CADET_TUNNEL_KEY_REKEY);
       break;