aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2010-07-20 07:24:27 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2010-07-20 07:24:27 +0000
commitb217565b770810db1aa36fe29fcfaf0224f8fbe5 (patch)
treebf3383bceac6c628fddf46c0d4775266bfcf1c64
parent0395351ad94b6209b27c0ab45aad00c90b7ff60f (diff)
downloadgnunet-b217565b770810db1aa36fe29fcfaf0224f8fbe5.tar.gz
gnunet-b217565b770810db1aa36fe29fcfaf0224f8fbe5.zip
-rw-r--r--src/transport/Makefile.am2
-rw-r--r--src/transport/test_transport_api_http_peer1.conf4
-rw-r--r--src/transport/test_transport_api_http_peer2.conf4
-rw-r--r--src/transport/test_transport_api_rel_http_peer1.conf2
-rw-r--r--src/transport/test_transport_api_rel_http_peer2.conf2
5 files changed, 7 insertions, 7 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 4560782d2..730115231 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -134,9 +134,9 @@ check_PROGRAMS = \
134 test_transport_api_udp_nat \ 134 test_transport_api_udp_nat \
135 test_transport_api_reliability_tcp \ 135 test_transport_api_reliability_tcp \
136 test_transport_api_reliability_tcp_nat \ 136 test_transport_api_reliability_tcp_nat \
137 test_transport_api_reliability_http \
138 test_transport_api_reliability_udp \ 137 test_transport_api_reliability_udp \
139 test_transport_api_http 138 test_transport_api_http
139#test_transport_api_reliability_http
140# TODO: add tests for nat, etc. 140# TODO: add tests for nat, etc.
141 141
142TESTS = \ 142TESTS = \
diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf
index 18513d8fc..f0d48e563 100644
--- a/src/transport/test_transport_api_http_peer1.conf
+++ b/src/transport/test_transport_api_http_peer1.conf
@@ -1,9 +1,9 @@
1[transport-http] 1[transport-http]
2PORT = 12389 2PORT = 12389
3DEBUG = NO 3DEBUG = NO
4USE_IPv6 = YES 4USE_IPv6 = NO
5USE_IPv4 = YES 5USE_IPv4 = YES
6#BINDTO4 = 127.0.0.1 6BINDTO4 = 127.0.0.1
7#BINDTO6 = ::1 7#BINDTO6 = ::1
8 8
9 9
diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf
index 940931b4a..403169ce0 100644
--- a/src/transport/test_transport_api_http_peer2.conf
+++ b/src/transport/test_transport_api_http_peer2.conf
@@ -1,9 +1,9 @@
1[transport-http] 1[transport-http]
2PORT = 22368 2PORT = 22368
3DEBUG = NO 3DEBUG = NO
4USE_IPv6 = YES 4USE_IPv6 = NO
5USE_IPv4 = YES 5USE_IPv4 = YES
6#BINDTO4 = 127.0.0.1 6BINDTO4 = 127.0.0.1
7#BINDTO6 = ::1 7#BINDTO6 = ::1
8 8
9[fs] 9[fs]
diff --git a/src/transport/test_transport_api_rel_http_peer1.conf b/src/transport/test_transport_api_rel_http_peer1.conf
index 807e49149..c8ce1db1b 100644
--- a/src/transport/test_transport_api_rel_http_peer1.conf
+++ b/src/transport/test_transport_api_rel_http_peer1.conf
@@ -37,7 +37,7 @@ MINIMUM-FRIENDS = 0
37[transport] 37[transport]
38PLUGINS = http 38PLUGINS = http
39#PLUGINS = tcp http 39#PLUGINS = tcp http
40DEBUG = YES 40#DEBUG = YES
41ACCEPT_FROM6 = ::1; 41ACCEPT_FROM6 = ::1;
42ACCEPT_FROM = 127.0.0.1; 42ACCEPT_FROM = 127.0.0.1;
43NEIGHBOUR_LIMIT = 50 43NEIGHBOUR_LIMIT = 50
diff --git a/src/transport/test_transport_api_rel_http_peer2.conf b/src/transport/test_transport_api_rel_http_peer2.conf
index 7d14e3987..805d4292b 100644
--- a/src/transport/test_transport_api_rel_http_peer2.conf
+++ b/src/transport/test_transport_api_rel_http_peer2.conf
@@ -37,7 +37,7 @@ MINIMUM-FRIENDS = 0
37[transport] 37[transport]
38PLUGINS = http 38PLUGINS = http
39#PLUGINS = tcp http 39#PLUGINS = tcp http
40DEBUG = YES 40#DEBUG = YES
41ACCEPT_FROM6 = ::1; 41ACCEPT_FROM6 = ::1;
42ACCEPT_FROM = 127.0.0.1; 42ACCEPT_FROM = 127.0.0.1;
43NEIGHBOUR_LIMIT = 50 43NEIGHBOUR_LIMIT = 50