From eb3f4006fc74ef71296e53d83b1d4b6990b639d1 Mon Sep 17 00:00:00 2001 From: Sree Harsha Totakura Date: Tue, 17 Jul 2012 14:59:10 +0000 Subject: helper integration to GNUNET_TESTBED_host_run_() todo: add controller start callback with the configuration with which the controller is started --- src/testbed/test_testbed_api.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/testbed/test_testbed_api.c') diff --git a/src/testbed/test_testbed_api.c b/src/testbed/test_testbed_api.c index 849f5ddd4..9bdae1fb0 100644 --- a/src/testbed/test_testbed_api.c +++ b/src/testbed/test_testbed_api.c @@ -42,11 +42,6 @@ #define TIME_REL_SECS(sec) \ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, sec) -/** - * The testing system we work with - */ -struct GNUNET_TESTING_System *test_system; - /** * Our localhost */ @@ -117,7 +112,6 @@ do_shutdown (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_TESTBED_controller_stop (cp); GNUNET_TESTBED_host_destroy (neighbour); GNUNET_TESTBED_host_destroy (host); - GNUNET_TESTING_system_destroy (test_system, GNUNET_YES); } @@ -190,12 +184,10 @@ run (void *cls, char *const *args, const char *cfgfile, { uint64_t event_mask; - test_system = GNUNET_TESTING_system_create ("test_testbed", - "127.0.0.1"); host = GNUNET_TESTBED_host_create (NULL, NULL, 0); GNUNET_assert (NULL != host); cfg = GNUNET_CONFIGURATION_dup (config); - cp = GNUNET_TESTBED_controller_start (test_system, host, cfg, NULL, NULL); + cp = GNUNET_TESTBED_controller_start ("127.0.0.1", host, cfg, NULL, NULL); event_mask = 0; event_mask |= (1L << GNUNET_TESTBED_ET_PEER_START); event_mask |= (1L << GNUNET_TESTBED_ET_PEER_STOP); -- cgit v1.2.3