5 files changed, 50 insertions, 31 deletions

diff --git a/src/gns/gnunet-gns-fcfsd.c b/src/gns/gnunet-gns-fcfsd.c
index b919b4fed..6802d6685 100644
--- a/src/gns/gnunet-gns-fcfsd.c
+++ b/src/gns/gnunet-gns-fcfsd.c
@@ -386,7 +386,7 @@ zone_to_name_cb (void *cls,
                                                         &pub));
   r.data = &pub;
   r.data_size = sizeof (pub);
-  r.expiration = GNUNET_TIME_UNIT_FOREVER_ABS;
+  r.expiration_time = UINT64_MAX;
   r.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
   r.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
   request->qe = GNUNET_NAMESTORE_record_create (ns,
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c
index 63b180b4b..f63e22e25 100644
--- a/src/gns/gnunet-service-gns.c
+++ b/src/gns/gnunet-service-gns.c
@@ -500,13 +500,16 @@ process_shorten_zone_shorten (void *cls,
 {
   struct ClientShortenHandle *csh = cls;
   struct GNUNET_TIME_Relative remaining_time;
+  struct GNUNET_TIME_Absolute et;
 
   remaining_time = GNUNET_TIME_absolute_get_remaining (expiration);
 
   if ((rd_count == 1) &&
       (remaining_time.rel_value != 0))
   {
-    remaining_time = GNUNET_TIME_absolute_get_remaining (rd->expiration);
+    GNUNET_break (0 == (rd->flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION));
+    et.abs_value = rd->expiration_time;
+    remaining_time = GNUNET_TIME_absolute_get_remaining (et);
     if ((rd->record_type == GNUNET_GNS_RECORD_PKEY) &&
         (remaining_time.rel_value != 0))
     {
@@ -523,6 +526,7 @@ process_shorten_zone_shorten (void *cls,
 
 }
 
+
 static void
 process_private_zone_shorten (void *cls,
                       const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *key,
@@ -534,13 +538,16 @@ process_private_zone_shorten (void *cls,
 {
   struct GNUNET_TIME_Relative remaining_time;
   struct ClientShortenHandle *csh = cls;
+  struct GNUNET_TIME_Absolute et;
 
   remaining_time = GNUNET_TIME_absolute_get_remaining (expiration);
 
   if ((rd_count == 1) &&
       (remaining_time.rel_value != 0))
   {
-    remaining_time = GNUNET_TIME_absolute_get_remaining (rd->expiration);
+    GNUNET_break (0 == (rd->flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION));
+    et.abs_value = rd->expiration_time;
+    remaining_time = GNUNET_TIME_absolute_get_remaining (et);
     if ((rd->record_type == GNUNET_GNS_RECORD_PKEY) &&
         (remaining_time.rel_value != 0))
     {
diff --git a/src/gns/gnunet-service-gns_interceptor.c b/src/gns/gnunet-service-gns_interceptor.c
index 0e44755ed..5956e5223 100644
--- a/src/gns/gnunet-service-gns_interceptor.c
+++ b/src/gns/gnunet-service-gns_interceptor.c
@@ -40,13 +40,19 @@
  */
 struct InterceptLookupHandle
 {
-  /* the request handle to reply to */
+  /**
+   * the request handle to reply to 
+   */
   struct GNUNET_DNS_RequestHandle *request_handle;
   
-  /* the dns parser packet received */
+  /**
+   * the dns parser packet received 
+   */
   struct GNUNET_DNSPARSER_Packet *packet;
   
-  /* the query parsed from the packet */
+  /**
+   * the query parsed from the packet 
+   */
   struct GNUNET_DNSPARSER_Query *query;
 };
 
@@ -71,6 +77,7 @@ static struct GNUNET_CRYPTO_RsaPrivateKey *our_key;
  */
 static struct GNUNET_TIME_Relative default_lookup_timeout;
 
+
 /**
  * Reply to dns request with the result from our lookup.
  *
@@ -82,7 +89,7 @@ static void
 reply_to_dns(void* cls, uint32_t rd_count,
              const struct GNUNET_NAMESTORE_RecordData *rd)
 {
-  int i;
+  uint32_t i;
   size_t len;
   int ret;
   char *buf;
@@ -137,7 +144,8 @@ reply_to_dns(void* cls, uint32_t rd_count,
         answer_records[i].data.raw.data_len = rd[i].data_size;
         answer_records[i].data.raw.data = (char*)rd[i].data;
       }
-      answer_records[i].expiration_time = rd[i].expiration;
+      GNUNET_break (0 == (rd[i].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION));
+      answer_records[i].expiration_time.abs_value = rd[i].expiration_time;
       answer_records[i].class = GNUNET_DNSPARSER_CLASS_INTERNET;//hmmn
     }
     else
@@ -163,7 +171,8 @@ reply_to_dns(void* cls, uint32_t rd_count,
         additional_records[i].data.raw.data_len = rd[i].data_size;
         additional_records[i].data.raw.data = (char*)rd[i].data;
       }
-      additional_records[i].expiration_time = rd[i].expiration;
+      GNUNET_break (0 == (rd[i].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION));
+      additional_records[i].expiration_time.abs_value = rd[i].expiration_time;
       additional_records[i].class = GNUNET_DNSPARSER_CLASS_INTERNET;//hmmn
     }
   }
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c
index b6bc5eb1d..8d82fa8ad 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -200,11 +200,11 @@ process_pseu_lookup_ns (void* cls,
     return;
   }
 
-  /** name is free */
+  /* name is free */
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
             "GNS_AUTO_PSEU: Name %s not taken in NS! Adding\n", gph->test_name);
 
-  new_pkey.expiration = GNUNET_TIME_UNIT_FOREVER_ABS;
+  new_pkey.expiration_time = UINT64_MAX;
   new_pkey.data_size = sizeof (struct GNUNET_CRYPTO_ShortHashCode);
   new_pkey.data = &gph->ahead->zone;
   new_pkey.record_type = GNUNET_GNS_RECORD_PKEY;
@@ -1136,6 +1136,8 @@ process_record_result_ns(void* cls,
   struct RecordLookupHandle *rlh;
   struct GNUNET_TIME_Relative remaining_time;
   struct GNUNET_CRYPTO_ShortHashCode zone;
+  struct GNUNET_TIME_Absolute et;
+  unsigned int i;
 
   rh = (struct ResolverHandle *) cls;
   rlh = (struct RecordLookupHandle *)rh->proc_cls;
@@ -1179,14 +1181,11 @@ process_record_result_ns(void* cls,
   }
   else
   {
-
     GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
                "GNS_PHASE_REC-%d: Processing additional result %s from namestore\n",
                rh->id, name);
-    int i;
     for (i=0; i<rd_count;i++)
     {
-
       if (rd[i].record_type != rlh->record_type)
         continue;
 
@@ -1199,7 +1198,9 @@ process_record_result_ns(void* cls,
         continue;
       }
 
-      if ((GNUNET_TIME_absolute_get_remaining (rd[i].expiration)).rel_value
+      GNUNET_break (0 == (rd[i].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION));
+      et.abs_value = rd[i].expiration_time;
+      if ((GNUNET_TIME_absolute_get_remaining (et)).rel_value
           == 0)
       {
         GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
@@ -1207,9 +1208,7 @@ process_record_result_ns(void* cls,
                    rh->id);
         continue;
       }
-
       rh->answered++;
-
     }
 
     /**
@@ -1265,7 +1264,7 @@ process_record_result_vpn (void* cls, int af, const void *address)
       return;
     }
     rd.record_type = GNUNET_GNS_RECORD_TYPE_A;
-    rd.expiration = GNUNET_TIME_UNIT_FOREVER_ABS;
+    rd.expiration_time = UINT64_MAX; /* FIXME: should probably pick something shorter... */
     rd.data = address;
     rd.data_size = sizeof (struct in_addr);
     rd.flags = 0;
@@ -1286,7 +1285,7 @@ process_record_result_vpn (void* cls, int af, const void *address)
       return;
     }
     rd.record_type = GNUNET_GNS_RECORD_AAAA;
-    rd.expiration = GNUNET_TIME_UNIT_FOREVER_ABS;
+    rd.expiration_time = UINT64_MAX; /* FIXME: should probably pick something shorter... */
     rd.data = address;
     rd.data_size = sizeof (struct in6_addr);
     rd.flags = 0;
@@ -1360,6 +1359,7 @@ handle_record_vpn (void* cls, struct ResolverHandle *rh,
 static void
 send_dns_packet (struct ResolverHandle *rh);
 
+
 static void
 handle_dns_resolver (void *cls,
                      const struct sockaddr *addr,
@@ -1395,7 +1395,7 @@ handle_dns_resolver (void *cls,
     rd.data = &sai6->sin6_addr;
   }
   
-  rd.expiration = GNUNET_TIME_UNIT_FOREVER_ABS;
+  rd.expiration_time = UINT64_MAX; /* FIXME: should probably pick something shorter */
 
   finish_lookup (rh, rlh, 1, &rd);
   free_resolver_handle (rh);
@@ -1530,7 +1530,7 @@ read_dns_response (void *cls,
       rd.data_size = packet->answers[i].data.raw.data_len;
       rd.record_type = packet->answers[i].type;
       rd.flags = 0;
-      rd.expiration = packet->answers[i].expiration_time;
+      rd.expiration_time = packet->answers[i].expiration_time.abs_value;
       finish_lookup (rh, rlh, 1, &rd);
       GNUNET_NETWORK_socket_close (rh->dns_sock);
       GNUNET_DNSPARSER_free_packet (packet);
@@ -2956,6 +2956,8 @@ process_delegation_result_ns (void* cls,
   struct GNUNET_TIME_Relative remaining_time;
   struct GNUNET_CRYPTO_ShortHashCode zone;
   char new_name[MAX_DNS_NAME_LENGTH];
+  unsigned int i;
+  struct GNUNET_TIME_Absolute et;
  
   rh = (struct ResolverHandle *)cls; 
   GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
@@ -3032,7 +3034,6 @@ process_delegation_result_ns (void* cls,
    * move on with query
    * Note only 1 pkey should have been returned.. anything else would be strange
    */
-  int i;
   for (i=0; i<rd_count;i++)
   {
     
@@ -3096,7 +3097,9 @@ process_delegation_result_ns (void* cls,
       continue;
     }
     
-    if ((GNUNET_TIME_absolute_get_remaining (rd[i].expiration)).rel_value
+    GNUNET_break (0 == (rd[i].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION));
+    et.abs_value = rd[i].expiration_time;
+    if ((GNUNET_TIME_absolute_get_remaining (et)).rel_value
          == 0)
     {
       GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
diff --git a/src/gns/plugin_block_gns.c b/src/gns/plugin_block_gns.c
index ba1fd56e1..f033811ee 100644
--- a/src/gns/plugin_block_gns.c
+++ b/src/gns/plugin_block_gns.c
@@ -135,7 +135,8 @@ block_plugin_gns_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
   {
     struct GNUNET_NAMESTORE_RecordData rd[rd_count];
     unsigned int i;
-    struct GNUNET_TIME_Absolute exp = GNUNET_TIME_UNIT_FOREVER_ABS;
+    uint64_t exp = UINT64_MAX;
+    struct GNUNET_TIME_Absolute et;
     
     if (GNUNET_SYSERR == GNUNET_NAMESTORE_records_deserialize (rd_len,
                                                                rd_data,
@@ -154,26 +155,25 @@ block_plugin_gns_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
       record_xquery = ntohl(*((uint32_t*)xquery));
     
     for (i=0; i<rd_count; i++)
-    {
-      
-      exp = GNUNET_TIME_absolute_min (exp, rd[i].expiration);
-      
+    {     
+      GNUNET_break (0 == (rd[i].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION));
+      exp = GNUNET_MIN (exp, rd[i].expiration_time);
       GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-                 "Got record of size %d\n", rd[i].data_size);
-
+                 "Got record of size %d\n", rd[i].data_size);
       if ((record_xquery != 0)
           && (rd[i].record_type == record_xquery))
       {
         record_match++;
       }
     }
+    et.abs_value = exp;
     
     GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
                "Verifying signature of %d records for name %s\n",
                rd_count, name);
 
     if (GNUNET_OK != GNUNET_NAMESTORE_verify_signature (&nrb->public_key,
-                                                        exp,
+                                                        et,
                                                         name,
                                                         rd_count,
                                                         rd,