4 files changed, 420 insertions, 8 deletions

diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 6ca49b2e4..cf31c4d79 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -29,7 +29,8 @@ check_SCRIPTS = \
 
 check_PROGRAMS = \
   test_gns_simple_lookup \
-  test_gns_simple_delegated_lookup
+  test_gns_simple_delegated_lookup \
+  test_gns_dht_delegated_lookup
 
 
 plugin_LTLIBRARIES = \
@@ -68,6 +69,18 @@ test_gns_simple_delegated_lookup_DEPENDENCIES = \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/testing/libgnunettesting.la
 
+test_gns_dht_delegated_lookup_SOURCES = \
+  test_gns_dht_delegated_lookup.c
+test_gns_dht_delegated_lookup_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/dht/libgnunetdht.la \
+  $(top_builddir)/src/testing/libgnunettesting.la
+test_gns_dht_delegated_lookup_DEPENDENCIES = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/dht/libgnunetdht.la \
+  $(top_builddir)/src/testing/libgnunettesting.la
 
 #gnunet_gns_lookup_SOURCES = \
 # gnunet-gns-lookup.c
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c
index 9ec08b205..4b693440f 100644
--- a/src/gns/gnunet-service-gns.c
+++ b/src/gns/gnunet-service-gns.c
@@ -266,8 +266,8 @@ process_authority_dht_result(void* cls,
   {
     struct GNUNET_NAMESTORE_RecordData rd[num_records];
     
-    rd_data += strlen(name) + sizeof(struct GNSNameRecordBlock);
-    rd_size = size - strlen(name) - sizeof(struct GNSNameRecordBlock);
+    rd_data += strlen(name) + 1 + sizeof(struct GNSNameRecordBlock);
+    rd_size = size - strlen(name) - 1 - sizeof(struct GNSNameRecordBlock);
   
     if (GNUNET_SYSERR == GNUNET_NAMESTORE_records_deserialize (rd_size,
                                                                rd_data,
@@ -427,8 +427,8 @@ process_name_dht_result(void* cls,
   {
     struct GNUNET_NAMESTORE_RecordData rd[num_records];
 
-    rd_data += strlen(name) + sizeof(struct GNSNameRecordBlock);
-    rd_size = size - strlen(name) - sizeof(struct GNSNameRecordBlock);
+    rd_data += strlen(name) + 1 + sizeof(struct GNSNameRecordBlock);
+    rd_size = size - strlen(name) - 1 - sizeof(struct GNSNameRecordBlock);
   
     if (GNUNET_SYSERR == GNUNET_NAMESTORE_records_deserialize (rd_size,
                                                                rd_data,
@@ -504,6 +504,9 @@ resolve_name_dht(struct GNUNET_GNS_ResolverHandle *rh, const char* name)
   GNUNET_HashCode lookup_key;
   struct GNUNET_CRYPTO_HashAsciiEncoded lookup_key_string;
 
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+             "A\n");
+
   GNUNET_CRYPTO_hash(name, strlen(name), &name_hash);
   GNUNET_CRYPTO_hash_xor(&name_hash, &rh->authority, &lookup_key);
   GNUNET_CRYPTO_hash_to_enc (&lookup_key, &lookup_key_string);
@@ -793,7 +796,7 @@ process_authoritative_result(void* cls,
       {
         GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
                    "trying dht...\n");
-        resolve_name_dht(rh, name);
+        resolve_name_dht(rh, rh->name);
         return;
       }
       else
@@ -1181,7 +1184,9 @@ put_gns_record(void *cls,
                                                 rd_payload_length,
                                                 nrb_data))
   {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Recor serialization failed!\n");
+    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Record serialization failed!\n");
+    return;
+    //FIXME what to do
   }
 
 
diff --git a/src/gns/plugin_block_gns.c b/src/gns/plugin_block_gns.c
index d1d8d4d6b..ca7cfe8f4 100644
--- a/src/gns/plugin_block_gns.c
+++ b/src/gns/plugin_block_gns.c
@@ -109,6 +109,8 @@ block_plugin_gns_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
                                                                rd_count,
                                                                rd))
     {
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+                 "Data invalid (%d bytes, %d records)\n", rd_len, rd_count);
       return GNUNET_BLOCK_EVALUATION_REQUEST_INVALID;
     }
     
@@ -125,7 +127,7 @@ block_plugin_gns_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
                                                         name,
                                                         rd_count,
                                                         rd,
-                                                        NULL))
+                                                        &nrb->signature))
     {
       GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Signature invalid\n");
       return GNUNET_BLOCK_EVALUATION_REQUEST_INVALID;
diff --git a/src/gns/test_gns_dht_delegated_lookup.c b/src/gns/test_gns_dht_delegated_lookup.c
new file mode 100644
index 000000000..8c2224623
--- /dev/null
+++ b/src/gns/test_gns_dht_delegated_lookup.c
@@ -0,0 +1,392 @@
+/*
+     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 gns/test_gns_twopeer.c
+ * @brief base testcase for testing DHT service with
+ *        two running peers.
+ *
+ * This testcase starts peers using the GNUNET_TESTING_daemons_start
+ * function call.  On peer start, connects to the peers DHT service
+ * by calling GNUNET_DHT_connected.  Once notified about all peers
+ * being started (by the peers_started_callback function), calls
+ * GNUNET_TESTING_connect_topology, which connects the peers in a
+ * "straight line" topology.  On notification that all peers have
+ * been properly connected, calls the do_get function which initiates
+ * a GNUNET_DHT_get from the *second* peer. Once the GNUNET_DHT_get
+ * function starts, runs the do_put function to insert data at the first peer.
+ *   If the GET is successful, schedules finish_testing
+ * to stop the test and shut down peers.  If GET is unsuccessful
+ * after GET_TIMEOUT seconds, prints an error message and shuts down
+ * the peers.
+ */
+#include "platform.h"
+#include "gnunet_testing_lib.h"
+#include "gnunet_core_service.h"
+#include "block_gns.h"
+#include "gnunet_signatures.h"
+#include "gnunet_namestore_service.h"
+#include "../namestore/namestore.h"
+#include "gnunet_dnsparser_lib.h"
+#include "gnunet_dht_service.h"
+#include "gnunet_gns_service.h"
+
+/* DEFINES */
+#define VERBOSE GNUNET_YES
+
+/* Timeout for entire testcase */
+#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 10)
+
+/* If number of peers not in config file, use this number */
+#define DEFAULT_NUM_PEERS 2
+
+/* test records to resolve */
+#define TEST_DOMAIN "www.bob.gnunet"
+#define TEST_IP "127.0.0.1"
+#define TEST_RECORD_NAME "www"
+
+#define TEST_AUTHORITY_NAME "bob"
+
+#define DHT_OPERATION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+
+/* Globals */
+
+/**
+ * Directory to store temp data in, defined in config file
+ */
+static char *test_directory;
+
+struct GNUNET_TESTING_Daemon *d1;
+
+
+/* Task handle to use to schedule test failure */
+GNUNET_SCHEDULER_TaskIdentifier die_task;
+
+/* Global return value (0 for success, anything else for failure) */
+static int ok;
+
+static struct GNUNET_NAMESTORE_Handle *namestore_handle;
+
+static struct GNUNET_DHT_Handle *dht_handle;
+
+const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded alice_pkey;
+struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded bob_pkey;
+struct GNUNET_CRYPTO_RsaPrivateKey *alice_key;
+struct GNUNET_CRYPTO_RsaPrivateKey *bob_key;
+
+/**
+ * Check whether peers successfully shut down.
+ */
+void
+shutdown_callback (void *cls, const char *emsg)
+{
+  if (emsg != NULL)
+  {
+    if (ok == 0)
+      ok = 2;
+  }
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "done(ret=%d)!\n", ok);
+}
+
+/**
+ * Function scheduled to be run on the successful start of services
+ * tries to look up the dns record for TEST_DOMAIN
+ */
+static void
+finish_testing (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  struct hostent *he;
+  struct in_addr a;
+  char* addr;
+  GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "A\n");
+  GNUNET_NAMESTORE_disconnect(namestore_handle, GNUNET_YES);
+  GNUNET_DHT_disconnect(dht_handle);
+  GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "B\n");
+
+  he = gethostbyname (TEST_DOMAIN);
+
+  if (!he)
+  {
+    ok = 2;
+  }
+  else
+  {
+    ok = 1;
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "name: %s\n", he->h_name);
+    while (*he->h_addr_list)
+    {
+      memcpy(&a, *he->h_addr_list++, sizeof(a));
+      addr = inet_ntoa(a);
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO, "address: %s\n", addr);
+      if (0 == strcmp(addr, TEST_IP))
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                    "%s correctly resolved to %s!\n", TEST_DOMAIN, addr);
+        ok = 0;
+      }
+      else
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_INFO, "No resolution!\n");
+      }
+    }
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer1!\n");
+  GNUNET_TESTING_daemon_stop (d1, TIMEOUT, &shutdown_callback, NULL,
+                              GNUNET_YES, GNUNET_NO);
+}
+
+/**
+ * Continuation for the GNUNET_DHT_get_stop call, so that we don't shut
+ * down the peers without freeing memory associated with GET request.
+ */
+static void
+end_badly_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+
+  if (d1 != NULL)
+    GNUNET_TESTING_daemon_stop (d1, TIMEOUT, &shutdown_callback, NULL,
+                                GNUNET_YES, GNUNET_NO);
+  GNUNET_SCHEDULER_cancel (die_task);
+}
+
+/**
+ * Check if the get_handle is being used, if so stop the request.  Either
+ * way, schedule the end_badly_cont function which actually shuts down the
+ * test.
+ */
+static void
+end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Failing test with error: `%s'!\n",
+              (char *) cls);
+  GNUNET_SCHEDULER_add_now (&end_badly_cont, NULL);
+  ok = 1;
+}
+
+
+static void
+put_dht(void *cls, int32_t success, const char *emsg)
+{
+  struct GNSNameRecordBlock *nrb;
+  GNUNET_HashCode name_hash;
+  GNUNET_HashCode xor_hash;
+  GNUNET_HashCode zone_hash;
+  uint32_t rd_payload_length;
+  char* nrb_data = NULL;
+  struct GNUNET_CRYPTO_RsaSignature *sig;
+  struct GNUNET_NAMESTORE_RecordData rd;
+  char* ip = TEST_IP;
+  struct in_addr *web = GNUNET_malloc(sizeof(struct in_addr));
+  
+  rd.expiration = GNUNET_TIME_absolute_get_forever ();
+  GNUNET_assert(1 == inet_pton (AF_INET, ip, web));
+  rd.data_size = sizeof(struct in_addr);
+  rd.data = web;
+  rd.record_type = GNUNET_DNSPARSER_TYPE_A;
+  sig = GNUNET_NAMESTORE_create_signature(bob_key, TEST_RECORD_NAME,
+                                          &rd, 1);
+  
+  GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "B\n");
+  rd_payload_length = GNUNET_NAMESTORE_records_get_size (1, &rd);
+  nrb = GNUNET_malloc(rd_payload_length + strlen(TEST_RECORD_NAME) + 1
+                      + sizeof(struct GNSNameRecordBlock));
+  nrb->signature = *sig;
+  nrb->public_key = bob_pkey;
+  nrb->rd_count = htonl(1);
+  memset(&nrb[1], 0, strlen(TEST_RECORD_NAME) + 1);
+  memcpy(&nrb[1], TEST_RECORD_NAME, strlen(TEST_RECORD_NAME));
+  nrb_data = (char*)&nrb[1];
+  nrb_data += strlen(TEST_RECORD_NAME) + 1;
+  GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "C\n");
+
+  if (-1 == GNUNET_NAMESTORE_records_serialize (1,
+                                                &rd,
+                                                rd_payload_length,
+                                                nrb_data))
+  {
+    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Record serialization failed!\n");
+    ok = 3;
+    return;
+  }
+  GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "D\n");
+  GNUNET_CRYPTO_hash(TEST_RECORD_NAME, strlen(TEST_RECORD_NAME), &name_hash);
+  GNUNET_CRYPTO_hash(&bob_pkey,
+                     sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+                     &zone_hash);
+  GNUNET_CRYPTO_hash_xor(&zone_hash, &name_hash, &xor_hash);
+  GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "E\n");
+
+  rd_payload_length += sizeof(struct GNSNameRecordBlock) +
+    strlen(TEST_RECORD_NAME) + 1;
+  GNUNET_DHT_put (dht_handle, &xor_hash,
+                  0,
+                  GNUNET_DHT_RO_NONE,
+                  GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
+                  rd_payload_length,
+                  (char*)nrb,
+                  rd.expiration,
+                  DHT_OPERATION_TIMEOUT,
+                  NULL,
+                  NULL);
+  GNUNET_SCHEDULER_add_delayed(TIMEOUT, &finish_testing, NULL);
+  GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "F\n");
+}
+
+static void
+do_lookup(void *cls, const struct GNUNET_PeerIdentity *id,
+          const struct GNUNET_CONFIGURATION_Handle *cfg,
+          struct GNUNET_TESTING_Daemon *d, const char *emsg)
+{
+  
+  
+  char* alice_keyfile;
+
+  
+
+  GNUNET_SCHEDULER_cancel (die_task);
+
+  /* put records into namestore */
+  namestore_handle = GNUNET_NAMESTORE_connect(cfg);
+  if (NULL == namestore_handle)
+  {
+    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n");
+    ok = -1;
+    return;
+  }
+  
+  /* dht */
+  dht_handle = GNUNET_DHT_connect(cfg, 1);
+  if (NULL == dht_handle)
+  {
+    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to dht\n");
+    ok = -1;
+    return;
+  }
+
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg, "gns",
+                                                          "ZONEKEY",
+                                                          &alice_keyfile))
+  {
+    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to get key from cfg\n");
+    ok = -1;
+    return;
+  }
+
+  alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (alice_keyfile);
+  bob_key = GNUNET_CRYPTO_rsa_key_create ();
+
+  GNUNET_CRYPTO_rsa_key_get_public (alice_key, &alice_pkey);
+  GNUNET_CRYPTO_rsa_key_get_public (bob_key, &bob_pkey);
+
+  struct GNUNET_NAMESTORE_RecordData rd;
+  rd.expiration = GNUNET_TIME_absolute_get_forever ();
+  rd.data_size = sizeof(bob_pkey);
+  rd.data = &bob_pkey;
+  rd.record_type = GNUNET_GNS_RECORD_PKEY;
+
+  GNUNET_NAMESTORE_record_create (namestore_handle,
+                                  alice_key,
+                                  TEST_AUTHORITY_NAME,
+                                  &rd,
+                                  &put_dht,
+                                  NULL);
+
+  
+
+}
+
+static void
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *c)
+{
+  cfg = c;
+   /* Get path from configuration file */
+  if (GNUNET_YES !=
+      GNUNET_CONFIGURATION_get_value_string (cfg, "paths", "servicehome",
+                                             &test_directory))
+  {
+    ok = 404;
+    return;
+  }
+
+    
+  /* Set up a task to end testing if peer start fails */
+  die_task =
+      GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly,
+                                    "didn't start all daemons in reasonable amount of time!!!");
+  
+  /* Start alice */
+  d1 = GNUNET_TESTING_daemon_start(cfg, TIMEOUT, GNUNET_NO, NULL, NULL, 0,
+                                   NULL, NULL, NULL, &do_lookup, NULL);
+}
+
+static int
+check ()
+{
+  int ret;
+
+  /* Arguments for GNUNET_PROGRAM_run */
+  char *const argv[] = { "test-gns-simple-lookup", /* Name to give running binary */
+    "-c",
+    "test_gns_simple_lookup.conf",       /* Config file to use */
+#if VERBOSE
+    "-L", "DEBUG",
+#endif
+    NULL
+  };
+  struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_OPTION_END
+  };
+  /* Run the run function as a new program */
+  ret =
+      GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
+                          "test-gns-simple-lookup", "nohelp", options, &run,
+                          &ok);
+  if (ret != GNUNET_OK)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "`test-gns-simple-lookup': Failed with error code %d\n", ret);
+  }
+  return ok;
+}
+
+int
+main (int argc, char *argv[])
+{
+  int ret;
+
+  GNUNET_log_setup ("test-gns-simple-lookup",
+#if VERBOSE
+                    "DEBUG",
+#else
+                    "WARNING",
+#endif
+                    NULL);
+  ret = check ();
+  /**
+   * Need to remove base directory, subdirectories taken care
+   * of by the testing framework.
+   */
+  return ret;
+}
+
+/* end of test_gns_twopeer.c */