-simlify and correct tombstone logic

5 files changed, 10 insertions, 367 deletions

diff --git a/src/zonemaster/Makefile.am b/src/zonemaster/Makefile.am
index d561d75fe..f2d569c75 100644
--- a/src/zonemaster/Makefile.am
+++ b/src/zonemaster/Makefile.am
@@ -20,8 +20,7 @@ libexec_PROGRAMS = \
  gnunet-service-zonemaster-monitor
 
 gnunet_service_zonemaster_SOURCES = \
- gnunet-service-zonemaster.c \
- zonemaster_misc.c zonemaster_misc.h
+ gnunet-service-zonemaster.c
 gnunet_service_zonemaster_LDADD = \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
@@ -33,8 +32,7 @@ gnunet_service_zonemaster_LDADD = \
 
 
 gnunet_service_zonemaster_monitor_SOURCES = \
- gnunet-service-zonemaster-monitor.c \
- zonemaster_misc.c zonemaster_misc.h
+ gnunet-service-zonemaster-monitor.c
 gnunet_service_zonemaster_monitor_LDADD = \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
diff --git a/src/zonemaster/gnunet-service-zonemaster-monitor.c b/src/zonemaster/gnunet-service-zonemaster-monitor.c
index dcacec60f..fef9e6b82 100644
--- a/src/zonemaster/gnunet-service-zonemaster-monitor.c
+++ b/src/zonemaster/gnunet-service-zonemaster-monitor.c
@@ -28,7 +28,6 @@
 #include "gnunet_dht_service.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_statistics_service.h"
-#include "zonemaster_misc.h"
 
 #define LOG_STRERROR_FILE(kind, syscall, \
                           filename) GNUNET_log_from_strerror_file (kind, "util", \
@@ -59,30 +58,6 @@
 #define DHT_GNS_REPLICATION_LEVEL 5
 
 /**
- * Handle for tombston updates which are executed for each published
- * record set.
- */
-struct TombstoneActivity
-{
-  /**
-   * Kept in a DLL.
-   */
-  struct TombstoneActivity *next;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct TombstoneActivity *prev;
-
-  /**
-   * Handle for the store operation.
-   */
-  struct GNUNET_NAMESTORE_QueueEntry *ns_qe;
-
-};
-
-
-/**
  * Handle for DHT PUT activity triggered from the namestore monitor.
  */
 struct DhtPutActivity
@@ -130,17 +105,6 @@ static struct GNUNET_NAMESTORE_Handle *namestore_handle;
 static struct GNUNET_NAMESTORE_ZoneMonitor *zmon;
 
 /**
- * Head of the tombstone operations
- */
-static struct TombstoneActivity *ta_head;
-
-/**
- * Tail of the tombstone operations
- */
-static struct TombstoneActivity *ta_tail;
-
-
-/**
  * Head of monitor activities; kept in a DLL.
  */
 static struct DhtPutActivity *ma_head;
@@ -186,14 +150,6 @@ shutdown_task (void *cls)
                                  ma);
     GNUNET_free (ma);
   }
