]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
remove dead code in dns_request
authorEvan Hunt <each@isc.org>
Wed, 22 Feb 2023 02:15:55 +0000 (18:15 -0800)
committerEvan Hunt <each@isc.org>
Fri, 24 Feb 2023 08:30:33 +0000 (08:30 +0000)
the 'connected' variable in 'dns_request_create()` was always false.

lib/dns/request.c

index 442b98bc4be6d76a1b463cfc658436176b9fb662..e3bef774b5738579584e0cff44a2a2d52469fd0e 100644 (file)
@@ -561,7 +561,6 @@ dns_request_create(dns_requestmgr_t *requestmgr, dns_message_t *message,
        isc_mem_t *mctx = NULL;
        dns_messageid_t id;
        bool tcp = false;
-       bool connected = false;
 
        REQUIRE(VALID_REQUESTMGR(requestmgr));
        REQUIRE(message != NULL);
@@ -672,21 +671,14 @@ again:
        UNLOCK(&requestmgr->lock);
 
        request->destaddr = *destaddr;
-       if (tcp && connected) {
-               req_send(request);
-
-               /* no need to call req_connected(), unref here */
-               dns_request_unref(request);
-       } else {
-               request->flags |= DNS_REQUEST_F_CONNECTING;
-               if (tcp) {
-                       request->flags |= DNS_REQUEST_F_TCP;
-               }
+       request->flags |= DNS_REQUEST_F_CONNECTING;
+       if (tcp) {
+               request->flags |= DNS_REQUEST_F_TCP;
+       }
 
-               result = dns_dispatch_connect(request->dispentry);
-               if (result != ISC_R_SUCCESS) {
-                       goto unlink;
-               }
+       result = dns_dispatch_connect(request->dispentry);
+       if (result != ISC_R_SUCCESS) {
+               goto unlink;
        }
 
        req_log(ISC_LOG_DEBUG(3), "dns_request_create: request %p", request);