1 files changed, 94 insertions, 40 deletions

diff --git a/src/namestore/gnunet-zoneimport.c b/src/namestore/gnunet-zoneimport.c
index 0fd0a4ab8..ddc8b483a 100644
--- a/src/namestore/gnunet-zoneimport.c
+++ b/src/namestore/gnunet-zoneimport.c
@@ -2,20 +2,18 @@
      This file is part of GNUnet
      Copyright (C) 2018 GNUnet e.V.
 
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
+     Affero General Public License for more details.
 
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA 02110-1301, USA.
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /**
  * @file src/namestore/gnunet-zoneimport.c
@@ -59,6 +57,11 @@
 #define SERIES_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MICROSECONDS, 10)
 
 /**
+ * How long do DNS records have to last at least after being imported?
+ */
+static struct GNUNET_TIME_Relative minimum_expiration_time;
+
+/**
  * How many requests do we request from NAMESTORE in one batch
  * during our initial iteration?
  */
@@ -429,9 +432,9 @@ get_label (struct Request *req)
     GNUNET_break (0);
     return NULL;
   }
-  memcpy (label,
-          req->hostname,
-          dot - req->hostname);
+  GNUNET_memcpy (label,
+                 req->hostname,
+                 dot - req->hostname);
   label[dot - req->hostname] = '\0';
   return label;
 }
@@ -453,6 +456,7 @@ build_dns_query (struct Request *req,
   char *rawp;
   struct GNUNET_DNSPARSER_Packet p;
   struct GNUNET_DNSPARSER_Query q;
+  int ret;
 
   q.name = (char *) req->hostname;
   q.type = GNUNET_DNSPARSER_TYPE_NS;
@@ -464,12 +468,14 @@ build_dns_query (struct Request *req,
   p.num_queries = 1;
   p.queries = &q;
   p.id = req->id;
-  if (GNUNET_OK !=
-      GNUNET_DNSPARSER_pack (&p,
-                             UINT16_MAX,
-                             &rawp,
-                             raw_size))
+  ret = GNUNET_DNSPARSER_pack (&p,
+                               UINT16_MAX,
+                               &rawp,
+                               raw_size);
+  if (GNUNET_OK != ret)
   {
+    if (GNUNET_NO == ret)
+      GNUNET_free (rawp);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Failed to pack query for hostname `%s'\n",
                 req->hostname);
@@ -486,9 +492,9 @@ build_dns_query (struct Request *req,
     GNUNET_free (rawp);
     return NULL;
   }
-  memcpy (raw,
-          rawp,
-          *raw_size);
+  GNUNET_memcpy (raw,
+                 rawp,
+                 *raw_size);
   GNUNET_free (rawp);
   return raw;
 }
@@ -632,10 +638,19 @@ check_for_glue (void *cls,
   size_t off;
   char ip[INET6_ADDRSTRLEN+1];
   socklen_t ip_size = (socklen_t) sizeof (ip);
+  struct GNUNET_TIME_Absolute expiration_time;
+  struct GNUNET_TIME_Relative left;
 
   if (0 != strcasecmp (rec->name,
                        gc->ns))
     return;
+  expiration_time = rec->expiration_time;
+  left = GNUNET_TIME_absolute_get_remaining (expiration_time);
+  if (0 == left.rel_value_us)
+    return; /* ignore expired glue records */
+  /* if expiration window is too short, bump it to configured minimum */
+  if (left.rel_value_us < minimum_expiration_time.rel_value_us)
+    expiration_time = GNUNET_TIME_relative_to_absolute (minimum_expiration_time);
   dst_len = sizeof (dst);
   off = 0;
   switch (rec->type)
@@ -668,7 +683,7 @@ check_for_glue (void *cls,
     {
       add_record (gc->req,
                   GNUNET_GNSRECORD_TYPE_GNS2DNS,
-                  rec->expiration_time,
+                  expiration_time,
                   dst,
                   off);
       gc->found = GNUNET_YES;
@@ -702,7 +717,7 @@ check_for_glue (void *cls,
     {
       add_record (gc->req,
                   GNUNET_GNSRECORD_TYPE_GNS2DNS,
-                  rec->expiration_time,
+                  expiration_time,
                   dst,
                   off);
       gc->found = GNUNET_YES;
@@ -722,7 +737,7 @@ check_for_glue (void *cls,
     {
       add_record (gc->req,
                   GNUNET_GNSRECORD_TYPE_GNS2DNS,
-                  rec->expiration_time,
+                  expiration_time,
                   dst,
                   off);
       gc->found = GNUNET_YES;
@@ -768,6 +783,8 @@ process_record (void *cls,
   char dst[65536];
   size_t dst_len;
   size_t off;
+  struct GNUNET_TIME_Absolute expiration_time;
+  struct GNUNET_TIME_Relative left;
 
   dst_len = sizeof (dst);
   off = 0;
@@ -783,18 +800,27 @@ process_record (void *cls,
     return; /* does not match hostname, might be glue, but
                not useful for this pass! */
   }
-  if (0 ==
-      GNUNET_TIME_absolute_get_remaining (rec->expiration_time).rel_value_us)
+  expiration_time = rec->expiration_time;
+  left = GNUNET_TIME_absolute_get_remaining (expiration_time);
+  if (0 == left.rel_value_us)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "DNS returned expired record for `%s'\n",
                 req->hostname);
+    GNUNET_STATISTICS_update (stats,
+                              "# expired records obtained from DNS",
+                              1,
+                              GNUNET_NO);
     return; /* record expired */
   }
+
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "DNS returned record that expires at %s for `%s'\n",
-              GNUNET_STRINGS_absolute_time_to_string (rec->expiration_time),
+              GNUNET_STRINGS_absolute_time_to_string (expiration_time),
               req->hostname);
