updated _api_, _api_reliability_ and api_unrel... confs

diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf
index e4e972c8c492f99fb6a81cd5e3f3ff83e97cdefa..d9ab3c5e01ad5c4cbe65e5907a2e54375ae764b6 100644 (file)
--- a/src/transport/test_transport_api_http_peer1.conf
+++ b/src/transport/test_transport_api_http_peer1.conf
@@ -1,5 +1,5 @@
 [transport-http]
-PORT = 12389
+PORT = 12080
 DEBUG = NO
 USE_IPv6 = YES
 USE_IPv4 = YES
@@ -7,23 +7,6 @@ USE_IPv4 = YES
 #BINDTO6 = ::1
 USE_LOCALADDR = YES
 
-[transport-https]
-PORT = 42389
-DEBUG = NO
-USE_IPv6 = YES
-USE_IPv4 = YES
-#BINDTO4 = 127.0.0.1
-#BINDTO6 = ::1
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[core]
-AUTOSTART = NO
-
 [hostlist]
 HTTP-PROXY = 
 SERVERS = http://gnunet.org:8080/
@@ -45,7 +28,6 @@ MINIMUM-FRIENDS = 0
 
 [transport]
 PLUGINS = http
-#PLUGINS = tcp http
 #DEBUG = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
@@ -54,7 +36,7 @@ BINARY = gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12365
+PORT = 12081
 UNIXPATH = /tmp/gnunet-p1-service-transport.sock
 #PREFIX = xterm -T transport2 -e gdb --command=cmd --args
 #PREFIX = valgrind --leak-check=full
@@ -69,7 +51,7 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12369
+PORT = 12082
 UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
 
 [resolver]
@@ -79,7 +61,7 @@ BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12364
+PORT = 12083
 UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
 
 [statistics]
@@ -89,7 +71,7 @@ BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12367
+PORT = 12084
 UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
 
 [arm]
@@ -100,13 +82,9 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12366
+PORT = 12085
 UNIXPATH = /tmp/gnunet-p1-service-arm.sock
 
-[transport-tcp]
-PORT = 12399
-#DEBUG = YES
-
 
 [TESTING]
 WEAKRANDOM = YES
@@ -115,8 +93,16 @@ WEAKRANDOM = YES
 HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
+SERVICEHOME = /tmp/test-transport/api-http-p1/
+
+[fs]
+AUTOSTART = NO
+
+[datastore]
+AUTOSTART = NO
 
+[core]
+AUTOSTART = NO
 
 [dht]
 AUTOSTART = NO

diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf
index a8833c7a45dbf2670b5a95aa3623bc67bb637810..a4b7b8bf03dc6771e108fd331fae1310e16c7cab 100644 (file)
--- a/src/transport/test_transport_api_http_peer2.conf
+++ b/src/transport/test_transport_api_http_peer2.conf
@@ -1,5 +1,5 @@
 [transport-http]
-PORT = 22368
+PORT = 12090
 DEBUG = NO
 USE_IPv6 = YES
 USE_IPv4 = YES
@@ -7,23 +7,6 @@ USE_IPv4 = YES
 #BINDTO6 = ::1
 USE_LOCALADDR = YES
 
-[transport-https]
-PORT = 42388
-DEBUG = NO
-USE_IPv6 = YES
-USE_IPv4 = YES
-#BINDTO4 = 127.0.0.1
-#BINDTO6 = ::1
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[core]
-AUTOSTART = NO
-
 [hostlist]
 HTTP-PROXY = 
 SERVERS = http://gnunet.org:8080/
@@ -45,7 +28,6 @@ MINIMUM-FRIENDS = 0
 
 [transport]
 PLUGINS = http
-#PLUGINS = tcp http
 #DEBUG = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
@@ -54,7 +36,7 @@ BINARY = gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22365
+PORT = 12091
 UNIXPATH = /tmp/gnunet-p2-service-transport.sock
 #PREFIX = xterm -T transport1 -e gdb --command=cmd --args
 #PREFIX = valgrind --leak-check=full
@@ -69,7 +51,7 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22369
+PORT = 12092
 UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 
 [resolver]
@@ -79,7 +61,7 @@ BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22364
+PORT = 12093
 UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
 [statistics]
@@ -89,7 +71,7 @@ BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22367
+PORT = 12094
 UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
 
 
@@ -101,18 +83,9 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22366
+PORT = 12095
 UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 
