From: Mark Andrews <marka@isc.org>
Date: Wed, 31 Oct 2018 05:14:43 +0000 (+1100)
Subject: use new packet for response; rename variable to request and response
X-Git-Tag: v9.13.4~65^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=280d0ca50793c2172286a83d940e28c3bb99ac2f;p=thirdparty%2Fbind9.git

use new packet for response; rename variable to request and response
---

diff --git a/bin/tests/system/resolver/ans8/ans.pl b/bin/tests/system/resolver/ans8/ans.pl
index f3bf33fa6de..fd76eb1c742 100644
--- a/bin/tests/system/resolver/ans8/ans.pl
+++ b/bin/tests/system/resolver/ans8/ans.pl
@@ -44,39 +44,42 @@ $SIG{TERM} = \&rmpid;
 
 sub handleUDP {
 	my ($buf) = @_;
-	my $packet;
+	my $request;
 
 	if ($Net::DNS::VERSION > 0.68) {
-		$packet = new Net::DNS::Packet(\$buf, 0);
+		$request = new Net::DNS::Packet(\$buf, 0);
 		$@ and die $@;
 	} else {
 		my $err;
-		($packet, $err) = new Net::DNS::Packet(\$buf, 0);
+		($request, $err) = new Net::DNS::Packet(\$buf, 0);
 		$err and die $err;
 	}
 
-	my @questions = $packet->question;
+	my @questions = $request->question;
 	my $qname = $questions[0]->qname;
 	my $qtype = $questions[0]->qtype;
 	my $qclass = $questions[0]->qclass;
-	my $id = $packet->header->id;
+	my $id = $request->header->id;
 
-	$packet->header->qr(1);
-	$packet->header->aa(1);
-	$packet->header->tc(0);
+	my $response = new Net::DNS::Packet($qname, $qtype, $qclass);
+	$response->header->qr(1);
+	$response->header->aa(1);
+	$response->header->tc(0);
+	$response->header->id($id);
 
 	# Responses to queries for no-questions/NS and ns.no-questions/A are
 	# _not_ malformed or truncated.
 	if ($qname eq "no-questions" && $qtype eq "NS") {
-		$packet->push("answer", new Net::DNS::RR($qname . " 300 NS ns.no-questions"));
-		$packet->push("additional", new Net::DNS::RR("ns.no-questions. 300 A 10.53.0.8"));
-		return $packet->data;
+		$response->push("answer", new Net::DNS::RR($qname . " 300 NS ns.no-questions"));
+		$response->push("additional", new Net::DNS::RR("ns.no-questions. 300 A 10.53.0.8"));
+		return $response->data;
 	} elsif ($qname eq "ns.no-questions") {
-		$packet->push("answer", new Net::DNS::RR($qname . " 300 A 10.53.0.8"));
-		return $packet->data;
+		$response->push("answer", new Net::DNS::RR($qname . " 300 A 10.53.0.8"))
+			if ($qtype eq "A");
+		return $response->data;
 	} elsif ($qname =~ /\.formerr-to-all$/) {
-		$packet->header->rcode("FORMERR");
-		return $packet->data;
+		$response->header->rcode("FORMERR");
+		return $response->data;
 	}
 
 	# don't use Net::DNS to construct the header only reply as early
@@ -110,14 +113,14 @@ sub handleTCP {
 	my $id = $request->header->id;
 
 	my @results = ();
-	my $packet = new Net::DNS::Packet($qname, $qtype, $qclass);
+	my $response = new Net::DNS::Packet($qname, $qtype, $qclass);
 
-	$packet->header->qr(1);
-	$packet->header->aa(1);
-	$packet->header->id($id);
+	$response->header->qr(1);
+	$response->header->aa(1);
+	$response->header->id($id);
 
-	$packet->push("answer", new Net::DNS::RR("$qname 300 A 1.2.3.4"));
-	push(@results, $packet->data);
+	$response->push("answer", new Net::DNS::RR("$qname 300 A 1.2.3.4"));
+	push(@results, $response->data);
 
 	return \@results;
 }