13 files changed, 46 insertions, 39 deletions

diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c
index ec64f0730..c1fdc2dc8 100644
--- a/src/gns/gnunet-dns2gns.c
+++ b/src/gns/gnunet-dns2gns.c
@@ -282,7 +282,7 @@ result_processor (void *cls,
   //packet->flags.opcode = GNUNET_DNSPARSER_OPCODE_STATUS; // ???
   for (i=0;i<rd_count;i++)
     {
-      rec.expiration_time.abs_value = rd[i].expiration_time;
+      rec.expiration_time.abs_value_us = rd[i].expiration_time;
       switch (rd[i].record_type)
         {
         case GNUNET_DNSPARSER_TYPE_A:
diff --git a/src/gns/gnunet-gns-fcfsd.c b/src/gns/gnunet-gns-fcfsd.c
index 832060583..dd4572cb1 100644
--- a/src/gns/gnunet-gns-fcfsd.c
+++ b/src/gns/gnunet-gns-fcfsd.c
@@ -804,7 +804,7 @@ run_httpd ()
   GNUNET_assert (MHD_YES == MHD_get_fdset (httpd, &rs, &ws, &es, &max));
   haveto = MHD_get_timeout (httpd, &timeout);
   if (haveto == MHD_YES)
-    tv.rel_value = (uint64_t) timeout;
+    tv.rel_value_us = (uint64_t) timeout * 1000LL;
   else
     tv = GNUNET_TIME_UNIT_FOREVER_REL;
   GNUNET_NETWORK_fdset_copy_native (wrs, &rs, max + 1);
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index 4752422dd..46b16c323 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -2200,7 +2200,7 @@ run_httpd (struct MhdHttpList *hd)
   haveto = MHD_get_timeout (hd->daemon, &timeout);
 
   if (MHD_YES == haveto)
-    tv.rel_value = (uint64_t) timeout;
+    tv.rel_value_us = (uint64_t) timeout * 1000LL;
   else
     tv = GNUNET_TIME_UNIT_FOREVER_REL;
   GNUNET_NETWORK_fdset_copy_native (wrs, &rs, max + 1);
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c
index 8200e3f87..1bff3e51d 100644
--- a/src/gns/gnunet-service-gns.c
+++ b/src/gns/gnunet-service-gns.c
@@ -427,7 +427,7 @@ put_gns_record (void *cls,
                 GNUNET_STRINGS_relative_time_to_string (put_interval, GNUNET_YES));
     GNUNET_STATISTICS_set (statistics,
                            "Current zone iteration interval (in ms)",
-                           put_interval.rel_value,
+                           put_interval.rel_value_us / 1000LL,
                            GNUNET_NO);
     GNUNET_STATISTICS_update (statistics,
                               "Number of zone iterations", 1, GNUNET_NO);
@@ -545,7 +545,7 @@ put_gns_record (void *cls,
 
   GNUNET_STATISTICS_set (statistics,
                          "Current zone iteration interval (ms)",
-                         next_put_interval.rel_value,
+                         next_put_interval.rel_value_us / 1000LL,
                          GNUNET_NO); 
   zone_publish_task = GNUNET_SCHEDULER_add_delayed (next_put_interval,
                                                     &publish_zone_dht_next,
diff --git a/src/gns/gnunet-service-gns_interceptor.c b/src/gns/gnunet-service-gns_interceptor.c
index affa0f5d6..8f55b8284 100644
--- a/src/gns/gnunet-service-gns_interceptor.c
+++ b/src/gns/gnunet-service-gns_interceptor.c
@@ -141,7 +141,7 @@ reply_to_dns (void* cls, uint32_t rd_count,
         answer_records[i].data.raw.data = (char*)rd[i].data;
       }
       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].expiration_time.abs_value_us = rd[i].expiration_time;
       answer_records[i].class = GNUNET_DNSPARSER_CLASS_INTERNET;//hmmn
     }
     else
@@ -168,7 +168,7 @@ reply_to_dns (void* cls, uint32_t rd_count,
         additional_records[i].data.raw.data = (char*)rd[i].data;
       }
       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].expiration_time.abs_value_us = 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 2e96b60ea..bd9daf56e 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -888,8 +888,10 @@ dht_lookup_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   char new_name[GNUNET_DNSPARSER_MAX_NAME_LENGTH];
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "GNS_PHASE_REC-%llu: dht lookup for query %s (%llus) timed out.\n",
-              rh->id, rh->name, rh->timeout.rel_value);
+              "GNS_PHASE_REC-%llu: dht lookup for query %s (%s) timed out.\n",
+              rh->id, rh->name, 
+              GNUNET_STRINGS_relative_time_to_string (rh->timeout,
+                                                      GNUNET_YES));
   /**
    * Start resolution in bg
    */
