rename configs to match

diff --git a/src/transport/test_communicator_tcp_basic_peer1.conf b/src/transport/test_communicator_tcp_basic_peer1.conf
new file mode 100644 (file)
index 0000000..fc08af1
--- /dev/null
+++ b/src/transport/test_communicator_tcp_basic_peer1.conf
@@ -0,0 +1,31 @@
+@INLINE@ test_transport_defaults.conf
+
+[PATHS]
+GNUNET_TEST_HOME = $GNUNET_TMP/test-communicator-unix-1/
+
+[PEER]
+PRIVATE_KEY = $GNUNET_TMP/test-communicator-unix-1/private.key
+
+[transport-tcp]
+PORT = 52400
+
+[transport-udp]
+PORT = 52401
+
+[transport]
+PORT = 60000
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport_test_1.sock
+
+[nat]
+UNIXPATH = $GNUNET_TMP/test-communicator-unix-1/nat.sock
+ENABLE_IPSCAN = YES
+
+[communicator-unix]
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_gnunet-communicator-unix_1.sock
+
+[communicator-tcp]
+BINDTO = 60002
+DISABLE_V6 = YES
+
+[communicator-udp]
+BINDTO = 60002

diff --git a/src/transport/test_communicator_tcp_basic_peer2.conf b/src/transport/test_communicator_tcp_basic_peer2.conf
new file mode 100644 (file)
index 0000000..4197df0
--- /dev/null
+++ b/src/transport/test_communicator_tcp_basic_peer2.conf
@@ -0,0 +1,31 @@
+@INLINE@ test_transport_defaults.conf
+
+[PATHS]
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunetd-plugin-transport/
+
+[PEER]
+PRIVATE_KEY = $GNUNET_TMP/test-communicator-unix-2/private.key
+
+
+[transport-tcp]
+PORT = 52400
+
+[transport-udp]
+PORT = 52401
+
+[transport]
+PORT = 60001
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport_test_2.sock
+
+[nat]
+UNIXPATH = $GNUNET_TMP/test-communicator-unix-2/nat.sock
+
+[communicator-unix]
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_gnunet-communicator-unix_2.sock
+
+[communicator-tcp]
+BINDTO = 60003
+DISABLE_V6 = YES
+
+[communicator-udp]
+BINDTO = 60003

diff --git a/src/transport/test_communicator_tcp_peer1.conf b/src/transport/test_communicator_tcp_peer1.conf
deleted file mode 100644 (file)
index fc08af1..0000000
--- a/src/transport/test_communicator_tcp_peer1.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-@INLINE@ test_transport_defaults.conf
-
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-communicator-unix-1/
-
-[PEER]
-PRIVATE_KEY = $GNUNET_TMP/test-communicator-unix-1/private.key
-
-[transport-tcp]
-PORT = 52400
-
-[transport-udp]
-PORT = 52401
-
-[transport]
-PORT = 60000
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport_test_1.sock
-
-[nat]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-1/nat.sock
-ENABLE_IPSCAN = YES
-
-[communicator-unix]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_gnunet-communicator-unix_1.sock
-
-[communicator-tcp]
-BINDTO = 60002
-DISABLE_V6 = YES
-
-[communicator-udp]
-BINDTO = 60002

diff --git a/src/transport/test_communicator_tcp_peer2.conf b/src/transport/test_communicator_tcp_peer2.conf
deleted file mode 100644 (file)
index 4197df0..0000000
--- a/src/transport/test_communicator_tcp_peer2.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-@INLINE@ test_transport_defaults.conf
-
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunetd-plugin-transport/
-
-[PEER]
-PRIVATE_KEY = $GNUNET_TMP/test-communicator-unix-2/private.key
-
-
-[transport-tcp]
-PORT = 52400
-
-[transport-udp]
-PORT = 52401
-
-[transport]
-PORT = 60001
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport_test_2.sock
-
-[nat]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-2/nat.sock
-
-[communicator-unix]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_gnunet-communicator-unix_2.sock
-
-[communicator-tcp]
-BINDTO = 60003
-DISABLE_V6 = YES
-
-[communicator-udp]
-BINDTO = 60003

