-fixes

6 files changed, 27 insertions, 18 deletions

diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 9a2573b91..da6da331e 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -206,13 +206,13 @@ libgnunet_plugin_block_gns_la_SOURCES = \
 libgnunet_plugin_block_gns_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/block/libgnunetblock.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
+  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la
 libgnunet_plugin_block_gns_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS)
 libgnunet_plugin_block_gns_la_DEPENDENCIES = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/block/libgnunetblock.la \
-  $(top_builddir)/src/namestore/libgnunetnamestore.la
+  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la
 
 
 check_SCRIPTS = \
diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in
index 4e83a00bf..56276c6c6 100644
--- a/src/gns/gns.conf.in
+++ b/src/gns/gns.conf.in
@@ -12,8 +12,8 @@ UNIX_MATCH_UID = NO
 # Do we require users that want to access GNS to be in the 'gnunet' group?
 UNIX_MATCH_GID = YES
 
-# How many queries is GADS allowed to perform in the background at the same time?
-MAX_PARALLEL_BACKGROUND_QUERIES = 25
+# How many queries is GNS allowed to perform in the background at the same time?
+MAX_PARALLEL_BACKGROUND_QUERIES = 1000
 
 # How frequently do we try to publish our full zone?
 ZONE_PUBLISH_TIME_WINDOW = 4 h
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c
index 53d6c11a4..9f3623e8d 100644
--- a/src/gns/gnunet-service-gns.c
+++ b/src/gns/gnunet-service-gns.c
@@ -430,7 +430,6 @@ put_gns_record (void *cls,
   GNUNET_GNSRECORD_query_from_private_key (key,
                                            name,
                                            &query);
-
   active_put = GNUNET_DHT_put (dht_handle, &query,
                                DHT_GNS_REPLICATION_LEVEL,
                                GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,
@@ -463,7 +462,7 @@ publish_zone_dht_start (void *cls,
   zone_publish_task = GNUNET_SCHEDULER_NO_TASK;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Scheduling DHT zone update!\n");
+              "Starting DHT zone update!\n");
   /* start counting again */
   num_public_records = 0;
   namestore_iter = GNUNET_NAMESTORE_zone_iteration_start (namestore_handle,
diff --git a/src/gns/gnunet-service-gns_shorten.c b/src/gns/gnunet-service-gns_shorten.c
index 2f0bf9644..4e7f9a91d 100644
--- a/src/gns/gnunet-service-gns_shorten.c
+++ b/src/gns/gnunet-service-gns_shorten.c
@@ -281,9 +281,9 @@ process_pseu_lookup_ns (void *cls,
   gph->namestore_task = NULL;
   if (rd_count > 0)
   {
-    GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-               "Name `%s' already taken, cannot shorten.\n",
-               gph->current_label);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Name `%s' already taken, cannot shorten.\n",
+                gph->current_label);
     /* if this was not yet the original label, try one more
        time, this time not using PSEU but the original label */
     if (0 == strcmp (gph->current_label,
@@ -356,7 +356,8 @@ handle_auth_discovery_timeout (void *cls,
 
   gph->timeout_task = GNUNET_SCHEDULER_NO_TASK;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "DHT lookup for PSEU query timed out.\n");
+              "DHT lookup for PSEU query in zone `%s' timed out.\n",
+              GNUNET_GNSRECORD_z2s (&gph->target_zone));
   GNUNET_DHT_get_stop (gph->get_handle);
   gph->get_handle = NULL;
   process_pseu_result (gph, NULL);
@@ -395,7 +396,8 @@ process_auth_records (void *cls,
     }
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "No PSEU record found in DHT reply.\n");
+              "No PSEU record found in DHT reply with %u records.\n",
+              rd_count);
   process_pseu_result (gph, NULL);
 }
 
