[GNUnet-SVN] r30318 - gnunet/src/gns

[gnunet]

Author: grothoff
Date: 2013-10-18 15:36:24 +0200 (Fri, 18 Oct 2013)
New Revision: 30318

Modified:
   gnunet/src/gns/gnunet-service-gns.c
Log:
-conversion to absolute time is now done in GNUNET_GNSRECORD_block_create

Modified: gnunet/src/gns/gnunet-service-gns.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns.c 2013-10-18 13:36:08 UTC (rev 30317)
+++ gnunet/src/gns/gnunet-service-gns.c 2013-10-18 13:36:24 UTC (rev 30318)
@@ -415,12 +415,17 @@
       rd_public[rd_public_count] = rd[i];
       if (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION))
       {
+        /* GNUNET_GNSRECORD_block_create will convert to absolute time;
+           we just need to adjust our iteration frequency */
         min_relative_record_time.rel_value_us =
           GNUNET_MIN (rd_public[rd_public_count].expiration_time,
                       min_relative_record_time.rel_value_us);
-       rd_public[rd_public_count].flags &= 
~GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
-       rd_public[rd_public_count].expiration_time += now.abs_value_us;
       }
+      else if (rd_public[rd_public_count].expiration_time < now.abs_value_us)
+      {
+        /* record already expired, skip it */
+        continue;
+      }
       rd_public_count++;
     }