-start namecache as well, perform NC registration for client during lookup handling

11 files changed, 45 insertions, 54 deletions

diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c
index 40a7ac790..de6f6eaec 100644
--- a/src/namestore/gnunet-service-namestore.c
+++ b/src/namestore/gnunet-service-namestore.c
@@ -422,7 +422,7 @@ send_lookup_response (struct GNUNET_SERVER_NotificationContext *nc,
   name_len = strlen (name) + 1;
   rd_ser_len = GNUNET_GNSRECORD_records_get_size (rd_count, rd);
   msg_size = sizeof (struct RecordResultMessage) + name_len + rd_ser_len;
-
+  (void) client_lookup (client);
   zir_msg = GNUNET_malloc (msg_size);
   zir_msg->gns_header.header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_RESULT);
   zir_msg->gns_header.header.size = htons (msg_size);
@@ -539,7 +539,8 @@ refresh_block (struct GNUNET_SERVER_Client *client,
                                                                                         rd),
                                            name,
                                            rd, rd_count);
-
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Caching block in namecache\n");
   cop = GNUNET_new (struct CacheOperation);
   cop->client = client;
   cop->rid = rid;
@@ -1180,7 +1181,7 @@ monitor_iterate_cb (void *cls,
  * Handles a #GNUNET_MESSAGE_TYPE_NAMESTORE_MONITOR_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 ZoneMonitorStartMessage'
  */
 static void
diff --git a/src/namestore/test_namestore_api_lookup_public.c b/src/namestore/test_namestore_api_lookup_public.c
index 10bfefbed..a119e34d6 100644
--- a/src/namestore/test_namestore_api_lookup_public.c
+++ b/src/namestore/test_namestore_api_lookup_public.c
@@ -233,14 +233,13 @@ main (int argc, char *argv[])
 {
   res = 1;
   if (0 !=
-      GNUNET_TESTING_service_run ("test-namestore-api",
-                                  "namestore",
-                                  "test_namestore_api.conf",
-                                  &run,
-                                  NULL))
+      GNUNET_TESTING_peer_run ("test-namestore-api",
+                               "test_namestore_api.conf",
+                               &run,
+                               NULL))
     return 1;
   return res;
 }
 
 
-/* end of test_namestore_api.c */
+/* end of test_namestore_api_lookup_public.c */
diff --git a/src/namestore/test_namestore_api_monitoring.c b/src/namestore/test_namestore_api_monitoring.c
index 4ccb425a2..0bd1e1350 100644
--- a/src/namestore/test_namestore_api_monitoring.c
+++ b/src/namestore/test_namestore_api_monitoring.c
@@ -335,11 +335,10 @@ main (int argc, char *argv[])
 {
   res = 1;
   if (0 !=
-      GNUNET_TESTING_service_run ("test-namestore-api-monitoring",
-                                  "namestore",
-                                  "test_namestore_api.conf",
-                                  &run,
-                                  NULL))
+      GNUNET_TESTING_peer_run ("test-namestore-api-monitoring",
+                               "test_namestore_api.conf",
+                               &run,
+                               NULL))
     return 1;
   return res;
 }
diff --git a/src/namestore/test_namestore_api_monitoring_existing.c b/src/namestore/test_namestore_api_monitoring_existing.c
index b8ac7a729..bab857def 100644
--- a/src/namestore/test_namestore_api_monitoring_existing.c
+++ b/src/namestore/test_namestore_api_monitoring_existing.c
@@ -340,11 +340,10 @@ main (int argc, char *argv[])
 {
   res = 1;
   if (0 !=
-      GNUNET_TESTING_service_run ("test-namestore-api-monitoring",
-                                  "namestore",
-                                  "test_namestore_api.conf",
-                                  &run,
-                                  NULL))
+      GNUNET_TESTING_peer_run ("test-namestore-api-monitoring",
+                               "test_namestore_api.conf",
+                               &run,
+                               NULL))
     return 1;
   return res;
 }
diff --git a/src/namestore/test_namestore_api_put.c b/src/namestore/test_namestore_api_put.c
index c0e04e98e..4f06283c1 100644
--- a/src/namestore/test_namestore_api_put.c
+++ b/src/namestore/test_namestore_api_put.c
@@ -175,11 +175,10 @@ int
 main (int argc, char *argv[])
 {
   res = 1;
-  if (0 != GNUNET_TESTING_service_run ("test-namestore-api-put",
-                                       "namestore",
-                                       "test_namestore_api.conf",
-                                       &run,
-                                       NULL))
+  if (0 != GNUNET_TESTING_peer_run ("test-namestore-api-put",
+                                    "test_namestore_api.conf",
+                                    &run,
+                                    NULL))
     return 1;
   return res;
 }