@@ -407,11 +409,11 @@ process_auth_records (void *cls,
  * @param exp lifetime
  * @param key the key the record was stored under
  * @param get_path get path
- * @param get_path_length get path length
+ * @param get_path_length @a get_path length
  * @param put_path put path
- * @param put_path_length put path length
+ * @param put_path_length @a put_path length
  * @param type the block type
- * @param size the size of the record
+ * @param size number of bytes in @a data
  * @param data the record data
  */
 static void
@@ -510,6 +512,11 @@ process_zone_to_name_discover (void *cls,
   GNUNET_GNSRECORD_query_from_public_key (&gph->target_zone,
                                           GNUNET_GNS_TLD_PLUS,
                                           &lookup_key);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Shortening searches in DHT for PSEU record under `%s' in zone `%s'\n",
+              GNUNET_h2s (&lookup_key),
+              GNUNET_GNSRECORD_z2s (&gph->target_zone));
+
   gph->timeout_task = GNUNET_SCHEDULER_add_delayed (DHT_LOOKUP_TIMEOUT,
                                                     &handle_auth_discovery_timeout,
                                                     gph);
@@ -540,7 +547,6 @@ GNS_shorten_start (const char *original_label,
 {
   struct GetPseuAuthorityHandle *gph;
 
-  // if (1) return;
   if (strlen (original_label) > GNUNET_DNSPARSER_MAX_LABEL_LENGTH)
   {
     GNUNET_break (0);
diff --git a/src/gns/test_gns_lookup.conf b/src/gns/test_gns_lookup.conf
index 5d77e157a..18ebc04c5 100644
--- a/src/gns/test_gns_lookup.conf
+++ b/src/gns/test_gns_lookup.conf
@@ -6,13 +6,13 @@ AUTOSTART = YES
 PLUGINS =
 
 [arm]
-DEFAULTSERVICES = 
+DEFAULTSERVICES =
 
 [PATHS]
 GNUNET_TEST_HOME = /tmp/test-gnunet-gns-peer-1/
 
 [gns]
-#PREFIX = valgrind --leak-check=full --track-origins=yes 
+#PREFIX = valgrind --leak-check=full --track-origins=yes
 AUTOSTART = YES
 AUTO_IMPORT_PKEY = YES
 MAX_PARALLEL_BACKGROUND_QUERIES = 10
diff --git a/src/gns/test_gns_pseu_shorten.sh b/src/gns/test_gns_pseu_shorten.sh
index 8b22438de..b0ae5ebf5 100755
--- a/src/gns/test_gns_pseu_shorten.sh
+++ b/src/gns/test_gns_pseu_shorten.sh
@@ -20,11 +20,15 @@ gnunet-namestore -p -z testego -a -n mybestfriendalice -t PKEY -V $DELEGATED_PKE
 gnunet-namestore -p -z testego -a -n short -t PKEY -V $SHORT -e never -c test_gns_lookup.conf
 gnunet-namestore -p -z delegatedego -a -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf
 gnunet-namestore -p -z delegatedego -a -n "+" -t PSEU -V $TEST_PSEU -e never -c test_gns_lookup.conf
+# Force start of GNS
+gnunet-arm -c test_gns_lookup.conf -i gns
+# need to sleep here, to give PSEU record chance to be copied to DHT
+sleep 1
 RES_IP=`$DO_TIMEOUT gnunet-gns --raw -z testego -u $TEST_NAME -t A -c test_gns_lookup.conf`
 # need to sleep here, as shortening happens asynchronously...
 sleep 1
 RES_IP_PSEU=`$DO_TIMEOUT gnunet-gns --raw -z testego -u www.alice.short.gnu -t A -c test_gns_lookup.conf`
-gnunet-namestore -z testego -d -n b -t PKEY -V $DELEGATED_PKEY  -e never -c test_gns_lookup.conf
+gnunet-namestore -z testego -d -n mybestfriendalice -t PKEY -V $DELEGATED_PKEY  -e never -c test_gns_lookup.conf
 gnunet-namestore -z delegatedego -d -n www -t A -V $TEST_IP  -e never -c test_gns_lookup.conf
 gnunet-arm -e -c test_gns_lookup.conf