merge dns_request_createvia() into dns_request_create()

dns_request_create() was a front-end to dns_request_createvia() that
was only used by test binaries. dns_request_createvia() has been
renamed to dns_request_create(), and the test programs that formerly
used dns_request_create() have been updated to use the new parameters.

(cherry picked from commit ebf7b31aa36c379b5adef6ebd999d3ef0ebfd308)

diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 202a1637f349add249e4d3bec3799fd5f0ae2909..933a05602fbd8eade053b52e63e9714d7b408b1d 100644 (file)
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -2500,11 +2500,11 @@ send_update(dns_name_t *zone, isc_sockaddr_t *primary) {
                updatemsg->tsigname->attributes |= DNS_NAMEATTR_NOCOMPRESS;
        }
 
-       result = dns_request_createvia(requestmgr, updatemsg, srcaddr, primary,
-                                      -1, options, tsigkey, timeout,
-                                      udp_timeout, udp_retries, global_task,
-                                      update_completed, NULL, &request);
-       check_result(result, "dns_request_createvia");
+       result = dns_request_create(requestmgr, updatemsg, srcaddr, primary, -1,
+                                   options, tsigkey, timeout, udp_timeout,
+                                   udp_retries, global_task, update_completed,
+                                   NULL, &request);
+       check_result(result, "dns_request_create");
 
        if (debugging) {
                show_message(stdout, updatemsg, "Outgoing update query:");
@@ -2609,11 +2609,11 @@ recvsoa(isc_task_t *task, isc_event_t *event) {
                        srcaddr = localaddr4;
                }
 
-               result = dns_request_createvia(
-                       requestmgr, soaquery, srcaddr, addr, -1, 0, NULL,
-                       FIND_TIMEOUT * 20, FIND_TIMEOUT, 3, global_task,
-                       recvsoa, reqinfo, &request);
-               check_result(result, "dns_request_createvia");
+               result = dns_request_create(requestmgr, soaquery, srcaddr, addr,
+                                           -1, 0, NULL, FIND_TIMEOUT * 20,
+                                           FIND_TIMEOUT, 3, global_task,
+                                           recvsoa, reqinfo, &request);
+               check_result(result, "dns_request_create");
                requests++;
                return;
        }
@@ -2828,11 +2828,11 @@ sendrequest(isc_sockaddr_t *destaddr, dns_message_t *msg,
                srcaddr = localaddr4;
        }
 
-       result = dns_request_createvia(requestmgr, msg, srcaddr, destaddr, -1,
-                                      0, default_servers ? NULL : tsigkey,
-                                      FIND_TIMEOUT * 20, FIND_TIMEOUT, 3,
-                                      global_task, recvsoa, reqinfo, request);
-       check_result(result, "dns_request_createvia");
+       result = dns_request_create(requestmgr, msg, srcaddr, destaddr, -1, 0,
+                                   default_servers ? NULL : tsigkey,
+                                   FIND_TIMEOUT * 20, FIND_TIMEOUT, 3,
+                                   global_task, recvsoa, reqinfo, request);
+       check_result(result, "dns_request_create");
        requests++;
 }
 
@@ -3030,11 +3030,11 @@ send_gssrequest(isc_sockaddr_t *destaddr, dns_message_t *msg,
                srcaddr = localaddr4;
        }
 
-       result = dns_request_createvia(requestmgr, msg, srcaddr, destaddr, -1,
-                                      options, tsigkey, FIND_TIMEOUT * 20,
-                                      FIND_TIMEOUT, 3, global_task, recvgss,
-                                      reqinfo, request);
-       check_result(result, "dns_request_createvia");
+       result = dns_request_create(requestmgr, msg, srcaddr, destaddr, -1,
+                                   options, tsigkey, FIND_TIMEOUT * 20,
+                                   FIND_TIMEOUT, 3, global_task, recvgss,
+                                   reqinfo, request);
+       check_result(result, "dns_request_create");
        if (debugging) {
                show_message(stdout, msg, "Outgoing update query:");
        }

