-fix #3301

[oweals/gnunet.git] / src / namestore / gnunet-namestore.c

diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c
index 8dc35984e7bee5cb5a50854562e6e54d655bab5f..f5a13c96b9bda7af7bedf53912c8596c1c2ec7ca 100644 (file)
--- a/src/namestore/gnunet-namestore.c
+++ b/src/namestore/gnunet-namestore.c
@@ -459,23 +459,91 @@ get_existing_record (void *cls,
 {
   struct GNUNET_GNSRECORD_Data rdn[rd_count + 1];
   struct GNUNET_GNSRECORD_Data *rde;
+  unsigned int i;
 
   add_qe = NULL;
   if ( (NULL != zone_key) &&
        (0 != strcmp (rec_name, name)) )
   {
     GNUNET_break (0);
+    ret = 1;
+    test_finished ();
     return;
   }
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received %u records for name `%s'\n",
-      rd_count, rec_name);
-
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Received %u records for name `%s'\n",
+              rd_count, rec_name);
+  for (i=0;i<rd_count;i++)
+  {
+    switch (rd[i].record_type)
+    {
+    case GNUNET_DNSPARSER_TYPE_CNAME:
+      fprintf (stderr,
+               _("A %s record exists already under `%s', no other records can be added.\n"),
+               "CNAME",
+               rec_name);
+      ret = 1;
+      test_finished ();
+      return;
+    case GNUNET_GNSRECORD_TYPE_PKEY:
+      fprintf (stderr,
+               _("A %s record exists already under `%s', no other records can be added.\n"),
+               "PKEY",
+               rec_name);
+      ret = 1;
+      test_finished ();
+    case GNUNET_GNSRECORD_TYPE_GNS2DNS:
+      fprintf (stderr,
+               _("A %s record exists already under `%s', no other records can be added.\n"),
+               "GNS2DNS",
+               rec_name);
+      ret = 1;
+      test_finished ();
+      return;
+    }
+  }
+  switch (type)
+  {
+  case GNUNET_DNSPARSER_TYPE_CNAME:
+    if (0 != rd_count)
+    {
+      fprintf (stderr,
+               _("Records already exist under `%s', cannot add `%s' record.\n"),
+               rec_name,
+               "CNAME");
+      ret = 1;
+      test_finished ();
+      return;
+    }
+    break;
+  case GNUNET_GNSRECORD_TYPE_PKEY:
+    if (0 != rd_count)
+    {
+      fprintf (stderr,
+               _("Records already exist under `%s', cannot add `%s' record.\n"),
+               rec_name,
+               "PKEY");
+      ret = 1;
+      test_finished ();
+      return;
+    }
+    break;
+  case GNUNET_GNSRECORD_TYPE_GNS2DNS:
+    if (0 != rd_count)
+    {
+      fprintf (stderr,
+               _("Records already exist under `%s', cannot add `%s' record.\n"),
+               rec_name,
+               "GNS2DNS");
+      ret = 1;
+      test_finished ();
+      return;
+    }
+    break;
+  }
   memset (rdn, 0, sizeof (struct GNUNET_GNSRECORD_Data));
   memcpy (&rdn[1], rd, rd_count * sizeof (struct GNUNET_GNSRECORD_Data));
-  /* FIXME: should add some logic to overwrite records if there
-     can only be one record of a particular type, and to check
-     if the combination of records is valid to begin with... */
   rde = &rdn[0];
   rde->data = data;
   rde->data_size = data_size;
@@ -536,6 +604,88 @@ handle_reverse_lookup (void *cls,
 }
 
 
+/**
+ * We were asked to delete something; this function is called with
+ * the existing records. Now we should determine what should be
+ * deleted and then issue the deletion operation.
+ *
+ * @param cls NULL
+ * @param zone private key of the zone we are deleting from
+ * @param label name of the records we are editing
+ * @param rd_count size of the @a rd array
+ * @param rd existing records
+ */
+static void
+del_monitor (void *cls,
+             const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
+             const char *label,
+             unsigned int rd_count,
+             const struct GNUNET_GNSRECORD_Data *rd)
+{
+  struct GNUNET_GNSRECORD_Data rdx[rd_count];
+  unsigned int rd_left;
+  unsigned int i;
+  uint32_t type;
+  char *vs;
+
+  del_qe = NULL;
+  if (0 == rd_count)
+  {
+    FPRINTF (stderr,
+             _("There are no records under label `%s' that could be deleted.\n"),
+             label);
+    test_finished ();
+    return;
+  }
+  if ( (NULL == value) &&
+       (NULL == typestring) )
+  {
+    /* delete everything */
+    del_qe = GNUNET_NAMESTORE_records_store (ns,
+                                             &zone_pkey,
+                                             name,
+                                             0, NULL,
+                                             &del_continuation,
+                                             NULL);
+    return;
+  }
+  rd_left = 0;
+  if (NULL != typestring)
+    type = GNUNET_GNSRECORD_typename_to_number (typestring);
+  else
+    type = GNUNET_GNSRECORD_TYPE_ANY;
+  for (i=0;i<rd_count;i++)
+  {
+    vs = NULL;
+    if (! ( ( (GNUNET_GNSRECORD_TYPE_ANY == type) ||
+              (rd[i].record_type == type) ) &&
+            ( (NULL == value) ||
+              (NULL == (vs = (GNUNET_GNSRECORD_value_to_string (rd[i].record_type,
+                                                                rd[i].data,
+                                                                rd[i].data_size)))) ||
+              (0 == strcmp (vs, value)) ) ) )
+      rdx[rd_left++] = rd[i];
+    GNUNET_free_non_null (vs);
+  }
+  if (rd_count == rd_left)
+  {
+    /* nothing got deleted */
+    FPRINTF (stderr,
+             _("There are no records under label `%s' that match the request for deletion.\n"),
+             label);
+    test_finished ();
+    return;
+  }
+  /* delete everything but what we copied to 'rdx' */
+  del_qe = GNUNET_NAMESTORE_records_store (ns,
+                                           &zone_pkey,
+                                           name,
+                                           rd_left, rdx,
+                                           &del_continuation,
+                                           NULL);
+}
+
+
 /**
  * Function called with the result from the check if the namestore
  * service is actually running.  If it is, we start the actual
@@ -675,12 +825,11 @@ testservice_task (void *cls,
       ret = 1;
       return;
     }
-    del_qe = GNUNET_NAMESTORE_records_store (ns,
-                                            &zone_pkey,
-                                            name,
-                                            0, NULL,
-                                            &del_continuation,
-                                            NULL);
+    del_qe = GNUNET_NAMESTORE_records_lookup (ns,
+                                              &zone_pkey,
+                                              name,
+                                              &del_monitor,
+                                              NULL);
   }
   if (list)
   {