-add tests

diff --git a/src/gns/gnunet-service-gns_reverser.c b/src/gns/gnunet-service-gns_reverser.c
index 6bae20b61281c415010d96b38d57d523c25bc9b5..2e66e7fa64058b71dcaca76433296b98b2286aab 100644 (file)
--- a/src/gns/gnunet-service-gns_reverser.c
+++ b/src/gns/gnunet-service-gns_reverser.c
@@ -29,6 +29,54 @@
 #include "gnunet-service-gns_resolver.h"
 #include "gnunet-service-gns_reverser.h"
 
+struct ReverseRecordEntry
+{
+  /**
+   * DLL
+   */
+  struct ReverseRecordEntry *next;
+
+  /**
+   * DLL
+   */
+  struct ReverseRecordEntry *prev;
+
+  /**
+   * ReverseRecord
+   */
+  struct GNUNET_GNSRECORD_ReverseRecord *record;
+
+};
+
+struct IteratorHandle
+{
+  /**
+   * Records found
+   */
+  struct ReverseRecordEntry *records_head;
+
+  /**
+   * Records found
+   */
+  struct ReverseRecordEntry *records_tail;
+
+  /**
+   * Current delegation to expect
+   */
+  struct GNUNET_CRYPTO_EcdsaPublicKey target;
+
+  /**
+   * The zone target for reverse record resolution
+   */
+  struct GNUNET_CRYPTO_EcdsaPublicKey myzone;
+
+  /**
+   * The nick of our zone
+   */
+  char *mynick;
+
+};
+
 struct ReverseTreeNode
 {
   /**
@@ -70,7 +118,7 @@ struct GNS_ReverserHandle
    * The authority to look for
    */
   struct GNUNET_CRYPTO_EcdsaPublicKey authority;
-  
+
   /**
    * Resolution candidate queue
    */
@@ -97,6 +145,26 @@ struct GNS_ReverserHandle
   void *proc_cls;
 };
 
+/**
+ * Reverse record collection task
+ */
+static struct GNUNET_SCHEDULER_Task *reverse_record_check_task;
+
+/**
+ * GNS lookup handle
+ */
+static struct GNS_ResolverHandle *gns_lookup_reverse;
+
+/**
+ * NS handle
+ */
+static struct GNUNET_NAMESTORE_Handle *ns;
+
+/**
+ * NS Iterator
+ */
+static struct GNUNET_NAMESTORE_ZoneIterator *namestore_iter;
+
 void
 cleanup_handle (struct GNS_ReverserHandle *rh)
 {
@@ -241,4 +309,138 @@ GNS_reverse_lookup_cancel (struct GNS_ReverserHandle *rh)
   return;
 }
 
+void
+next_it (void *cls);
+
+void
+handle_gns_result_iter (void *cls,
+                        uint32_t rd_count,
+                        const struct GNUNET_GNSRECORD_Data *rd)
+{
+  struct IteratorHandle *ith = cls;
+  struct ReverseRecordEntry *rr;
+  if ((rd_count != 1) ||
+      (GNUNET_GNSRECORD_TYPE_PKEY != rd->record_type))
+  {
+    gns_lookup_reverse = NULL;
+    GNUNET_SCHEDULER_add_now (&next_it, NULL);
+    return;
+  }
+
+
+  rr = GNUNET_new (struct ReverseRecordEntry);
+  rr->record = GNUNET_malloc (sizeof (struct GNUNET_GNSRECORD_ReverseRecord)
+                              + strlen (ith->mynick) + 1);
+  rr->record->pkey = ith->target;
+  rr->record->expiration.abs_value_us = rd->expiration_time;
+  GNUNET_memcpy ((char*)&rr->record[1],
+                 ith->mynick,
+                 strlen (ith->mynick));
+  GNUNET_CONTAINER_DLL_insert (ith->records_head,
+                               ith->records_tail,
+                               rr);
+  GNUNET_SCHEDULER_add_now (&next_it, NULL);
+}
+
+void
+next_it (void *cls)
+{
+  GNUNET_assert (NULL != namestore_iter);
+  GNUNET_NAMESTORE_zone_iterator_next (namestore_iter);
+}
+
+void
+iterator_cb (void *cls,
+             const struct GNUNET_CRYPTO_EcdsaPrivateKey *key,
+             const char *label,
+             unsigned int rd_count,
+             const struct GNUNET_GNSRECORD_Data *rd)
+{
+  struct IteratorHandle *ith = cls;
+  struct GNUNET_CRYPTO_EcdsaPublicKey *target;
+  struct GNUNET_CRYPTO_EcdsaPublicKey zone;
+
+  if ((rd_count != 1) ||
+      (GNUNET_GNSRECORD_TYPE_PKEY != rd->record_type))
+  {
+    GNUNET_SCHEDULER_add_now (&next_it, NULL);
+    return;
+  }
+  GNUNET_CRYPTO_ecdsa_key_get_public (key,
+                                      &zone);
+  if (0 != memcmp (&zone, &ith->myzone,
+                   sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey)))
+  {
+    GNUNET_SCHEDULER_add_now (&next_it, NULL);
+    return;
+  }
+  target = (struct GNUNET_CRYPTO_EcdsaPublicKey *) rd->data;
+  gns_lookup_reverse = GNS_resolver_lookup (target,
+                                            GNUNET_GNSRECORD_TYPE_PKEY,
+                                            ith->mynick,
+                                            NULL,
+                                            GNUNET_GNS_LO_DEFAULT,
+                                            &handle_gns_result_iter,
+                                            ith);
+}
+
+void check_reverse_records (void *cls);
+
+void
+finished_cb (void *cls)
+{
+  struct IteratorHandle *ith = cls;
+  struct ReverseRecordEntry *rr;
+
+  //TODO add results to namestore!
+  for (rr = ith->records_head; NULL != rr; rr = ith->records_head)
+  {
+    GNUNET_CONTAINER_DLL_remove (ith->records_head,
+                                 ith->records_tail,
+                                 rr);
+    GNUNET_free (rr->record);
+    GNUNET_free (rr);
+  }
+  reverse_record_check_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_DAYS,
+                                                            &check_reverse_records,
+                                                            NULL);
+
+}
+
+void
+it_error (void *cls)
+{
+  finished_cb (cls);
+}
+
+void
+check_reverse_records (void *cls)
+{
+  struct IteratorHandle *ith = cls;
+  namestore_iter = GNUNET_NAMESTORE_zone_iteration_start (ns,
+                                                          NULL,
+                                                          &it_error,
+                                                          ith,
+                                                          &iterator_cb,
+                                                          ith,
+                                                          &finished_cb,
+                                                          ith);
+}
+
+void
+GNS_reverse_init (const struct GNUNET_CONFIGURATION_Handle *c,
+                  const struct GNUNET_NAMESTORE_Handle *nh,
+                  const struct GNUNET_CRYPTO_EcdsaPublicKey *myzone,
+                  const char *mynick)
+{
+  struct IteratorHandle *ith;
+
+  ns = ns;
+  ith = GNUNET_new (struct IteratorHandle);
+  ith->mynick = GNUNET_strdup (mynick);
+  ith->myzone = *myzone;
+  reverse_record_check_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_DAYS,
+                                                            &check_reverse_records,
+                                                            NULL);
+}
 

