diff options
author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2019-12-23 17:29:57 +0900 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2019-12-23 17:29:57 +0900 |
commit | ad16610d60141848958c9a4838cd4b706a2d4f2b (patch) | |
tree | d7ba25b8f206fe769f7c20de6fde4f7439f87839 | |
parent | 58b8c9ffcbfb433fb764e6259a73c9bc971f1545 (diff) | |
download | gnunet-ad16610d60141848958c9a4838cd4b706a2d4f2b.tar.gz gnunet-ad16610d60141848958c9a4838cd4b706a2d4f2b.zip |
add tcp test; minor fix
-rw-r--r-- | src/transport/Makefile.am | 15 | ||||
-rw-r--r-- | 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 += \ | |||
588 | test_transport_api_slow_ats | 588 | test_transport_api_slow_ats |
589 | endif | 589 | endif |
590 | check_PROGRAMS += \ | 590 | check_PROGRAMS += \ |
591 | test_communicator_basic_unix | 591 | test_communicator_basic_unix \ |
592 | test_communicator_basic_tcp | ||
592 | if HAVE_EXPERIMENTAL | 593 | if HAVE_EXPERIMENTAL |
593 | check_PROGRAMS += \ | 594 | check_PROGRAMS += \ |
594 | test_transport_address_switch_udp \ | 595 | test_transport_address_switch_udp \ |
@@ -789,6 +790,14 @@ test_communicator_basic_unix_LDADD = \ | |||
789 | $(top_builddir)/src/testing/libgnunettesting.la \ | 790 | $(top_builddir)/src/testing/libgnunettesting.la \ |
790 | $(top_builddir)/src/util/libgnunetutil.la | 791 | $(top_builddir)/src/util/libgnunetutil.la |
791 | 792 | ||
793 | test_communicator_basic_tcp_SOURCES = \ | ||
794 | test_communicator_basic.c | ||
795 | test_communicator_basic_tcp_LDADD = \ | ||
796 | libgnunettransporttesting2.la \ | ||
797 | $(top_builddir)/src/testing/libgnunettesting.la \ | ||
798 | $(top_builddir)/src/util/libgnunetutil.la | ||
799 | |||
800 | |||
792 | test_plugin_unix_SOURCES = \ | 801 | test_plugin_unix_SOURCES = \ |
793 | test_plugin_transport.c | 802 | test_plugin_transport.c |
794 | test_plugin_unix_LDADD = \ | 803 | test_plugin_unix_LDADD = \ |
@@ -1487,4 +1496,6 @@ test_transport_api_slow_ats_peer2.conf \ | |||
1487 | tcp_server_legacy.c \ | 1496 | tcp_server_legacy.c \ |
1488 | tcp_service_legacy.c \ | 1497 | tcp_service_legacy.c \ |
1489 | test_communicator_unix_peer1.conf \ | 1498 | test_communicator_unix_peer1.conf \ |
1490 | test_communicator_unix_peer2.conf | 1499 | test_communicator_unix_peer2.conf \ |
1500 | test_communicator_tcp_peer1.conf \ | ||
1501 | 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, | |||
2081 | (void) cls; | 2081 | (void) cls; |
2082 | cfg = c; | 2082 | cfg = c; |
2083 | if (GNUNET_OK != | 2083 | if (GNUNET_OK != |
2084 | GNUNET_CONFIGURATION_get_value_filename (cfg, | 2084 | GNUNET_CONFIGURATION_get_value_string (cfg, |
2085 | COMMUNICATOR_CONFIG_SECTION, | 2085 | COMMUNICATOR_CONFIG_SECTION, |
2086 | "BINDTO", | 2086 | "BINDTO", |
2087 | &bindto)) | 2087 | &bindto)) |
2088 | { | 2088 | { |
2089 | GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, | 2089 | GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, |
2090 | COMMUNICATOR_CONFIG_SECTION, | 2090 | COMMUNICATOR_CONFIG_SECTION, |