restructuring configs + enabling additional plugins

4 files changed, 79 insertions, 84 deletions

diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf
index f6bd4a439..b6653ccd5 100644
--- a/src/integration-tests/confs/c_bootstrap_server.conf
+++ b/src/integration-tests/confs/c_bootstrap_server.conf
@@ -1,12 +1,39 @@
 @INLINE@ confs/test_defaults.conf
 
-
 [PATHS]
 GNUNET_TEST_HOME = /tmp/c_bootstrap_server/
 
 [PEER]
 PRIVATE_KEY = hostkeys/c_bootstrap_server
 
+
+[transport]
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-8
+PORT = 20011
+PLUGINS = tcp udp http_client https_client http_server https_server
+
+[transport-tcp]
+PORT = 20010
+ADVERTISED_PORT = 20010
+
+[transport-udp]
+PORT = 20009
+
+[transport-http_server]
+PORT = 20008
+
+[transport-https_server]
+PORT = 20007
+
+[hostlist]
+OPTIONS = -p
+SERVERs = 
+
+[nat]
+BEHIND_NAT = NO
+DISABLEV6 = NO
+
+
 [arm]
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-4
 PORT = 20004
@@ -45,17 +72,6 @@ BEHIND_NAT = NO
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-6
 PORT = 20005
 
-[transport]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-8
-PORT = 20011
-
-[transport-tcp]
-PORT = 20010
-ADVERTISED_PORT = 20010
-
-[transport-udp]
-PORT = 20009
-
 [gns]
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-gns-15
 PORT = 20018
@@ -64,12 +80,6 @@ PORT = 20018
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-16
 PORT = 20019
 
-
-
-[hostlist]
-OPTIONS = -p
-SERVERs = 
-
 [vpn]
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn-15
 
@@ -85,10 +95,5 @@ PORT = 20001
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-12
 PORT = 20015
 
-[transport-http]
-PORT = 20008
-
-[transport-https]
-PORT = 20007
 
 
diff --git a/src/integration-tests/confs/c_nat_client.conf b/src/integration-tests/confs/c_nat_client.conf
index 942360c93..d4126a8b5 100644
--- a/src/integration-tests/confs/c_nat_client.conf
+++ b/src/integration-tests/confs/c_nat_client.conf
@@ -1,5 +1,32 @@
 @INLINE@ confs/test_defaults.conf
 
+[PATHS]
+GNUNET_TEST_HOME = /tmp/c_nat_client/
+
+[PEER]
+PRIVATE_KEY = hostkeys/c_nat_client
+
+
+[transport]
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-50
+PORT = 20065
+PLUGINS = tcp udp
+
+[transport-tcp]
+PORT = 0
+ADVERTISED_PORT = 20064
+
+[transport-udp]
+PORT = 0
+
+[hostlist]
+SERVERS = http://localhost:8080/
+
+[nat]
+BEHIND_NAT = YES
+DISABLEV6 = NO
+
+
 [arm]
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-46
 PORT = 20058
@@ -28,20 +55,6 @@ PORT = 20054
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-48
 PORT = 20059
 
-[transport]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-50
-PORT = 20065
-
-[transport-tcp]
-PORT = 0
-ADVERTISED_PORT = 20064
-
-[transport-udp]
-PORT = 0
-
-[hostlist]
-SERVERS = http://localhost:8080/
-
 [dv]
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_nat_c-1
 
@@ -49,18 +62,6 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_nat_c-1
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-52
 PORT = 20067
 
-[PATHS]
-GNUNET_TEST_HOME = /tmp/c_nat_client
-
-[PEER]
-PRIVATE_KEY = hostkeys/c_nat_client
-
 [nse]
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-54
-PORT = 20069
-
-[transport-http]
-PORT = 0
-
-[transport-https]
-PORT = 0
+PORT = 20069
\ No newline at end of file
diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf
index f26925265..731331ba3 100644
--- a/src/integration-tests/confs/c_no_nat_client.conf
+++ b/src/integration-tests/confs/c_no_nat_client.conf
@@ -6,8 +6,29 @@ GNUNET_TEST_HOME = /tmp/c_no_nat_client/
 [PEER]
 PRIVATE_KEY = hostkeys/c_no_nat_client
 
+
+[transport]
+PLUGINS = tcp udp http_client https_client 
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-22
+PORT = 20029
+
+[transport-tcp]
+PORT = 20028
+ADVERTISED_PORT = 20028
+
+[transport-udp]
+PORT = 20027
+BROADCAST_INTERVAL = 30 s
+
+[hostlist]
+SERVERS = http://localhost:8080/
+
+[nat]
+BEHIND_NAT = NO
+DISABLEV6 = NO
+
+
 [arm]
-DEFAULTSERVICES = topology hostlist dht nse mesh fs
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-18
 PORT = 20022
 
@@ -53,10 +74,6 @@ PORT = 20018
 DATABASE = heap
 QUOTA = 50 MB
 
-[nat]
-BEHIND_NAT = NO
-DISABLEV6 = NO
-
 [gnunet-nat-server]
 PORT = 20020
 
@@ -64,23 +81,6 @@ PORT = 20020
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-20
 PORT = 20023
 
-[transport]
-PLUGINS = tcp udp
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-22
-UNIX_MATCH_UID = NO
-PORT = 20029
-
-[transport-tcp]
-PORT = 20028
-ADVERTISED_PORT = 20028
-
-[transport-udp]
-PORT = 20027
-BROADCAST_INTERVAL = 30 s
-
-[hostlist]
-SERVERS = http://localhost:8080/
-
 [vpn]
 BINARY = gnunet-service-vpn
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn-29
@@ -114,10 +114,3 @@ PORT = 20038
 [dv]
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-36
 PORT = 20039
-
-[transport-http]
-PORT = 20026
-
-[transport-https]
-PORT = 20025
-
diff --git a/src/integration-tests/confs/test_defaults.conf b/src/integration-tests/confs/test_defaults.conf
index e5f5bd264..75677acc5 100644
--- a/src/integration-tests/confs/test_defaults.conf
+++ b/src/integration-tests/confs/test_defaults.conf
@@ -40,8 +40,7 @@ QUOTA = 1 MB
 WEAKRANDOM = NO
 
 [nat]
-BEHIND_NAT = YES
-DISABLEV6 = YES
+BEHIND_NAT = NO
 EXTERNAL_ADDRESS = 127.0.0.1
 INTERNAL_ADDRESS = 127.0.0.1
 BINDTO = 127.0.0.1
@@ -53,9 +52,6 @@ STATE_DIR = $GNUNET_TEST_HOME/persistence/
 UPDATE_DIR = $GNUNET_TEST_HOME/updates/
 TRUST = $GNUNET_TEST_HOME/data/credit/
 
-[transport]
-PLUGINS = tcp
-
 [transport-tcp]
 USE_LOCALADDR = YES