#define VERBOSE GNUNET_YES
#define REMOVE_DIR GNUNET_YES
-#define MESH_REGEX_PEERS 1
+#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.
*/
/**
* How many connects have happened.
*/
-static int connected_peers;
+static int regex_peers;
/**
* Be verbose
/**
* 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*",
- "0*123456789ABC*"};
+ "GNUNETVPN0001000IPEX401110011101100100000111(0|1)*"};
/**
* Service strings to look for.
*/
-static char *strings[MESH_REGEX_PEERS] = {/*"1123456789ABC",
+static char *strings[MESH_REGEX_PEERS] = {"1123456789ABC",
+
+ "0123456789AABC",
- "0123456789AABC",*/
+ "00123456789ABCCCC",
- "00123456789ABCCCC"};
+ "GNUNETVPN0001000IPEX401110011101100100000111"};
/**
* Check whether peers successfully shut down.
/**
* 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)
{
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;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Peer connected: %s\n",
GNUNET_i2s (peer));
- connected_peers++;
-
- GNUNET_MESH_notify_transmit_ready(t[i], 0, 0,
+ regex_peers++;
+
+ GNUNET_MESH_notify_transmit_ready(t[i], GNUNET_NO,
GNUNET_TIME_UNIT_FOREVER_REL,
peer,
sizeof(struct GNUNET_MessageHeader),
GNUNET_SCHEDULER_cancel (disconnect_task);
disconnect_task =
GNUNET_SCHEDULER_add_now (&disconnect_peers, NULL);
- }
+ }
return GNUNET_OK;
}
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,
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,
GNUNET_MESH_peer_request_connect_by_string (t[i], strings[i]);
}
/* connect handler = success, timeout = error */
-
+
}
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;
}