diff --git a/bin/tests/system/pipelined/pipequeries.c b/bin/tests/system/pipelined/pipequeries.c
index 3291fcf0d3b171b97dca35e71a842ecefa90eb0a..67994b5a468d3d5ca0e6b287b2a757fb96e6b50e 100644 (file)
--- a/bin/tests/system/pipelined/pipequeries.c
+++ b/bin/tests/system/pipelined/pipequeries.c
@@ -169,10 +169,10 @@ sendquery(isc_task_t *task) {
        ISC_LIST_APPEND(qname->list, qrdataset, link);
        dns_message_addname(message, qname, DNS_SECTION_QUESTION);
 
-       result = dns_request_createvia(requestmgr, message,
-                                      have_src ? &srcaddr : NULL, &dstaddr, -1,
-                                      DNS_REQUESTOPT_TCP, NULL, TIMEOUT, 0, 0,
-                                      task, recvresponse, message, &request);
+       result = dns_request_create(requestmgr, message,
+                                   have_src ? &srcaddr : NULL, &dstaddr, -1,
+                                   DNS_REQUESTOPT_TCP, NULL, TIMEOUT, 0, 0,
+                                   task, recvresponse, message, &request);
        CHECK("dns_request_create", result);
 
        return (ISC_R_SUCCESS);

diff --git a/bin/tests/system/tkey/keycreate.c b/bin/tests/system/tkey/keycreate.c
index b2c61e23e2f4f561b72bd8cfdf35cb7e498cdeb6..3b9c3a451f327511232c9031ede918e23b4fdf76 100644 (file)
--- a/bin/tests/system/tkey/keycreate.c
+++ b/bin/tests/system/tkey/keycreate.c
@@ -178,9 +178,9 @@ sendquery(isc_task_t *task, isc_event_t *event) {
                                       DNS_TSIG_HMACMD5_NAME, &nonce, 3600);
        CHECK("dns_tkey_builddhquery", result);
 
-       result = dns_request_create(requestmgr, query, &address,
-                                   DNS_REQUESTOPT_TCP, initialkey, TIMEOUT,
-                                   task, recvquery, query, &request);
+       result = dns_request_create(requestmgr, query, NULL, &address, -1,
+                                   DNS_REQUESTOPT_TCP, initialkey, TIMEOUT, 0,
+                                   0, task, recvquery, query, &request);
        CHECK("dns_request_create", result);
 }
 

diff --git a/bin/tests/system/tkey/keydelete.c b/bin/tests/system/tkey/keydelete.c
index b563ebcb44dac5425e283102a1b661fd5b38a72a..100ed8461e52cc79cdf9f8754d0d35519c868700 100644 (file)
--- a/bin/tests/system/tkey/keydelete.c
+++ b/bin/tests/system/tkey/keydelete.c
@@ -122,9 +122,9 @@ sendquery(isc_task_t *task, isc_event_t *event) {
        result = dns_tkey_builddeletequery(query, tsigkey);
        CHECK("dns_tkey_builddeletequery", result);
 
-       result = dns_request_create(requestmgr, query, &address,
-                                   DNS_REQUESTOPT_TCP, tsigkey, TIMEOUT, task,
-                                   recvquery, query, &request);
+       result = dns_request_create(requestmgr, query, NULL, &address, -1,
+                                   DNS_REQUESTOPT_TCP, tsigkey, TIMEOUT, 0, 0,
+                                   task, recvquery, query, &request);
        CHECK("dns_request_create", result);
 }
 

diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c
index cd1488fd55d8f826473e3e7c865bc99cbea7c36e..034331e953fd8254334d509bf17edba70a616b29 100644 (file)
--- a/bin/tools/mdig.c
+++ b/bin/tools/mdig.c
@@ -754,12 +754,13 @@ sendquery(struct query *query, isc_task_t *task) {
        if (tcp_mode) {
                options |= DNS_REQUESTOPT_TCP;
        }
+
        request = NULL;
-       result = dns_request_createvia(
+       result = dns_request_create(
                requestmgr, message, have_src ? &srcaddr : NULL, &dstaddr, dscp,
                options, NULL, query->timeout, query->udptimeout,
                query->udpretries, task, recvresponse, message, &request);
-       CHECK("dns_request_createvia", result);
+       CHECK("dns_request_create", result);
 
        return (ISC_R_SUCCESS);
 }

diff --git a/lib/dns/include/dns/request.h b/lib/dns/include/dns/request.h
index bf17171edd00baf0ad3992e94e9422e985809cbe..49d579fdc218510071179780f4f64bd32d3bbef1 100644 (file)
--- a/lib/dns/include/dns/request.h
+++ b/lib/dns/include/dns/request.h
@@ -155,49 +155,13 @@ dns_requestmgr_detach(dns_requestmgr_t **requestmgrp);
 
 isc_result_t
 dns_request_create(dns_requestmgr_t *requestmgr, dns_message_t *message,
-                  const isc_sockaddr_t *address, unsigned int options,
-                  dns_tsigkey_t *key, unsigned int timeout, isc_task_t *task,
+                  const isc_sockaddr_t *srcaddr,
+                  const isc_sockaddr_t *destaddr, isc_dscp_t dscp,
+                  unsigned int options, dns_tsigkey_t *key,
+                  unsigned int timeout, unsigned int udptimeout,
+                  unsigned int udpretries, isc_task_t *task,
                   isc_taskaction_t action, void *arg,
                   dns_request_t **requestp);
-/*%<
- * Create and send a request.
- *
- * Notes:
- *
- *\li  'message' will be rendered and sent to 'address'.  If the
- *     #DNS_REQUESTOPT_TCP option is set, TCP will be used,
- *     #DNS_REQUESTOPT_SHARE option is set too, connecting TCP
- *     (vs. connected) will be shared too.  The request
- *     will timeout after 'timeout' seconds.
- *
- *\li  If the #DNS_REQUESTOPT_CASE option is set, use case sensitive
- *     compression.
- *
- *\li  When the request completes, successfully, due to a timeout, or
- *     because it was canceled, a completion event will be sent to 'task'.
- *
- * Requires:
- *
- *\li  'message' is a valid DNS message.
- *
- *\li  'address' is a valid sockaddr.
- *
- *\li  'timeout' > 0
- *
- *\li  'task' is a valid task.
- *
- *\li  requestp != NULL && *requestp == NULL
- */
-
-isc_result_t
-dns_request_createvia(dns_requestmgr_t *requestmgr, dns_message_t *message,
-                     const isc_sockaddr_t *srcaddr,
-                     const isc_sockaddr_t *destaddr, isc_dscp_t dscp,
-                     unsigned int options, dns_tsigkey_t *key,
-                     unsigned int timeout, unsigned int udptimeout,
-                     unsigned int udpretries, isc_task_t *task,
-                     isc_taskaction_t action, void *arg,
-                     dns_request_t **requestp);
 /*%<
  * Create and send a request.
  *

diff --git a/lib/dns/request.c b/lib/dns/request.c
index 5a70ad6d890402876ce2590073d871528bb03d1e..699744eee4732f4aab6b9ee5c5a5223303c63847 100644 (file)
--- a/lib/dns/request.c
+++ b/lib/dns/request.c
@@ -634,24 +634,13 @@ cleanup:
 
 isc_result_t
 dns_request_create(dns_requestmgr_t *requestmgr, dns_message_t *message,
-                  const isc_sockaddr_t *address, unsigned int options,
-                  dns_tsigkey_t *key, unsigned int timeout, isc_task_t *task,
+                  const isc_sockaddr_t *srcaddr,
+                  const isc_sockaddr_t *destaddr, isc_dscp_t dscp,
+                  unsigned int options, dns_tsigkey_t *key,
+                  unsigned int timeout, unsigned int udptimeout,
+                  unsigned int udpretries, isc_task_t *task,
                   isc_taskaction_t action, void *arg,
                   dns_request_t **requestp) {
-       return (dns_request_createvia(requestmgr, message, NULL, address, -1,
-                                     options, key, timeout, 0, 0, task, action,
-                                     arg, requestp));
-}
-
-isc_result_t
-dns_request_createvia(dns_requestmgr_t *requestmgr, dns_message_t *message,
-                     const isc_sockaddr_t *srcaddr,
-                     const isc_sockaddr_t *destaddr, isc_dscp_t dscp,
-                     unsigned int options, dns_tsigkey_t *key,
-                     unsigned int timeout, unsigned int udptimeout,
-                     unsigned int udpretries, isc_task_t *task,
-                     isc_taskaction_t action, void *arg,
-                     dns_request_t **requestp) {
        dns_request_t *request = NULL;
        isc_result_t result;
        isc_mem_t *mctx = NULL;
@@ -669,7 +658,7 @@ dns_request_createvia(dns_requestmgr_t *requestmgr, dns_message_t *message,
 
        mctx = requestmgr->mctx;
 
-       req_log(ISC_LOG_DEBUG(3), "dns_request_createvia");
+       req_log(ISC_LOG_DEBUG(3), "dns_request_create");
 
        if (atomic_load_acquire(&requestmgr->exiting)) {
                return (ISC_R_SHUTTINGDOWN);
@@ -786,7 +775,7 @@ again:
                }
        }
 
-       req_log(ISC_LOG_DEBUG(3), "dns_request_createvia: request %p", request);
+       req_log(ISC_LOG_DEBUG(3), "dns_request_create: request %p", request);
        *requestp = request;
        return (ISC_R_SUCCESS);
 
@@ -803,7 +792,7 @@ cleanup:
        isc_task_detach(&(isc_task_t *){ task });
        /* final detach to shut down request */
        req_detach(&request);
-       req_log(ISC_LOG_DEBUG(3), "dns_request_createvia: failed %s",
+       req_log(ISC_LOG_DEBUG(3), "dns_request_create: failed %s",
                isc_result_totext(result));
        return (result);
 }
@@ -1032,7 +1021,7 @@ req_connected(isc_result_t eresult, isc_region_t *region, void *arg) {
        }
        UNLOCK(&request->requestmgr->locks[request->hash]);
 
-       /* attached in dns_request_createvia/_createraw() */
+       /* attached in dns_request_create/_createraw() */
        req_detach(&(dns_request_t *){ request });
 }
 

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index b5b564ed07c19dd89d2a738b14212ace0f17076d..3247fdea991372d5f10efde08eedbd26b0f09f25 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -12807,10 +12807,10 @@ notify_send_toaddr(isc_task_t *task, isc_event_t *event) {
        if (DNS_ZONE_FLAG(notify->zone, DNS_ZONEFLG_DIALNOTIFY)) {
                timeout = 30;
        }
-       result = dns_request_createvia(
-               notify->zone->view->requestmgr, message, &src, &notify->dst,
-               dscp, options, key, timeout * 3, timeout, 2, notify->zone->task,
-               notify_done, notify, &notify->request);
+       result = dns_request_create(notify->zone->view->requestmgr, message,
+                                   &src, &notify->dst, dscp, options, key,
+                                   timeout * 3, timeout, 2, notify->zone->task,
+                                   notify_done, notify, &notify->request);
        if (result == ISC_R_SUCCESS) {
                if (isc_sockaddr_pf(&notify->dst) == AF_INET) {
                        inc_stats(notify->zone,
@@ -13535,7 +13535,7 @@ stub_request_nameserver_address(struct stub_cb_args *args, bool ipv4,
 
        atomic_fetch_add_release(&args->stub->pending_requests, 1);
 
-       result = dns_request_createvia(
+       result = dns_request_create(
                zone->view->requestmgr, message, &zone->sourceaddr,
                &zone->primaryaddr, args->dscp, DNS_REQUESTOPT_TCP,
                args->tsig_key, args->timeout * 3, args->timeout, 2, zone->task,
@@ -13546,7 +13546,7 @@ stub_request_nameserver_address(struct stub_cb_args *args, bool ipv4,
                pr = atomic_fetch_sub_release(&args->stub->pending_requests, 1);
                INSIST(pr > 1);
                zone_debuglog(zone, "stub_send_query", 1,
-                             "dns_request_createvia() failed: %s",
+                             "dns_request_create() failed: %s",
                              isc_result_totext(result));
                goto fail;
        }
@@ -14785,13 +14785,13 @@ again:
        if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DIALREFRESH)) {
                timeout = 30;
        }
-       result = dns_request_createvia(
+       result = dns_request_create(
                zone->view->requestmgr, message, &zone->sourceaddr,
                &zone->primaryaddr, dscp, options, key, timeout * 3, timeout, 2,
                zone->task, refresh_callback, zone, &zone->request);
        if (result != ISC_R_SUCCESS) {
                zone_idetach(&dummy);
-               zone_debuglog(zone, me, 1, "dns_request_createvia() failed: %s",
+               zone_debuglog(zone, me, 1, "dns_request_create() failed: %s",
                              isc_result_totext(result));
                goto skip_primary;
        } else {
@@ -15071,12 +15071,12 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) {
        cb_args->timeout = timeout;
        cb_args->reqnsid = reqnsid;
 
-       result = dns_request_createvia(
+       result = dns_request_create(
                zone->view->requestmgr, message, &zone->sourceaddr,
                &zone->primaryaddr, dscp, DNS_REQUESTOPT_TCP, key, timeout * 3,
                timeout, 2, zone->task, stub_callback, cb_args, &zone->request);
        if (result != ISC_R_SUCCESS) {
-               zone_debuglog(zone, me, 1, "dns_request_createvia() failed: %s",
+               zone_debuglog(zone, me, 1, "dns_request_create() failed: %s",
                              isc_result_totext(result));
                goto cleanup;
        }
@@ -21420,15 +21420,14 @@ checkds_send_toaddr(isc_task_t *task, isc_event_t *event) {
 
        timeout = 15;
        options |= DNS_REQUESTOPT_TCP;
-       result = dns_request_createvia(
+       result = dns_request_create(
                checkds->zone->view->requestmgr, message, &src, &checkds->dst,
                dscp, options, key, timeout * 3, timeout, 2,
                checkds->zone->task, checkds_done, checkds, &checkds->request);
        if (result != ISC_R_SUCCESS) {
-               dns_zone_log(
-                       checkds->zone, ISC_LOG_DEBUG(3),
-                       "checkds: dns_request_createvia() to %s failed: %s",
-                       addrbuf, isc_result_totext(result));
+               dns_zone_log(checkds->zone, ISC_LOG_DEBUG(3),
+                            "checkds: dns_request_create() to %s failed: %s",
+                            addrbuf, isc_result_totext(result));
        }
 
 cleanup_key: