with respect to #3615: we might (theoretically) get a migration stop before we finish...

diff --git a/src/fs/gnunet-service-fs_cp.c b/src/fs/gnunet-service-fs_cp.c
index 708308f7f6d9c76a29ebf86422d739456fc3b935..5dcd7689e5ab55e98bf2a111af624935c173c134 100644 (file)
--- a/src/fs/gnunet-service-fs_cp.c
+++ b/src/fs/gnunet-service-fs_cp.c
@@ -741,7 +741,8 @@ GSF_handle_p2p_migration_stop_ (void *cls,
               GNUNET_i2s (other),
              GNUNET_STRINGS_relative_time_to_string (bt, GNUNET_YES));
   cp->ppd.migration_blocked_until = GNUNET_TIME_relative_to_absolute (bt);
-  if (NULL == cp->mig_revive_task)
+  if ( (NULL == cp->mig_revive_task) &&
+       (NULL == cp->respect_iterate_req) )
   {
     GSF_push_stop_ (cp);
     cp->mig_revive_task =

diff --git a/src/fs/gnunet-service-fs_push.c b/src/fs/gnunet-service-fs_push.c
index d1bdad1d5095cebc999786c388e1d8c34d479297..73813c68e03be194ab431df31ae604b32168e35e 100644 (file)
--- a/src/fs/gnunet-service-fs_push.c
+++ b/src/fs/gnunet-service-fs_push.c
@@ -611,6 +611,7 @@ GSF_push_start_ (struct GSF_ConnectedPeer *peer)
       break;
   if (NULL != mrp)
   {
+    /* same peer added twice, must not happen */
     GNUNET_break (0);
     return;
   }