- lookup specific types

3 files changed, 408 insertions, 9 deletions

diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index 7bd014fd9..23fac2eb5 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -29,6 +29,7 @@ check_PROGRAMS = \
  test_namestore_api \
  test_namestore_api_put \
  test_namestore_api_lookup \
+ test_namestore_api_lookup_specific_type \
  test_namestore_api_create \
  test_namestore_api_create_update \
  test_namestore_api_remove \
@@ -106,6 +107,13 @@ test_namestore_api_lookup_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la
 
+test_namestore_api_lookup_specific_type_SOURCES = \
+ test_namestore_api_lookup_specific_type.c
+test_namestore_api_lookup_specific_type_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la
+
+
 test_namestore_api_create_SOURCES = \
  test_namestore_api_create.c
 test_namestore_api_create_LDADD = \
diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c
index b7bd129e5..23d45d080 100644
--- a/src/namestore/gnunet-service-namestore.c
+++ b/src/namestore/gnunet-service-namestore.c
@@ -215,7 +215,6 @@ void drop_iterator (void *cls,
   else
   {
     (*stop) = GNUNET_YES;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "NULL \n");
   }
 }
 
@@ -261,7 +260,6 @@ static void handle_stop (void *cls,
     while (stop == GNUNET_NO)
     {
       GSN_database->iterate_records (GSN_database->cls, NULL, NULL, offset, &drop_iterator, &stop);
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "STOP %u \n");
       offset ++;
     }
   }
