Updated regex profiler config with mesh and dht default arm services

2 files changed, 14 insertions, 8 deletions

diff --git a/src/mesh/gnunet-regex-profiler.c b/src/mesh/gnunet-regex-profiler.c
index 6d2f5934a..dd5de1785 100644
--- a/src/mesh/gnunet-regex-profiler.c
+++ b/src/mesh/gnunet-regex-profiler.c
@@ -257,6 +257,11 @@ static char *search_string = "GNUNETVPN0001000IPEX4110010011001111001101000";
  */
 static GNUNET_SCHEDULER_TaskIdentifier search_task;
 
+/**
+ * Search timeout task identifier.
+ */
+static GNUNET_SCHEDULER_TaskIdentifier search_timeout_task;
+
 
 /**
  * Shutdown nicely
@@ -400,6 +405,8 @@ mesh_peer_connect_handler (void *cls,
 {
   //  struct Peer *peer = (struct Peer *)cls;
 
+  GNUNET_SCHEDULER_cancel (search_timeout_task);
+
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Mesh peer connect handler.\n");
   printf ("\nString successfully matched\n");
   GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
@@ -446,9 +453,9 @@ do_connect_by_string (void *cls,
   GNUNET_MESH_peer_request_connect_by_string (peers[0].mesh_tunnel_handle,
                                               search_string);
 
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                (GNUNET_TIME_UNIT_SECONDS, 30),
-                                &do_connect_by_string_timeout, (void *)(long)30);
+  search_timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+                                                      (GNUNET_TIME_UNIT_SECONDS, 30),
+                                                      &do_connect_by_string_timeout, (void *)(long)30);
 }
 
 
@@ -489,7 +496,6 @@ mesh_connect_cb (void *cls, struct GNUNET_TESTBED_Operation *op,
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 "Could not find policy file %s\n", peer->policy_file);
-    GNUNET_TESTBED_operation_done (peer->op_handle);
     return;
   }
   if (GNUNET_OK != GNUNET_DISK_file_size (peer->policy_file, &filesize, GNUNET_YES, GNUNET_YES))
@@ -497,7 +503,6 @@ mesh_connect_cb (void *cls, struct GNUNET_TESTBED_Operation *op,
   if (0 == filesize)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Policy file %s is empty.\n", peer->policy_file);
-    GNUNET_TESTBED_operation_done (peer->op_handle);
     return;
   }
   data = GNUNET_malloc (filesize);
@@ -506,7 +511,6 @@ mesh_connect_cb (void *cls, struct GNUNET_TESTBED_Operation *op,
     GNUNET_free (data);
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Could not read policy file %s.\n",
          peer->policy_file);
-    GNUNET_TESTBED_operation_done (peer->op_handle);
     return;
   }
   buf = data;
diff --git a/src/mesh/regex_profiler_test.conf b/src/mesh/regex_profiler_test.conf
index 1c59eff6d..97fce9265 100644
--- a/src/mesh/regex_profiler_test.conf
+++ b/src/mesh/regex_profiler_test.conf
@@ -5,7 +5,6 @@ ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
 HOSTNAME = localhost
 MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5
 MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 5
-#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
 
 [fs]
 AUTOSTART = NO
@@ -15,6 +14,9 @@ AUTOSTART = NO
 
 [mesh]
 AUTOSTART = NO
+APP_ANNOUNCE_TIME = 4 s
+ID_ANNOUNCE_TIME = 4 s
+CONNECT_TIMEOUT = 30 s
 
 [dht]
 AUTOSTART = NO
@@ -43,7 +45,7 @@ PORT = 12092
 AUTOSTART = YES
 
 [arm]
-DEFAULTSERVICES = core
+DEFAULTSERVICES = core mesh dht
 PORT = 12366
 DEBUG = NO