diff --git a/src/transport/test_communicator_udp_basic_peer2.conf b/src/transport/test_communicator_udp_basic_peer2.conf
new file mode 100644 (file)
index 0000000..0472820
--- /dev/null
+++ b/src/transport/test_communicator_udp_basic_peer2.conf
@@ -0,0 +1,33 @@
+@INLINE@ test_transport_defaults.conf
+
+[PATHS]
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunetd-plugin-transport/
+
+[PEER]
+PRIVATE_KEY = $GNUNET_TMP/test-communicator-unix-2/private.key
+
+
+[transport-tcp]
+PORT = 52400
+
+[transport-udp]
+PORT = 52401
+
+[transport]
+PORT = 60001
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport_test_2.sock
+
+[nat]
+UNIXPATH = $GNUNET_TMP/test-communicator-unix-2/nat.sock
+
+[communicator-unix]
+UNIXPATH = $GNUNET_RUNTIME_DIR/test_gnunet-communicator-unix_2.sock
+
+[communicator-tcp]
+BINDTO = 60003
+DISABLE_V6 = YES
+
+[communicator-udp]
+BINDTO = 60003
+DISABLE_V6 = YES
+MAX_QUEUE_LENGTH=5000

diff --git a/src/transport/test_communicator_udp_peer2.conf b/src/transport/test_communicator_udp_peer2.conf
deleted file mode 100644 (file)
index 0472820..0000000
--- a/src/transport/test_communicator_udp_peer2.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-@INLINE@ test_transport_defaults.conf
-
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunetd-plugin-transport/
-
-[PEER]
-PRIVATE_KEY = $GNUNET_TMP/test-communicator-unix-2/private.key
-
-
-[transport-tcp]
-PORT = 52400
-
-[transport-udp]
-PORT = 52401
-
-[transport]
-PORT = 60001
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport_test_2.sock
-
-[nat]
-UNIXPATH = $GNUNET_TMP/test-communicator-unix-2/nat.sock
-
-[communicator-unix]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test_gnunet-communicator-unix_2.sock
-
-[communicator-tcp]
-BINDTO = 60003
-DISABLE_V6 = YES
-
-[communicator-udp]
-BINDTO = 60003
-DISABLE_V6 = YES
-MAX_QUEUE_LENGTH=5000

diff --git a/src/transport/test_communicator_unix_basic_peer2.conf b/src/transport/test_communicator_unix_basic_peer2.conf
new file mode 100644 (file)
index 0000000..fe27ef1
--- /dev/null
+++ b/src/transport/test_communicator_unix_basic_peer2.conf
@@ -0,0 +1,30 @@
+@INLINE@ test_transport_defaults.conf
+
+[PATHS]
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunetd-plugin-transport/
+
+[PEER]
+PRIVATE_KEY = $GNUNET_TMP/test-communicator-unix-2/private.key
+
+
+[transport-tcp]
+PORT = 52400
+
+[transport-udp]
+PORT = 52401
+
+[transport]
+PORT = 60001
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport_test_2.sock
+
+[nat]
+UNIXPATH = $GNUNET_TMP/communicator-unix-2/nat.sock
+
+[communicator-unix]
+UNIXPATH = $GNUNET_RUNTIME_DIR/communicator-unix-2.sock
+
+[communicator-tcp]
+BINDTO = 60003
+
+[communicator-udp]
+BINDTO = 60003

diff --git a/src/transport/test_communicator_unix_peer2.conf b/src/transport/test_communicator_unix_peer2.conf
deleted file mode 100644 (file)
index fe27ef1..0000000
--- a/src/transport/test_communicator_unix_peer2.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-@INLINE@ test_transport_defaults.conf
-
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunetd-plugin-transport/
-
-[PEER]
-PRIVATE_KEY = $GNUNET_TMP/test-communicator-unix-2/private.key
-
-
-[transport-tcp]
-PORT = 52400
-
-[transport-udp]
-PORT = 52401
-
-[transport]
-PORT = 60001
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport_test_2.sock
-
-[nat]
-UNIXPATH = $GNUNET_TMP/communicator-unix-2/nat.sock
-
-[communicator-unix]
-UNIXPATH = $GNUNET_RUNTIME_DIR/communicator-unix-2.sock
-
-[communicator-tcp]
-BINDTO = 60003
-
-[communicator-udp]
-BINDTO = 60003