@@ -291,8 +289,6 @@ handle_lookup_name_it (void *cls,
   size_t rd_ser_len;
   struct GNUNET_CRYPTO_RsaSignature *signature_tmp;
 
-
-
   size_t r_size = 0;
 
   size_t name_len = 0;
@@ -312,6 +308,8 @@ handle_lookup_name_it (void *cls,
       for (c = 0; c < rd_count; c ++)
         if (rd[c].record_type == lnc->record_type)
           copied_elements++; /* found matching record */
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found %u records with type %u for name `%s' in zone `%s'\n",
+          copied_elements, lnc->record_type, lnc->name, GNUNET_h2s(lnc->zone));
       rd_selected = GNUNET_malloc (copied_elements * sizeof (struct GNUNET_NAMESTORE_RecordData));
       copied_elements = 0;
       for (c = 0; c < rd_count; c ++)
@@ -338,8 +336,6 @@ handle_lookup_name_it (void *cls,
     expire = GNUNET_TIME_UNIT_ZERO_ABS;
   }
 
-
-
   rd_ser_len = GNUNET_NAMESTORE_records_get_size(copied_elements, rd_selected);
   char rd_ser[rd_ser_len];
   GNUNET_NAMESTORE_records_serialize(copied_elements, rd_selected, rd_ser_len, rd_ser);
@@ -366,7 +362,7 @@ handle_lookup_name_it (void *cls,
   lnr_msg->gns_header.header.type = ntohs (GNUNET_MESSAGE_TYPE_NAMESTORE_LOOKUP_NAME_RESPONSE);
   lnr_msg->gns_header.header.size = ntohs (r_size);
   lnr_msg->gns_header.r_id = htonl (lnc->request_id);
-  lnr_msg->rd_count = htons (rd_count);
+  lnr_msg->rd_count = htons (copied_elements);
   lnr_msg->rd_len = htons (rd_ser_len);
   lnr_msg->name_len = htons (name_len);
   lnr_msg->expire = GNUNET_TIME_absolute_hton(expire);
@@ -443,8 +439,10 @@ static void handle_lookup_name (void *cls,
     return;
   }
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Looking up record for name `%s' in zone `%s'\n", name, GNUNET_h2s(&ln_msg->zone));
-
+  if (0 == type)
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Looking up all records for name `%s' in zone `%s'\n", name, GNUNET_h2s(&ln_msg->zone));
+  else
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Looking up records with type %u for name `%s' in zone `%s'\n", type, name, GNUNET_h2s(&ln_msg->zone));
   /* do the actual lookup */
   lnc.request_id = rid;
   lnc.nc = nc;
diff --git a/src/namestore/test_namestore_api_lookup_specific_type.c b/src/namestore/test_namestore_api_lookup_specific_type.c
new file mode 100644
index 000000000..8ffa9ca2c
--- /dev/null
+++ b/src/namestore/test_namestore_api_lookup_specific_type.c
@@ -0,0 +1,393 @@
+/*
+     This file is part of GNUnet.
+     (C) 2009 Christian Grothoff (and other contributing authors)
+
+     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 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.
+
+     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., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+/**
+ * @file namestore/test_namestore_api.c
+ * @brief testcase for namestore_api.c
+ */
+#include "platform.h"
+#include "gnunet_common.h"
+#include "gnunet_namestore_service.h"
+#include "namestore.h"
+#include "gnunet_signatures.h"
+
+#define VERBOSE GNUNET_NO
+
+#define RECORDS 5
+#define TEST_RECORD_TYPE 1234
+#define TEST_RECORD_DATALEN 123
+#define TEST_RECORD_DATA 'a'
+
+#define TEST_RECORD_LOOKUP_TYPE_NOT_EXISTING 11111
+#define TEST_RECORD_LOOKUP_TYPE_EXISTING 22222
+
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
+
+static struct GNUNET_NAMESTORE_Handle * nsh;
+
+static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
+static struct GNUNET_OS_Process *arm;
+
+static struct GNUNET_CRYPTO_RsaPrivateKey * privkey;
+static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey;
+struct GNUNET_CRYPTO_RsaSignature *s_signature;
+static GNUNET_HashCode s_zone;
+struct GNUNET_NAMESTORE_RecordData *s_rd;
+static char *s_name;
+
+
+
+static int res;
+
+static void
+start_arm (const char *cfgname)
+{
+  arm = GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm",
+                               "gnunet-service-arm", "-c", cfgname,
+#if VERBOSE_PEERS
+                               "-L", "DEBUG",
+#else
+                               "-L", "ERROR",
+#endif
+                               NULL);
+}
+
+static void
+stop_arm ()
+{
+  if (NULL != arm)
+  {
+    if (0 != GNUNET_OS_process_kill (arm, SIGTERM))
+      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+    GNUNET_OS_process_wait (arm);
+    GNUNET_OS_process_close (arm);
+    arm = NULL;
+  }
+}
+
+/**
+ * Re-establish the connection to the service.
+ *
+ * @param cls handle to use to re-connect.
+ * @param tc scheduler context
+ */
+static void
+endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  if (nsh != NULL)
+    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+  nsh = NULL;
+
+  if (privkey != NULL)
+    GNUNET_CRYPTO_rsa_key_free (privkey);
+  privkey = NULL;
+
+  if (NULL != arm)
+    stop_arm();
+
+  res = 1;
+}
+
+
+static void
+end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
+  {
+    GNUNET_SCHEDULER_cancel (endbadly_task);
+    endbadly_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+
+  int c;
+  for (c = 0; c < RECORDS; c++)
+  {
+    GNUNET_free_non_null((void *) s_rd[c].data);
+  }
+  GNUNET_free (s_rd);
+
+  if (privkey != NULL)
+    GNUNET_CRYPTO_rsa_key_free (privkey);
+  privkey = NULL;
+
+  if (nsh != NULL)
+    GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES);
+  nsh = NULL;
+
+  if (NULL != arm)
+    stop_arm();
+}
+
+
+void name_lookup_existing_record_type (void *cls,
+                            const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
+                            struct GNUNET_TIME_Absolute expire,
+                            const char *n,
+                            unsigned int rd_count,
+                            const struct GNUNET_NAMESTORE_RecordData *rd,
+                            const struct GNUNET_CRYPTO_RsaSignature *signature)
+{
+  int failed = GNUNET_NO;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Namestore returned %u records\n", rd_count);
+
+  if ((NULL == n) || (0 != memcmp(zone_key, &pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded))))
+  {
+    GNUNET_break(0);
+    failed = GNUNET_YES;
+  }
+  if ((NULL == n) || (0 != strcmp(n, s_name)))
+  {
+    GNUNET_break(0);
+    failed = GNUNET_YES;
+  }
+  if (1 != rd_count)
+  {
+    GNUNET_break(0);
+    failed = GNUNET_YES;
+  }
+  if (NULL == rd)
+  {
+    GNUNET_break(0);
+    failed = GNUNET_YES;
+  }
+  if (NULL != signature)
+  {
+    GNUNET_break(0);
+    failed = GNUNET_YES;
+  }
+
+  if (failed == GNUNET_YES)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Namestore returned invalid response\n");
+    res = 1;
+  }
+  else
+  {
+   res = 0;
+  }
+
+  GNUNET_SCHEDULER_add_now(&end, NULL);
+}
+
+
+void name_lookup_non_existing_record_type (void *cls,
+                            const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
+                            struct GNUNET_TIME_Absolute expire,
+                            const char *n,
+                            unsigned int rd_count,
+                            const struct GNUNET_NAMESTORE_RecordData *rd,
+                            const struct GNUNET_CRYPTO_RsaSignature *signature)
+{
+  int failed = GNUNET_NO;
+
+  if ((NULL == zone_key) || (0 != memcmp(zone_key, &pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded))))
+  {
+    GNUNET_break(0);
+    failed = GNUNET_YES;
+  }
+  if ((NULL == n) || (0 != strcmp(n, s_name)))
+  {
+    GNUNET_break(0);
+    failed = GNUNET_YES;
+  }
+  if (0 != rd_count)
+  {
+    GNUNET_break(0);
+    failed = GNUNET_YES;
+  }
+  if (NULL != rd)
+  {
+    GNUNET_break(0);
+    failed = GNUNET_YES;
+  }
+  if (NULL != signature)
+  {
+    GNUNET_break(0);
+    failed = GNUNET_YES;
+  }
+
+  if ((rd_count == 1) && (rd != NULL))
+  {
+    if (GNUNET_NO == GNUNET_NAMESTORE_records_cmp(rd, &rd[RECORDS-1]))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Records are not equal!\n");
+      failed = GNUNET_YES;
+    }
+    else
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Records are equal!\n");
+    }
+  }
+
+  if (failed == GNUNET_YES)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Namestore returned invalid response\n");
+    res = 1;
+
+  }
+  else
+  {
+   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Namestore returned valid response\n");
+   GNUNET_NAMESTORE_lookup_record (nsh, &s_zone, s_name, TEST_RECORD_LOOKUP_TYPE_EXISTING, &name_lookup_existing_record_type, NULL);
+   res = 0;
+  }
+}
+
+void
+put_cont (void *cls, int32_t success, const char *emsg)
+{
+  char * name = cls;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Name store added record for `%s': %s\n", name, (success == GNUNET_OK) ? "SUCCESS" : "FAIL");
+  if (success == GNUNET_OK)
+  {
+    res = 0;
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Looking up non-existing record type %u for name `%s'\n", TEST_RECORD_LOOKUP_TYPE_NOT_EXISTING, name);
+    GNUNET_NAMESTORE_lookup_record (nsh, &s_zone, name, TEST_RECORD_LOOKUP_TYPE_NOT_EXISTING, &name_lookup_non_existing_record_type, NULL);
+  }
+  else
+  {
+    res = 1;
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to put records for name `%s'\n", name);
+    GNUNET_SCHEDULER_add_now(&end, NULL);
+  }
+}
+
+static struct GNUNET_NAMESTORE_RecordData *
+create_record (int count)
+{
+  int c;
+  struct GNUNET_NAMESTORE_RecordData * rd;
+  rd = GNUNET_malloc (count * sizeof (struct GNUNET_NAMESTORE_RecordData));
+
+  for (c = 0; c < RECORDS-1; c++)
+  {
+  rd[c].expiration = GNUNET_TIME_absolute_get();
+  rd[c].record_type = 1;
+  rd[c].data_size = TEST_RECORD_DATALEN;
+  rd[c].data = GNUNET_malloc(TEST_RECORD_DATALEN);
+  memset ((char *) rd[c].data, TEST_RECORD_DATA, TEST_RECORD_DATALEN);
+  }
+
+  rd[c].expiration = GNUNET_TIME_absolute_get();
+  rd[c].record_type = TEST_RECORD_LOOKUP_TYPE_EXISTING;
+  rd[c].data_size = TEST_RECORD_DATALEN;
+  rd[c].data = GNUNET_malloc(TEST_RECORD_DATALEN);
+  memset ((char *) rd[c].data, TEST_RECORD_DATA, TEST_RECORD_DATALEN);
+
+
+  return rd;
+}
+
+void
+delete_existing_db (const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  char *afsdir;
+
+  if (GNUNET_OK ==
+      GNUNET_CONFIGURATION_get_value_filename (cfg, "namestore-sqlite",
+                                               "FILENAME", &afsdir))
+  {
+    if (GNUNET_OK == GNUNET_DISK_file_test (afsdir))
+      if (GNUNET_OK == GNUNET_DISK_file_test (afsdir))
+        if (GNUNET_OK == GNUNET_DISK_directory_remove(afsdir))
+          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Deleted existing database `%s' \n", afsdir);
+   GNUNET_free (afsdir);
+  }
+
+}
+
+static void
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  delete_existing_db(cfg);
+  endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,endbadly, NULL);
+
+  size_t rd_ser_len;
+
+  /* load privat key */
+  privkey = GNUNET_CRYPTO_rsa_key_create_from_file("hostkey");
+  GNUNET_assert (privkey != NULL);
+  /* get public key */
+  GNUNET_CRYPTO_rsa_key_get_public(privkey, &pubkey);
+
+  /* create record */
+  s_name = "dummy.dummy.gnunet";
+  s_rd = create_record (RECORDS);
+
+  rd_ser_len = GNUNET_NAMESTORE_records_get_size(RECORDS, s_rd);
+  char rd_ser[rd_ser_len];
+  GNUNET_NAMESTORE_records_serialize(RECORDS, s_rd, rd_ser_len, rd_ser);
+
+  /* sign */
+  s_signature = GNUNET_NAMESTORE_create_signature(privkey, s_name, s_rd, RECORDS);
+
+  /* create random zone hash */
+  GNUNET_CRYPTO_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &s_zone);
+
+  start_arm (cfgfile);
+  GNUNET_assert (arm != NULL);
+
+  nsh = GNUNET_NAMESTORE_connect (cfg);
+  GNUNET_break (NULL != nsh);
+
+  GNUNET_break (s_rd != NULL);
+  GNUNET_break (s_name != NULL);
+
+  GNUNET_NAMESTORE_record_put (nsh, &pubkey, s_name,
+                              GNUNET_TIME_absolute_get_forever(),
+                              RECORDS, s_rd, s_signature, put_cont, s_name);
+
+
+
+}
+
+static int
+check ()
+{
+  static char *const argv[] = { "test-namestore-api",
+    "-c",
+    "test_namestore_api.conf",
+#if VERBOSE
+    "-L", "DEBUG",
+#endif
+    NULL
+  };
+  static struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_OPTION_END
+  };
+
+  res = 1;
+  GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, "test-namestore-api",
+                      "nohelp", options, &run, &res);
+  return res;
+}
+
+int
+main (int argc, char *argv[])
+{
+  int ret;
+
+  ret = check ();
+  GNUNET_free (s_signature);
+  return ret;
+}
+
+/* end of test_namestore_api.c */