- more zone iteration code

6 files changed, 291 insertions, 18 deletions

diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index f3211d6a0..f6ea6d051 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -26,7 +26,7 @@ check_PROGRAMS = \
  $(SQLITE_TESTS) 
 
 if HAVE_EXPERIMENTAL
-check_PROGRAMS += test_namestore_api
+check_PROGRAMS += test_namestore_api test_namestore_api_zone_iteration
 endif
 
 lib_LTLIBRARIES = \
@@ -73,6 +73,12 @@ test_namestore_api_SOURCES = \
 test_namestore_api_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la
+  
+test_namestore_api_zone_iteration_SOURCES = \
+ test_namestore_api_zone_iteration.c
+test_namestore_api_zone_iteration_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la  
 
 EXTRADIST = \
   test_namestore_api.conf \
diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c
index 7d9eb4801..e796fe530 100644
--- a/src/namestore/gnunet-service-namestore.c
+++ b/src/namestore/gnunet-service-namestore.c
@@ -35,14 +35,16 @@
 /**
  * A namestore operation.
  */
-struct GNUNET_NAMESTORE_Operation
+struct GNUNET_NAMESTORE_ZoneIteration
 {
-  struct GNUNET_NAMESTORE_Operation *next;
-  struct GNUNET_NAMESTORE_Operation *prev;
+  struct GNUNET_NAMESTORE_ZoneIteration *next;
+  struct GNUNET_NAMESTORE_ZoneIteration *prev;
+
+  struct GNUNET_NAMESTORE_Client * client;
 
   uint64_t op_id;
+  uint32_t offset;
 
-  char *data; /*stub data pointer*/
 };
 
 
@@ -56,8 +58,8 @@ struct GNUNET_NAMESTORE_Client
 
   struct GNUNET_SERVER_Client * client;
 
-  struct GNUNET_NAMESTORE_Operation *op_head;
-  struct GNUNET_NAMESTORE_Operation *op_tail;
+  struct GNUNET_NAMESTORE_ZoneIteration *op_head;
+  struct GNUNET_NAMESTORE_ZoneIteration *op_tail;
 };
 
 
@@ -91,8 +93,8 @@ cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping namestore service\n");
 
-  struct GNUNET_NAMESTORE_Operation * no;
-  struct GNUNET_NAMESTORE_Operation * tmp;
+  struct GNUNET_NAMESTORE_ZoneIteration * no;
+  struct GNUNET_NAMESTORE_ZoneIteration * tmp;
   struct GNUNET_NAMESTORE_Client * nc;
   struct GNUNET_NAMESTORE_Client * next;
 
@@ -144,7 +146,7 @@ client_lookup (struct GNUNET_SERVER_Client *client)
 static void
 client_disconnect_notification (void *cls, struct GNUNET_SERVER_Client *client)
 {
-  struct GNUNET_NAMESTORE_Operation * no;
+  struct GNUNET_NAMESTORE_ZoneIteration * no;
   struct GNUNET_NAMESTORE_Client * nc;
   if (NULL == client)
     return;
@@ -374,7 +376,7 @@ static void handle_record_put (void *cls,
     return;
   }
 
-  nc = client_lookup(client);
+  nc = client_lookup (client);
   if (nc == NULL)
   {
     GNUNET_break_op (0);
@@ -575,6 +577,70 @@ static void handle_record_remove (void *cls,
 }
 
 
+void zone_iteration_proc (void *cls,
+                         const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
+                         struct GNUNET_TIME_Absolute expire,
+                         const char *name,
+                         unsigned int rd_count,
+                         const struct GNUNET_NAMESTORE_RecordData *rd,
+                         const struct GNUNET_CRYPTO_RsaSignature *signature)
+{
+  struct ZoneIterationResponseMessage zir_msg;
+  struct GNUNET_NAMESTORE_ZoneIteration * zi = cls;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message\n", "ZONE_ITERATION_RESPONSE");
+  zir_msg.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_RESPONSE);
+  zir_msg.op_id = htonl(zi->op_id);
+  zir_msg.header.size = htons (sizeof (struct ZoneIterationResponseMessage));
+
+
+  GNUNET_SERVER_notification_context_unicast (snc, zi->client->client, (const struct GNUNET_MessageHeader *) &zir_msg, GNUNET_NO);
+}
+
+static void handle_iteration_start (void *cls,
+                          struct GNUNET_SERVER_Client * client,
+                          const struct GNUNET_MessageHeader * message)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "ZONE_ITERATION_START");
+
+  struct ZoneIterationStartMessage * zis_msg = (struct ZoneIterationStartMessage *) message;
+  struct GNUNET_NAMESTORE_Client *nc;
+  struct GNUNET_NAMESTORE_ZoneIteration *zi;
+
+  nc = client_lookup(client);
+  if (nc == NULL)
+  {
+    GNUNET_break_op (0);
+    GNUNET_SERVER_receive_done (client, GNUNET_OK);
+    return;
+  }
+
+  zi = GNUNET_malloc (sizeof (struct GNUNET_NAMESTORE_ZoneIteration));
+  zi->op_id = ntohl (zis_msg->op_id);
+  zi->offset = 0;
+  zi->client = nc;
+
+  GNUNET_CONTAINER_DLL_insert (nc->op_head, nc->op_tail, zi);
+
+  GSN_database->iterate_records (GSN_database->cls, &zis_msg->zone, NULL, zi->offset , &zone_iteration_proc, zi);
+  GNUNET_SERVER_receive_done (client, GNUNET_OK);
+}
+
+static void handle_iteration_stop (void *cls,
+                          struct GNUNET_SERVER_Client * client,
+                          const struct GNUNET_MessageHeader * message)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "ZONE_ITERATION_STOP");
+}
+
+static void handle_iteration_next (void *cls,
+                          struct GNUNET_SERVER_Client * client,
+                          const struct GNUNET_MessageHeader * message)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "ZONE_ITERATION_NEXT");
+}
+
+
 
 /**
  * Process template requests.
@@ -602,6 +668,12 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
      GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_CREATE, 0},
     {&handle_record_remove, NULL,
      GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_REMOVE, 0},
+    {&handle_iteration_start, NULL,
+     GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_START, sizeof (struct ZoneIterationStartMessage)},
+    {&handle_iteration_stop, NULL,
+     GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_STOP, 0},
+    {&handle_iteration_next, NULL,
+     GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_NEXT, 0},
     {NULL, NULL, 0, 0}
   };
 
diff --git a/src/namestore/namestore.h b/src/namestore/namestore.h
index d2c026e7a..04eaa61fc 100644
--- a/src/namestore/namestore.h
+++ b/src/namestore/namestore.h
@@ -39,9 +39,10 @@
 #define GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_REMOVE_RESPONSE 438
 
 #define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_START 439
-#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_NEXT 439
-#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_STOP 439
-#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_RESPONSE 439
+#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_RESPONSE 440
+#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_NEXT 441
+#define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_STOP 442
+
 
 GNUNET_NETWORK_STRUCT_BEGIN
 /**
diff --git a/src/namestore/namestore_api.c b/src/namestore/namestore_api.c
index dc6a0aa8f..17c638050 100644
--- a/src/namestore/namestore_api.c
+++ b/src/namestore/namestore_api.c
@@ -1132,14 +1132,14 @@ GNUNET_NAMESTORE_zone_iteration_stop (struct GNUNET_NAMESTORE_ZoneIterator *it)
   struct GNUNET_NAMESTORE_Handle *h = it->h;
 
   /* set msg_size*/
