- leaks

[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 a58828deebbbe623d0eb40cd83b983dbd0b3e094..f88822bc8d541a9d777005d8e63424b6f7c9e1a4 100644 (file)
--- a/src/mesh/test_mesh_regex.c
+++ b/src/mesh/test_mesh_regex.c
@@ -29,12 +29,12 @@
 
 #define VERBOSE GNUNET_YES
 #define REMOVE_DIR GNUNET_YES
-#define MESH_REGEX_PEERS 1
+#define MESH_REGEX_PEERS 3
 
 /**
  * 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
@@ -50,7 +50,7 @@ static int ok[MESH_REGEX_PEERS];
 /**
  * How many connects have happened.
  */
-static int connected_peers;
+static int regex_peers;
 
 /**
  * Be verbose
@@ -120,11 +120,11 @@ static struct GNUNET_MESH_Tunnel *incoming_t[MESH_REGEX_PEERS];
 /**
  * Regular expressions for the announces.
  */
-static char *regexes[MESH_REGEX_PEERS] = {/*"(0|1)"
+static char *regexes[MESH_REGEX_PEERS] = {"(0|1)"
                                           "(0|1)"
                                           "23456789ABC",
 
-                                          "0123456789A*BC",*/
+                                          "0123456789A*BC",
 
                                           "0*123456789ABC*"};
 
@@ -132,9 +132,9 @@ static char *regexes[MESH_REGEX_PEERS] = {/*"(0|1)"
 /**
  * Service strings to look for.
  */
-static char *strings[MESH_REGEX_PEERS] = {/*"1123456789ABC",
+static char *strings[MESH_REGEX_PEERS] = {"1123456789ABC",
 
-                                          "0123456789AABC",*/
+                                          "0123456789AABC",
 
                                           "00123456789ABCCCC"};
 
@@ -225,7 +225,7 @@ tunnel_cleaner (void *cls, const struct GNUNET_MESH_Tunnel *tunnel,
 {
   long i = (long) cls;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Incoming tunnel disconnected at peer %d\n",
               i);
   return;
@@ -286,9 +286,9 @@ ch (void *cls, const struct GNUNET_PeerIdentity *peer,
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Peer connected: %s\n",
               GNUNET_i2s (peer));
-  connected_peers++;
+  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),
@@ -427,17 +427,17 @@ 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,
                             &app);
-  connected_peers = 0;
+  regex_peers = 0;
   for (i = 0; i < MESH_REGEX_PEERS; i++)
   {
     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,
@@ -449,7 +449,7 @@ peergroup_ready (void *cls, const char *emsg)
 
   for (i = 0; i < MESH_REGEX_PEERS; i++)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Create tunnel\n");
     t[i] = GNUNET_MESH_tunnel_create (h1, NULL, &ch, &dh, (void *) (long) i);
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -601,14 +601,14 @@ main (int argc, char *argv[])
                   i, strings[i]);
     }
   }
-  if (GNUNET_OK != result || connected_peers != MESH_REGEX_PEERS)
+  if (GNUNET_OK != result || regex_peers != MESH_REGEX_PEERS)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "test: FAILED! %u connected peers\n",
-                connected_peers);
+                regex_peers);
     return 1;
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: success\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "test: success\n");
   return 0;
 }