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

[gnunet]

Author: wachs
Date: 2013-12-20 11:43:48 +0100 (Fri, 20 Dec 2013)
New Revision: 31599

Modified:
   gnunet/src/gnsrecord/gnsrecord_crypto.c
Log:
major bug: not converting NBO to HBO


Modified: gnunet/src/gnsrecord/gnsrecord_crypto.c
===================================================================
--- gnunet/src/gnsrecord/gnsrecord_crypto.c     2013-12-20 10:13:48 UTC (rev 
31598)
+++ gnunet/src/gnsrecord/gnsrecord_crypto.c     2013-12-20 10:43:48 UTC (rev 
31599)
@@ -187,6 +187,7 @@
                                GNUNET_GNSRECORD_RecordCallback proc,
                                void *proc_cls)
 {
+  struct GNUNET_TIME_Absolute exp;
   size_t payload_len = ntohl (block->purpose.size) -
     sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) -
     sizeof (struct GNUNET_TIME_AbsoluteNBO);
@@ -249,6 +250,7 @@
           continue;
         }
 
+        exp.abs_value_us = GNUNET_ntohll (rd[i].expiration_time);
         if (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD))
         {
           int include_record = GNUNET_YES;
@@ -257,10 +259,12 @@
           {
             if (k == i)
               continue;
-            if (rd[i].expiration_time < now.abs_value_us)
+            if (exp.abs_value_us < now.abs_value_us)
+            {
               include_record = GNUNET_NO; /* Shadow record is expired */
+            }
             if ((rd[k].record_type == rd[i].record_type)
-                && (rd[k].expiration_time >= now.abs_value_us)
+                && (GNUNET_ntohll (rd[k].expiration_time) >= now.abs_value_us)
                 && (0 == (rd[k].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD)))
               include_record = GNUNET_NO; /* We have a non-expired, non-shadow 
record of the same type */
           }
@@ -272,7 +276,7 @@
             j++;
           }
         }
-        else if (rd[i].expiration_time >= now.abs_value_us)
+        else if (exp.abs_value_us >= now.abs_value_us)
         {
           /* Include this record */
           if (j != i)