diff options
| author | Sree Harsha Totakura <totakura@in.tum.de> | 2012-11-05 16:49:12 +0000 |
|---|---|---|
| committer | Sree Harsha Totakura <totakura@in.tum.de> | 2012-11-05 16:49:12 +0000 |
| commit | a5750919060a5ca7a6367e1d95a68a852a555056 (patch) | |
| tree | ddd7c973b685fb1ed6e3e1199ff34d3f1b312a6c /src | |
| parent | d723de38e4c4a9b4b9b29fae828b9824c6bc052a (diff) | |
| download | gnunet-a5750919060a5ca7a6367e1d95a68a852a555056.tar.gz gnunet-a5750919060a5ca7a6367e1d95a68a852a555056.zip | |
merging configs
Diffstat (limited to 'src')
4 files changed, 12 insertions, 3 deletions
diff --git a/src/testbed/test_testbed_api.conf b/src/testbed/test_testbed_api.conf index dc6116d71..85d7c337f 100644 --- a/src/testbed/test_testbed_api.conf +++ b/src/testbed/test_testbed_api.conf | |||
| @@ -35,8 +35,7 @@ NEIGHBOUR_LIMIT = 50 | |||
| 35 | PORT = 12365 | 35 | PORT = 12365 |
| 36 | 36 | ||
| 37 | [ats] | 37 | [ats] |
| 38 | WAN_QUOTA_OUT = 3932160 | 38 | AUTOSTART = NO |
| 39 | WAN_QUOTA_IN = 3932160 | ||
| 40 | 39 | ||
| 41 | [core] | 40 | [core] |
| 42 | PORT = 12092 | 41 | PORT = 12092 |
| @@ -77,4 +76,5 @@ AUTOSTART = NO | |||
| 77 | RETURN_LOCAL_ADDRESSES = YES | 76 | RETURN_LOCAL_ADDRESSES = YES |
| 78 | 77 | ||
| 79 | [gns-helper-service-w32] | 78 | [gns-helper-service-w32] |
| 80 | AUTOSTART = NO \ No newline at end of file | 79 | AUTOSTART = NO |
| 80 | |||
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyclique.conf b/src/testbed/test_testbed_api_testbed_run_topologyclique.conf index e54b0b238..3eb136e1c 100644 --- a/src/testbed/test_testbed_api_testbed_run_topologyclique.conf +++ b/src/testbed/test_testbed_api_testbed_run_topologyclique.conf | |||
| @@ -75,3 +75,6 @@ AUTOSTART = NO | |||
| 75 | 75 | ||
| 76 | [nat] | 76 | [nat] |
| 77 | RETURN_LOCAL_ADDRESSES = YES | 77 | RETURN_LOCAL_ADDRESSES = YES |
| 78 | |||
| 79 | [gns-helper-service-w32] | ||
| 80 | AUTOSTART = NO \ No newline at end of file | ||
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyline.conf b/src/testbed/test_testbed_api_testbed_run_topologyline.conf index d3c840dd1..53d0e6f4c 100644 --- a/src/testbed/test_testbed_api_testbed_run_topologyline.conf +++ b/src/testbed/test_testbed_api_testbed_run_topologyline.conf | |||
| @@ -75,3 +75,6 @@ AUTOSTART = NO | |||
| 75 | 75 | ||
| 76 | [nat] | 76 | [nat] |
| 77 | RETURN_LOCAL_ADDRESSES = YES | 77 | RETURN_LOCAL_ADDRESSES = YES |
| 78 | |||
| 79 | [gns-helper-service-w32] | ||
| 80 | AUTOSTART = NO \ No newline at end of file | ||
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf b/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf index 5ba272cfa..84f338c3e 100644 --- a/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf +++ b/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf | |||
| @@ -76,3 +76,6 @@ AUTOSTART = NO | |||
| 76 | 76 | ||
| 77 | [nat] | 77 | [nat] |
| 78 | RETURN_LOCAL_ADDRESSES = YES | 78 | RETURN_LOCAL_ADDRESSES = YES |
| 79 | |||
| 80 | [gns-helper-service-w32] | ||
| 81 | AUTOSTART = NO \ No newline at end of file | ||