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

[gnunet]

Author: bartpolot
Date: 2015-04-27 21:14:38 +0200 (Mon, 27 Apr 2015)
New Revision: 35596

Modified:
   gnunet/src/cadet/gnunet-service-cadet_tunnel.c
Log:
- use axolotl by default

Modified: gnunet/src/cadet/gnunet-service-cadet_tunnel.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2015-04-27 19:14:37 UTC 
(rev 35595)
+++ gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2015-04-27 19:14:38 UTC 
(rev 35596)
@@ -2230,6 +2230,10 @@
   {
     destroy_ax (t);
     t->enc_type = CADET_Fallback;
+    if (NULL != t->rekey_task)
+      GNUNET_SCHEDULER_cancel (t->rekey_task);
+    create_kx_ctx (t);
+    rekey_tunnel (t, NULL);
   }
 
   /**
@@ -2735,11 +2739,8 @@
     }
     else if (CADET_TUNNEL_KEY_UNINITIALIZED == t->estate)
     {
-      LOG (GNUNET_ERROR_TYPE_DEBUG, "  cstate triggered rekey\n");
-      if (NULL != t->rekey_task)
-        GNUNET_SCHEDULER_cancel (t->rekey_task);
-      create_kx_ctx (t);
-      rekey_tunnel (t, NULL);
+      LOG (GNUNET_ERROR_TYPE_DEBUG, "  cstate triggered kx\n");
+      GCT_send_ax_kx (t);
     }
   }
   t->cstate = cstate;