-
-[transport-http]
-PORT = 22389
-DEBUG = NO
-
-[transport-tcp]
-PORT = 22399
-#DEBUG = YES
-
 [TESTING]
 WEAKRANDOM = YES
 
@@ -120,8 +93,16 @@ WEAKRANDOM = YES
 HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/
+SERVICEHOME = /tmp/test-transport/api-http-p2/
+
+[fs]
+AUTOSTART = NO
 
+[datastore]
+AUTOSTART = NO
+
+[core]
+AUTOSTART = NO
 
 [dht]
 AUTOSTART = NO

diff --git a/src/transport/test_transport_api_https_peer1.conf b/src/transport/test_transport_api_https_peer1.conf
index a2decb6fb6f4a4c4ecfa7f97b2efd8949ed4ed63..e441bfc2bec21c03b03b218960dbd84d7d8788af 100644 (file)
--- a/src/transport/test_transport_api_https_peer1.conf
+++ b/src/transport/test_transport_api_https_peer1.conf
@@ -1,13 +1,5 @@
-[transport-http]
-PORT = 12389
-DEBUG = NO
-USE_IPv6 = YES
-USE_IPv4 = YES
-#BINDTO4 = 127.0.0.1
-#BINDTO6 = ::1
-
 [transport-https]
-PORT = 42389
+PORT = 12100
 DEBUG = NO
 USE_IPv6 = YES
 USE_IPv4 = YES
@@ -50,7 +42,6 @@ MINIMUM-FRIENDS = 0
 
 [transport]
 PLUGINS = https
-#PLUGINS = tcp http
 DEBUG = NO
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
@@ -59,7 +50,7 @@ BINARY = gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12365
+PORT = 12101
 UNIXPATH = /tmp/gnunet-p1-service-transport.sock
 #PREFIX = xterm -T transport2 -e gdb --command=cmd --args
 #PREFIX = valgrind --leak-check=full
@@ -74,7 +65,7 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12369
+PORT = 12102
 UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
 
 [resolver]
@@ -84,7 +75,7 @@ BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12364
+PORT = 12103
 UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
 
 [statistics]
@@ -94,7 +85,7 @@ BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12367
+PORT = 12104
 UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
 
 [arm]
@@ -105,24 +96,7 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12366[mesh]
-AUTOSTART = YES
-PORT = 10512
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-mesh2.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
-
-[transport-tcp]
-PORT = 12399
-DEBUG = YES
-
+PORT = 12105
 
 [TESTING]
 WEAKRANDOM = YES
@@ -131,7 +105,7 @@ WEAKRANDOM = YES
 HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
+SERVICEHOME = /tmp/test-transport/api-https-p1/
 
 
 [dht]

diff --git a/src/transport/test_transport_api_https_peer2.conf b/src/transport/test_transport_api_https_peer2.conf
index 07495835cd40c0491313112201c583409bf6c631..cf0c5c9154dfa1977969a00e08715ce73621e6bd 100644 (file)
--- a/src/transport/test_transport_api_https_peer2.conf
+++ b/src/transport/test_transport_api_https_peer2.conf
@@ -1,13 +1,5 @@
-[transport-http]
-PORT = 22368
-DEBUG = NO
-USE_IPv6 = YES
-USE_IPv4 = YES
-#BINDTO4 = 127.0.0.1
-#BINDTO6 = ::1
-
 [transport-https]
-PORT = 42388
+PORT = 12110
 DEBUG = NO
 USE_IPv6 = YES
 USE_IPv4 = YES
@@ -59,7 +51,7 @@ BINARY = gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22365
+PORT = 12111
 UNIXPATH = /tmp/gnunet-p2-service-transport.sock
 #PREFIX = xterm -T transport1 -e gdb --command=cmd --args
 #PREFIX = valgrind --leak-check=full
@@ -74,7 +66,7 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22369
+PORT = 12112
 UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 
 [resolver]
@@ -84,7 +76,7 @@ BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22364
+PORT = 12113
 UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
 [statistics]
@@ -94,7 +86,7 @@ BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22367
+PORT = 12114
 UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
 
 
@@ -106,18 +98,9 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22366
+PORT = 12115
 UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 
-
-[transport-http]
-PORT = 22389
-DEBUG = NO
-
-[transport-tcp]
-PORT = 22399
-DEBUG = YES
-
 [TESTING]
 WEAKRANDOM = YES
 
@@ -125,8 +108,7 @@ WEAKRANDOM = YES
 HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/
-
+SERVICEHOME = /tmp/test-transport/api-https-p2/
 
 [dht]
 AUTOSTART = NO

