From 937abe2f277d163e19b626fc37955d91e5126140 Mon Sep 17 00:00:00 2001
From: Bruno Cabral <bcabral@uw.edu>
Date: Sun, 31 Aug 2014 14:58:43 +0000
Subject: Fix infinite loop ( grothoff, please check !)

---
 src/fs/gnunet-service-fs_cadet_client.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/fs/gnunet-service-fs_cadet_client.c')

diff --git a/src/fs/gnunet-service-fs_cadet_client.c b/src/fs/gnunet-service-fs_cadet_client.c
index dde7aba48..aa2c0c426 100644
--- a/src/fs/gnunet-service-fs_cadet_client.c
+++ b/src/fs/gnunet-service-fs_cadet_client.c
@@ -219,8 +219,17 @@ reset_cadet (struct CadetHandle *mh)
 	      "Resetting cadet channel to %s\n",
 	      GNUNET_i2s (&mh->target));
   mh->channel = NULL;
+
   if (NULL != channel)
+  {
+    /* Avoid loop */
+    if ( NULL != mh->wh)
+	{
+        GNUNET_CADET_cancel_notify(mh->wh);
+		mh->wh = NULL;
+	}
     GNUNET_CADET_channel_destroy (channel);
+  }
   GNUNET_CONTAINER_multihashmap_iterate (mh->waiting_map,
 					 &move_to_pending,
 					 mh);
-- 
cgit v1.2.3