From d91097e0c7154b82a54cae7e181bfb25925ecb48 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Tue, 11 Jan 2022 23:35:22 -0800 Subject: [PATCH] change ns__client_request() to ns_client_request() in the future we'll want to call this function from outside named, so change the name to one suitable for external access. --- lib/ns/client.c | 4 ++-- lib/ns/include/ns/client.h | 4 ++-- lib/ns/interfacemgr.c | 8 ++++---- tests/libtest/ns.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/ns/client.c b/lib/ns/client.c index 13b4b4f49b..c016c8986c 100644 --- a/lib/ns/client.c +++ b/lib/ns/client.c @@ -1680,8 +1680,8 @@ ns__client_put_cb(void *client0) { * or tcpmsg (TCP case). */ void -ns__client_request(isc_nmhandle_t *handle, isc_result_t eresult, - isc_region_t *region, void *arg) { +ns_client_request(isc_nmhandle_t *handle, isc_result_t eresult, + isc_region_t *region, void *arg) { ns_client_t *client = NULL; isc_result_t result; isc_result_t sigresult = ISC_R_SUCCESS; diff --git a/lib/ns/include/ns/client.h b/lib/ns/include/ns/client.h index bfd4e131c4..28f4bfd929 100644 --- a/lib/ns/include/ns/client.h +++ b/lib/ns/include/ns/client.h @@ -445,8 +445,8 @@ ns_client_addopt(ns_client_t *client, dns_message_t *message, */ void -ns__client_request(isc_nmhandle_t *handle, isc_result_t eresult, - isc_region_t *region, void *arg); +ns_client_request(isc_nmhandle_t *handle, isc_result_t eresult, + isc_region_t *region, void *arg); /*%< * Handle client requests. diff --git a/lib/ns/interfacemgr.c b/lib/ns/interfacemgr.c index c21003c2c2..ae73e42340 100644 --- a/lib/ns/interfacemgr.c +++ b/lib/ns/interfacemgr.c @@ -482,7 +482,7 @@ ns_interface_listenudp(ns_interface_t *ifp) { /* Reserve space for an ns_client_t with the netmgr handle */ result = isc_nm_listenudp(ifp->mgr->nm, ISC_NM_LISTEN_ALL, &ifp->addr, - ns__client_request, ifp, + ns_client_request, ifp, &ifp->udplistensocket); return (result); } @@ -492,7 +492,7 @@ ns_interface_listentcp(ns_interface_t *ifp) { isc_result_t result; result = isc_nm_listenstreamdns( - ifp->mgr->nm, ISC_NM_LISTEN_ALL, &ifp->addr, ns__client_request, + ifp->mgr->nm, ISC_NM_LISTEN_ALL, &ifp->addr, ns_client_request, ifp, ns__client_tcpconn, ifp, ifp->mgr->backlog, &ifp->mgr->sctx->tcpquota, NULL, &ifp->tcplistensocket); if (result != ISC_R_SUCCESS) { @@ -525,7 +525,7 @@ ns_interface_listentls(ns_interface_t *ifp, isc_tlsctx_t *sslctx) { isc_result_t result; result = isc_nm_listenstreamdns( - ifp->mgr->nm, ISC_NM_LISTEN_ALL, &ifp->addr, ns__client_request, + ifp->mgr->nm, ISC_NM_LISTEN_ALL, &ifp->addr, ns_client_request, ifp, ns__client_tcpconn, ifp, ifp->mgr->backlog, &ifp->mgr->sctx->tcpquota, sslctx, &ifp->tcplistensocket); @@ -559,7 +559,7 @@ load_http_endpoints(isc_nm_http_endpoints_t *epset, ns_interface_t *ifp, for (size_t i = 0; i < neps; i++) { result = isc_nm_http_endpoints_add(epset, eps[i], - ns__client_request, ifp); + ns_client_request, ifp); if (result != ISC_R_SUCCESS) { break; } diff --git a/tests/libtest/ns.c b/tests/libtest/ns.c index 49c60256e2..4e450c86dd 100644 --- a/tests/libtest/ns.c +++ b/tests/libtest/ns.c @@ -456,7 +456,7 @@ ns_test_qctx_create(const ns_test_qctx_create_params_t *params, /* * Allow recursion for the client. As NS_CLIENTATTR_RA normally gets - * set in ns__client_request(), i.e. earlier than the unit tests hook + * set in ns_client_request(), i.e. earlier than the unit tests hook * into the call chain, just set it manually. */ client->attributes |= NS_CLIENTATTR_RA;