*/
/**
- * @file mesh/test_mesh_local.c
+ * @file mesh/test_mesh_local_1.c
* @brief test mesh local: test of tunnels with just one peer
* @author Bartlomiej Polot
*/
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_dht_service.h"
-#include "gnunet_mesh_service_new.h"
+#include "gnunet_testing_lib-new.h"
+#include "gnunet_mesh_service.h"
-#define VERBOSE 1
-#define VERBOSE_ARM 0
-static struct GNUNET_OS_Process *arm_pid;
static struct GNUNET_MESH_Handle *mesh_peer_1;
+
static struct GNUNET_MESH_Handle *mesh_peer_2;
+
static struct GNUNET_MESH_Tunnel *t;
-static int result;
+static unsigned int one = 1;
+
+static unsigned int two = 2;
+
+static int result = GNUNET_OK;
+
static GNUNET_SCHEDULER_TaskIdentifier abort_task;
-static GNUNET_SCHEDULER_TaskIdentifier test_task;
+
+static GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
/**
{
GNUNET_SCHEDULER_cancel (abort_task);
}
+ if (NULL != t)
+ {
+ GNUNET_MESH_tunnel_destroy(t);
+ }
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: D1\n");
if (NULL != mesh_peer_1)
{
{
GNUNET_MESH_disconnect (mesh_peer_2);
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: arm\n");
- if (0 != GNUNET_OS_process_kill (arm_pid, SIGTERM))
- {
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Wait\n");
- GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (arm_pid));
- GNUNET_OS_process_close (arm_pid);
}
do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: ABORT\n");
- if (0 != test_task)
- {
- GNUNET_SCHEDULER_cancel (test_task);
- }
result = GNUNET_SYSERR;
abort_task = 0;
+ if (GNUNET_SCHEDULER_NO_TASK != shutdown_task)
+ {
+ GNUNET_SCHEDULER_cancel (shutdown_task);
+ shutdown_task = GNUNET_SCHEDULER_NO_TASK;
+ }
do_shutdown (cls, tc);
}
*/
static int
data_callback (void *cls, struct GNUNET_MESH_Tunnel *tunnel, void **tunnel_ctx,
- const struct GNUNET_PeerIdentity *sender,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+ const struct GNUNET_PeerIdentity *sender,
+ const struct GNUNET_MessageHeader *message,
+ const struct GNUNET_ATS_Information *atsi)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Data callback\n");
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS, 2), &do_shutdown,
- NULL);
+ if (GNUNET_SCHEDULER_NO_TASK != shutdown_task)
+ GNUNET_SCHEDULER_cancel (shutdown_task);
+ shutdown_task =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 2), &do_shutdown,
+ NULL);
return GNUNET_OK;
}
static void *
inbound_tunnel (void *cls, struct GNUNET_MESH_Tunnel *tunnel,
const struct GNUNET_PeerIdentity *initiator,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+ const struct GNUNET_ATS_Information *atsi)
{
- unsigned int id = (unsigned int) cls;
+ unsigned int id = *(unsigned int *) cls;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: received incoming tunnel\n");
if (id != 1)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "test: received incoming tunnel on peer 2\n");
+ "test: received incoming tunnel on peer 2\n");
result = GNUNET_SYSERR;
}
return NULL;
* with the tunnel is stored
*/
static void
-inbound_end (void *cls,
- const struct GNUNET_MESH_Tunnel * tunnel,
+inbound_end (void *cls, const struct GNUNET_MESH_Tunnel *tunnel,
void *tunnel_ctx)
{
- unsigned int id = (unsigned int) cls;
+ unsigned int id = *(unsigned int *) cls;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: incoming tunnel closed\n");
if (id != 1)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "test: received closing tunnel on peer 2\n");
+ "test: received closing tunnel on peer 2\n");
result = GNUNET_SYSERR;
}
}
/**
- * Method called whenever a peer has disconnected from the tunnel.
+ * Method called whenever a peer has connected to the tunnel.
*
* @param cls closure
* @param peer peer identity the tunnel stopped working with
*/
-static void peer_conected (
- void *cls,
- const struct GNUNET_PeerIdentity * peer)
+static void
+peer_conected (void *cls, const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_ATS_Information *atsi)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: peer connected\n");
- GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_SECONDS, &do_shutdown, NULL);
+ if (GNUNET_SCHEDULER_NO_TASK != shutdown_task)
+ GNUNET_SCHEDULER_cancel(shutdown_task);
+ shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+ &do_shutdown, NULL);
}
* @param peer peer identity the tunnel was created to, NULL on timeout
* @param atsi performance data for the connection
*/
-static void peer_disconnected (
- void *cls,
- const struct GNUNET_PeerIdentity * peer,
- const struct GNUNET_TRANSPORT_ATS_Information * atsi)
+static void
+peer_disconnected (void *cls, const struct GNUNET_PeerIdentity *peer)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: peer disconnected\n");
}
static void
do_find (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_MESH_peer_request_connect_by_type(t, 1);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: CONNECT BY TYPE\n");
+ GNUNET_MESH_peer_request_connect_by_type (t, 1);
}
/**
- * Main test function
+ * Initialize framework and start test
*/
static void
-test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+run (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_TESTING_Peer *peer)
{
- struct GNUNET_CONFIGURATION_Handle *cfg = cls;
static const GNUNET_MESH_ApplicationType app1[] = { 1, 0 };
static const GNUNET_MESH_ApplicationType app2[] = { 0 };
- test_task = GNUNET_SCHEDULER_NO_TASK;
+ abort_task =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 20), &do_abort,
+ NULL);
mesh_peer_1 = GNUNET_MESH_connect (cfg, /* configuration */
- 10, /* queue size */
- (void *) 1, /* cls */
+ (void *) &one, /* cls */
&inbound_tunnel, /* inbound new hndlr */
&inbound_end, /* inbound end hndlr */
handlers1, /* traffic handlers */
app1); /* apps offered */
mesh_peer_2 = GNUNET_MESH_connect (cfg, /* configuration */
- 10, /* queue size */
- (void *) 2, /* cls */
+ (void *) &two, /* cls */
&inbound_tunnel, /* inbound new hndlr */
&inbound_end, /* inbound end hndlr */
handlers2, /* traffic handlers */
if (NULL == mesh_peer_1 || NULL == mesh_peer_2)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "test: Couldn't connect to mesh :(\n");
+ result = GNUNET_SYSERR;
return;
}
else
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: YAY! CONNECTED TO MESH :D\n");
}
-
- t = GNUNET_MESH_tunnel_create (mesh_peer_2,
- NULL,
- &peer_conected,
- &peer_disconnected,
- (void *) 2);
- GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_SECONDS, &do_find, NULL);
-}
-
-
-/**
- * Initialize framework and start test
- */
-static void
-run (void *cls, char *const *args, const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
- GNUNET_log_setup ("test_mesh_local",
-#if VERBOSE
- "DEBUG",
-#else
- "WARNING",
-#endif
- NULL);
- arm_pid =
- GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
- "gnunet-service-arm",
-#if VERBOSE_ARM
- "-L", "DEBUG",
-#endif
- "-c", "test_mesh.conf", NULL);
-
- abort_task =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS, 20), &do_abort,
- NULL);
-
- test_task = GNUNET_SCHEDULER_add_now (&test, (void *) cfg);
-
+ t = GNUNET_MESH_tunnel_create (mesh_peer_2, NULL, &peer_conected,
+ &peer_disconnected, (void *) &two);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &do_find, NULL);
}
int
main (int argc, char *argv[])
{
- int ret;
-
- char *const argv2[] = { "test-mesh-local",
- "-c", "test_mesh.conf",
-#if VERBOSE
- "-L", "DEBUG",
-#endif
- NULL
- };
- struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_END
- };
-
- ret =
- GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2,
- "test-mesh-local", "nohelp", options, &run, NULL);
-
- if (GNUNET_OK != ret)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "run failed with error code %d\n",
- ret);
+ if (0 != GNUNET_TESTING_peer_run ("test-mesh-local-1",
+ "test_mesh.conf",
+ &run, NULL))
return 1;
- }
- if (GNUNET_SYSERR == result)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "test failed\n");
- return 1;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test ok\n");
- return 0;
+ return (result == GNUNET_OK) ? 0 : 1;
}
+
+/* end of test_mesh_local_1.c */
projects / oweals / gnunet.git / blobdiff