diff --git a/src/transport/test_transport_api_multi_peer1.conf b/src/transport/test_transport_api_multi_peer1.conf
index 9593883918cabae0aa4688af923e4be3affc7612..003491323e9bf7d3ce47458ff49f281d0ded6776 100644 (file)
--- a/src/transport/test_transport_api_multi_peer1.conf
+++ b/src/transport/test_transport_api_multi_peer1.conf
@@ -1,5 +1,5 @@
 [transport-tcp]
-PORT = 30001
+PORT = 12140
 BINDTO = 127.0.0.1
 USE_LOCALADDR = YES
 
@@ -12,11 +12,11 @@ INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 
 [transport-udp]
-PORT = 30001
+PORT = 12141
 USE_LOCALADDR = YES
 
 [transport-http]
-PORT = 30002
+PORT = 12142
 DEBUG = NO
 USE_IPv6 = YES
 USE_IPv4 = YES
@@ -25,7 +25,7 @@ USE_IPv4 = YES
 USE_LOCALADDR = YES
 
 [transport-https]
-PORT = 30003
+PORT = 12143
 DEBUG = NO
 USE_IPv6 = YES
 USE_IPv4 = YES
@@ -34,7 +34,7 @@ USE_IPv4 = YES
 USE_LOCALADDR = YES
 
 [transport-unix]
-PORT = 30004
+PORT = 12144
 
 [fs]
 AUTOSTART = NO
@@ -73,11 +73,10 @@ ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
 BINARY = gnunet-service-transport
-#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12365
+PORT = 12145
 UNIXPATH = /tmp/gnunet-p1-service-transport.sock
 
 [peerinfo]
@@ -89,7 +88,7 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12369
+PORT = 12146
 UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
 
 [resolver]
@@ -99,7 +98,7 @@ BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 1236
+PORT = 12147
 UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
 
 [statistics]
@@ -110,7 +109,7 @@ BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12367
+PORT = 12148
 UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
 
 [arm]
@@ -121,7 +120,7 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12366
+PORT = 12149
 UNIXPATH = /tmp/gnunet-p1-service-arm.sock
 
 [TESTING]
@@ -132,7 +131,7 @@ HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
 DEFAULTCONFIG = test_transport_api_multi_peer1.conf
-SERVICEHOME = /tmp/test-gnunetd-transport-multi-peer-1/
+SERVICEHOME = /tmp/test-transport/api-multi-p1/
 
 
 [dht]

diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf
index ca7a505c9a91f7f2bb5c5f1325eb913e3b852f22..fcfc1db033821e5ec778294b2493fd0baeaf65bc 100644 (file)
--- a/src/transport/test_transport_api_multi_peer2.conf
+++ b/src/transport/test_transport_api_multi_peer2.conf
@@ -1,5 +1,5 @@
 [transport-tcp]
-PORT = 40001
+PORT = 12150
 USE_LOCALADDR = YES
 
 [nat]
@@ -12,11 +12,11 @@ EXTERNAL_ADDRESS = 127.0.0.1
 INTERNAL_ADDRESS = 127.0.0.1
 
 [transport-udp]
-PORT = 40002
+PORT = 12151
 USE_LOCALADDR = YES
 
 [transport-http]
-PORT = 40003
+PORT = 12152
 DEBUG = NO
 USE_IPv6 = YES
 USE_IPv4 = YES
@@ -25,7 +25,7 @@ USE_IPv4 = YES
 USE_LOCALADDR = YES
 
 [transport-https]
-PORT = 40004
+PORT = 12153
 DEBUG = NO
 USE_IPv6 = YES
 USE_IPv4 = YES
@@ -34,7 +34,7 @@ USE_IPv4 = YES
 USE_LOCALADDR = YES
 
 [transport-unix]
-PORT = 40005
+PORT = 12154
 
 [core]
 AUTOSTART = NO
@@ -44,18 +44,7 @@ AUTOSTART = NO
 
 [datastore]
 AUTOSTART = NO
-[mesh]
-AUTOSTART = YES
-PORT = 10512
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-mesh2.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+
 [hostlist]
 HTTP-PROXY = 
 SERVERS = http://gnunet.org:8080/
@@ -86,7 +75,7 @@ BINARY = gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22365
+PORT = 12155
 UNIXPATH = /tmp/gnunet-p2-service-transport.sock
 #PREFIX = valgrind --tool=callgrind
 #PREFIX = xterm -T transport2 -e gdb --command=cmd --args