@@ -1042,7 +1044,7 @@ process_record_result_dht (void* cls,
 
     namestore_bg_task->node = GNUNET_CONTAINER_heap_insert (ns_task_heap,
                                   namestore_bg_task,
-                                  GNUNET_TIME_absolute_get().abs_value);
+                                  GNUNET_TIME_absolute_get().abs_value_us);
     if (0 < rh->answered)
       rh->proc (rh->proc_cls, rh, num_records, rd);
     else
@@ -1072,7 +1074,7 @@ resolve_record_dht (struct ResolverHandle *rh)
 
   rh->dht_heap_node = NULL;
 
-  if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value != rh->timeout.rel_value)
+  if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us != rh->timeout.rel_value_us)
   {
     /**
      * Update timeout if necessary
@@ -1114,7 +1116,7 @@ resolve_record_dht (struct ResolverHandle *rh)
     }
     rh->dht_heap_node = GNUNET_CONTAINER_heap_insert (dht_lookup_heap,
                                          rh,
-                                         GNUNET_TIME_absolute_get ().abs_value);
+                                         GNUNET_TIME_absolute_get ().abs_value_us);
   }
 
   xquery = htonl (rlh->record_type);
@@ -1169,7 +1171,7 @@ process_record_result_ns (void* cls,
   if (NULL != name)
   {
     rh->status |= RSL_RECORD_EXISTS;
-    if (remaining_time.rel_value == 0)
+    if (remaining_time.rel_value_us == 0)
       rh->status |= RSL_RECORD_EXPIRED;
   }
   if (0 == rd_count)
@@ -1210,8 +1212,8 @@ process_record_result_ns (void* cls,
     
     //FIXME: eh? do I have to handle this here?
     GNUNET_break (0 == (rd[i].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION));
-    et.abs_value = rd[i].expiration_time;
-    if (0 == (GNUNET_TIME_absolute_get_remaining (et)).rel_value)
+    et.abs_value_us = rd[i].expiration_time;
+    if (0 == (GNUNET_TIME_absolute_get_remaining (et)).rel_value_us)
     {
       GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
                  "GNS_PHASE_REC-%llu: This record is expired. Skipping\n",
@@ -1554,7 +1556,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_time = packet->answers[i].expiration_time.abs_value;
+      rd.expiration_time = packet->answers[i].expiration_time.abs_value_us;
       finish_lookup (rh, rlh, 1, &rd);
       GNUNET_DNSPARSER_free_packet (packet);
       return;
@@ -1931,9 +1933,10 @@ dht_authority_lookup_timeout (void *cls,
   char new_name[GNUNET_DNSPARSER_MAX_NAME_LENGTH];
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "GNS_PHASE_DELEGATE_DHT-%llu: dht lookup for query %s (%llus) timed out.\n",
+              "GNS_PHASE_DELEGATE_DHT-%llu: dht lookup for query %s (%s) timed out.\n",
               rh->id, rh->authority_name, 
-              rh->timeout.rel_value);
+              GNUNET_STRINGS_relative_time_to_string (rh->timeout,
+                                                      GNUNET_YES));
 
   rh->status |= RSL_TIMED_OUT;
   rh->timeout_task = GNUNET_SCHEDULER_NO_TASK;
@@ -2058,13 +2061,13 @@ process_pkey_revocation_result_ns (void *cls,
   }
   
   if ((NULL == name) ||
-      (0 == remaining_time.rel_value))
+      (0 == remaining_time.rel_value_us))
   {
     GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
           "GNS_PHASE_DELEGATE_REV-%llu: + Records don't exist or are expired.\n",
           rh->id, name);
 
-    if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value != rh->timeout.rel_value)
+    if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us != rh->timeout.rel_value_us)
     {
       GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
         "GNS_PHASE_DELEGATE_REV-%llu: Starting background lookup for %s type %d\n",
@@ -2291,7 +2294,7 @@ process_delegation_result_dht (void* cls,
 
       namestore_bg_task->node = GNUNET_CONTAINER_heap_insert (ns_task_heap,
                                     namestore_bg_task,
-                                    GNUNET_TIME_absolute_get().abs_value);
+                                    GNUNET_TIME_absolute_get().abs_value_us);
       namestore_bg_task->qe = GNUNET_NAMESTORE_record_put (namestore_handle,
                                  &nrb->public_key,
                                  name,
@@ -2762,7 +2765,7 @@ resolve_delegation_dht (struct ResolverHandle *rh)
                                  &rh->authority, 
                                  &lookup_key);
   rh->dht_heap_node = NULL;
-  if (rh->timeout.rel_value != GNUNET_TIME_UNIT_FOREVER_REL.rel_value)
+  if (rh->timeout.rel_value_us != GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us)
   {
     rh->timeout_cont = &dht_authority_lookup_timeout;
     rh->timeout_cont_cls = rh;
@@ -2788,7 +2791,7 @@ resolve_delegation_dht (struct ResolverHandle *rh)
     }
     rh->dht_heap_node = GNUNET_CONTAINER_heap_insert (dht_lookup_heap,
                                                       rh,
-                                                      GNUNET_TIME_absolute_get().abs_value);
+                                                      GNUNET_TIME_absolute_get().abs_value_us);
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Beginning DHT lookup for %s in zone %s for request %llu\n",
@@ -3096,7 +3099,7 @@ process_delegation_result_ns (void* cls,
                 GNUNET_short_h2s (&zone));
     rh->status |= RSL_RECORD_EXISTS;
   
-    if (0 == remaining_time.rel_value)
+    if (0 == remaining_time.rel_value_us)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "GNS_PHASE_DELEGATE_NS-%llu: Record set %s expired.\n",
@@ -3194,13 +3197,13 @@ process_delegation_result_ns (void* cls,
         continue;
       }    
       GNUNET_break (0 == (rd[i].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION));
-      et.abs_value = rd[i].expiration_time;
-      if (0 == (GNUNET_TIME_absolute_get_remaining (et)).rel_value)
+      et.abs_value_us = rd[i].expiration_time;
+      if (0 == (GNUNET_TIME_absolute_get_remaining (et)).rel_value_us)
       {
         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                     "GNS_PHASE_DELEGATE_NS-%llu: This pkey is expired.\n",
                     rh->id);
-        if (remaining_time.rel_value == 0)
+        if (remaining_time.rel_value_us == 0)
         {
           GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                       "GNS_PHASE_DELEGATE_NS-%llu: This dht entry is expired.\n",
@@ -3364,7 +3367,7 @@ gns_resolver_lookup_record (struct GNUNET_CRYPTO_ShortHashCode zone,
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "No shorten key for resolution\n");
 
-  if (timeout.rel_value != GNUNET_TIME_UNIT_FOREVER_REL.rel_value)
+  if (timeout.rel_value_us != GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us)
   {
     /*
      * Set timeout for authority lookup phase to 1/2
diff --git a/src/gns/plugin_block_gns.c b/src/gns/plugin_block_gns.c
index ffc38c99b..4d12f02df 100644
--- a/src/gns/plugin_block_gns.c
+++ b/src/gns/plugin_block_gns.c
@@ -166,11 +166,12 @@ block_plugin_gns_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
         record_match++;
       }
     }
-    et.abs_value = exp;
+    et.abs_value_us = exp;
     
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Verifying signature of %d records for name %s with expiration of %u\n",
-                rd_count, name, et.abs_value);
+                "Verifying signature of %d records for name %s with expiration of %s\n",
+                rd_count, name, 
+                GNUNET_STRINGS_absolute_time_to_string (et));
 
     if (GNUNET_OK != 
         GNUNET_NAMESTORE_verify_signature (&nrb->public_key,
diff --git a/src/gns/test_gns_dht_three_peers.c b/src/gns/test_gns_dht_three_peers.c
index 35a738aef..11f78db4b 100644
--- a/src/gns/test_gns_dht_three_peers.c
+++ b/src/gns/test_gns_dht_three_peers.c
@@ -250,12 +250,14 @@ on_lookup_result(void *cls, uint32_t rd_count,
   end_now ();
 }
 
+
 static void
 commence_testing(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   static int wait = 0;
+
   wait++;
-  if ((ZONE_PUT_WAIT_TIME.rel_value / 1000) == wait)
+  if ((ZONE_PUT_WAIT_TIME.rel_value_us / 1000LL / 1000LL) == wait)
   {
     fprintf (stderr, "\n");
     wait_task = GNUNET_SCHEDULER_NO_TASK;
@@ -274,6 +276,7 @@ commence_testing(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   }
 }
 
+
 void
 all_connected ()
 {
diff --git a/src/gns/test_gns_proxy.c b/src/gns/test_gns_proxy.c
index cfbcb1d9e..050e2d258 100644
--- a/src/gns/test_gns_proxy.c
+++ b/src/gns/test_gns_proxy.c
@@ -422,7 +422,7 @@ run (void *cls,
   }
 
   host_key = GNUNET_CRYPTO_ecc_key_create_from_file (zone_keyfile);
-  rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value;
+  rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
   GNUNET_assert (GNUNET_OK == GNUNET_NAMESTORE_string_to_value (GNUNET_GNS_RECORD_A,
                                                                "127.0.0.1",
                                                                (void**)&rd.data,
diff --git a/src/gns/test_gns_pseu_shorten.c b/src/gns/test_gns_pseu_shorten.c
index 7413c7074..ba7cd2492 100644
--- a/src/gns/test_gns_pseu_shorten.c
+++ b/src/gns/test_gns_pseu_shorten.c
@@ -269,7 +269,7 @@ put_pseu_dht (void *cls, int success)
   struct GNUNET_NAMESTORE_RecordData rd;
   
   memset (&rd, 0, sizeof (struct GNUNET_NAMESTORE_RecordData));
-  rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value;
+  rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
   rd.data_size = strlen(TEST_PSEU_ALICE)+1;
   rd.data = TEST_PSEU_ALICE;
   rd.record_type = GNUNET_GNS_RECORD_PSEU;
diff --git a/src/gns/test_gns_simple_delegated_lookup.c b/src/gns/test_gns_simple_delegated_lookup.c
index ff19569d6..8b5f8bc38 100644
--- a/src/gns/test_gns_simple_delegated_lookup.c
+++ b/src/gns/test_gns_simple_delegated_lookup.c
@@ -247,7 +247,7 @@ do_check (void *cls,
                                            GNUNET_TIME_UNIT_FOREVER_ABS,
                                            TEST_RECORD_NAME,
                                            &rd, 1);
-  et.abs_value = rd.expiration_time;
+  et.abs_value_us = rd.expiration_time;
   GNUNET_NAMESTORE_record_put (namestore_handle,
                                &bob_pkey,
                                TEST_RECORD_NAME,
diff --git a/src/gns/test_gns_simple_mx_lookup.c b/src/gns/test_gns_simple_mx_lookup.c
index 904758bde..b078edc4f 100644
--- a/src/gns/test_gns_simple_mx_lookup.c
+++ b/src/gns/test_gns_simple_mx_lookup.c
@@ -245,7 +245,7 @@ do_check (void *cls,
                                           GNUNET_TIME_UNIT_FOREVER_ABS,
                                           TEST_RECORD_NAME,
                                           &rd, 1);
-  et.abs_value = rd.expiration_time;
+  et.abs_value_us = rd.expiration_time;
   GNUNET_NAMESTORE_record_put (namestore_handle,
                                &bob_pkey,
                                TEST_RECORD_NAME,
@@ -267,7 +267,7 @@ do_check (void *cls,
                                           GNUNET_TIME_UNIT_FOREVER_ABS,
                                           GNUNET_GNS_MASTERZONE_STR,
                                           &rd, 1);
-  et.abs_value = rd.expiration_time;
+  et.abs_value_us = rd.expiration_time;
   GNUNET_NAMESTORE_record_put (namestore_handle,
                                &bob_pkey,
                                GNUNET_GNS_MASTERZONE_STR,
diff --git a/src/gns/test_gns_simple_srv_lookup.c b/src/gns/test_gns_simple_srv_lookup.c
index a403bf554..601d01af9 100644
--- a/src/gns/test_gns_simple_srv_lookup.c
+++ b/src/gns/test_gns_simple_srv_lookup.c
@@ -251,7 +251,7 @@ do_check (void *cls,
                                           GNUNET_TIME_UNIT_FOREVER_ABS,
                                           TEST_RECORD_NAME,
                                           &rd, 1);
-  et.abs_value = rd.expiration_time;
+  et.abs_value_us = rd.expiration_time;
   GNUNET_NAMESTORE_record_put (namestore_handle,
                                &bob_pkey,
                                TEST_RECORD_NAME,
@@ -274,7 +274,7 @@ do_check (void *cls,
                                           GNUNET_TIME_UNIT_FOREVER_ABS,
                                           TEST_RECORD_NAME_SRV,
                                           &rd, 1);
-  et.abs_value = rd.expiration_time;
+  et.abs_value_us = rd.expiration_time;
   GNUNET_NAMESTORE_record_put (namestore_handle,
                                &bob_pkey,
                                TEST_RECORD_NAME_SRV,