Re-purpose TLS DNS and TCP DNS unit tests for Stream DNS

This commit modifies the existing unit tests for TLS DNS and TCP DNS
in such a way that the new Stream DNS transport is used as it is
intended to be a drop-in replacement for these two transports.

diff --git a/bin/tests/test_client.c b/bin/tests/test_client.c
index 15cf35125d1fba7e875b7ba35f67e7552379dec9..e4a133c0344de93338acc310337b5e5451556b3f 100644 (file)
--- a/bin/tests/test_client.c
+++ b/bin/tests/test_client.c
@@ -380,14 +380,16 @@ run(void) {
                                  connect_cb, NULL, timeout);
                break;
        case TCP:
-               isc_nm_tcpdnsconnect(netmgr, &sockaddr_local, &sockaddr_remote,
-                                    connect_cb, NULL, timeout);
+               isc_nm_streamdnsconnect(netmgr, &sockaddr_local,
+                                       &sockaddr_remote, connect_cb, NULL,
+                                       timeout, NULL, NULL);
                break;
        case DOT: {
                isc_tlsctx_createclient(&tls_ctx);
 
-               isc_nm_tlsdnsconnect(netmgr, &sockaddr_local, &sockaddr_remote,
-                                    connect_cb, NULL, timeout, tls_ctx, NULL);
+               isc_nm_streamdnsconnect(netmgr, &sockaddr_local,
+                                       &sockaddr_remote, connect_cb, NULL,
+                                       timeout, tls_ctx, NULL);
                break;
        }
 #if HAVE_LIBNGHTTP2

