[GNUnet-SVN] r25387 - gnunet/src/fs

[gnunet]

Author: harsha
Date: 2012-12-11 11:55:49 +0100 (Tue, 11 Dec 2012)
New Revision: 25387

Modified:
   gnunet/src/fs/gnunet-service-fs_stream.c
Log:
- fix 2672

Modified: gnunet/src/fs/gnunet-service-fs_stream.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_stream.c    2012-12-11 10:51:28 UTC (rev 
25386)
+++ gnunet/src/fs/gnunet-service-fs_stream.c    2012-12-11 10:55:49 UTC (rev 
25387)
@@ -392,6 +392,8 @@
     GNUNET_STREAM_io_read_cancel (sh->rh);
   if (GNUNET_SCHEDULER_NO_TASK != sh->timeout_task)
     GNUNET_SCHEDULER_cancel (sh->timeout_task);
+  if (GNUNET_SCHEDULER_NO_TASK != sh->reset_task)
+    GNUNET_SCHEDULER_cancel (sh->reset_task);
   GNUNET_STREAM_close (sh->stream);
   GNUNET_assert (GNUNET_OK ==
                 GNUNET_CONTAINER_multihashmap_remove (stream_map,
@@ -469,7 +471,10 @@
              "Resetting stream to %s\n",
              GNUNET_i2s (&sh->target));
   if (NULL != sh->rh)
+  {
     GNUNET_STREAM_io_read_cancel (sh->rh);
+    sh->rh = NULL;
+  }
   GNUNET_STREAM_close (sh->stream);
   sh->is_ready = GNUNET_NO;
   GNUNET_CONTAINER_multihashmap_iterate (sh->waiting_map,
@@ -1055,6 +1060,8 @@
   if (GNUNET_NO == ret)
     return; 
   refresh_timeout_task (sc);
+  if (NULL != sc->rh)
+    return;
   sc->rh = GNUNET_STREAM_read (sc->socket,
                               GNUNET_TIME_UNIT_FOREVER_REL,
                               &process_request,