summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2011-06-16 12:32:58 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2011-06-16 12:32:58 +0000
commit2aff944f4bce448c67c576d384926c2ffe8c8c5a (patch)
treed998a3b512d7ecb20f860420d37e5c283a83caed
parent79da60ccee66fd4f4bff337e298915a45f808768 (diff)
updated _api_, _api_reliability_ and api_unrel... confs
-rw-r--r--src/transport/test_transport_api_http_peer1.conf44
-rw-r--r--src/transport/test_transport_api_http_peer2.conf49
-rw-r--r--src/transport/test_transport_api_https_peer1.conf40
-rw-r--r--src/transport/test_transport_api_https_peer2.conf32
-rw-r--r--src/transport/test_transport_api_multi_peer1.conf23
-rw-r--r--src/transport/test_transport_api_multi_peer2.conf35
-rw-r--r--src/transport/test_transport_api_rel_http_peer2.conf32
-rw-r--r--src/transport/test_transport_api_tcp_nat_peer1.conf43
-rw-r--r--src/transport/test_transport_api_tcp_nat_peer2.conf30
-rw-r--r--src/transport/test_transport_api_tcp_peer1.conf31
-rw-r--r--src/transport/test_transport_api_tcp_peer2.conf30
-rw-r--r--src/transport/test_transport_api_udp_nat_peer1.conf42
-rw-r--r--src/transport/test_transport_api_udp_nat_peer2.conf44
-rw-r--r--src/transport/test_transport_api_udp_peer1.conf18
-rw-r--r--src/transport/test_transport_api_udp_peer2.conf50
-rw-r--r--src/transport/test_transport_api_unix_peer1.conf18
-rw-r--r--src/transport/test_transport_api_unix_peer2.conf18
17 files changed, 199 insertions, 380 deletions
diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf
index e4e972c8c..d9ab3c5e0 100644
--- 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 a8833c7a4..a4b7b8bf0 100644
--- 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 a2decb6fb..e441bfc2b 100644
--- 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 07495835c..cf0c5c915 100644
--- 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 959388391..003491323 100644
--- 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 ca7a505c9..fcfc1db03 100644
--- 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 8f7640f21..3c8621b39 100644
--- 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 2afe41210..e7724aa88 100644
--- 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 b8e0906e2..1bc6a530d 100644
--- 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 c4a27ea98..f677f9001 100644
--- 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 000e4c6fd..a0074f155 100644
--- 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 0dead9a63..12e1bafb5 100644
--- 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 c291e9e5a..3d2063854 100644
--- 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 dab597fbd..40986e0df 100644
--- 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 2bdeaa6fb..62e21f866 100644
--- 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 04d198d62..b896bafa5 100644
--- 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 50623fd93..fd5f5fa47 100644
--- 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]