diff --git a/src/namestore/test_namestore_api_store.c b/src/namestore/test_namestore_api_store.c
index 711a160d6..d5583862c 100644
--- a/src/namestore/test_namestore_api_store.c
+++ b/src/namestore/test_namestore_api_store.c
@@ -153,11 +153,10 @@ main (int argc, char *argv[])
 {
   res = 1;
   if (0 !=
-      GNUNET_TESTING_service_run ("test-namestore-api",
-                                  "namestore",
-                                  "test_namestore_api.conf",
-                                  &run,
-                                  NULL))
+      GNUNET_TESTING_peer_run ("test-namestore-api",
+                               "test_namestore_api.conf",
+                               &run,
+                               NULL))
     return 1;
   return res;
 }
diff --git a/src/namestore/test_namestore_api_store_update.c b/src/namestore/test_namestore_api_store_update.c
index 1440addbe..b2506f874 100644
--- a/src/namestore/test_namestore_api_store_update.c
+++ b/src/namestore/test_namestore_api_store_update.c
@@ -271,11 +271,10 @@ main (int argc, char *argv[])
   GNUNET_DISK_directory_remove ("/tmp/test-gnunet-namestore/");
   res = 1;
   if (0 !=
-      GNUNET_TESTING_service_run ("test-namestore-api-store-update",
-                                  "namestore",
-                                  "test_namestore_api.conf",
-                                  &run,
-                                  NULL))
+      GNUNET_TESTING_peer_run ("test-namestore-api-store-update",
+                               "test_namestore_api.conf",
+                               &run,
+                               NULL))
     return 1;
   return res;
 }
diff --git a/src/namestore/test_namestore_api_zone_iteration.c b/src/namestore/test_namestore_api_zone_iteration.c
index f7e4fe489..cfeceabe0 100644
--- a/src/namestore/test_namestore_api_zone_iteration.c
+++ b/src/namestore/test_namestore_api_zone_iteration.c
@@ -441,11 +441,10 @@ main (int argc, char *argv[])
 {
   res = 1;
   if (0 !=
-      GNUNET_TESTING_service_run ("test-namestore-api-zone-iteration",
-                                  "namestore",
-                                  "test_namestore_api.conf",
-                                  &run,
-                                  NULL))
+      GNUNET_TESTING_peer_run ("test-namestore-api-zone-iteration",
+                               "test_namestore_api.conf",
+                               &run,
+                               NULL))
     return 1;
   return res;
 }
diff --git a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
index 1554d5673..fdaef8d90 100644
--- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
+++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
@@ -419,11 +419,10 @@ main (int argc, char *argv[])
   GNUNET_DISK_directory_remove ("/tmp/test-gnunet-namestore/");
   res = 1;
   if (0 !=
-      GNUNET_TESTING_service_run ("test-namestore-api-zone-iteration",
-                                  "namestore",
-                                  "test_namestore_api.conf",
-                                  &run,
-                                  NULL))
+      GNUNET_TESTING_peer_run ("test-namestore-api-zone-iteration",
+                               "test_namestore_api.conf",
+                               &run,
+                               NULL))
     return 1;
   return res;
 }
diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c b/src/namestore/test_namestore_api_zone_iteration_stop.c
index f7fd4203d..f2a3f7940 100644
--- a/src/namestore/test_namestore_api_zone_iteration_stop.c
+++ b/src/namestore/test_namestore_api_zone_iteration_stop.c
@@ -452,11 +452,10 @@ main (int argc, char *argv[])
   GNUNET_DISK_directory_remove ("/tmp/test-gnunet-namestore/");
   res = 1;
   if (0 !=
-      GNUNET_TESTING_service_run ("test-namestore-api-zone-iteration-stop",
-                                  "namestore",
-                                  "test_namestore_api.conf",
-                                  &run,
-                                  NULL))
+      GNUNET_TESTING_peer_run ("test-namestore-api-zone-iteration-stop",
+                               "test_namestore_api.conf",
+                               &run,
+                               NULL))
     return 1;
   return res;
 }
diff --git a/src/namestore/test_namestore_api_zone_to_name.c b/src/namestore/test_namestore_api_zone_to_name.c
index 83e7de458..5c5eff87c 100644
--- a/src/namestore/test_namestore_api_zone_to_name.c
+++ b/src/namestore/test_namestore_api_zone_to_name.c
@@ -208,11 +208,10 @@ main (int argc, char *argv[])
 {
   res = 1;
   if (0 !=
-      GNUNET_TESTING_service_run ("test-namestore-api-zone-to-name",
-                                  "namestore",
-                                  "test_namestore_api.conf",
-                                  &run,
-                                  NULL))
+      GNUNET_TESTING_peer_run ("test-namestore-api-zone-to-name",
+                               "test_namestore_api.conf",
+                               &run,
+                               NULL))
     return 1;
   return res;
 }