-  msg_size = sizeof (struct ZoneIterationNextMessage);
+  msg_size = sizeof (struct ZoneIterationStopMessage);
   pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
 
   /* create msg here */
-  struct LookupNameMessage * msg;
+  struct ZoneIterationStopMessage * msg;
   pe->size = msg_size;
   pe->is_init = GNUNET_NO;
-  msg = (struct LookupNameMessage *) &pe[1];
+  msg = (struct ZoneIterationStopMessage *) &pe[1];
   msg->header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_STOP);
   msg->header.size = htons (msg_size);
   msg->op_id = htonl (it->op_id);
diff --git a/src/namestore/test_namestore_api.conf b/src/namestore/test_namestore_api.conf
index 1b83e8f13..1683d13cf 100644
--- a/src/namestore/test_namestore_api.conf
+++ b/src/namestore/test_namestore_api.conf
@@ -4,7 +4,7 @@ DEFAULTSERVICES = namestore
 UNIXPATH = /tmp/gnunet-p1-service-arm.sock
 
 [namestore]
-#PREFIX = valgrind --leak-check=full
+PREFIX = valgrind --leak-check=full
 AUTOSTART = YES
 UNIXPATH = /tmp/gnunet-service-namestore.sock
 UNIX_MATCH_UID = YES
diff --git a/src/namestore/test_namestore_api_zone_iteration.c b/src/namestore/test_namestore_api_zone_iteration.c
new file mode 100644
index 000000000..a53a2febc
--- /dev/null
+++ b/src/namestore/test_namestore_api_zone_iteration.c
@@ -0,0 +1,194 @@
+/*
+     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_zone_iteration.c
+ * @brief testcase for namestore_api.c zone iteration functionality
+ */
+#include "platform.h"
+#include "gnunet_common.h"
+#include "gnunet_namestore_service.h"
+
+#define VERBOSE GNUNET_NO
+
+#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;
+static GNUNET_HashCode zone;
+
+static struct GNUNET_NAMESTORE_ZoneIterator *zi;
+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;
+  }
+
+  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();
+
+  res = 0;
+}
+
+
+void zone_proc (void *cls,
+                const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
+                struct GNUNET_TIME_Absolute expire,
+                const char *name,
+                unsigned int rd_count,
+                const struct GNUNET_NAMESTORE_RecordData *rd,
+                const struct GNUNET_CRYPTO_RsaSignature *signature)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback for zone `%s'\n", GNUNET_h2s (&zone));
+  endbadly_task = GNUNET_SCHEDULER_add_now (&end, NULL);
+}
+
+static void
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,&endbadly, NULL);
+
+  privkey = GNUNET_CRYPTO_rsa_key_create_from_file("hostkey");
+  GNUNET_assert (privkey != NULL);
+  GNUNET_CRYPTO_rsa_key_get_public(privkey, &pubkey);
+
+  GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK, &zone);
+
+  start_arm (cfgfile);
+  GNUNET_assert (arm != NULL);
+
+  nsh = GNUNET_NAMESTORE_connect (cfg);
+  GNUNET_break (NULL != nsh);
+
+  zi = GNUNET_NAMESTORE_zone_iteration_start(nsh,
+                                        &zone,
+                                        GNUNET_NAMESTORE_RF_NONE,
+                                        GNUNET_NAMESTORE_RF_NONE,
+                                        zone_proc,
+                                        &zone);
+  if (zi == NULL)
+  {
+    GNUNET_break (0);
+    GNUNET_SCHEDULER_cancel (endbadly_task);
+    endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+  }
+}
+
+static int
+check ()
+{
+  static char *const argv[] = { "test_namestore_api_zone_iteration",
+    "-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_zone_iteration",
+                      "nohelp", options, &run, &res);
+  return res;
+}
+
+int
+main (int argc, char *argv[])
+{
+  int ret;
+
+  ret = check ();
+
+  return ret;
+}
+
+/* end of test_namestore_api_zone_iteration.c */