[GNUnet-SVN] r26269 - gnunet/src/core

[gnunet]

Author: grothoff
Date: 2013-03-03 09:33:03 +0100 (Sun, 03 Mar 2013)
New Revision: 26269

Modified:
   gnunet/src/core/gnunet-service-core_kx.c
Log:
-fix

Modified: gnunet/src/core/gnunet-service-core_kx.c
===================================================================
--- gnunet/src/core/gnunet-service-core_kx.c    2013-03-03 08:14:37 UTC (rev 
26268)
+++ gnunet/src/core/gnunet-service-core_kx.c    2013-03-03 08:33:03 UTC (rev 
26269)
@@ -618,6 +618,7 @@
 
   kx->retry_set_key_task = GNUNET_SCHEDULER_NO_TASK;
   kx->set_key_retry_frequency = GNUNET_TIME_STD_BACKOFF 
(kx->set_key_retry_frequency);
+  GNUNET_assert (KX_STATE_DOWN != kx->status);
   send_key (kx);
 }
 
@@ -834,10 +835,10 @@
   switch (sender_status)
   {
   case KX_STATE_DOWN:
-    /* makes no sense, should be at least KX_STATE_KEY_SENT */
     GNUNET_break_op (0);
     break;
   case KX_STATE_KEY_SENT:
+    kx->status = KX_STATE_KEY_RECEIVED;
     send_key (kx);
     break;
   case KX_STATE_KEY_RECEIVED:
@@ -1162,6 +1163,7 @@
 static void
 send_key (struct GSC_KeyExchangeInfo *kx)
 {
+  GNUNET_assert (KX_STATE_DOWN != kx->status);
   if (GNUNET_SCHEDULER_NO_TASK != kx->retry_set_key_task)
   {
      GNUNET_SCHEDULER_cancel (kx->retry_set_key_task);