@@ -101,7 +90,7 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22369
+PORT = 12156
 UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 
 [resolver]
@@ -111,7 +100,7 @@ BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22364
+PORT = 12157
 UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
 [statistics]
@@ -122,7 +111,7 @@ BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22367
+PORT = 12158
 UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
 
 [arm]
@@ -133,7 +122,7 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22366
+PORT = 12159
 UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 
 [TESTING]
@@ -144,7 +133,7 @@ HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
 DEFAULTCONFIG = test_transport_api_multi_peer2.conf
-SERVICEHOME = /tmp/test-gnunetd-transport-multi-peer-2/
+SERVICEHOME = /tmp/test-transport/api-multi-p2/
 
 
 [dht]

diff --git a/src/transport/test_transport_api_rel_http_peer2.conf b/src/transport/test_transport_api_rel_http_peer2.conf
index 8f7640f21ae4f1468be2f3f0aed3eea8fbbd7a7d..3c8621b39c459a34c4c0543048c1b35da951d12f 100644 (file)
--- a/src/transport/test_transport_api_rel_http_peer2.conf
+++ b/src/transport/test_transport_api_rel_http_peer2.conf
@@ -1,14 +1,5 @@
-[transport-http]
-PORT = 22389
-DEBUG = NO
-USE_IPv4 = YES
-USE_IPv6 = NO
-BINDTO4 = 127.0.0.1
-#BINDTO6 = ::1
-USE_LOCALADDR = YES
-
 [transport-https]
-PORT = 42389
+PORT = 12090
 DEBUG = NO
 USE_IPv6 = YES
 USE_IPv4 = YES
@@ -56,7 +47,7 @@ BINARY = gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22365
+PORT = 12091
 UNIXPATH = /tmp/gnunet-p2-service-transport.sock
 #PREFIX = xterm -T transport1 -e gdb --command=cmd --args
 #PREFIX = valgrind --leak-check=full
@@ -73,7 +64,7 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22369
+PORT = 12092
 UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 
 [resolver]
@@ -83,7 +74,7 @@ BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22364
+PORT = 12093
 UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
 [statistics]
@@ -93,7 +84,7 @@ BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22367
+PORT = 12094
 UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
 
 
@@ -105,18 +96,9 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22366
+PORT = 12095
 UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 
-
-[transport-http]
-PORT = 22389
-#DEBUG = NO
-
-[transport-tcp]
-PORT = 22399
-#DEBUG = YES
-
 [TESTING]
 WEAKRANDOM = YES
 
@@ -124,7 +106,7 @@ WEAKRANDOM = YES
 HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/
+SERVICEHOME = /tmp/test-transport/api-http-p2/
 
 
 [dht]

diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf
index 2afe41210f1ae37dd3bd34f9d56b7ae3b22b043f..e7724aa88cff39c49c0573fec037548ab2e272e6 100644 (file)
--- a/src/transport/test_transport_api_tcp_nat_peer1.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer1.conf
@@ -1,5 +1,5 @@
 [transport-tcp]
-PORT = 12368
+PORT = 12020
 USE_LOCALADDR = YES
 
 [nat]
@@ -11,15 +11,6 @@ ENABLE_NAT_SERVER = YES
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[core]
-AUTOSTART = NO
-
 [hostlist]
 HTTP-PROXY = 
 SERVERS = http://gnunet.org:8080/
@@ -64,7 +55,7 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12369
+PORT = 12021
 UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
 
 [resolver]
@@ -74,7 +65,7 @@ BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 1236
+PORT = 12022
 UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
 
 [statistics]
@@ -85,7 +76,7 @@ BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12367
+PORT = 12023
 UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
 
 [arm]
@@ -96,22 +87,9 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12366
+PORT = 1204
 UNIXPATH = /tmp/gnunet-p1-service-arm.sock
 
-[mesh]
-AUTOSTART = NO
-PORT = 10511
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-mesh.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
 [TESTING]
 WEAKRANDOM = YES
 
@@ -121,16 +99,21 @@ HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
 DEFAULTCONFIG = test_transport_api_tcp_nat_peer1.conf
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
+SERVICEHOME = /tmp/test-transport/api-tcp-nat-p1/
 
+[fs]
+AUTOSTART = NO
 
-[dht]
+[datastore]
 AUTOSTART = NO
 
-[mesh]
+[core]
 AUTOSTART = NO
 
 
+[dht]
+AUTOSTART = NO
+
 [dns]
 AUTOSTART = NO
 

