projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix #3904, also simplify and clean up gnunet-publish shutdown logic in general
[oweals/gnunet.git]
/
src
/
fs
/
gnunet-service-fs_cp.c
diff --git
a/src/fs/gnunet-service-fs_cp.c
b/src/fs/gnunet-service-fs_cp.c
index 708308f7f6d9c76a29ebf86422d739456fc3b935..7e5ffb45e02e495d74b83699bc63aa666e2202fa 100644
(file)
--- a/
src/fs/gnunet-service-fs_cp.c
+++ b/
src/fs/gnunet-service-fs_cp.c
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
- Boston, MA 0211
1-1307
, USA.
+ Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+ Boston, MA 0211
0-1301
, USA.
*/
/**
* @file fs/gnunet-service-fs_cp.c
*/
/**
* @file 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);
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 =
{
GSF_push_stop_ (cp);
cp->mig_revive_task =