- Keep calm and carry on

[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 002ffa8de0e68e51249006e031e9e5b1190d6567..4bb0c8ddf40cc35700b339d0644e961f5319e00d 100644 (file)
--- a/src/mesh/test_mesh_regex.c
+++ b/src/mesh/test_mesh_regex.c
@@ -27,9 +27,8 @@
 #include "gnunet_testing_lib.h"
 #include "gnunet_mesh_service.h"
 
-#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?
@@ -41,7 +40,6 @@
  */
 #define SHORT_TIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
 
-
 /**
  * Which strings have been found & connected.
  */
@@ -126,7 +124,9 @@ static char *regexes[MESH_REGEX_PEERS] = {"(0|1)"
 
                                           "0123456789A*BC",
 
-                                          "0*123456789ABC*"};
+                                          "0*123456789ABC*",
+
+                                          "GNUNETVPN0001000IPEX401110011101100100000111(0|1)*"};
 
 
 /**
@@ -136,7 +136,9 @@ static char *strings[MESH_REGEX_PEERS] = {"1123456789ABC",
 
                                           "0123456789AABC",
 
-                                          "00123456789ABCCCC"};
+                                          "00123456789ABCCCC",
+
+                                          "GNUNETVPN0001000IPEX401110011101100100000111"};
 
 /**
  * Check whether peers successfully shut down.
@@ -156,13 +158,11 @@ shutdown_callback (void *cls, const char *emsg)
     for (i = 0; i < MESH_REGEX_PEERS; i++)
       ok[i] = GNUNET_NO;
   }
-#if VERBOSE
   else
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "test: All peers successfully shut down!\n");
   }
-#endif
   GNUNET_CONFIGURATION_destroy (testing_cfg);
 }
 
@@ -177,9 +177,7 @@ shutdown_callback (void *cls, const char *emsg)
 static void
 shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-#if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Ending test.\n");
-#endif
   shutdown_handle = GNUNET_SCHEDULER_NO_TASK;
   GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
 }
@@ -188,7 +186,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 +285,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 +368,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;
 }
 
@@ -404,13 +402,9 @@ peergroup_ready (void *cls, const char *emsg)
     GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
     return;
   }
-#if VERBOSE
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "test: Peer Group started successfully!\n");
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "test: Have %u connections\n",
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Peer Group started successfully with %u connections\n",
               total_connections);
-#endif
-
   peers_running = GNUNET_TESTING_daemons_running (pg);
   if (0 < failed_connections)
   {
@@ -427,7 +421,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 +431,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 +451,7 @@ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
     GNUNET_MESH_peer_request_connect_by_string (t[i], strings[i]);
   }
   /* connect handler = success, timeout = error */
-  
+
 }
 
 
@@ -516,19 +510,9 @@ run (void *cls, char *const *args, const char *cfgfile,
   testing_cfg = GNUNET_CONFIGURATION_dup (cfg);
 
   GNUNET_log_setup ("test_mesh_regex",
-#if VERBOSE
-                    "DEBUG",
-#else
                     "WARNING",
-#endif
                     NULL);
-
-#if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Starting daemons.\n");
-  GNUNET_CONFIGURATION_set_value_string (testing_cfg, "testing_old",
-                                         "use_progressbars", "YES");
-#endif
-
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_number (testing_cfg, "testing_old",
                                              "num_peers", &num_peers))
@@ -571,10 +555,6 @@ main (int argc, char *argv[])
     argv[0],
     "-c",
     "test_mesh_2dtorus.conf",
-#if VERBOSE
-    "-L",
-    "DEBUG",
-#endif
     NULL
   };
   int result;