3 files changed, 74 insertions, 2 deletions

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index e35b6bb3f..e037f3001 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -597,7 +597,8 @@ check_PROGRAMS += \
   test_transport_api_reliability_udp \
   test_quota_compliance_udp \
   test_communicator_basic_unix \
-  test_communicator_basic_tcp
+  test_communicator_basic_tcp \
+  test_communicator_basic_udp
 endif
 endif
 
@@ -796,6 +797,13 @@ test_communicator_basic_tcp_LDADD = \
  libgnunettransporttesting2.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
+
+test_communicator_basic_udp_SOURCES = \
+ test_communicator_basic.c
+test_communicator_basic_udp_LDADD = \
+ libgnunettransporttesting2.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
 endif
 
 test_plugin_unix_SOURCES = \
@@ -1498,4 +1506,6 @@ test_transport_api_slow_ats_peer2.conf \
 test_communicator_unix_peer1.conf \
 test_communicator_unix_peer2.conf \
 test_communicator_tcp_peer1.conf \
-test_communicator_tcp_peer2.conf
+test_communicator_tcp_peer2.conf \
+test_communicator_udp_peer1.conf \
+test_communicator_udp_peer2.conf
diff --git a/src/transport/test_communicator_udp_peer1.conf b/src/transport/test_communicator_udp_peer1.conf
new file mode 100644
index 000000000..fc08af1ee
--- /dev/null
+++ b/src/transport/test_communicator_udp_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_udp_peer2.conf b/src/transport/test_communicator_udp_peer2.conf
new file mode 100644
index 000000000..4197df00d
--- /dev/null
+++ b/src/transport/test_communicator_udp_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