diff --git a/src/transport/test_transport_api_tcp_nat_peer2.conf b/src/transport/test_transport_api_tcp_nat_peer2.conf
index b8e0906e2e6a2377ea48c02447531d5c98877b47..1bc6a530d8f1c23fb9d41a82e599e5fb6a449f60 100644 (file)
--- a/src/transport/test_transport_api_tcp_nat_peer2.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer2.conf
@@ -1,5 +1,5 @@
 [transport-tcp]
-PORT = 23000
+PORT = 12030
 USE_LOCALADDR = YES
 
 [nat]
@@ -10,15 +10,6 @@ ENABLE_NAT_CLIENT = YES
 EXTERNAL_ADDRESS = 127.0.0.1
 INTERNAL_ADDRESS = 127.0.0.1
 
-[core]
-AUTOSTART = NO
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
 [hostlist]
 HTTP-PROXY = 
 SERVERS = http://gnunet.org:8080/
@@ -63,7 +54,7 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22369
+PORT = 12031
 UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 
 [resolver]
@@ -73,7 +64,7 @@ BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22364
+PORT = 12032
 UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
 [statistics]
@@ -84,7 +75,7 @@ BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22367
+PORT = 12033
 UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
 
 [arm]
@@ -95,7 +86,7 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22366
+PORT = 12034
 UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 
 [TESTING]
@@ -107,8 +98,16 @@ HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
 DEFAULTCONFIG = test_transport_api_tcp_nat_peer2.conf
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/
+SERVICEHOME = /tmp/test-transport/api-tcp-nat-p2/
 
+[core]
+AUTOSTART = NO
+
+[fs]
+AUTOSTART = NO
+
+[datastore]
+AUTOSTART = NO
 
 [dht]
 AUTOSTART = NO
@@ -116,7 +115,6 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
-
 [dns]
 AUTOSTART = NO
 

diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf
index c4a27ea981e7f65205d02d7a8acb3443ce3a2783..f677f9001b4dc5b89eb6379a365d19877d687284 100644 (file)
--- a/src/transport/test_transport_api_tcp_peer1.conf
+++ b/src/transport/test_transport_api_tcp_peer1.conf
@@ -1,6 +1,6 @@
 [transport-tcp]
 USE_LOCALADDR = YES
-PORT = 12368
+PORT = 12000
 
 [nat]
 DISABLEV6 = YES
@@ -11,15 +11,6 @@ ENABLE_UPNP = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[core]
-AUTOSTART = NO
-
 [hostlist]
 HTTP-PROXY = 
 SERVERS = http://gnunet.org:8080/
@@ -52,7 +43,7 @@ BINARY = gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12365
+PORT = 12001
 UNIXPATH = /tmp/gnunet-p1-service-transport.sock
 
 [peerinfo]
@@ -64,7 +55,7 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12369
+PORT = 12002
 UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
 
 [resolver]
@@ -74,7 +65,7 @@ BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 1236
+PORT = 12003
 UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
 
 [statistics]
@@ -85,7 +76,7 @@ BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12367
+PORT = 12004
 UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
 
 [arm]
@@ -96,7 +87,7 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12366
+PORT = 12005
 UNIXPATH = /tmp/gnunet-p1-service-arm.sock
 
 [TESTING]
@@ -107,8 +98,16 @@ HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
 #DEFAULTCONFIG = test_transport_api_tcp_peer1.conf
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
+SERVICEHOME = /tmp/test-transport/api-tcp-p1/
 
+[fs]
+AUTOSTART = NO
+
+[datastore]
+AUTOSTART = NO
+
+[core]
+AUTOSTART = NO
 
 [dht]
 AUTOSTART = NO

diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf
index 000e4c6fd6bf67d5f18bc12829947d13e3cdfb1f..a0074f155badfcc9ea32f0910dd9a1c43e215277 100644 (file)
--- a/src/transport/test_transport_api_tcp_peer2.conf
+++ b/src/transport/test_transport_api_tcp_peer2.conf
@@ -11,15 +11,6 @@ ENABLE_UPNP = NO
 EXTERNAL_ADDRESS = 127.0.0.1
 INTERNAL_ADDRESS = 127.0.0.1
 
-[core]
-AUTOSTART = NO
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
 [hostlist]
 HTTP-PROXY = 
 SERVERS = http://gnunet.org:8080/