-  while (NULL != (ta = ta_head))
-  {
-    GNUNET_NAMESTORE_cancel (ta->ns_qe);
-    GNUNET_CONTAINER_DLL_remove (ta_head,
-                                 ta_tail,
-                                 ta);
-    GNUNET_free (ta);
-  }
   if (NULL != statistics)
   {
     GNUNET_STATISTICS_destroy (statistics,
@@ -309,21 +265,6 @@ perform_dht_put (const struct GNUNET_IDENTITY_PrivateKey *key,
   return ret;
 }
 
-static void
-ts_store_cont (void *cls, int32_t success, const char *emsg)
-{
-  struct TombstoneActivity *ta = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Tombstone update complete\n");
-  GNUNET_CONTAINER_DLL_remove (ta_head,
-                               ta_tail,
-                               ta);
-  GNUNET_free (ta);
-
-}
-
-
 /**
  * Process a record that was stored in the namestore
  * (invoked by the monitor).
@@ -346,7 +287,6 @@ handle_monitor_event (void *cls,
   unsigned int rd_public_count;
   unsigned int rd_fresh_count;
   struct DhtPutActivity *ma;
-  struct TombstoneActivity *ta;
   struct GNUNET_TIME_Absolute expire;
 
   (void) cls;
@@ -360,10 +300,10 @@ handle_monitor_event (void *cls,
               label);
   /* filter out records that are not public, and convert to
      absolute expiration time. */
-  rd_public_count = ZMSTR_convert_records_for_export (rd,
-                                                      rd_count,
-                                                      rd_public,
-                                                      &expire);
+  rd_public_count = GNUNET_GNSRECORD_convert_records_for_export (rd,
+                                                                 rd_count,
+                                                                 rd_public,
+                                                                 &expire);
   if (0 == rd_public_count)
   {
     GNUNET_NAMESTORE_zone_monitor_next (zmon,
@@ -378,27 +318,6 @@ handle_monitor_event (void *cls,
                             rd_count,
                             expire,
                             ma);
-  ta = GNUNET_new (struct TombstoneActivity);
-  ZMSTR_touch_tombstone (zone,
-                         label,
-                         rd,
-                         rd_count,
-                         rd_fresh,
-                         &rd_fresh_count,
-                         expire);
-  ta->ns_qe =  GNUNET_NAMESTORE_records_store_ (namestore_handle,
-                                                zone,
-                                                label,
-                                                rd_fresh_count,
-                                                rd_fresh,
-                                                GNUNET_YES,
-                                                &ts_store_cont,
-                                                ta);
-
-
-  GNUNET_CONTAINER_DLL_insert_tail (ta_head,
-                                    ta_tail,
-                                    ta);
   if (NULL == ma->ph)
   {
     /* PUT failed, do not remember operation */
diff --git a/src/zonemaster/gnunet-service-zonemaster.c b/src/zonemaster/gnunet-service-zonemaster.c
index 9f0de8a54..9eb3432ee 100644
--- a/src/zonemaster/gnunet-service-zonemaster.c
+++ b/src/zonemaster/gnunet-service-zonemaster.c
@@ -29,7 +29,6 @@
 #include "gnunet_dht_service.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_statistics_service.h"
-#include "zonemaster_misc.h"
 
 #define LOG_STRERROR_FILE(kind, syscall, \
                           filename) GNUNET_log_from_strerror_file (kind, "util", \
@@ -91,30 +90,6 @@
 #define DHT_GNS_REPLICATION_LEVEL 5
 
 /**
- * Handle for tombston updates which are executed for each published
- * record set.
- */
-struct TombstoneActivity
-{
-  /**
-   * Kept in a DLL.
-   */
-  struct TombstoneActivity *next;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct TombstoneActivity *prev;
-
-  /**
-   * Handle for the store operation.
-   */
-  struct GNUNET_NAMESTORE_QueueEntry *ns_qe;
-
-};
-
-
-/**
  * Handle for DHT PUT activity triggered from the namestore monitor.
  */
 struct DhtPutActivity
@@ -172,16 +147,6 @@ static struct DhtPutActivity *it_head;
 static struct DhtPutActivity *it_tail;
 
 /**
- * Head of the tombstone operations
- */
-static struct TombstoneActivity *ta_head;
-
-/**
- * Tail of the tombstone operations
- */
-static struct TombstoneActivity *ta_tail;
-
-/**
  * Number of entries in the DHT queue #it_head.
  */
 static unsigned int dht_queue_length;
@@ -296,14 +261,6 @@ shutdown_task (void *cls)
     dht_queue_length--;
     GNUNET_free (ma);
   }
-  while (NULL != (ta = ta_head))
-  {
-    GNUNET_NAMESTORE_cancel (ta->ns_qe);
-    GNUNET_CONTAINER_DLL_remove (ta_head,
-                                 ta_tail,
-                                 ta);
-    GNUNET_free (ta);
-  }
   if (NULL != statistics)
   {
     GNUNET_STATISTICS_destroy (statistics,
@@ -713,21 +670,6 @@ zone_iteration_finished (void *cls)
   }
 }
 
-static void
-ts_store_cont (void *cls, int32_t success, const char *emsg)
-{
-  struct TombstoneActivity *ta = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Tombstone update complete\n");
-  GNUNET_CONTAINER_DLL_remove (ta_head,
-                               ta_tail,
-                               ta);
-  GNUNET_free (ta);
-
-}
-
-
 /**
  * Function used to put all records successively into the DHT.
  *
@@ -749,15 +691,14 @@ put_gns_record (void *cls,
   unsigned int rd_public_count;
   unsigned int rd_fresh_count = 0;
   struct DhtPutActivity *ma;
-  struct TombstoneActivity *ta;
   struct GNUNET_TIME_Absolute expire;
 
   (void) cls;
   ns_iteration_left--;
-  rd_public_count = ZMSTR_convert_records_for_export (rd,
-                                                      rd_count,
-                                                      rd_public,
-                                                      &expire);
+  rd_public_count = GNUNET_GNSRECORD_convert_records_for_export (rd,
+                                                                 rd_count,
+                                                                 rd_public,
+                                                                 &expire);
   if (0 == rd_public_count)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -790,27 +731,6 @@ put_gns_record (void *cls,
                             rd_public_count,
                             expire,
                             ma);
-  ta = GNUNET_new (struct TombstoneActivity);
-  ZMSTR_touch_tombstone (key,
-                         label,
-                         rd,
-                         rd_count,
-                         rd_fresh,
-                         &rd_fresh_count,
-                         expire);
-  ta->ns_qe =  GNUNET_NAMESTORE_records_store_ (namestore_handle,
-                                                key,
-                                                label,
-                                                rd_fresh_count,
-                                                rd_fresh,
-                                                GNUNET_YES,
-                                                &ts_store_cont,
-                                                ta);
-
-
-  GNUNET_CONTAINER_DLL_insert_tail (ta_head,
-                                    ta_tail,
-                                    ta);
   put_cnt++;
   if (0 == put_cnt % DELTA_INTERVAL)
     update_velocity (DELTA_INTERVAL);
diff --git a/src/zonemaster/zonemaster_misc.c b/src/zonemaster/zonemaster_misc.c
deleted file mode 100644
index f067e9c62..000000000
--- a/src/zonemaster/zonemaster_misc.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2021 GNUnet e.V.
-
-     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
-     Affero General Public License for more details.
-
-     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/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-
-#include "zonemaster_misc.h"
-
-/**
- * Convert namestore records from the internal format to that
- * suitable for publication (removes private records, converts
- * to absolute expiration time).
- *
- * @param rd input records
- * @param rd_count size of the @a rd and @a rd_public arrays
- * @param rd_public where to write the converted records
- * @param expire the expiration of the block
- * @return number of records written to @a rd_public
- */
-unsigned int
-ZMSTR_convert_records_for_export (const struct GNUNET_GNSRECORD_Data *rd,
-                            unsigned int rd_count,
-                            struct GNUNET_GNSRECORD_Data *rd_public,
-                            struct GNUNET_TIME_Absolute *expiry)
-{
-  const struct GNUNET_GNSRECORD_TombstoneRecord *tombstone;
-  struct GNUNET_TIME_Absolute expiry_tombstone;
-  struct GNUNET_TIME_Absolute now;
-  unsigned int rd_public_count;
-
-  rd_public_count = 0;
-  tombstone = NULL;
-  now = GNUNET_TIME_absolute_get ();
-  for (unsigned int i = 0; i < rd_count; i++)
-  {
-    if (GNUNET_GNSRECORD_TYPE_TOMBSTONE == rd[i].record_type)
-    {
-      tombstone = rd[i].data;
-      continue;
-    }
-    if (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_PRIVATE))
-      continue;
-    if ((0 == (rd[i].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION)) &&
-        (rd[i].expiration_time < now.abs_value_us))
-      continue;   /* record already expired, skip it */
-      rd_public[rd_public_count] = rd[i];
-    /* Make sure critical record types are published as such */
-    if (GNUNET_YES == GNUNET_GNSRECORD_is_critical (rd[i].record_type))
-      rd_public[rd_public_count].flags |= GNUNET_GNSRECORD_RF_CRITICAL;
-    rd_public_count++;
-  }
-
-  *expiry = GNUNET_GNSRECORD_record_get_expiration_time (rd_public_count,
-                                                         rd_public);
-
-  /* We need to check if the tombstone has an expiration in the fututre
-   * which would mean there was a block published under this label
-   * previously that is still valid. In this case we MUST NOT publish this
-   * block
-   */
-  if (NULL != tombstone)
-  {
-    expiry_tombstone = GNUNET_TIME_absolute_ntoh (tombstone->time_of_death);
-    if (GNUNET_TIME_absolute_cmp (*expiry,<=,expiry_tombstone))
-      return 0;
-  }
-  return rd_public_count;
-}
-
-
-/**
- * Update tombstone records.
- *
- * @param key key of the zone
- * @param label label to store under
- * @param rd_public public record data
- * @param rd_public_count number of records in @a rd_public
- * @param rd the buffer for the result. Must be rd_public_count +1
- * @param rd_count the actual number of records written to rd
- * @param expire the expiration time for the tombstone
- * @return Namestore queue entry, NULL on error
- */
-void
-ZMSTR_touch_tombstone (const struct GNUNET_IDENTITY_PrivateKey *key,
-                 const char *label,
-                 const struct GNUNET_GNSRECORD_Data *rd_original,
-                 unsigned int rd_count_original,
-                 struct GNUNET_GNSRECORD_Data *rd,
-                 unsigned int *rd_count,
-                 const struct GNUNET_TIME_Absolute expire)
-{
-  struct GNUNET_TIME_AbsoluteNBO exp_nbo;
-  int tombstone_exists = GNUNET_NO;
-  unsigned int i;
-
-  exp_nbo = GNUNET_TIME_absolute_hton (expire);
-  for (i = 0; i < rd_count_original; i++)
-  {
-    memcpy (&rd[i], &rd_original[i],
-            sizeof (struct GNUNET_GNSRECORD_Data));
-    if (GNUNET_GNSRECORD_TYPE_TOMBSTONE == rd[i].record_type)
-    {
-      rd[i].data = &exp_nbo;
-      tombstone_exists = GNUNET_YES;
-    }
-  }
-  if (GNUNET_NO == tombstone_exists)
-  {
-    rd[i].data = &exp_nbo;
-    rd[i].data_size = sizeof (exp_nbo);
-    rd[i].record_type = GNUNET_GNSRECORD_TYPE_TOMBSTONE;
-    rd[i].flags = GNUNET_GNSRECORD_RF_PRIVATE;
-    rd[i].expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
-    i++;
-  }
-  *rd_count = i;
-}
diff --git a/src/zonemaster/zonemaster_misc.h b/src/zonemaster/zonemaster_misc.h
deleted file mode 100644
index 27ef3aab7..000000000
--- a/src/zonemaster/zonemaster_misc.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2021 GNUnet e.V.
-
-     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
-     Affero General Public License for more details.
-
-     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/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_namestore_service.h"
-
-
-/**
- * Convert namestore records from the internal format to that
- * suitable for publication (removes private records, converts
- * to absolute expiration time).
- *
- * @param rd input records
- * @param rd_count size of the @a rd and @a rd_public arrays
- * @param rd_public where to write the converted records
- * @param expire the expiration of the block
- * @return number of records written to @a rd_public
- */
-unsigned int
-ZMSTR_convert_records_for_export (const struct GNUNET_GNSRECORD_Data *rd,
-                            unsigned int rd_count,
-                            struct GNUNET_GNSRECORD_Data *rd_public,
-                            struct GNUNET_TIME_Absolute *expiry);
-
-/**
- * Update tombstone records.
- *
- * @param key key of the zone
- * @param label label to store under
- * @param rd_public public record data
- * @param rd_public_count number of records in @a rd_public
- * @param rd the buffer for the result. Must be rd_public_count +1
- * @param rd_count the actual number of records written to rd
- * @param expire the expiration time for the tombstone
- * @return Namestore queue entry, NULL on error
- */
-void
-ZMSTR_touch_tombstone (const struct GNUNET_IDENTITY_PrivateKey *key,
-                 const char *label,
-                 const struct GNUNET_GNSRECORD_Data *rd_original,
-                 unsigned int rd_count_original,
-                 struct GNUNET_GNSRECORD_Data *rd,
-                 unsigned int *rd_count,
-                 const struct GNUNET_TIME_Absolute expire);