aboutsummaryrefslogtreecommitdiff
path: root/src/testbed
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-11-04 21:01:22 +0000
committerChristian Grothoff <christian@grothoff.org>2012-11-04 21:01:22 +0000
commit0e4c7cdccfc4105f9c6e529cfa0e3722104b0ddf (patch)
treeac53b9088e75b7041e14e3455698a75da085b3d7 /src/testbed
parentb6d09b511fbd61d3b36fde4c28624bed321bf4a1 (diff)
downloadgnunet-0e4c7cdccfc4105f9c6e529cfa0e3722104b0ddf.tar.gz
gnunet-0e4c7cdccfc4105f9c6e529cfa0e3722104b0ddf.zip
-misc bugfixes, travel hacking
Diffstat (limited to 'src/testbed')
-rw-r--r--src/testbed/gnunet-testbed-profiler.c1
-rw-r--r--src/testbed/test_testbed_api.conf3
-rw-r--r--src/testbed/test_testbed_api_testbed_run_topologyclique.conf3
-rw-r--r--src/testbed/test_testbed_api_testbed_run_topologyline.conf3
-rw-r--r--src/testbed/test_testbed_api_testbed_run_topologyrandom.conf3
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]
31PLUGINS = tcp 31PLUGINS = tcp
32DEBUG = NO
33ACCEPT_FROM6 = ::1; 32ACCEPT_FROM6 = ::1;
34ACCEPT_FROM = 127.0.0.1; 33ACCEPT_FROM = 127.0.0.1;
35NEIGHBOUR_LIMIT = 50 34NEIGHBOUR_LIMIT = 50
@@ -46,7 +45,6 @@ AUTOSTART = YES
46[arm] 45[arm]
47DEFAULTSERVICES = core transport 46DEFAULTSERVICES = core transport
48PORT = 12366 47PORT = 12366
49DEBUG = NO
50 48
51[transport-tcp] 49[transport-tcp]
52TIMEOUT = 300 s 50TIMEOUT = 300 s
@@ -55,7 +53,6 @@ PORT = 12368
55[TESTING] 53[TESTING]
56NUM_PEERS = 5 54NUM_PEERS = 5
57WEAKRANDOM = YES 55WEAKRANDOM = YES
58DEBUG = YES
59HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat 56HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
60MAX_CONCURRENT_SSH = 10 57MAX_CONCURRENT_SSH = 10
61USE_PROGRESSBARS = YES 58USE_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]
31PLUGINS = tcp 31PLUGINS = tcp
32DEBUG = NO
33ACCEPT_FROM6 = ::1; 32ACCEPT_FROM6 = ::1;
34ACCEPT_FROM = 127.0.0.1; 33ACCEPT_FROM = 127.0.0.1;
35NEIGHBOUR_LIMIT = 50 34NEIGHBOUR_LIMIT = 50
@@ -46,7 +45,6 @@ AUTOSTART = YES
46[arm] 45[arm]
47DEFAULTSERVICES = core transport 46DEFAULTSERVICES = core transport
48PORT = 12366 47PORT = 12366
49DEBUG = NO
50 48
51[transport-tcp] 49[transport-tcp]
52TIMEOUT = 300 s 50TIMEOUT = 300 s
@@ -55,7 +53,6 @@ PORT = 12368
55[TESTING] 53[TESTING]
56NUM_PEERS = 5 54NUM_PEERS = 5
57WEAKRANDOM = YES 55WEAKRANDOM = YES
58DEBUG = YES
59HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat 56HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
60MAX_CONCURRENT_SSH = 10 57MAX_CONCURRENT_SSH = 10
61USE_PROGRESSBARS = YES 58USE_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]
31PLUGINS = tcp 31PLUGINS = tcp
32DEBUG = NO
33ACCEPT_FROM6 = ::1; 32ACCEPT_FROM6 = ::1;
34ACCEPT_FROM = 127.0.0.1; 33ACCEPT_FROM = 127.0.0.1;
35NEIGHBOUR_LIMIT = 50 34NEIGHBOUR_LIMIT = 50
@@ -46,7 +45,6 @@ AUTOSTART = YES
46[arm] 45[arm]
47DEFAULTSERVICES = core transport 46DEFAULTSERVICES = core transport
48PORT = 12366 47PORT = 12366
49DEBUG = NO
50 48
51[transport-tcp] 49[transport-tcp]
52TIMEOUT = 300 s 50TIMEOUT = 300 s
@@ -55,7 +53,6 @@ PORT = 12368
55[TESTING] 53[TESTING]
56NUM_PEERS = 5 54NUM_PEERS = 5
57WEAKRANDOM = YES 55WEAKRANDOM = YES
58DEBUG = YES
59HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat 56HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
60MAX_CONCURRENT_SSH = 10 57MAX_CONCURRENT_SSH = 10
61USE_PROGRESSBARS = YES 58USE_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]
32PLUGINS = tcp 32PLUGINS = tcp
33DEBUG = NO
34ACCEPT_FROM6 = ::1; 33ACCEPT_FROM6 = ::1;
35ACCEPT_FROM = 127.0.0.1; 34ACCEPT_FROM = 127.0.0.1;
36NEIGHBOUR_LIMIT = 50 35NEIGHBOUR_LIMIT = 50
@@ -47,7 +46,6 @@ AUTOSTART = YES
47[arm] 46[arm]
48DEFAULTSERVICES = core transport 47DEFAULTSERVICES = core transport
49PORT = 12366 48PORT = 12366
50DEBUG = NO
51 49
52[transport-tcp] 50[transport-tcp]
53TIMEOUT = 300 s 51TIMEOUT = 300 s
@@ -56,7 +54,6 @@ PORT = 12368
56[TESTING] 54[TESTING]
57NUM_PEERS = 5 55NUM_PEERS = 5
58WEAKRANDOM = YES 56WEAKRANDOM = YES
59DEBUG = YES
60HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat 57HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
61MAX_CONCURRENT_SSH = 10 58MAX_CONCURRENT_SSH = 10
62USE_PROGRESSBARS = YES 59USE_PROGRESSBARS = YES