@@ -50,7 +41,7 @@ BINARY = gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22365
+PORT = 12010
 UNIXPATH = /tmp/gnunet-p2-service-transport.sock
 #PREFIX = valgrind --tool=callgrind
 #PREFIX = xterm -T transport2 -e gdb --command=cmd --args
@@ -65,7 +56,7 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22369
+PORT = 12011
 UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 
 [resolver]
@@ -75,7 +66,7 @@ BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22364
+PORT = 12012
 UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
 [statistics]
@@ -86,7 +77,7 @@ BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22367
+PORT = 12013
 UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
 
 [arm]
@@ -97,7 +88,7 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22366
+PORT = 12014
 UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 
 [TESTING]
@@ -108,8 +99,16 @@ HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
 #DEFAULTCONFIG = test_transport_api_tcp_peer2.conf
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/
+SERVICEHOME = /tmp/test-transport/api-tcp-p2/
 
+[core]
+AUTOSTART = NO
+
+[fs]
+AUTOSTART = NO
+
+[datastore]
+AUTOSTART = NO
 
 [dht]
 AUTOSTART = NO
@@ -117,7 +116,6 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
-
 [dns]
 AUTOSTART = NO
 

diff --git a/src/transport/test_transport_api_udp_nat_peer1.conf b/src/transport/test_transport_api_udp_nat_peer1.conf
index 0dead9a633ecb3591b044f344441d02868077eb2..12e1bafb554c4a0e4c28343b1a280c5086be037f 100644 (file)
--- a/src/transport/test_transport_api_udp_nat_peer1.conf
+++ b/src/transport/test_transport_api_udp_nat_peer1.conf
@@ -1,5 +1,5 @@
 [transport-udp]
-PORT = 12368
+PORT = 12060
 USE_LOCALADDR = YES
 
 [nat]
@@ -10,15 +10,6 @@ ONLY_NAT_ADDRESSES = YES
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 
-[fs]
-AUTOSTART = NO
-
-[datastore-sqlite]
-FILENAME = $SERVICEHOME/datastore/sqlite.db
-
-[datastore]
-AUTOSTART = NO
-
 [hostlist]
 HTTP-PROXY = 
 SERVERS = http://gnunet.org:8080/
@@ -38,21 +29,17 @@ AUTOCONNECT = YES
 FRIENDS-ONLY = NO
 MINIMUM-FRIENDS = 0
 
-[core]
-AUTOSTART = NO
-
 [transport]
 PLUGINS = udp
 DEBUG = NO
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
-#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
 BINARY = gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12365
+PORT = 12061
 UNIXPATH = /tmp/gnunet-p1-service-transport.sock
 #PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer1.log
 #PREFIX = xterm -e xterm -T transport -e gdb --args 
@@ -66,7 +53,7 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12369
+PORT = 12062
 UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
 
 [resolver]
@@ -76,7 +63,7 @@ BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12364
+PORT = 12063
 UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
 
 [statistics]
@@ -86,7 +73,7 @@ BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12367
+PORT = 12064
 UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
 
 [arm]
@@ -97,13 +84,9 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12366
+PORT = 12065
 UNIXPATH = /tmp/gnunet-p1-service-arm.sock
 
-[transport-tcp]
-TIMEOUT = 300000
-PORT = 12368
-
 [TESTING]
 WEAKRANDOM = YES
 
@@ -112,13 +95,24 @@ HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
 DEFAULTCONFIG = test_transport_api_udp_nat_peer1.conf
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
+SERVICEHOME = /tmp/test-transport/api-udp-nat-p1/
 
 [mesh]
 AUTOSTART = NO
 
+[fs]
+AUTOSTART = NO
+
+[datastore-sqlite]
+FILENAME = $SERVICEHOME/datastore/sqlite.db
+
+[datastore]
+AUTOSTART = NO
 
 [dns]
 AUTOSTART = NO
 
+[core]
+AUTOSTART = NO
+
 

diff --git a/src/transport/test_transport_api_udp_nat_peer2.conf b/src/transport/test_transport_api_udp_nat_peer2.conf
index c291e9e5a179065586b0d1118784cf98767700e8..3d2063854e42d86c98a05cecb6b68944c08e9ed4 100644 (file)
--- a/src/transport/test_transport_api_udp_nat_peer2.conf
+++ b/src/transport/test_transport_api_udp_nat_peer2.conf
@@ -1,5 +1,5 @@
 [transport-udp]
-PORT = 22368
+PORT = 12070
 USE_LOCALADDR = YES
 
 [nat]