diff --git a/src/gns/test_gns_reverse_lookup.sh b/src/gns/test_gns_reverse_lookup.sh
new file mode 100755 (executable)
index 0000000..73b829e
--- /dev/null
+++ b/src/gns/test_gns_reverse_lookup.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
+which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
+
+LOCATION=$(which gnunet-config)
+if [ -z $LOCATION ]
+then
+  LOCATION="gnunet-config"
+fi
+$LOCATION --version 1> /dev/null
+if test $? != 0
+then
+       echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" 
+       exit 77
+fi
+
+TEST_NAME="dave.bob.alice.gnu"
+gnunet-arm -s -c test_gns_lookup.conf
+gnunet-identity -C bobego -c test_gns_lookup.conf
+BOB_PKEY=$(gnunet-identity -d -c test_gns_lookup.conf | grep bob | awk '{print $3}')
+gnunet-identity -C daveego -c test_gns_lookup.conf
+DAVE_PKEY=$(gnunet-identity -d -c test_gns_lookup.conf | grep dave | awk '{print $3}')
+gnunet-identity -C aliceego -c test_gns_lookup.conf
+ALICE_PKEY=$(gnunet-identity -d -c test_gns_lookup.conf | grep alice | awk '{print $3}')
+gnunet-identity -C testego -c test_gns_lookup.conf
+ROOT_PKEY=$(gnunet-identity -d -c test_gns_lookup.conf | grep testego | awk '{print $3}')
+gnunet-namestore -p -z testego -a -n alice -t PKEY -V $ALICE_PKEY -e never -c test_gns_lookup.conf
+gnunet-namestore -p -z aliceego -a -n bob -t PKEY -V $BOB_PKEY -e never -c test_gns_lookup.conf
+gnunet-namestore -p -z aliceego -a -n + -t REVERSE -V "alice $ROOT_PKEY 0" -e never -c test_gns_lookup.conf
+gnunet-namestore -p -z bobego -a -n dave -t PKEY -V $DAVE_PKEY -e never -c test_gns_lookup.conf
+gnunet-namestore -p -z bobego -a -n + -t REVERSE -V "bob $ALICE_PKEY 0" -e never -c test_gns_lookup.conf
+gnunet-namestore -p -z daveego -a -n + -t REVERSE -V "dave $BOB_PKEY 0" -e never -c test_gns_lookup.conf
+gnunet-arm -i gns -c test_gns_lookup.conf
+sleep 0.5
+RES_NAME=`$DO_TIMEOUT gnunet-gns --raw -z testego -R $DAVE_PKEY -c test_gns_lookup.conf`
+gnunet-arm -e -c test_gns_lookup.conf
+rm -rf /tmp/test-gnunet-gns-peer-1/
+
+if [ "$RES_NAME" == "$TEST_NAME" ]
+then
+  exit 0
+else
+  echo "Failed to resolve to proper IP, got $RES_IP."
+  exit 1
+fi