1178. [bug] Follow and cache (if appropriate) A6 and other

                        data chains to completion in the additional section.

diff --git a/CHANGES b/CHANGES
index f854f1eeb05b04cca8980c71d471af6db12a7e79..a986d659ebeb9e6fa4919d95024a9b9a5dab154c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1178.  [bug]           Follow and cache (if appropriate) A6 and other
+                       data chains to completion in the additional section.
 
        --- 9.2.1rc2 released ---
 

diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h
index 12e97108d6f3db554335832b65870d16a4aac7ad..216501b31125d01e9ea8d2736e3fba8bf3f27122 100644 (file)
--- a/lib/dns/include/dns/name.h
+++ b/lib/dns/include/dns/name.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: name.h,v 1.95 2001/08/28 03:58:19 marka Exp $ */
+/* $Id: name.h,v 1.95.2.1 2002/04/19 01:11:17 marka Exp $ */
 
 #ifndef DNS_NAME_H
 #define DNS_NAME_H 1
@@ -209,6 +209,7 @@ struct dns_name {
 #define DNS_NAMEATTR_ANSWER            0x0200          /* Used by resolver. */
 #define DNS_NAMEATTR_NCACHE            0x0400          /* Used by resolver. */
 #define DNS_NAMEATTR_CHAINING          0x0800          /* Used by resolver. */
+#define DNS_NAMEATTR_CHASE             0x1000          /* Used by resolver. */
 
 LIBDNS_EXTERNAL_DATA extern dns_name_t *dns_rootname;
 extern dns_name_t *dns_wildcardname;

diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h
index 2281fb5b98a10c21b864a27345d4f2447eeda54a..166ed17d97e27a34bf62bf934fcef441f952c30d 100644 (file)
--- a/lib/dns/include/dns/rdataset.h
+++ b/lib/dns/include/dns/rdataset.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdataset.h,v 1.41 2001/08/28 03:58:21 marka Exp $ */
+/* $Id: rdataset.h,v 1.41.2.1 2002/04/19 01:11:19 marka Exp $ */
 
 #ifndef DNS_RDATASET_H
 #define DNS_RDATASET_H 1
@@ -128,6 +128,7 @@ struct dns_rdataset {
 #define DNS_RDATASETATTR_TTLADJUSTED   0x0200          /* Used by message.c */
 #define DNS_RDATASETATTR_FIXEDORDER    0x0400
 #define DNS_RDATASETATTR_RANDOMIZE     0x0800
+#define DNS_RDATASETATTR_CHASE         0x1000          /* Used by resolver. */
 
 void
 dns_rdataset_init(dns_rdataset_t *rdataset);

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index f52bdb1669b9518d4099d4c6cceca4f57d8c223f..4c1eeb0af05f5a2c25bba9ec24a79af4b4869ebf 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.218.2.9 2002/03/26 00:54:58 marka Exp $ */
+/* $Id: resolver.c,v 1.218.2.10 2002/04/19 01:11:16 marka Exp $ */
 
 #include <config.h>
 
@@ -2427,6 +2427,7 @@ clone_results(fetchctx_t *fctx) {
 #define ANSWERSIG(r)   (((r)->attributes & DNS_RDATASETATTR_ANSWERSIG) != 0)
 #define EXTERNAL(r)    (((r)->attributes & DNS_RDATASETATTR_EXTERNAL) != 0)
 #define CHAINING(r)    (((r)->attributes & DNS_RDATASETATTR_CHAINING) != 0)
+#define CHASE(r)       (((r)->attributes & DNS_RDATASETATTR_CHASE) != 0)
 
 
 /*
@@ -3240,6 +3241,13 @@ mark_related(dns_name_t *name, dns_rdataset_t *rdataset,
                        rdataset->ttl = 1;
        } else
                rdataset->trust = dns_trust_additional;
+       /*
+        * Avoid infinite loops by only marking new rdatasets.
+        */
+       if (!CACHE(rdataset)) {
+               name->attributes |= DNS_NAMEATTR_CHASE;
+               rdataset->attributes |= DNS_RDATASETATTR_CHASE;
+       }
        rdataset->attributes |= DNS_RDATASETATTR_CACHE;
        if (external)
                rdataset->attributes |= DNS_RDATASETATTR_EXTERNAL;
@@ -3262,58 +3270,66 @@ check_related(void *arg, dns_name_t *addname, dns_rdatatype_t type) {
        else
                gluing = ISC_FALSE;
        name = NULL;
-       rdataset = NULL;
        result = dns_message_findname(fctx->rmessage, DNS_SECTION_ADDITIONAL,
                                      addname, dns_rdatatype_any, 0, &name,
                                      NULL);
        if (result == ISC_R_SUCCESS) {
                external = ISC_TF(!dns_name_issubdomain(name, &fctx->domain));
-               if (type == dns_rdatatype_a) {
-                       for (rdataset = ISC_LIST_HEAD(name->list);
-                            rdataset != NULL;
-                            rdataset = ISC_LIST_NEXT(rdataset, link)) {
-                               if (rdataset->type == dns_rdatatype_sig)
-                                       rtype = rdataset->covers;
-                               else
-                                       rtype = rdataset->type;
-                               if (rtype == dns_rdatatype_a ||
-                                   rtype == dns_rdatatype_aaaa ||
-                                   rtype == dns_rdatatype_a6)
-                                       mark_related(name, rdataset, external,
-                                                    gluing);
-                               /*
-                                * XXXRTH  Need to do a controlled recursion
-                                *         on the A6 prefix names to mark
-                                *         any additional data related to them.
-                                *
-                                *         Ick.
-                                */
-                       }
-               } else {
-                       result = dns_message_findtype(name, type, 0,
-                                                     &rdataset);
-                       if (result == ISC_R_SUCCESS) {
-                               mark_related(name, rdataset, external, gluing);
-                               /*
-                                * Do we have its SIG too?
-                                */
-                               result = dns_message_findtype(name,
-                                                     dns_rdatatype_sig,
-                                                     type, &rdataset);
-                               if (result == ISC_R_SUCCESS)
-                                       mark_related(name, rdataset, external,
-                                                    gluing);
-                       }
+               for (rdataset = ISC_LIST_HEAD(name->list);
+                    rdataset != NULL;
+                    rdataset = ISC_LIST_NEXT(rdataset, link)) {
+                       if (rdataset->type == dns_rdatatype_sig)
+                               rtype = rdataset->covers;
+                       else
+                               rtype = rdataset->type;
+                       if ((type == dns_rdatatype_a && 
+                            (rtype == dns_rdatatype_a ||
+                             rtype == dns_rdatatype_aaaa ||
+                             rtype == dns_rdatatype_a6)) ||
+                           type == rtype)
+                               mark_related(name, rdataset, external,
+                                            gluing);
                }
-               /*
-                * XXXRTH  Some other stuff still needs to be marked.
-                *         See query.c.
-                */
        }
 
        return (ISC_R_SUCCESS);
 }
 
+static void
+chase_additional(fetchctx_t *fctx) {
+       isc_boolean_t rescan;
+       dns_section_t section = DNS_SECTION_ADDITIONAL;
+       isc_result_t result;
+
+ again:
+       rescan = ISC_FALSE;
+       
+       for (result = dns_message_firstname(fctx->rmessage, section);
+            result == ISC_R_SUCCESS;
+            result = dns_message_nextname(fctx->rmessage, section)) {
+               dns_name_t *name = NULL;
+               dns_rdataset_t *rdataset;
+               dns_message_currentname(fctx->rmessage, DNS_SECTION_ADDITIONAL,
+                                       &name);
+               if ((name->attributes & DNS_NAMEATTR_CHASE) == 0)
+                       continue;
+               name->attributes &= ~DNS_NAMEATTR_CHASE;
+               for (rdataset = ISC_LIST_HEAD(name->list);
+                    rdataset != NULL;
+                    rdataset = ISC_LIST_NEXT(rdataset, link)) {
+                       if (CHASE(rdataset)) {
+                               rdataset->attributes &= ~DNS_RDATASETATTR_CHASE;
+                               (void)dns_rdataset_additionaldata(rdataset,
+                                                                 check_related,
+                                                                 fctx);
+                               rescan = ISC_TRUE;
+                       }
+               }
+       }
+       if (rescan)
+               goto again;
+}
+
 static inline isc_result_t
 cname_target(dns_rdataset_t *rdataset, dns_name_t *tname) {
        isc_result_t result;
@@ -4350,6 +4366,11 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
                goto done;
        }
 
+       /*
+        * Follow A6 and other additional section data chains.
+        */
+       chase_additional(fctx);
+
        /*
         * Cache the cacheable parts of the message.  This may also cause
         * work to be queued to the DNSSEC validator.