@@ -9,12 +9,6 @@ ALLOW_NAT = YES
 EXTERNAL_ADDRESS = 127.0.0.1
 INTERNAL_ADDRESS = 127.0.0.1
 
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
 [hostlist]
 HTTP-PROXY = 
 SERVERS = http://gnunet.org:8080/
@@ -45,11 +39,10 @@ ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
 BINARY = gnunet-service-transport
-#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22365
+PORT = 12071
 UNIXPATH = /tmp/gnunet-p2-service-transport.sock
 #PREFIX = xterm -e xterm -T transport -e gdb --args
 #PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer2.log
@@ -63,7 +56,7 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22369
+PORT = 12072
 UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 
 [resolver]
@@ -73,7 +66,7 @@ BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22364
+PORT = 12073
 UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
 [statistics]
@@ -83,7 +76,7 @@ BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22367
+PORT = 12074
 UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
 
 [arm]
@@ -94,25 +87,10 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22366
+PORT = 12075
 UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 
-[transport-tcp]
-TIMEOUT = 300000
-PORT = 22368
-
-[TESTING][mesh]
-AUTOSTART = YES
-PORT = 10512
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-mesh2.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+[TESTING]
 WEAKRANDOM = YES
 
 [gnunetd]
@@ -120,8 +98,13 @@ HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
 DEFAULTCONFIG = test_transport_api_udp_nat_peer2.conf
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/
+SERVICEHOME = /tmp/test-transport/api-udp-nat-p2/
 
+[fs]
+AUTOSTART = NO
+
+[datastore]
+AUTOSTART = NO
 
 [dht]
 AUTOSTART = NO
@@ -129,7 +112,6 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
-
 [dns]
 AUTOSTART = NO
 

diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/transport/test_transport_api_udp_peer1.conf
index dab597fbd04a33c85f2d338d6806350e4464d316..40986e0df2c95c1800b2f90e1d8c0f3bfd64735e 100644 (file)
--- a/src/transport/test_transport_api_udp_peer1.conf
+++ b/src/transport/test_transport_api_udp_peer1.conf
@@ -1,5 +1,5 @@
 [transport-udp]
-PORT = 12368
+PORT = 12040
 USE_LOCALADDR = YES
 
 [fs]
@@ -47,7 +47,7 @@ BINARY = gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12365
+PORT = 12041
 UNIXPATH = /tmp/gnunet-p1-service-transport.sock
 #PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer1.log
 #PREFIX = xterm -e xterm -T transport -e gdb --args 
@@ -61,7 +61,7 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12369
+PORT = 12042
 UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
 
 [resolver]
@@ -71,7 +71,7 @@ BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12364
+PORT = 12043
 UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
 
 [statistics]
@@ -81,7 +81,7 @@ BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12367
+PORT = 12044
 UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
 
 [arm]
@@ -92,13 +92,9 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12366
+PORT = 12045
 UNIXPATH = /tmp/gnunet-p1-service-arm.sock
 
-[transport-tcp]
-TIMEOUT = 300000
-PORT = 12368
-
 [TESTING]
 WEAKRANDOM = YES
 
@@ -107,7 +103,7 @@ HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
 DEFAULTCONFIG = test_transport_api_udp_peer1.conf
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
+SERVICEHOME = /tmp/test-transport/api-udp-p1/
 
 
 [dht]

diff --git a/src/transport/test_transport_api_udp_peer2.conf b/src/transport/test_transport_api_udp_peer2.conf
index 2bdeaa6fb43cd5651b610ca345da3fa14edd7588..62e21f866e15493e5e8b6b063e7a8d512cd945db 100644 (file)
--- a/src/transport/test_transport_api_udp_peer2.conf
+++ b/src/transport/test_transport_api_udp_peer2.conf
@@ -1,20 +1,11 @@
 [transport-udp]
-PORT = 22368
+PORT = 12050
 USE_LOCALADDR = YES
 
-[fs]
-AUTOSTART = NO
-
 [nat]
 # Are we behind NAT?
 BEHIND_NAT = NO
 
-[datastore]
-AUTOSTART = NO
-
-[core]
-AUTOSTART = NO
-
 [hostlist]
 HTTP-PROXY = 
 SERVERS = http://gnunet.org:8080/
@@ -45,7 +36,7 @@ BINARY = gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22365
+PORT = 12051
 UNIXPATH = /tmp/gnunet-p2-service-transport.sock
 #PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer2.log
 
@@ -58,7 +49,7 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22369
+PORT = 12052
 UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 
 [resolver]
