regex profiler fixes

[oweals/gnunet.git] / src / mesh / test_mesh_regex.c

diff --git a/src/mesh/test_mesh_regex.c b/src/mesh/test_mesh_regex.c
index 5ecfe175321a83befcb5d28f2616b56578f823c8..8e65324dffe7be2a2bf2ebbd350efd96bef35df1 100644 (file)
--- a/src/mesh/test_mesh_regex.c
+++ b/src/mesh/test_mesh_regex.c
@@ -29,19 +29,18 @@
 
 #define VERBOSE GNUNET_YES
 #define REMOVE_DIR GNUNET_YES
-#define MESH_REGEX_PEERS 3
+#define MESH_REGEX_PEERS 4
 
 /**
  * How long until we give up on connecting the peers?
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
 
 /**
  * Time to wait for stuff that should be rather fast
  */
 #define SHORT_TIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
 
-
 /**
  * Which strings have been found & connected.
  */
@@ -126,7 +125,9 @@ static char *regexes[MESH_REGEX_PEERS] = {"(0|1)"
 
                                           "0123456789A*BC",
 
-                                          "0*123456789ABC*"};
+                                          "0*123456789ABC*",
+
+                                          "GNUNETVPN0001000IPEX401110011101100100000111(0|1)*"};
 
 
 /**
@@ -136,7 +137,9 @@ static char *strings[MESH_REGEX_PEERS] = {"1123456789ABC",
 
                                           "0123456789AABC",
 
-                                          "00123456789ABCCCC"};
+                                          "00123456789ABCCCC",
+
+                                          "GNUNETVPN0001000IPEX401110011101100100000111"};
 
 /**
  * Check whether peers successfully shut down.
@@ -188,7 +191,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 /**
  * Ends test: Disconnects peers and calls shutdown.
  * @param cls Closure (not used).
- * @param tc TaskContext. 
+ * @param tc TaskContext.
  */
 static void
 disconnect_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
@@ -287,8 +290,8 @@ ch (void *cls, const struct GNUNET_PeerIdentity *peer,
               "Peer connected: %s\n",
               GNUNET_i2s (peer));
   regex_peers++;
- 
-  GNUNET_MESH_notify_transmit_ready(t[i], 0, 0,
+
+  GNUNET_MESH_notify_transmit_ready(t[i], GNUNET_NO,
                                     GNUNET_TIME_UNIT_FOREVER_REL,
                                     peer,
                                     sizeof(struct GNUNET_MessageHeader),
@@ -370,7 +373,7 @@ data_callback (void *cls, struct GNUNET_MESH_Tunnel *tunnel, void **tunnel_ctx,
     GNUNET_SCHEDULER_cancel (disconnect_task);
     disconnect_task =
         GNUNET_SCHEDULER_add_now (&disconnect_peers, NULL);
-  } 
+  }
   return GNUNET_OK;
 }
 
@@ -427,7 +430,7 @@ peergroup_ready (void *cls, const char *emsg)
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Connect to mesh\n");
-  h1 = GNUNET_MESH_connect (d->cfg, 5, (void *) 1L,
+  h1 = GNUNET_MESH_connect (d->cfg, (void *) 1L,
                             NULL,
                             NULL,
                             handlers,
@@ -437,14 +440,14 @@ peergroup_ready (void *cls, const char *emsg)
   {
     ok[i] = GNUNET_NO;
     d = GNUNET_TESTING_daemon_get (pg, 10 + i);
-    h2[i] = GNUNET_MESH_connect (d->cfg, 5, (void *) (long) (i + 2),
+    h2[i] = GNUNET_MESH_connect (d->cfg, (void *) (long) (i + 2),
                                  &incoming_tunnel,
                                  &tunnel_cleaner,
                                  handlers,
                                  &app);
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Announce REGEX %u: %s\n", i, regexes[i]);
-    GNUNET_MESH_announce_regex (h2[i], regexes[i]);
+    GNUNET_MESH_announce_regex (h2[i], regexes[i], 1);
   }
 
   for (i = 0; i < MESH_REGEX_PEERS; i++)
@@ -457,7 +460,7 @@ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
     GNUNET_MESH_peer_request_connect_by_string (t[i], strings[i]);
   }
   /* connect handler = success, timeout = error */
-  
+
 }