diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2011-05-19 09:26:08 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2011-05-19 09:26:08 +0000 |
commit | a4915ad6b39aa8a67bee611106edbb505975030d (patch) | |
tree | df32d6efd2f7511bf4206fe6a1100225fd7a5ecd /src/testing | |
parent | 240aac5d69983caa456359867dbbacb80132da1e (diff) | |
download | gnunet-a4915ad6b39aa8a67bee611106edbb505975030d.tar.gz gnunet-a4915ad6b39aa8a67bee611106edbb505975030d.zip |
changes to testing
Diffstat (limited to 'src/testing')
-rw-r--r-- | src/testing/test_testing_peergroup_data.conf | 2 | ||||
-rw-r--r-- | src/testing/testing_group.c | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/testing/test_testing_peergroup_data.conf b/src/testing/test_testing_peergroup_data.conf index d8d3de7e4..2e6b6db6c 100644 --- a/src/testing/test_testing_peergroup_data.conf +++ b/src/testing/test_testing_peergroup_data.conf | |||
@@ -8,6 +8,7 @@ PORT = 2564 | |||
8 | [transport] | 8 | [transport] |
9 | PORT = 2565 | 9 | PORT = 2565 |
10 | PLUGINS = tcp | 10 | PLUGINS = tcp |
11 | #DEBUG = YES | ||
11 | #PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args | 12 | #PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args |
12 | #PREFIX = valgrind --tool=memcheck --log-file=logs%p | 13 | #PREFIX = valgrind --tool=memcheck --log-file=logs%p |
13 | 14 | ||
@@ -20,7 +21,6 @@ PORT = 2567 | |||
20 | 21 | ||
21 | [transport-tcp] | 22 | [transport-tcp] |
22 | PORT = 2568 | 23 | PORT = 2568 |
23 | USE_LOCALADDR = YES | ||
24 | 24 | ||
25 | [peerinfo] | 25 | [peerinfo] |
26 | PORT = 2569 | 26 | PORT = 2569 |
diff --git a/src/testing/testing_group.c b/src/testing/testing_group.c index 66bcae842..b42ce8cc5 100644 --- a/src/testing/testing_group.c +++ b/src/testing/testing_group.c | |||
@@ -1410,6 +1410,10 @@ make_config(const struct GNUNET_CONFIGURATION_Handle *cfg, uint32_t off, | |||
1410 | GNUNET_CONFIGURATION_set_value_string (uc.ret, "statistics", "UNIXPATH", | 1410 | GNUNET_CONFIGURATION_set_value_string (uc.ret, "statistics", "UNIXPATH", |
1411 | ""); | 1411 | ""); |
1412 | 1412 | ||
1413 | GNUNET_CONFIGURATION_set_value_string (uc.ret, "transport-tcp", "USE_LOCALADDR", | ||
1414 | "YES"); | ||
1415 | GNUNET_CONFIGURATION_set_value_string (uc.ret, "transport-udp", "USE_LOCALADDR", | ||
1416 | "YES"); | ||
1413 | GNUNET_free_non_null (control_host); | 1417 | GNUNET_free_non_null (control_host); |
1414 | GNUNET_free (allowed_hosts); | 1418 | GNUNET_free (allowed_hosts); |
1415 | } | 1419 | } |
@@ -1423,6 +1427,10 @@ make_config(const struct GNUNET_CONFIGURATION_Handle *cfg, uint32_t off, | |||
1423 | hostname); | 1427 | hostname); |
1424 | GNUNET_CONFIGURATION_set_value_string (uc.ret, "transport-tcp", "BINDTO", | 1428 | GNUNET_CONFIGURATION_set_value_string (uc.ret, "transport-tcp", "BINDTO", |
1425 | hostname); | 1429 | hostname); |
1430 | GNUNET_CONFIGURATION_set_value_string (uc.ret, "transport-tcp", "USE_LOCALADDR", | ||
1431 | "YES"); | ||
1432 | GNUNET_CONFIGURATION_set_value_string (uc.ret, "transport-udp", "USE_LOCALADDR", | ||
1433 | "YES"); | ||
1426 | GNUNET_CONFIGURATION_set_value_string (uc.ret, "arm", "ACCEPT_FROM", | 1434 | GNUNET_CONFIGURATION_set_value_string (uc.ret, "arm", "ACCEPT_FROM", |
1427 | allowed_hosts); | 1435 | allowed_hosts); |
1428 | GNUNET_free (allowed_hosts); | 1436 | GNUNET_free (allowed_hosts); |
@@ -1433,6 +1441,10 @@ make_config(const struct GNUNET_CONFIGURATION_Handle *cfg, uint32_t off, | |||
1433 | "127.0.0.1"); | 1441 | "127.0.0.1"); |
1434 | GNUNET_CONFIGURATION_set_value_string (uc.ret, "transport-udp", "BINDTO", | 1442 | GNUNET_CONFIGURATION_set_value_string (uc.ret, "transport-udp", "BINDTO", |
1435 | "127.0.0.1"); | 1443 | "127.0.0.1"); |
1444 | GNUNET_CONFIGURATION_set_value_string (uc.ret, "transport-tcp", "USE_LOCALADDR", | ||
1445 | "YES"); | ||
1446 | GNUNET_CONFIGURATION_set_value_string (uc.ret, "transport-udp", "USE_LOCALADDR", | ||
1447 | "YES"); | ||
1436 | } | 1448 | } |
1437 | 1449 | ||
1438 | *port = (uint16_t) uc.nport; | 1450 | *port = (uint16_t) uc.nport; |