From: Evan Hunt <each@isc.org>
Date: Wed, 22 Feb 2023 02:15:55 +0000 (-0800)
Subject: remove dead code in dns_request
X-Git-Tag: v9.19.11~30^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d376210124bb859cb6465a73e66204a6ce77a5e;p=thirdparty%2Fbind9.git

remove dead code in dns_request

the 'connected' variable in 'dns_request_create()` was always false.
---

diff --git a/lib/dns/request.c b/lib/dns/request.c
index 442b98bc4be..e3bef774b57 100644
--- a/lib/dns/request.c
+++ b/lib/dns/request.c
@@ -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);