aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2012-11-16 14:46:54 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2012-11-16 14:46:54 +0000
commitd2d9a01f6e09efb9c2f9949809511241a3299151 (patch)
treee53559e0af3a9b8a0d5c09f9831d8241e7de7173
parent45ccc6c310dd4ad85f56eafc6bd4eb56ec43f08f (diff)
downloadgnunet-d2d9a01f6e09efb9c2f9949809511241a3299151.tar.gz
gnunet-d2d9a01f6e09efb9c2f9949809511241a3299151.zip
- test config fixes for adaptive overlay connects
-rw-r--r--src/testbed/test_testbed_api_testbed_run_topologyclique.conf2
-rw-r--r--src/testbed/test_testbed_api_testbed_run_topologyline.conf4
-rw-r--r--src/testbed/test_testbed_api_testbed_run_topologyrandom.conf2
-rw-r--r--src/testbed/test_testbed_api_testbed_run_topologyring.conf2
-rw-r--r--src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyclique.conf b/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
index b4c7f9f16..514cd42c1 100644
--- a/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
@@ -4,7 +4,7 @@ PORT = 12113
4ACCEPT_FROM = 127.0.0.1; 4ACCEPT_FROM = 127.0.0.1;
5HOSTNAME = localhost 5HOSTNAME = localhost
6NEIGHBOUR_LIMIT = 100 6NEIGHBOUR_LIMIT = 100
7MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 3 7PARALLEL_OVERLAY_CONNECT_THRESHOLD = 2
8OVERLAY_TOPOLOGY = CLIQUE 8OVERLAY_TOPOLOGY = CLIQUE
9#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args 9#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
10 10
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyline.conf b/src/testbed/test_testbed_api_testbed_run_topologyline.conf
index 0e362bf48..c07f023e0 100644
--- a/src/testbed/test_testbed_api_testbed_run_topologyline.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologyline.conf
@@ -4,8 +4,8 @@ PORT = 12113
4ACCEPT_FROM = 127.0.0.1; 4ACCEPT_FROM = 127.0.0.1;
5HOSTNAME = localhost 5HOSTNAME = localhost
6NEIGHBOUR_LIMIT = 100 6NEIGHBOUR_LIMIT = 100
7MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 1
8OVERLAY_TOPOLOGY = LINE 7OVERLAY_TOPOLOGY = LINE
8PARALLEL_OVERLAY_CONNECT_THRESHOLD = 2
9#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args 9#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
10 10
11[fs] 11[fs]
@@ -77,4 +77,4 @@ AUTOSTART = NO
77RETURN_LOCAL_ADDRESSES = YES 77RETURN_LOCAL_ADDRESSES = YES
78 78
79[gns-helper-service-w32] 79[gns-helper-service-w32]
80AUTOSTART = NO \ No newline at end of file 80AUTOSTART = NO
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf b/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
index ca2466af1..7156df3b2 100644
--- a/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
@@ -3,7 +3,7 @@ AUTOSTART = NO
3PORT = 12113 3PORT = 12113
4ACCEPT_FROM = 127.0.0.1; 4ACCEPT_FROM = 127.0.0.1;
5HOSTNAME = localhost 5HOSTNAME = localhost
6MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 3 6PARALLEL_OVERLAY_CONNECT_THRESHOLD = 2
7OVERLAY_TOPOLOGY = RANDOM 7OVERLAY_TOPOLOGY = RANDOM
8OVERLAY_RANDOM_LINKS = 5 8OVERLAY_RANDOM_LINKS = 5
9#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args 9#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyring.conf b/src/testbed/test_testbed_api_testbed_run_topologyring.conf
index a060a6386..de83ab201 100644
--- a/src/testbed/test_testbed_api_testbed_run_topologyring.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologyring.conf
@@ -4,7 +4,7 @@ PORT = 12113
4ACCEPT_FROM = 127.0.0.1; 4ACCEPT_FROM = 127.0.0.1;
5HOSTNAME = localhost 5HOSTNAME = localhost
6NEIGHBOUR_LIMIT = 100 6NEIGHBOUR_LIMIT = 100
7MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 3 7PARALLEL_OVERLAY_CONNECT_THRESHOLD = 2
8OVERLAY_TOPOLOGY = RING 8OVERLAY_TOPOLOGY = RING
9#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args 9#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
10 10
diff --git a/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf b/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
index 6317cb833..d33f34a8b 100644
--- a/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
@@ -3,7 +3,7 @@ AUTOSTART = NO
3PORT = 12113 3PORT = 12113
4ACCEPT_FROM = 127.0.0.1; 4ACCEPT_FROM = 127.0.0.1;
5HOSTNAME = localhost 5HOSTNAME = localhost
6MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 3 6PARALLEL_OVERLAY_CONNECT_THRESHOLD = 2
7OVERLAY_TOPOLOGY = SMALL_WORLD_RING 7OVERLAY_TOPOLOGY = SMALL_WORLD_RING
8OVERLAY_RANDOM_LINKS = 3 8OVERLAY_RANDOM_LINKS = 3
9#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args 9#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args