@@ -68,7 +59,7 @@ BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22364
+PORT = 12053
 UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
 [statistics]
@@ -78,7 +69,7 @@ BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22367
+PORT = 12054
 UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
 
 [arm]
@@ -89,13 +80,9 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22366
+PORT = 12055
 UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 
-[transport-tcp]
-TIMEOUT = 300000
-PORT = 22368
-
 [TESTING]
 WEAKRANDOM = YES
 
@@ -104,19 +91,17 @@ HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
 DEFAULTCONFIG = test_transport_api_udp_peer2.conf
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/
-[mesh]
-AUTOSTART = YES
-PORT = 10512
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-mesh2.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+SERVICEHOME = /tmp/test-transport/api-udp-p2/
+
+
+[fs]
+AUTOSTART = NO
+
+[datastore]
+AUTOSTART = NO
+
+[core]
+AUTOSTART = NO
 
 [dht]
 AUTOSTART = NO
@@ -124,7 +109,6 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
-
 [dns]
 AUTOSTART = NO
 

diff --git a/src/transport/test_transport_api_unix_peer1.conf b/src/transport/test_transport_api_unix_peer1.conf
index 04d198d6284ed7acbd2d10436d87e1a2cc869151..b896bafa5c3ac46c7b32975bdf8ff2b7a4ab650f 100644 (file)
--- a/src/transport/test_transport_api_unix_peer1.conf
+++ b/src/transport/test_transport_api_unix_peer1.conf
@@ -1,5 +1,5 @@
 [transport-unix]
-PORT = 12368
+PORT = 12120
 
 [fs]
 AUTOSTART = NO
@@ -42,7 +42,7 @@ BINARY = gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12365
+PORT = 12121
 UNIXPATH = /tmp/gnunet-p1-service-transport.sock
 
 
@@ -55,7 +55,7 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12369
+PORT = 12122
 UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
 
 [resolver]
@@ -65,7 +65,7 @@ BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12364
+PORT = 12123
 UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
 
 [statistics]
@@ -75,7 +75,7 @@ BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12367
+PORT = 12124
 UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
 
 [arm]
@@ -86,13 +86,9 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 12366
+PORT = 12125
 UNIXPATH = /tmp/gnunet-p1-service-arm.sock
 
-[transport-tcp]
-TIMEOUT = 300000
-PORT = 12368
-
 [TESTING]
 WEAKRANDOM = YES
 
@@ -101,7 +97,7 @@ HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
 DEFAULTCONFIG = test_transport_api_unix_peer1.conf
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
+SERVICEHOME = /tmp/test-transport/api-unix-p1/
 
 [dht]
 AUTOSTART = NO

diff --git a/src/transport/test_transport_api_unix_peer2.conf b/src/transport/test_transport_api_unix_peer2.conf
index 50623fd9381d1f5556ebc9834067e5ee4326ca33..fd5f5fa47b2808804e5273469dc7233a88c38c01 100644 (file)
--- a/src/transport/test_transport_api_unix_peer2.conf
+++ b/src/transport/test_transport_api_unix_peer2.conf
@@ -1,5 +1,5 @@
 [transport-unix]
-PORT = 22368
+PORT = 12130
 
 [fs]
 AUTOSTART = NO
@@ -40,7 +40,7 @@ BINARY = gnunet-service-transport
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22365
+PORT = 12131
 UNIXPATH = /tmp/gnunet-p2-service-transport.sock
 #PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer2.log
 
@@ -53,7 +53,7 @@ BINARY = gnunet-service-peerinfo
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22369
+PORT = 12132
 UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 
 [resolver]
@@ -63,7 +63,7 @@ BINARY = gnunet-service-resolver
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22364
+PORT = 12133
 UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
 [statistics]
@@ -73,7 +73,7 @@ BINARY = gnunet-service-statistics
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22367
+PORT = 12134
 UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
 
 [arm]
@@ -84,13 +84,9 @@ BINARY = gnunet-service-arm
 CONFIG = $DEFAULTCONFIG
 HOME = $SERVICEHOME
 HOSTNAME = localhost
-PORT = 22366
+PORT = 12135
 UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 
-[transport-tcp]
-TIMEOUT = 300000
-PORT = 22368
-
 [TESTING]
 WEAKRANDOM = YES
 
@@ -99,7 +95,7 @@ HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]
 DEFAULTCONFIG = test_transport_api_unix_peer2.conf
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/
+SERVICEHOME = /tmp/test-transport/api-unix-p2/
 
 
 [dht]