+  /* if expiration window is too short, bump it to configured minimum */
+  if (left.rel_value_us < minimum_expiration_time.rel_value_us)
+    expiration_time = GNUNET_TIME_relative_to_absolute (minimum_expiration_time);
   switch (rec->type)
   {
   case GNUNET_DNSPARSER_TYPE_NS:
@@ -828,7 +854,7 @@ process_record (void *cls,
                     rec->name);
         add_record (req,
                     GNUNET_GNSRECORD_TYPE_GNS2DNS,
-                    rec->expiration_time,
+                    expiration_time,
                     dst,
                     off);
       }
@@ -853,7 +879,7 @@ process_record (void *cls,
                   rec->name);
       add_record (req,
                   rec->type,
-                  rec->expiration_time,
+                  expiration_time,
                   dst,
                   off);
     }
@@ -878,7 +904,7 @@ process_record (void *cls,
                   rec->name);
       add_record (req,
                   rec->type,
-                  rec->expiration_time,
+                  expiration_time,
                   dst,
                   off);
     }
@@ -896,7 +922,7 @@ process_record (void *cls,
                   rec->name);
       add_record (req,
                   rec->type,
-                  rec->expiration_time,
+                  expiration_time,
                   dst,
                   off);
     }
@@ -913,7 +939,7 @@ process_record (void *cls,
                   rec->name);
       add_record (req,
                   rec->type,
-                  rec->expiration_time,
+                  expiration_time,
                   dst,
                   off);
     }
@@ -931,7 +957,7 @@ process_record (void *cls,
                   rec->name);
       add_record (req,
                   rec->type,
-                  rec->expiration_time,
+                  expiration_time,
                   dst,
                   off);
     }
@@ -948,7 +974,7 @@ process_record (void *cls,
                   rec->name);
       add_record (req,
                   rec->type,
-                  rec->expiration_time,
+                  expiration_time,
                   dst,
                   off);
     }
@@ -966,7 +992,7 @@ process_record (void *cls,
                 rec->name);
     add_record (req,
                 rec->type,
-                rec->expiration_time,
+                expiration_time,
                 rec->data.raw.data,
                 rec->data.raw.data_len);
     break;
@@ -1469,6 +1495,16 @@ do_shutdown (void *cls)
 
 
 /**
+ * Iterate over all of the zones we care about and see which records
+ * we may need to re-fetch when.
+ *
+ * @param cls NULL
+ */
+static void
+iterate_zones (void *cls);
+
+
+/**
  * Function called if #GNUNET_NAMESTORE_records_lookup() failed.
  * Just logs an error.
  *
@@ -1482,6 +1518,9 @@ ns_lookup_error_cb (void *cls)
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Failed to load data from namestore for zone `%s'\n",
               zone->domain);
+  zone_it = NULL;
+  ns_iterator_trigger_next = 0;
+  iterate_zones (NULL);
 }
 
 
@@ -1551,7 +1590,17 @@ ns_lookup_result_cb (void *cls,
   {
     struct GNUNET_TIME_Absolute at;
 
-    at.abs_value_us = rd->expiration_time;
+    if (0 != (rd->flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION))
+    {
+      struct GNUNET_TIME_Relative rel;
+
+      rel.rel_value_us = rd->expiration_time;
+      at = GNUNET_TIME_relative_to_absolute (rel);
+    }
+    else
+    {
+      at.abs_value_us = rd->expiration_time;
+    }
     add_record (req,
                 rd->record_type,
                 at,
@@ -1648,9 +1697,9 @@ queue (const char *hostname)
   req = GNUNET_malloc (sizeof (struct Request) + hlen);
   req->zone = zone;
   req->hostname = (char *) &req[1];
-  memcpy (req->hostname,
-          hostname,
-          hlen);
+  GNUNET_memcpy (req->hostname,
+                 hostname,
+                 hlen);
   req->id = (uint16_t) GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE,
                                                  UINT16_MAX);
   GNUNET_CRYPTO_hash (req->hostname,
@@ -1800,14 +1849,14 @@ process_stdin (void *cls)
     if (0 == idot)
       last = GNUNET_TIME_absolute_get ();
     idot++;
-    if (0 == idot % 10000)
+    if (0 == idot % 100000)
     {
       struct GNUNET_TIME_Relative delta;
 
       delta = GNUNET_TIME_absolute_get_duration (last);
       last = GNUNET_TIME_absolute_get ();
       fprintf (stderr,
-               "Imported 10000 records in %s\n",
+               "Read 100000 domain names in %s\n",
                GNUNET_STRINGS_relative_time_to_string (delta,
                                                        GNUNET_YES));
       GNUNET_STATISTICS_set (stats,
@@ -1986,6 +2035,11 @@ main (int argc,
                                "MAPSIZE",
                                gettext_noop ("size to use for the main hash map"),
                                &map_size),
+    GNUNET_GETOPT_option_relative_time ('m',
+                                        "minimum-expiration",
+                                        "RELATIVETIME",
+                                        gettext_noop ("minimum expiration time we assume for imported records"),
+                                        &minimum_expiration_time),
     GNUNET_GETOPT_OPTION_END
   };