Merge branch '622-validator-refactoring' into 'master'

preliminary validator refactoring

See merge request isc-projects/bind9!2346

CHANGES

@@ -1,3 +1,7 @@
+5318.	[cleanup]	The DNSSEC validation code has been refactored
+			for clarity and to reduce code duplication.
+			[GL #622]
+
 5317.	[func]		A new asynchronous network communications system
 			based on libuv is now used for listening for
 			incoming requests and responding to them. (The

doc/arm/notes-9.15.6.xml

@@ -46,6 +46,12 @@
           in the future releases. [GL #1265]
         </para>
       </listitem>
+      <listitem>
+	<para>
+	  The DNSSEC validation code has been refactored for clarity and to
+	  reduce code duplication.  [GL #622]
+	</para>
+      </listitem>
     </itemizedlist>
   </section>
 

lib/dns/include/dns/validator.h

@@ -128,7 +128,6 @@ struct dns_validator {
 	dns_validator_t *		subvalidator;
 	dns_validator_t *		parent;
 	dns_keytable_t *		keytable;
-	dns_keynode_t *			keynode;
 	dst_key_t *			key;
 	dns_rdata_rrsig_t *		siginfo;
 	isc_task_t *			task;
@@ -136,18 +135,12 @@ struct dns_validator {
 	void *				arg;
 	unsigned int			labels;
 	dns_rdataset_t *		currentset;
-	bool			seensig;
 	dns_rdataset_t *		keyset;
 	dns_rdataset_t *		dsset;
-	dns_rdataset_t *		soaset;
-	dns_rdataset_t *		nsecset;
-	dns_rdataset_t *		nsec3set;
-	dns_name_t *			soaname;
 	dns_rdataset_t			frdataset;
 	dns_rdataset_t			fsigrdataset;
 	dns_fixedname_t			fname;
 	dns_fixedname_t			wild;
-	dns_fixedname_t			nearest;
 	dns_fixedname_t			closest;
 	ISC_LINK(dns_validator_t)	link;
 	bool				mustbesecure;

lib/dns/keytable.c

@@ -47,8 +47,8 @@ struct dns_keynode {
 	unsigned int            magic;
 	isc_refcount_t          refcount;
 	dst_key_t *             key;
-	bool           managed;
-	bool		initial;
+	bool			managed;
+	bool			initial;
 	struct dns_keynode *    next;
 };
 

lib/dns/nta.c

@@ -320,8 +320,7 @@ nta_create(dns_ntatable_t *ntatable, const dns_name_t *name,
 
 isc_result_t
 dns_ntatable_add(dns_ntatable_t *ntatable, const dns_name_t *name,
-		 bool force, isc_stdtime_t now,
-		 uint32_t lifetime)
+		 bool force, isc_stdtime_t now, uint32_t lifetime)
 {
 	isc_result_t result;
 	dns_nta_t *nta = NULL;