-fixing #3034

[oweals/gnunet.git] / src / fs / gnunet-service-fs_push.c

diff --git a/src/fs/gnunet-service-fs_push.c b/src/fs/gnunet-service-fs_push.c
index 22a76f332d2c51696a0aaa0343b271da9cb6fbf2..70c13f49fb183b5a8ea8f5aaf6b95218f2c16567 100644 (file)
--- a/src/fs/gnunet-service-fs_push.c
+++ b/src/fs/gnunet-service-fs_push.c
@@ -71,7 +71,7 @@ struct MigrationReadyBlock
   /**
    * Query for the block.
    */
-  GNUNET_HashCode query;
+  struct GNUNET_HashCode query;
 
   /**
    * When does this block expire?
@@ -467,7 +467,7 @@ consider_gathering ()
  *        maybe 0 if no unique identifier is available
  */
 static void
-process_migration_content (void *cls, const GNUNET_HashCode * key, size_t size,
+process_migration_content (void *cls, const struct GNUNET_HashCode * key, size_t size,
                            const void *data, enum GNUNET_BLOCK_Type type,
                            uint32_t priority, uint32_t anonymity,
                            struct GNUNET_TIME_Absolute expiration, uint64_t uid)
@@ -482,8 +482,8 @@ process_migration_content (void *cls, const GNUNET_HashCode * key, size_t size,
     consider_gathering ();
     return;
   }
-  if (GNUNET_TIME_absolute_get_remaining (expiration).rel_value <
-      MIN_MIGRATION_CONTENT_LIFETIME.rel_value)
+  if (GNUNET_TIME_absolute_get_remaining (expiration).rel_value_us <
+      MIN_MIGRATION_CONTENT_LIFETIME.rel_value_us)
   {
     /* content will expire soon, don't bother */
     consider_gathering ();
@@ -567,7 +567,7 @@ GSF_push_start_ (struct GSF_ConnectedPeer *peer)
 
   if (GNUNET_YES != enabled)
     return;
-  mrp = GNUNET_malloc (sizeof (struct MigrationReadyPeer));
+  mrp = GNUNET_new (struct MigrationReadyPeer);
   mrp->peer = peer;
   find_content (mrp);
   GNUNET_CONTAINER_DLL_insert (peer_head, peer_tail, mrp);
@@ -624,10 +624,9 @@ GSF_push_init_ ()
       GNUNET_CONFIGURATION_get_value_time (GSF_cfg, "fs", "MIN_MIGRATION_DELAY",
                                            &min_migration_delay))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                _
-                ("Invalid value specified for option `%s' in section `%s', content pushing disabled\n"),
-                "MIN_MIGRATION_DELAY", "fs");
+    GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_WARNING,
+                              "fs", "MIN_MIGRATION_DELAY",
+                              _("time required, content pushing disabled"));
     return;
   }
   consider_gathering ();