7 files changed, 31 insertions, 23 deletions

diff --git a/contrib/gnunet-gns-import.sh b/contrib/gnunet-gns-import.sh
index e0956ffcd..eb1a4defa 100755
--- a/contrib/gnunet-gns-import.sh
+++ b/contrib/gnunet-gns-import.sh
@@ -3,7 +3,7 @@
 # namestore.
 #
 # By default, we create three GNS zones:
-gnunet-identity -C master-zone
+gnunet-identity -C master-zone 
 gnunet-identity -C short-zone
 gnunet-identity -C private-zone
 
diff --git a/src/include/gnunet_namestore_plugin.h b/src/include/gnunet_namestore_plugin.h
index 5ab374ed0..c40d95451 100644
--- a/src/include/gnunet_namestore_plugin.h
+++ b/src/include/gnunet_namestore_plugin.h
@@ -95,7 +95,7 @@ struct GNUNET_NAMESTORE_PluginFunctions
    * @param cls closure (internal context for the plugin)
    * @param query hash of public key derived from the zone and the label
    * @param iter function to call with the result
-   * @param iter_cls closure for iter
+   * @param iter_cls closure for @a iter
    * @return #GNUNET_OK on success, #GNUNET_NO if there were no results, #GNUNET_SYSERR on error
    */
   int (*lookup_block) (void *cls, 
@@ -127,10 +127,10 @@ struct GNUNET_NAMESTORE_PluginFunctions
    * datastore.  Will return at most one result to the iterator.
    *
    * @param cls closure (internal context for the plugin)
-   * @param zone private key of the zone
+   * @param zone private key of the zone, NULL for all zones
    * @param offset offset in the list of all matching records
    * @param iter function to call with the result
-   * @param iter_cls closure for iter
+   * @param iter_cls closure for @a iter
    * @return #GNUNET_OK on success, #GNUNET_NO if there were no results, #GNUNET_SYSERR on error
    */
   int (*iterate_records) (void *cls, 
@@ -147,7 +147,7 @@ struct GNUNET_NAMESTORE_PluginFunctions
    * @param zone private key of the zone to look up in, never NULL
    * @param value_zone public key of the target zone (value), never NULL
    * @param iter function to call with the result
-   * @param iter_cls closure for iter
+   * @param iter_cls closure for @a iter
    * @return #GNUNET_OK on success, #GNUNET_NO if there were no results, #GNUNET_SYSERR on error
    */
   int (*zone_to_name) (void *cls, 
diff --git a/src/include/gnunet_namestore_service.h b/src/include/gnunet_namestore_service.h
index 759b53581..0f6730d62 100644
--- a/src/include/gnunet_namestore_service.h
+++ b/src/include/gnunet_namestore_service.h
@@ -393,15 +393,18 @@ GNUNET_NAMESTORE_cancel (struct GNUNET_NAMESTORE_QueueEntry *qe);
 
 /**
  * Starts a new zone iteration (used to periodically PUT all of our
- * records into our DHT). @a proc will be called once immediately, and
- * then again after #GNUNET_NAMESTORE_zone_iterator_next is invoked.
+ * records into our DHT). This MUST lock the struct GNUNET_NAMESTORE_Handle
+ * for any other calls than #GNUNET_NAMESTORE_zone_iterator_next and
+ * #GNUNET_NAMESTORE_zone_iteration_stop. @a proc will be called once
+ * immediately, and then again after
+ * #GNUNET_NAMESTORE_zone_iterator_next is invoked.
  *
  * @param h handle to the namestore
- * @param zone zone to access
+ * @param zone zone to access, NULL for all zones
  * @param proc function to call on each name from the zone; it
  *        will be called repeatedly with a value (if available)
  *        and always once at the end with a name of NULL.
- * @param proc_cls closure for proc
+ * @param proc_cls closure for @a proc
  * @return an iterator handle to use for iteration
  */
 struct GNUNET_NAMESTORE_ZoneIterator *
diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c
index 194ceaa04..a1ce120d8 100644
--- a/src/namestore/gnunet-service-namestore.c
+++ b/src/namestore/gnunet-service-namestore.c
@@ -862,7 +862,7 @@ enum ZoneIterationResult
 
 /**
  * Context for record remove operations passed from
- * 'run_zone_iteration_round' to 'zone_iteraterate_proc' as closure
+ * #run_zone_iteration_round to #zone_iteraterate_proc as closure
  */
 struct ZoneIterationProcResult
 {
@@ -934,6 +934,7 @@ zone_iteraterate_proc (void *cls,
 static void
 run_zone_iteration_round (struct ZoneIteration *zi)
 {
+  static struct GNUNET_CRYPTO_EccPrivateKey zero;
   struct ZoneIterationProcResult proc;
   struct RecordResultMessage rrm;
   int ret;
@@ -945,7 +946,9 @@ run_zone_iteration_round (struct ZoneIteration *zi)
   {
     if (GNUNET_SYSERR ==
         (ret = GSN_database->iterate_records (GSN_database->cls, 
-                                              &zi->zone, 
+                                              (0 == memcmp (&zi->zone, &zero, sizeof (zero))) 
+                                              ? NULL 
+                                              : &zi->zone,
                                               zi->offset, 
                                               &zone_iteraterate_proc, &proc)))
     {
@@ -982,7 +985,7 @@ run_zone_iteration_round (struct ZoneIteration *zi)
  * Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_START message
  *
  * @param cls unused
- * @param client GNUNET_SERVER_Client sending the message
+ * @param client the client sending the message
  * @param message message of type 'struct ZoneIterationStartMessage'
  */
 static void
diff --git a/src/namestore/namestore.h b/src/namestore/namestore.h
index d54ab12a8..7d406df61 100644
--- a/src/namestore/namestore.h
+++ b/src/namestore/namestore.h
@@ -347,7 +347,7 @@ struct ZoneIterationStartMessage
   struct GNUNET_NAMESTORE_Header gns_header;
 
   /**
-   * Zone key.
+   * Zone key.  All zeros for "all zones".
    */
   struct GNUNET_CRYPTO_EccPrivateKey zone;
 
diff --git a/src/namestore/namestore_api.c b/src/namestore/namestore_api.c
index 112b71ba8..9e2e13066 100644
--- a/src/namestore/namestore_api.c
+++ b/src/namestore/namestore_api.c
@@ -1185,18 +1185,18 @@ GNUNET_NAMESTORE_zone_to_name (struct GNUNET_NAMESTORE_Handle *h,
 
 /**
  * Starts a new zone iteration (used to periodically PUT all of our
- * records into our DHT). This MUST lock the GNUNET_NAMESTORE_Handle
- * for any other calls than GNUNET_NAMESTORE_zone_iterator_next and
- * GNUNET_NAMESTORE_zone_iteration_stop.  "proc" will be called once
+ * records into our DHT). This MUST lock the struct GNUNET_NAMESTORE_Handle
+ * for any other calls than #GNUNET_NAMESTORE_zone_iterator_next and
+ * #GNUNET_NAMESTORE_zone_iteration_stop. @a proc will be called once
  * immediately, and then again after
- * "GNUNET_NAMESTORE_zone_iterator_next" is invoked.
+ * #GNUNET_NAMESTORE_zone_iterator_next is invoked.
  *
  * @param h handle to the namestore
- * @param zone zone to access
+ * @param zone zone to access, NULL for all zones
  * @param proc function to call on each name from the zone; it
  *        will be called repeatedly with a value (if available)
  *        and always once at the end with a name of NULL.
- * @param proc_cls closure for proc
+ * @param proc_cls closure for @a proc
  * @return an iterator handle to use for iteration
  */
 struct GNUNET_NAMESTORE_ZoneIterator *
@@ -1218,7 +1218,8 @@ GNUNET_NAMESTORE_zone_iteration_start (struct GNUNET_NAMESTORE_Handle *h,
   it->proc = proc;
   it->proc_cls = proc_cls;
   it->op_id = rid;
-  it->zone = *zone;
+  if (NULL != zone)
+    it->zone = *zone;
   GNUNET_CONTAINER_DLL_insert_tail (h->z_head, h->z_tail, it);
 
   msg_size = sizeof (struct ZoneIterationStartMessage);
@@ -1228,7 +1229,8 @@ GNUNET_NAMESTORE_zone_iteration_start (struct GNUNET_NAMESTORE_Handle *h,
   msg->gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_START);
   msg->gns_header.header.size = htons (msg_size);
   msg->gns_header.r_id = htonl (rid);
-  msg->zone = *zone;
+  if (NULL != zone)
+    msg->zone = *zone;
   GNUNET_CONTAINER_DLL_insert_tail (h->pending_head, h->pending_tail, pe);
   do_transmit(h);
   return it;
@@ -1236,7 +1238,7 @@ GNUNET_NAMESTORE_zone_iteration_start (struct GNUNET_NAMESTORE_Handle *h,
 
 
 /**
- * Calls the record processor specified in GNUNET_NAMESTORE_zone_iteration_start
+ * Calls the record processor specified in #GNUNET_NAMESTORE_zone_iteration_start
  * for the next record.
  *
  * @param it the iterator
diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/namestore/plugin_namestore_sqlite.c
index 0a3da174b..437a2efd6 100644
--- a/src/namestore/plugin_namestore_sqlite.c
+++ b/src/namestore/plugin_namestore_sqlite.c
@@ -762,7 +762,7 @@ namestore_sqlite_iterate_records (void *cls,
   sqlite3_stmt *stmt;
 
   stmt = plugin->iterate_zone;
-
+  // FIXME: does not hanlde NULL for zone!
   if ( (SQLITE_OK != sqlite3_bind_blob (stmt, 1, 
                                         zone, sizeof (struct GNUNET_CRYPTO_EccPrivateKey),
                                         SQLITE_STATIC)) ||