diff options
-rw-r--r-- | src/fs/gnunet-service-fs_push.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/fs/gnunet-service-fs_push.c b/src/fs/gnunet-service-fs_push.c index c08b57020..90e888b6a 100644 --- a/src/fs/gnunet-service-fs_push.c +++ b/src/fs/gnunet-service-fs_push.c | |||
@@ -485,7 +485,7 @@ consider_gathering () | |||
485 | */ | 485 | */ |
486 | static void | 486 | static void |
487 | process_migration_content (void *cls, | 487 | process_migration_content (void *cls, |
488 | const GNUNET_HashCode * key, | 488 | const GNUNET_HashCode *key, |
489 | size_t size, | 489 | size_t size, |
490 | const void *data, | 490 | const void *data, |
491 | enum GNUNET_BLOCK_Type type, | 491 | enum GNUNET_BLOCK_Type type, |
@@ -497,17 +497,17 @@ process_migration_content (void *cls, | |||
497 | struct MigrationReadyBlock *mb; | 497 | struct MigrationReadyBlock *mb; |
498 | struct MigrationReadyPeer *pos; | 498 | struct MigrationReadyPeer *pos; |
499 | 499 | ||
500 | mig_qe = NULL; | ||
500 | if (key == NULL) | 501 | if (key == NULL) |
501 | { | 502 | { |
502 | mig_qe = NULL; | ||
503 | consider_gathering (); | 503 | consider_gathering (); |
504 | return; | 504 | return; |
505 | } | 505 | } |
506 | if (GNUNET_TIME_absolute_get_remaining (expiration).rel_value < | 506 | if (GNUNET_TIME_absolute_get_remaining (expiration).rel_value < |
507 | MIN_MIGRATION_CONTENT_LIFETIME.rel_value) | 507 | MIN_MIGRATION_CONTENT_LIFETIME.rel_value) |
508 | { | 508 | { |
509 | /* content will expire soon, don't bother */ | 509 | /* content will expire soon, don't bother */ |
510 | GNUNET_DATASTORE_iterate_get_next (GSF_dsh); | 510 | consider_gathering (); |
511 | return; | 511 | return; |
512 | } | 512 | } |
513 | if (type == GNUNET_BLOCK_TYPE_FS_ONDEMAND) | 513 | if (type == GNUNET_BLOCK_TYPE_FS_ONDEMAND) |
@@ -517,10 +517,8 @@ process_migration_content (void *cls, | |||
517 | type, priority, anonymity, | 517 | type, priority, anonymity, |
518 | expiration, uid, | 518 | expiration, uid, |
519 | &process_migration_content, | 519 | &process_migration_content, |
520 | NULL)) | 520 | NULL)) |
521 | { | 521 | consider_gathering (); |
522 | GNUNET_DATASTORE_iterate_get_next (GSF_dsh); | ||
523 | } | ||
524 | return; | 522 | return; |
525 | } | 523 | } |
526 | #if DEBUG_FS | 524 | #if DEBUG_FS |
@@ -556,7 +554,7 @@ process_migration_content (void *cls, | |||
556 | } | 554 | } |
557 | pos = pos->next; | 555 | pos = pos->next; |
558 | } | 556 | } |
559 | GNUNET_DATASTORE_iterate_get_next (GSF_dsh); | 557 | consider_gathering (); |
560 | } | 558 | } |
561 | 559 | ||
562 | 560 | ||