diff --git a/tests/isc/tcpdns_test.c b/tests/isc/tcpdns_test.c
index 43b75a70a3877b1e384a7c20e55dc0095ab897ba..dabd0e84e4a3f3591b9991848abe95269207f2c9 100644 (file)
--- a/tests/isc/tcpdns_test.c
+++ b/tests/isc/tcpdns_test.c
@@ -50,9 +50,9 @@ stop_listening(void *arg __attribute__((__unused__))) {
 static void
 start_listening(uint32_t nworkers, isc_nm_accept_cb_t accept_cb,
                isc_nm_recv_cb_t recv_cb) {
-       isc_result_t result = isc_nm_listentcpdns(
+       isc_result_t result = isc_nm_listenstreamdns(
                listen_nm, nworkers, &tcp_listen_addr, recv_cb, NULL, accept_cb,
-               NULL, 128, NULL, &listen_sock);
+               NULL, 128, NULL, NULL, &listen_sock);
        assert_int_equal(result, ISC_R_SUCCESS);
 
        isc_loop_teardown(mainloop, stop_listening, listen_sock);
@@ -60,8 +60,9 @@ start_listening(uint32_t nworkers, isc_nm_accept_cb_t accept_cb,
 
 static void
 tcpdns_connect(isc_nm_t *nm) {
-       isc_nm_tcpdnsconnect(nm, &tcp_connect_addr, &tcp_listen_addr,
-                            connect_connect_cb, tcpdns_connect, T_CONNECT);
+       isc_nm_streamdnsconnect(nm, &tcp_connect_addr, &tcp_listen_addr,
+                               connect_connect_cb, tcpdns_connect, T_CONNECT,
+                               NULL, NULL);
 }
 
 ISC_LOOP_TEST_IMPL(tcpdns_noop) {
@@ -69,16 +70,18 @@ ISC_LOOP_TEST_IMPL(tcpdns_noop) {
 
        connect_readcb = NULL;
        isc_refcount_increment0(&active_cconnects);
-       isc_nm_tcpdnsconnect(connect_nm, &tcp_connect_addr, &tcp_listen_addr,
-                            connect_success_cb, tcpdns_connect, T_CONNECT);
+       isc_nm_streamdnsconnect(connect_nm, &tcp_connect_addr, &tcp_listen_addr,
+                               connect_success_cb, tcpdns_connect, T_CONNECT,
+                               NULL, NULL);
 }
 
 ISC_LOOP_TEST_IMPL(tcpdns_noresponse) {
        start_listening(ISC_NM_LISTEN_ALL, noop_accept_cb, noop_recv_cb);
 
        isc_refcount_increment0(&active_cconnects);
-       isc_nm_tcpdnsconnect(connect_nm, &tcp_connect_addr, &tcp_listen_addr,
-                            connect_connect_cb, tcpdns_connect, T_CONNECT);
+       isc_nm_streamdnsconnect(connect_nm, &tcp_connect_addr, &tcp_listen_addr,
+                               connect_connect_cb, tcpdns_connect, T_CONNECT,
+                               NULL, NULL);
 }
 
 ISC_LOOP_TEST_IMPL(tcpdns_timeout_recovery) {

diff --git a/tests/isc/tlsdns_test.c b/tests/isc/tlsdns_test.c
index a8de6bce4aa474adc4f43b6007bf24ba9f65809d..b33496ba7d4121256f2b3d9ccdb08edf74944605 100644 (file)
--- a/tests/isc/tlsdns_test.c
+++ b/tests/isc/tlsdns_test.c
@@ -49,7 +49,7 @@ stop_listening(void *arg __attribute__((__unused__))) {
 static void
 start_listening(uint32_t nworkers, isc_nm_accept_cb_t accept_cb,
                isc_nm_recv_cb_t recv_cb) {
-       isc_result_t result = isc_nm_listentlsdns(
+       isc_result_t result = isc_nm_listenstreamdns(
                listen_nm, nworkers, &tcp_listen_addr, recv_cb, NULL, accept_cb,
                NULL, 128, NULL, tcp_listen_tlsctx, &listen_sock);
        assert_int_equal(result, ISC_R_SUCCESS);
@@ -59,9 +59,10 @@ start_listening(uint32_t nworkers, isc_nm_accept_cb_t accept_cb,
 
 static void
 tlsdns_connect(isc_nm_t *nm) {
-       isc_nm_tlsdnsconnect(nm, &tcp_connect_addr, &tcp_listen_addr,
-                            connect_connect_cb, tlsdns_connect, T_CONNECT,
-                            tcp_connect_tlsctx, tcp_tlsctx_client_sess_cache);
+       isc_nm_streamdnsconnect(nm, &tcp_connect_addr, &tcp_listen_addr,
+                               connect_connect_cb, tlsdns_connect, T_CONNECT,
+                               tcp_connect_tlsctx,
+                               tcp_tlsctx_client_sess_cache);
 }
 
 ISC_LOOP_TEST_IMPL(tlsdns_noop) {
@@ -69,18 +70,20 @@ ISC_LOOP_TEST_IMPL(tlsdns_noop) {
 
        connect_readcb = NULL;
        isc_refcount_increment0(&active_cconnects);
-       isc_nm_tlsdnsconnect(connect_nm, &tcp_connect_addr, &tcp_listen_addr,
-                            connect_success_cb, tlsdns_connect, T_CONNECT,
-                            tcp_connect_tlsctx, tcp_tlsctx_client_sess_cache);
+       isc_nm_streamdnsconnect(connect_nm, &tcp_connect_addr, &tcp_listen_addr,
+                               connect_success_cb, tlsdns_connect, T_CONNECT,
+                               tcp_connect_tlsctx,
+                               tcp_tlsctx_client_sess_cache);
 }
 
 ISC_LOOP_TEST_IMPL(tlsdns_noresponse) {
        start_listening(ISC_NM_LISTEN_ALL, noop_accept_cb, noop_recv_cb);
 
        isc_refcount_increment0(&active_cconnects);
-       isc_nm_tlsdnsconnect(connect_nm, &tcp_connect_addr, &tcp_listen_addr,
-                            connect_connect_cb, tlsdns_connect, T_CONNECT,
-                            tcp_connect_tlsctx, tcp_tlsctx_client_sess_cache);
+       isc_nm_streamdnsconnect(connect_nm, &tcp_connect_addr, &tcp_listen_addr,
+                               connect_connect_cb, tlsdns_connect, T_CONNECT,
+                               tcp_connect_tlsctx,
+                               tcp_tlsctx_client_sess_cache);
 }
 
 ISC_LOOP_TEST_IMPL(tlsdns_timeout_recovery) {
@@ -99,9 +102,10 @@ ISC_LOOP_TEST_IMPL(tlsdns_timeout_recovery) {
        connect_readcb = timeout_retry_cb;
        isc_nm_settimeouts(connect_nm, T_SOFT, T_SOFT, T_SOFT, T_SOFT);
        isc_refcount_increment0(&active_cconnects);
-       isc_nm_tlsdnsconnect(connect_nm, &tcp_connect_addr, &tcp_listen_addr,
-                            connect_connect_cb, tlsdns_connect, T_SOFT,
-                            tcp_connect_tlsctx, tcp_tlsctx_client_sess_cache);
+       isc_nm_streamdnsconnect(connect_nm, &tcp_connect_addr, &tcp_listen_addr,
+                               connect_connect_cb, tlsdns_connect, T_SOFT,
+                               tcp_connect_tlsctx,
+                               tcp_tlsctx_client_sess_cache);
 }
 
 ISC_LOOP_TEST_IMPL(tlsdns_recv_one) {