diff options
Diffstat (limited to 'src/testbed')
5 files changed, 1 insertions, 12 deletions
diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c index 6a5b3cf71..3bddfac09 100644 --- a/src/testbed/gnunet-testbed-profiler.c +++ b/src/testbed/gnunet-testbed-profiler.c | |||
@@ -817,6 +817,7 @@ main (int argc, char *const *argv) | |||
817 | GNUNET_PROGRAM_run (argc, argv, "gnunet-testbed-profiler [OPTIONS] hosts-file", | 817 | GNUNET_PROGRAM_run (argc, argv, "gnunet-testbed-profiler [OPTIONS] hosts-file", |
818 | _("Profiler for testbed"), | 818 | _("Profiler for testbed"), |
819 | options, &run, NULL); | 819 | options, &run, NULL); |
820 | GNUNET_free ((void*) argv); | ||
820 | if (GNUNET_OK != ret) | 821 | if (GNUNET_OK != ret) |
821 | return ret; | 822 | return ret; |
822 | if (GNUNET_OK != result) | 823 | if (GNUNET_OK != result) |
diff --git a/src/testbed/test_testbed_api.conf b/src/testbed/test_testbed_api.conf index 17fdba862..e52b5df0e 100644 --- a/src/testbed/test_testbed_api.conf +++ b/src/testbed/test_testbed_api.conf | |||
@@ -29,7 +29,6 @@ DATABASE = sqlite | |||
29 | 29 | ||
30 | [transport] | 30 | [transport] |
31 | PLUGINS = tcp | 31 | PLUGINS = tcp |
32 | DEBUG = NO | ||
33 | ACCEPT_FROM6 = ::1; | 32 | ACCEPT_FROM6 = ::1; |
34 | ACCEPT_FROM = 127.0.0.1; | 33 | ACCEPT_FROM = 127.0.0.1; |
35 | NEIGHBOUR_LIMIT = 50 | 34 | NEIGHBOUR_LIMIT = 50 |
@@ -46,7 +45,6 @@ AUTOSTART = YES | |||
46 | [arm] | 45 | [arm] |
47 | DEFAULTSERVICES = core transport | 46 | DEFAULTSERVICES = core transport |
48 | PORT = 12366 | 47 | PORT = 12366 |
49 | DEBUG = NO | ||
50 | 48 | ||
51 | [transport-tcp] | 49 | [transport-tcp] |
52 | TIMEOUT = 300 s | 50 | TIMEOUT = 300 s |
@@ -55,7 +53,6 @@ PORT = 12368 | |||
55 | [TESTING] | 53 | [TESTING] |
56 | NUM_PEERS = 5 | 54 | NUM_PEERS = 5 |
57 | WEAKRANDOM = YES | 55 | WEAKRANDOM = YES |
58 | DEBUG = YES | ||
59 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | 56 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat |
60 | MAX_CONCURRENT_SSH = 10 | 57 | MAX_CONCURRENT_SSH = 10 |
61 | USE_PROGRESSBARS = YES | 58 | USE_PROGRESSBARS = YES |
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyclique.conf b/src/testbed/test_testbed_api_testbed_run_topologyclique.conf index 37fc7342d..e54b0b238 100644 --- a/src/testbed/test_testbed_api_testbed_run_topologyclique.conf +++ b/src/testbed/test_testbed_api_testbed_run_topologyclique.conf | |||
@@ -29,7 +29,6 @@ DATABASE = sqlite | |||
29 | 29 | ||
30 | [transport] | 30 | [transport] |
31 | PLUGINS = tcp | 31 | PLUGINS = tcp |
32 | DEBUG = NO | ||
33 | ACCEPT_FROM6 = ::1; | 32 | ACCEPT_FROM6 = ::1; |
34 | ACCEPT_FROM = 127.0.0.1; | 33 | ACCEPT_FROM = 127.0.0.1; |
35 | NEIGHBOUR_LIMIT = 50 | 34 | NEIGHBOUR_LIMIT = 50 |
@@ -46,7 +45,6 @@ AUTOSTART = YES | |||
46 | [arm] | 45 | [arm] |
47 | DEFAULTSERVICES = core transport | 46 | DEFAULTSERVICES = core transport |
48 | PORT = 12366 | 47 | PORT = 12366 |
49 | DEBUG = NO | ||
50 | 48 | ||
51 | [transport-tcp] | 49 | [transport-tcp] |
52 | TIMEOUT = 300 s | 50 | TIMEOUT = 300 s |
@@ -55,7 +53,6 @@ PORT = 12368 | |||
55 | [TESTING] | 53 | [TESTING] |
56 | NUM_PEERS = 5 | 54 | NUM_PEERS = 5 |
57 | WEAKRANDOM = YES | 55 | WEAKRANDOM = YES |
58 | DEBUG = YES | ||
59 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | 56 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat |
60 | MAX_CONCURRENT_SSH = 10 | 57 | MAX_CONCURRENT_SSH = 10 |
61 | USE_PROGRESSBARS = YES | 58 | USE_PROGRESSBARS = YES |
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyline.conf b/src/testbed/test_testbed_api_testbed_run_topologyline.conf index 2958f765c..d3c840dd1 100644 --- a/src/testbed/test_testbed_api_testbed_run_topologyline.conf +++ b/src/testbed/test_testbed_api_testbed_run_topologyline.conf | |||
@@ -29,7 +29,6 @@ DATABASE = sqlite | |||
29 | 29 | ||
30 | [transport] | 30 | [transport] |
31 | PLUGINS = tcp | 31 | PLUGINS = tcp |
32 | DEBUG = NO | ||
33 | ACCEPT_FROM6 = ::1; | 32 | ACCEPT_FROM6 = ::1; |
34 | ACCEPT_FROM = 127.0.0.1; | 33 | ACCEPT_FROM = 127.0.0.1; |
35 | NEIGHBOUR_LIMIT = 50 | 34 | NEIGHBOUR_LIMIT = 50 |
@@ -46,7 +45,6 @@ AUTOSTART = YES | |||
46 | [arm] | 45 | [arm] |
47 | DEFAULTSERVICES = core transport | 46 | DEFAULTSERVICES = core transport |
48 | PORT = 12366 | 47 | PORT = 12366 |
49 | DEBUG = NO | ||
50 | 48 | ||
51 | [transport-tcp] | 49 | [transport-tcp] |
52 | TIMEOUT = 300 s | 50 | TIMEOUT = 300 s |
@@ -55,7 +53,6 @@ PORT = 12368 | |||
55 | [TESTING] | 53 | [TESTING] |
56 | NUM_PEERS = 5 | 54 | NUM_PEERS = 5 |
57 | WEAKRANDOM = YES | 55 | WEAKRANDOM = YES |
58 | DEBUG = YES | ||
59 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | 56 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat |
60 | MAX_CONCURRENT_SSH = 10 | 57 | MAX_CONCURRENT_SSH = 10 |
61 | USE_PROGRESSBARS = YES | 58 | USE_PROGRESSBARS = YES |
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf b/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf index 3c7980682..5ba272cfa 100644 --- a/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf +++ b/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf | |||
@@ -30,7 +30,6 @@ DATABASE = sqlite | |||
30 | 30 | ||
31 | [transport] | 31 | [transport] |
32 | PLUGINS = tcp | 32 | PLUGINS = tcp |
33 | DEBUG = NO | ||
34 | ACCEPT_FROM6 = ::1; | 33 | ACCEPT_FROM6 = ::1; |
35 | ACCEPT_FROM = 127.0.0.1; | 34 | ACCEPT_FROM = 127.0.0.1; |
36 | NEIGHBOUR_LIMIT = 50 | 35 | NEIGHBOUR_LIMIT = 50 |
@@ -47,7 +46,6 @@ AUTOSTART = YES | |||
47 | [arm] | 46 | [arm] |
48 | DEFAULTSERVICES = core transport | 47 | DEFAULTSERVICES = core transport |
49 | PORT = 12366 | 48 | PORT = 12366 |
50 | DEBUG = NO | ||
51 | 49 | ||
52 | [transport-tcp] | 50 | [transport-tcp] |
53 | TIMEOUT = 300 s | 51 | TIMEOUT = 300 s |
@@ -56,7 +54,6 @@ PORT = 12368 | |||
56 | [TESTING] | 54 | [TESTING] |
57 | NUM_PEERS = 5 | 55 | NUM_PEERS = 5 |
58 | WEAKRANDOM = YES | 56 | WEAKRANDOM = YES |
59 | DEBUG = YES | ||
60 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat | 57 | HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat |
61 | MAX_CONCURRENT_SSH = 10 | 58 | MAX_CONCURRENT_SSH = 10 |
62 | USE_PROGRESSBARS = YES | 59 | USE_PROGRESSBARS = YES |