restructuring configs + enabling additional plugins

1 files changed, 28 insertions, 27 deletions

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