From ad16610d60141848958c9a4838cd4b706a2d4f2b Mon Sep 17 00:00:00 2001
From: "Schanzenbach, Martin" <mschanzenbach@posteo.de>
Date: Mon, 23 Dec 2019 17:29:57 +0900
Subject: [PATCH] add tcp test; minor fix

---
 src/transport/Makefile.am               | 15 +++++++++++++--
 src/transport/gnunet-communicator-tcp.c |  8 ++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 5d0ba2218..26a37c8bc 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -588,7 +588,8 @@ check_PROGRAMS += \
 test_transport_api_slow_ats
 endif
 check_PROGRAMS += \
-test_communicator_basic_unix
+test_communicator_basic_unix \
+test_communicator_basic_tcp
 if HAVE_EXPERIMENTAL
 check_PROGRAMS += \
   test_transport_address_switch_udp \
@@ -789,6 +790,14 @@ test_communicator_basic_unix_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
+test_communicator_basic_tcp_SOURCES = \
+ test_communicator_basic.c
+test_communicator_basic_tcp_LDADD = \
+ libgnunettransporttesting2.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
+
 test_plugin_unix_SOURCES = \
  test_plugin_transport.c
 test_plugin_unix_LDADD = \
@@ -1487,4 +1496,6 @@ test_transport_api_slow_ats_peer2.conf \
   tcp_server_legacy.c \
   tcp_service_legacy.c \
 test_communicator_unix_peer1.conf \
-test_communicator_unix_peer2.conf
+test_communicator_unix_peer2.conf \
+test_communicator_tcp_peer1.conf \
+test_communicator_tcp_peer2.conf
diff --git a/src/transport/gnunet-communicator-tcp.c b/src/transport/gnunet-communicator-tcp.c
index 098bb9523..70cbb731a 100644
--- a/src/transport/gnunet-communicator-tcp.c
+++ b/src/transport/gnunet-communicator-tcp.c
@@ -2081,10 +2081,10 @@ run (void *cls,
   (void) cls;
   cfg = c;
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_filename (cfg,
-                                               COMMUNICATOR_CONFIG_SECTION,
-                                               "BINDTO",
-                                               &bindto))
+      GNUNET_CONFIGURATION_get_value_string (cfg,
+                                             COMMUNICATOR_CONFIG_SECTION,
+                                             "BINDTO",
+                                             &bindto))
   {
     GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                COMMUNICATOR_CONFIG_SECTION,
-- 
2.25.1