[GNUnet-SVN] r31606 - gnunet/src/gnsrecord

[gnunet]

Author: wachs
Date: 2013-12-20 14:19:31 +0100 (Fri, 20 Dec 2013)
New Revision: 31606

Modified:
   gnunet/src/gnsrecord/gnsrecord_crypto.c
Log:
fix relative time calculation


Modified: gnunet/src/gnsrecord/gnsrecord_crypto.c
===================================================================
--- gnunet/src/gnsrecord/gnsrecord_crypto.c     2013-12-20 12:54:35 UTC (rev 
31605)
+++ gnunet/src/gnsrecord/gnsrecord_crypto.c     2013-12-20 13:19:31 UTC (rev 
31606)
@@ -106,11 +106,12 @@
     rdc[i] = rd[i];
     if (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION))
     {
+      struct GNUNET_TIME_Relative t;
+
       /* encrypted blocks must never have relative expiration times, convert! 
*/
       rdc[i].flags &= ~GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
-      rdc[i].expiration_time = GNUNET_TIME_absolute_add (now,
-                                                         
GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MICROSECONDS,
-                                                                               
         rdc[i].expiration_time)).abs_value_us;
+      t.rel_value_us = rdc[i].expiration_time;
+      rdc[i].expiration_time = GNUNET_TIME_absolute_add (now, t).abs_value_us;
     }
   }
   /* serialize */