X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/5f8085b735dac86cc516b40bf5b8bc57763ab360..6480e2dfab3ff911cac1d1e922666fcea65e511e:/src/types.c

diff --git a/src/types.c b/src/types.c
index 045415c..18cf159 100644
--- a/src/types.c
+++ b/src/types.c
@@ -51,8 +51,8 @@
  * _txt                       (pa)
  * _inaddr                    (pa,cs,di, +search_sortlist, dip_genaddr)
  * _in6addr                   (pa,cs,di)
- * _addr                      (pap,pa,di,csp,cs,qs,  +search_sortlist_sa,
-				dip_sockaddr, rrtypes)
+ * _addr                      (pap,pa,di,csp,cs,gsz,qs,  +search_sortlist_sa,
+ *				dip_sockaddr, rrtypes)
  * _domain                    (pap)
  * _host_raw                  (pa)
  * _hostaddr                  (pap,pa,dip,di,mfp,mf,csp,cs +pap_findaddrs)
@@ -66,13 +66,13 @@
  * _mailbox                   (pap +pap_mailbox822)
  * _rp                        (pa)
  * _soa                       (pa,mf,cs)
- * _srv*                      (qdpl,(pap),pa,mf,di,(csp),cs,postsort)
+ * _srv*                      (ckl,(pap),pa,mf,di,(csp),cs,postsort)
  * _byteblock                 (mf)
  * _opaque                    (pa,cs)
  * _flat                      (mf)
  *
  * within each section:
- *    qdpl_*
+ *    ckl_*
  *    pap_*
  *    pa_*
  *    dip_*
@@ -275,10 +275,9 @@ static int search_sortlist(adns_state ads, int af, const void *ad) {
 
   for (i=0, slp=ads->sortlist;
        i<ads->nsortlist &&
-       !(af == slp->ai->af &&
-	 slp->ai->matchp(ad, &slp->base, &slp->mask)) &&
-       !(v6mappedp && slp->ai->af == AF_INET &&
-	 slp->ai->matchp(&a, &slp->base, &slp->mask));
+	 !adns__addr_match_p(af,ad, slp->af,&slp->base,&slp->mask) &&
+	 !(v6mappedp &&
+	   adns__addr_match_p(AF_INET,&a, slp->af,&slp->base,&slp->mask));
        i++, slp++);
   return i;
 }
@@ -335,8 +334,60 @@ static adns_status cs_in6addr(vbuf *vb, const void *datap) {
 }
 
 /*
- * _addr   (pap,pa,di,csp,cs,qs, +search_sortlist_sa, dip_sockaddr,
- *		addr_rrtypes, addr_rrsz)
+ * _addr   (pap,pa,di,csp,cs,gsz,qs, +search_sortlist_sa, dip_sockaddr,
+ *		addr_rrtypes)
+ */
+
+static const typeinfo tinfo_addrsub;
+
+#define ADDR_RRTYPES(_) _(a) _(aaaa)
+
+static const adns_rrtype addr_all_rrtypes[] = {
+#define RRTY_CODE(ty) adns_r_##ty,
+  ADDR_RRTYPES(RRTY_CODE)
+#undef RRTY_CODE
+};
+
+enum {
+#define RRTY_INDEX(ty) addr__ri_##ty,
+  ADDR_RRTYPES(RRTY_INDEX)
+#undef RRTY_INDEX
+  addr_nrrtypes,
+#define RRTY_FLAG(ty) addr_rf_##ty = 1 << addr__ri_##ty,
+  ADDR_RRTYPES(RRTY_FLAG)
+  addr__rrty_hunoz
+#undef RRTY_FLAG
+};
+
+static unsigned addr_rrtypeflag(adns_rrtype type)
+{
+  int i;
+
+  type &= adns_rrt_typemask;
+  for (i = 0; i < addr_nrrtypes && type != addr_all_rrtypes[i]; i++);
+  assert(i < addr_nrrtypes);
+  return 1 << i;
+}
+
+/* About CNAME handling in addr queries.
+ *
+ * A user-level addr query is translated into a number of protocol-level
+ * queries, and its job is to reassemble the results.  This gets tricky if
+ * the answers aren't consistent.  In particular, if the answers report
+ * inconsistent indirection via CNAME records (e.g., different CNAMEs, or
+ * some indirect via a CNAME, and some don't) then we have trouble.
+ *
+ * Once we've received an answer, even if it was NODATA, we set
+ * adns__qf_addr_answer on the parent query.  This will let us detect a
+ * conflict between a no-CNAME-with-NODATA reply and a subsequent CNAME.
+ *
+ * If we detect a conflict of any kind, then at least one answer came back
+ * with a CNAME record, so we pick the first such answer (somewhat
+ * arbitrarily) as being the `right' canonical name, and set this in the
+ * parent query's answer->cname slot.  We discard address records from the
+ * wrong name.  And finally we cancel the outstanding child queries, and
+ * resubmit address queries for the address families we don't yet have, with
+ * adns__qf_addr_cname set so that we know that we're in the fixup state.
  */
 
 static adns_status pap_addr(const parseinfo *pai, int rrty, size_t rrsz,
@@ -352,7 +403,7 @@ static adns_status pap_addr(const parseinfo *pai, int rrty, size_t rrsz,
 
   switch (rrty) {
     case adns_r_a:
-      if (pai->qu->flags & adns_qf_ipv6_mapv4) {
+      if (pai->qu->flags & adns_qf_domapv4) {
 	if (avail < 4) return adns_s_invaliddata;
 	memset(v6map.s6_addr +  0, 0x00, 10);
 	memset(v6map.s6_addr + 10, 0xff,  2);
@@ -397,15 +448,7 @@ static adns_status pa_addr(const parseinfo *pai, int cbyte,
 
 static int search_sortlist_sa(adns_state ads, const struct sockaddr *sa)
 {
-  const afinfo *ai = 0;
-
-  switch (sa->sa_family) {
-    case AF_INET: ai = &adns__inet_afinfo; break;
-    case AF_INET6: ai = &adns__inet6_afinfo; break;
-  }
-  assert(ai);
-
-  return search_sortlist(ads, sa->sa_family, ai->sockaddr_to_inaddr(sa));
+  return search_sortlist(ads, sa->sa_family, adns__sockaddr_to_inaddr(sa));
 }
 
 static int dip_sockaddr(adns_state ads,
@@ -458,116 +501,250 @@ static adns_status cs_addr(vbuf *vb, const void *datap) {
   return csp_addr(vb,rrp);
 }
 
-#define ADDR_MAXRRTYPES 2
-
-static void addr_rrtypes(adns_state ads, adns_rrtype type,
-			 adns_queryflags qf,
-			 adns_rrtype *rrty, size_t *nrrty)
+static unsigned addr_rrtypes(adns_state ads, adns_rrtype type,
+			     adns_queryflags qf)
 {
-  size_t n = 0;
-  adns_rrtype qtf = type & adns__qtf_deref;
+  adns_queryflags permitaf = 0, hackaf = 0;
+  unsigned want = 0;
+
+  if (!(qf & (adns_qf_ipv4_only | adns_qf_ipv6_only)))
+    qf |= adns_qf_ipv4_only | adns_qf_ipv6_only;
+  if (!(type & adns__qtf_bigaddr) || !(type & adns__qtf_manyaf))
+    qf = (qf & adns__qf_afmask) | adns_qf_ipv4_only;
+  else if (ads->iflags & adns_if_afmask) {
+    if (ads->iflags & adns_if_af_v4only) {
+      permitaf |= adns_qf_ipv4_only;
+      hackaf |= adns_qf_domapv4;
+    }
+    if (ads->iflags & adns_if_af_v6only)
+      permitaf |= adns_qf_ipv6_only;
+    if (qf & permitaf)
+      qf &= hackaf | permitaf | ~adns__qf_afmask;
+  }
 
-  if ((qf & adns__qf_afmask) != adns_qf_ipv6_only)
-    rrty[n++] = adns_r_a | qtf;
-  if ((qf & adns__qf_afmask) != adns_qf_ipv4_only)
-    rrty[n++] = adns_r_aaaa | qtf;
+  if (qf & adns_qf_ipv4_only) want |= addr_rf_a;
+  if (qf & adns_qf_ipv6_only) want |= addr_rf_aaaa;
 
-  *nrrty = n;
+  return want;
 }
 
-static size_t addr_rrsz(adns_query qu)
+static int gsz_addr(adns_rrtype type)
 {
-  return qu->answer->type & adns__qtf_bigaddr ?
+  return type & adns__qtf_bigaddr ?
     sizeof(adns_rr_addr) : sizeof(adns_rr_addr_v4only);
 }
 
+static adns_status append_addrs(adns_query qu, adns_query from, size_t rrsz,
+				adns_rr_addr **dp, int *dlen,
+				const adns_rr_addr *sp, int slen)
+{
+  size_t drrsz = *dlen*rrsz, srrsz = slen*rrsz;
+  byte *p;
+
+  if (!slen) return adns_s_ok;
+  p = adns__alloc_interim(qu, drrsz + srrsz);
+  if (!p) R_NOMEM;
+  if (*dlen) {
+    memcpy(p, *dp, drrsz);
+    adns__free_interim(qu, *dp);
+  }
+  memcpy(p + drrsz, sp, srrsz);
+  *dlen += slen;
+  *dp = (adns_rr_addr *)p;
+  if (from && qu->expires > from->expires) qu->expires = from->expires;
+  return adns_s_ok;
+}
+
+static void icb_addr(adns_query parent, adns_query child);
+
+static void addr_subqueries(adns_query qu, struct timeval now,
+			    adns_queryflags qf_extra,
+			    const byte *qd_dgram, int qd_dglen)
+{
+  int i, err, id;
+  adns_query cqu;
+  adns_queryflags qf = (qu->flags & ~adns_qf_search) | qf_extra;
+  adns_rrtype qtf = qu->answer->type & adns__qtf_deref;
+  unsigned which = qu->ctx.tinfo.addr.want & ~qu->ctx.tinfo.addr.have;
+  qcontext ctx;
+
+  memset(&ctx, 0, sizeof(ctx));
+  ctx.callback = icb_addr;
+  for (i = 0; i < addr_nrrtypes; i++) {
+    if (!(which & (1 << i))) continue;
+    err = adns__mkquery_frdgram(qu->ads, &qu->vb, &id, qd_dgram, qd_dglen,
+				DNS_HDRSIZE, addr_all_rrtypes[i], qf);
+    if (err) goto x_error;
+    err = adns__internal_submit(qu->ads, &cqu, &tinfo_addrsub,
+				addr_all_rrtypes[i] | qtf,
+				&qu->vb, id, qf, now, &ctx);
+    if (err) goto x_error;
+    cqu->answer->rrsz = qu->answer->rrsz;
+    cqu->parent = qu;
+    LIST_LINK_TAIL_PART(qu->children, cqu,siblings.);
+  }
+  qu->state = query_childw;
+  LIST_LINK_TAIL(qu->ads->childw, qu);
+  return;
+
+x_error:
+  adns__query_fail(qu, err);
+}
+
+static adns_status addr_submit(adns_query parent, adns_query *query_r,
+			       vbuf *qumsg_vb, int id, unsigned want,
+			       adns_queryflags flags, struct timeval now,
+			       qcontext *ctx)
+{
+  /* This is effectively a substitute for adns__internal_submit, intended for
+   * the case where the caller (possibly) only wants a subset of the
+   * available record types.  The memory management and callback rules are
+   * the same as for adns__internal_submit.
+   *
+   * Some differences: the query is linked onto the parent's children list
+   * before exit (though the parent's state is not changed, and it is not
+   * linked into the childw list queue); and we fiddle with the `tinfo'
+   * portion of the context structure (yes, modifying *ctx), since this is,
+   * in fact, the main purpose of this function.
+   */
+
+  adns_state ads = parent->ads;
+  adns_query qu;
+  adns_status err;
+  adns_rrtype type =
+    (adns_r_addr & adns_rrt_reprmask) |
+    (parent->answer->type & ~adns_rrt_reprmask);
+
+  ctx->tinfo.addr.want = want;
+  ctx->tinfo.addr.have = 0;
+  err = adns__internal_submit(ads, &qu, adns__findtype(adns_r_addr),
+			      type, qumsg_vb, id, flags, now, ctx);
+  if (err) return err;
+
+  qu->parent = parent;
+  LIST_LINK_TAIL_PART(parent->children, qu, siblings.);
+  *query_r = qu;
+  return adns_s_ok;
+}
+
+static adns_status copy_cname_from_child(adns_query parent, adns_query child)
+{
+  adns_answer *pans = parent->answer, *cans = child->answer;
+  size_t n = strlen(cans->cname) + 1;
+
+  pans->cname = adns__alloc_preserved(parent, n);
+  if (!pans->cname) R_NOMEM;
+  memcpy(pans->cname, cans->cname, n);
+  return adns_s_ok;
+}
+
+static void done_addr_type(adns_query qu, adns_rrtype type)
+  { qu->ctx.tinfo.addr.have |= addr_rrtypeflag(type); }
+
 static void icb_addr(adns_query parent, adns_query child)
 {
   adns_state ads = parent->ads;
   adns_answer *pans = parent->answer, *cans = child->answer;
-  struct timeval tvbuf;
-  const struct timeval *now = 0;
-  size_t prrsz, crrsz;
-  unsigned char *rrs;
+  struct timeval now;
+  adns_status err;
+  int id;
 
-  /* Must handle CNAMEs correctly.  This gets very hairy if the answers we
-   * get are inconsistent.
-   */
+  if (!(child->flags & adns__qf_addr_cname) &&
+      (parent->flags & adns__qf_addr_answer) &&
+      (!!pans->cname != !!cans->cname ||
+       (pans->cname && strcmp(pans->cname, cans->cname) != 0))) {
+    /* We've detected an inconsistency in CNAME records, and must deploy
+     * countermeasures.
+     */
+
+    if (!pans->cname) {
+      /* The child has a CNAME record, but the parent doesn't.  We must
+       * discard all of the parent's addresses, and substitute the child's.
+       */
+
+      assert(pans->rrsz == cans->rrsz);
+      adns__free_interim(parent, pans->rrs.bytes);
+      adns__transfer_interim(child, parent, cans->rrs.bytes);
+      pans->rrs.bytes = cans->rrs.bytes;
+      pans->nrrs = cans->nrrs;
+      parent->ctx.tinfo.addr.have = 0;
+      done_addr_type(parent, cans->type);
+      err = copy_cname_from_child(parent, child); if (err) goto x_err;
+    }
+
+    /* We've settled on the CNAME (now) associated with the parent, which
+     * already has appropriate address records.  Build a query datagram for
+     * this name so that we can issue child queries for the missing address
+     * families.  The child's vbuf looks handy for this.
+     */
+    err = adns__mkquery(ads, &child->vb, &id, pans->cname,
+			strlen(pans->cname), &tinfo_addrsub,
+			adns_r_addr, parent->flags);
+    if (err) goto x_err;
+
+    /* Now cancel the remaining children, and try again with the CNAME we've
+     * settled on.
+     */
+    adns__cancel_children(parent);
+    if (gettimeofday(&now, 0)) goto x_gtod;
+    addr_subqueries(parent, now, adns__qf_addr_cname,
+		    child->vb.buf, child->vb.used);
+    return;
+  }
+
+  if (cans->cname && !pans->cname) {
+    err = copy_cname_from_child(parent, child);
+    if (err) goto x_err;
+  }
 
   if ((parent->flags & adns_qf_search) &&
-      cans->status == adns_s_nxdomain) {
+      !pans->cname && cans->status == adns_s_nxdomain) {
+    /* We're searching a list of suffixes, this is the first answer, and it
+     * tells us that the name doesn't exist.  Try the next one.
+     */
+
     if (parent->expires > child->expires) parent->expires = child->expires;
     adns__cancel_children(parent);
     adns__free_interim(parent, pans->rrs.bytes);
     pans->rrs.bytes = 0; pans->nrrs = 0;
-    adns__must_gettimeofday(ads, &now, &tvbuf);
-    if (now) adns__search_next(ads, parent, *now);
+    if (gettimeofday(&now, 0)) goto x_gtod;
+    adns__search_next(ads, parent, now);
     return;
   }
 
-  if (cans->status) {
-    adns__query_fail(parent, cans->status);
-    return;
-  }
+  if (cans->status && cans->status != adns_s_nodata)
+    { err = cans->status; goto x_err; }
 
   assert(pans->rrsz == cans->rrsz);
-  prrsz = pans->rrsz*pans->nrrs;
-  crrsz = cans->rrsz*cans->nrrs;
-  rrs = adns__alloc_interim(parent, prrsz + crrsz);
-  if (!rrs) {
-    adns__query_fail(parent, adns_s_nomemory);
-    return;
-  }
-  if (prrsz) {
-    memcpy(rrs, pans->rrs.bytes, prrsz);
-    adns__free_interim(parent, pans->rrs.bytes);
-  }
-  memcpy(rrs + prrsz, cans->rrs.bytes, crrsz);
-
-  if (parent->expires > child->expires) parent->expires = child->expires;
-  pans->rrs.bytes = rrs;
-  pans->nrrs += cans->nrrs;
+  err = append_addrs(parent, child, pans->rrsz,
+		     &pans->rrs.addr, &pans->nrrs,
+		     cans->rrs.addr, cans->nrrs);
+  if (err) goto x_err;
+  done_addr_type(parent, cans->type);
 
   if (parent->children.head) LIST_LINK_TAIL(ads->childw, parent);
+  else if (!pans->nrrs) adns__query_fail(parent, adns_s_nodata);
   else adns__query_done(parent);
+  parent->flags |= adns__qf_addr_answer;
+  return;
+
+x_gtod:
+  adns__diag(ads, -1, parent, "gettimeofday failed: %s", strerror(errno));
+  err = adns_s_systemfail;
+  goto x_err;
+
+x_err:
+  adns__query_fail(parent, err);
 }
 
 static void qs_addr(adns_query qu, struct timeval now)
 {
-  adns_rrtype rrty[ADDR_MAXRRTYPES];
-  int i, nrrty, err, id;
-  adns_query cqu;
-  adns_queryflags qf =
-    (qu->flags | adns__qf_senddirect) &
-    ~(adns_qf_search);
-  qcontext ctx;
-
-  addr_rrtypes(qu->ads, qu->answer->type, qu->flags, rrty, &nrrty);
-
-  if (!(qu->answer->type & adns__qtf_bigaddr))
-    qu->answer->rrsz = sizeof(adns_rr_addr_v4only);
-
-  /* This always makes child queries, even if there's only the one.  This
-   * seems wasteful, but there's only one case where it'd be safe -- namely
-   * IPv4-only -- and that's not the case I want to optimize.
-   */
-  memset(&ctx, 0, sizeof(ctx));
-  ctx.callback = icb_addr;
-  for (i = 0; i < nrrty; i++) {
-    err = adns__mkquery_frdgram(qu->ads, &qu->vb, &id, qu->query_dgram,
-				qu->query_dglen, DNS_HDRSIZE, rrty[i], qf);
-    if (err) goto x_error;
-    err = adns__internal_submit(qu->ads, &cqu, qu->typei, rrty[i],
-				&qu->vb, id, qf, now, &ctx);
-    if (err) goto x_error;
-    cqu->answer->rrsz = qu->answer->rrsz;
-    cqu->parent = qu;
-    LIST_LINK_TAIL_PART(qu->children, cqu,siblings.);
+  if (!qu->ctx.tinfo.addr.want) {
+    qu->ctx.tinfo.addr.want =
+      addr_rrtypes(qu->ads, qu->answer->type, qu->flags);
+    qu->ctx.tinfo.addr.have = 0;
   }
-  return;
-
-x_error:
-  adns__query_fail(qu, err);
+  addr_subqueries(qu, now, 0, qu->query_dgram, qu->query_dglen);
 }
 
 /*
@@ -640,35 +817,25 @@ static adns_status pa_host_raw(const parseinfo *pai, int cbyte,
  */
 
 static adns_status pap_findaddrs(const parseinfo *pai, adns_rr_hostaddr *ha,
+				 unsigned *want_io, size_t addrsz,
 				 int *cbyte_io, int count, int dmstart) {
-  int rri, naddrs, j;
+  int rri, naddrs;
+  unsigned typef, want = *want_io;
   int type, class, rdlen, rdend, rdstart, ownermatched;
-  adns_rrtype rrty[ADDR_MAXRRTYPES];
-  size_t nrrty, addrsz;
   unsigned long ttl;
   adns_status st;
-
-  addr_rrtypes(pai->qu->ads, pai->qu->answer->type,
-	       pai->qu->flags, rrty, &nrrty);
-
-  addrsz = addr_rrsz(pai->qu);
   
-  for (rri=0, naddrs=-1; rri<count; rri++) {
+  for (rri=0, naddrs=0; rri<count; rri++) {
     st= adns__findrr_anychk(pai->qu, pai->serv, pai->dgram,
 			    pai->dglen, cbyte_io,
 			    &type, &class, &ttl, &rdlen, &rdstart,
 			    pai->dgram, pai->dglen, dmstart, &ownermatched);
     if (st) return st;
-    if (!ownermatched || class != DNS_CLASS_IN) {
-      if (naddrs>0) break; else continue;
-    }
-    if (naddrs == -1) {
-      naddrs= 0;
-    }
-    for (j = 0; j < nrrty && type != (rrty[j] & adns_rrt_typemask); j++);
-    if (j >= nrrty) continue;
-    if (!adns__vbuf_ensure(&pai->qu->vb, (naddrs+1)*addrsz))
-      R_NOMEM;
+    if (!ownermatched || class != DNS_CLASS_IN) continue;
+    typef = addr_rrtypeflag(type);
+    if (!(want & typef)) continue;
+    want &= ~typef;
+    if (!adns__vbuf_ensure(&pai->qu->vb, (naddrs+1)*addrsz)) R_NOMEM;
     adns__update_expires(pai->qu,ttl,pai->now);
     rdend = rdstart + rdlen;
     st= pap_addr(pai, type, addrsz, &rdstart, rdend,
@@ -677,31 +844,50 @@ static adns_status pap_findaddrs(const parseinfo *pai, adns_rr_hostaddr *ha,
     if (rdstart != rdend) return adns_s_invaliddata;
     naddrs++;
   }
-  if (naddrs >= 0) {
-    ha->addrs= adns__alloc_interim(pai->qu, naddrs*addrsz);
-    if (!ha->addrs) R_NOMEM;
-    memcpy(ha->addrs, pai->qu->vb.buf, naddrs*addrsz);
-    ha->naddrs= naddrs;
+  if (naddrs > 0) {
+    st = append_addrs(pai->qu, 0, addrsz, &ha->addrs, &ha->naddrs,
+		      (const adns_rr_addr *)pai->qu->vb.buf, naddrs);
+    if (st) return st;
     ha->astatus= adns_s_ok;
 
-    adns__isort(ha->addrs, naddrs, addrsz, pai->qu->vb.buf,
-		div_addr, pai->ads);
+    if (!want) {
+      adns__isort(ha->addrs, naddrs, addrsz, pai->qu->vb.buf,
+		  div_addr, pai->ads);
+    }
   }
+  *want_io = want;
   return adns_s_ok;
 }
 
 static void icb_hostaddr(adns_query parent, adns_query child) {
   adns_answer *cans= child->answer;
-  adns_rr_hostaddr *rrp= child->ctx.info.hostaddr;
+  adns_rr_hostaddr *rrp= child->ctx.pinfo.hostaddr;
   adns_state ads= parent->ads;
   adns_status st;
+  size_t addrsz = gsz_addr(parent->answer->type);
+
+  st= cans->status == adns_s_nodata ? adns_s_ok : cans->status;
+
+  if (st) goto done;
+  assert(addrsz == cans->rrsz);
+  st = append_addrs(parent, child, addrsz,
+		    &rrp->addrs, &rrp->naddrs,
+		    cans->rrs.addr, cans->nrrs);
+  if (st) goto done;
+  if (!rrp->naddrs) { st = adns_s_nodata; goto done; }
+
+  if (!adns__vbuf_ensure(&parent->vb, addrsz))
+    { st = adns_s_nomemory; goto done; }
+  adns__isort(rrp->addrs, rrp->naddrs, addrsz, parent->vb.buf,
+	      div_addr, ads);
+
+done:
+  if (st) {
+    adns__free_interim(parent, rrp->addrs);
+    rrp->naddrs= (st>0 && st<=adns_s_max_tempfail) ? -1 : 0;
+  }
 
-  st= cans->status;
   rrp->astatus= st;
-  rrp->naddrs= (st>0 && st<=adns_s_max_tempfail) ? -1 : cans->nrrs;
-  rrp->addrs= cans->rrs.addr;
-  adns__transfer_interim(child, parent, rrp->addrs, rrp->naddrs*cans->rrsz);
-
   if (parent->children.head) {
     LIST_LINK_TAIL(ads->childw,parent);
   } else {
@@ -717,6 +903,8 @@ static adns_status pap_hostaddr(const parseinfo *pai, int *cbyte_io,
   int id;
   adns_query nqu;
   adns_queryflags nflags;
+  unsigned want;
+  size_t addrsz = gsz_addr(pai->qu->answer->type);
 
   dmstart= cbyte= *cbyte_io;
   st= pap_domain(pai, &cbyte, max, &rrp->host,
@@ -725,18 +913,20 @@ static adns_status pap_hostaddr(const parseinfo *pai, int *cbyte_io,
   *cbyte_io= cbyte;
 
   rrp->astatus= adns_s_ok;
-  rrp->naddrs= -1;
+  rrp->naddrs= 0;
   rrp->addrs= 0;
 
   cbyte= pai->nsstart;
 
-  st= pap_findaddrs(pai, rrp, &cbyte, pai->nscount, dmstart);
+  want = addr_rrtypes(pai->ads, pai->qu->answer->type, pai->qu->flags);
+
+  st= pap_findaddrs(pai, rrp, &want, addrsz, &cbyte, pai->nscount, dmstart);
   if (st) return st;
-  if (rrp->naddrs != -1) return adns_s_ok;
+  if (!want) return adns_s_ok;
 
-  st= pap_findaddrs(pai, rrp, &cbyte, pai->arcount, dmstart);
+  st= pap_findaddrs(pai, rrp, &want, addrsz, &cbyte, pai->arcount, dmstart);
   if (st) return st;
-  if (rrp->naddrs != -1) return adns_s_ok;
+  if (!want) return adns_s_ok;
 
   st= adns__mkquery_frdgram(pai->ads, &pai->qu->vb, &id,
 			    pai->dgram, pai->dglen, dmstart,
@@ -745,20 +935,15 @@ static adns_status pap_hostaddr(const parseinfo *pai, int *cbyte_io,
 
   ctx.ext= 0;
   ctx.callback= icb_hostaddr;
-  ctx.info.hostaddr= rrp;
+  ctx.pinfo.hostaddr= rrp;
   
-  nflags= adns_qf_quoteok_query;
+  nflags= adns_qf_quoteok_query | (pai->qu->flags & adns__qf_afmask);
   if (!(pai->qu->flags & adns_qf_cname_loose)) nflags |= adns_qf_cname_forbid;
   
-  st= adns__internal_submit(pai->ads, &nqu, adns__findtype(adns_r_addr),
-			    (adns_r_addr & adns_rrt_reprmask) |
-			    (pai->qu->answer->type & ~adns_rrt_reprmask),
-			    &pai->qu->vb, id, nflags, pai->now, &ctx);
+  st= addr_submit(pai->qu, &nqu, &pai->qu->vb, id, want,
+		  nflags, pai->now, &ctx);
   if (st) return st;
 
-  nqu->parent= pai->qu;
-  LIST_LINK_TAIL_PART(pai->qu->children,nqu,siblings.);
-
   return adns_s_ok;
 }
 
@@ -955,7 +1140,7 @@ static void icb_ptr(adns_query parent, adns_query child) {
     return;
   }
 
-  queried= &parent->ctx.info.ptr_parent_addr.addr;
+  queried= &parent->ctx.tinfo.ptr.addr.addr;
   for (i=0, found=cans->rrs.bytes; i<cans->nrrs; i++, found += cans->rrsz) {
     if (!memcmp(queried,found,cans->rrsz)) {
       if (!parent->children.head) {
@@ -971,24 +1156,28 @@ static void icb_ptr(adns_query parent, adns_query child) {
   adns__query_fail(parent,adns_s_inconsistent);
 }
 
+static adns_status ckl_ptr(adns_state ads, adns_queryflags flags,
+			   union checklabel_state *css, qcontext *ctx,
+			   int labnum, const char *label, int lablen)
+{
+  if (lablen) {
+    if (adns__revparse_label(&css->ptr, labnum, label,lablen))
+      return adns_s_querydomainwrong;
+  } else {
+    if (adns__revparse_done(&css->ptr, labnum,
+			    &ctx->tinfo.ptr.rev_rrtype,
+			    &ctx->tinfo.ptr.addr))
+      return adns_s_querydomainwrong;
+  }
+  return adns_s_ok;
+}
+
 static adns_status pa_ptr(const parseinfo *pai, int dmstart,
 			  int max, void *datap) {
-  static const struct {
-    const afinfo *ai;
-    const char *const tail[3];
-  } expectdomain[] = {
-    { &adns__inet_afinfo, { DNS_INADDR_ARPA, 0 } },
-    { &adns__inet6_afinfo, { DNS_IP6_ARPA, 0 } }
-  };
-  enum { n_ed = sizeof(expectdomain)/sizeof(expectdomain[0]) };
-  
   char **rrp= datap;
   adns_status st;
-  struct afinfo_addr *ap;
-  findlabel_state fls;
-  byte ipv[n_ed][32];
-  int cbyte, i, j, foundj = -1, lablen, labstart, id, f, ac;
-  const char *tp;
+  adns_rrtype rrtype = pai->qu->ctx.tinfo.ptr.rev_rrtype;
+  int cbyte, id;
   adns_query nqu;
   qcontext ctx;
 
@@ -998,64 +1187,17 @@ static adns_status pa_ptr(const parseinfo *pai, int dmstart,
   if (st) return st;
   if (cbyte != max) return adns_s_invaliddata;
 
-  ap= &pai->qu->ctx.info.ptr_parent_addr;
-  if (!ap->ai) {
-    adns__findlabel_start(&fls, pai->ads, -1, pai->qu,
-			  pai->qu->query_dgram, pai->qu->query_dglen,
-			  pai->qu->query_dglen, DNS_HDRSIZE, 0);
-
-    f = (1 << n_ed) - 1; /* superposition of address types */
-    for (i = 0;; i++) {
-      st= adns__findlabel_next(&fls,&lablen,&labstart); assert(!st);
-      if (lablen <= 0) break;
-      for (j = 0; j < n_ed; j++) {
-	if (!(f & (1 << j))) continue;
-	if (i < expectdomain[j].ai->nrevcomp) {
-	  ac = expectdomain[j].ai->rev_parsecomp(
-	    pai->qu->query_dgram + labstart, lablen);
-	  if (ac < 0) goto mismatch;
-	  assert(i < sizeof(ipv[j]));
-	  ipv[j][i] = ac;
-	} else {
-	  tp = expectdomain[j].tail[i - expectdomain[j].ai->nrevcomp];
-	  if (!tp ||
-	      strncmp(pai->qu->query_dgram + labstart, tp, lablen) != 0 ||
-	      tp[lablen] != 0)
-	    goto mismatch;
-	}
-	continue;
-
-      mismatch:
-	f &= ~(1 << j);
-	if (!f) return adns_s_querydomainwrong;
-      }
-    }
-
-    if (lablen < 0) return adns_s_querydomainwrong;
-    for (j = 0; j < n_ed; j++) {
-      if (!(f & (1 << j))) continue;
-      if (i >= expectdomain[j].ai->nrevcomp &&
-	  !expectdomain[j].tail[i - expectdomain[j].ai->nrevcomp])
-	{ foundj = j; continue; }
-      f &= ~(1 << j);
-      if (!f) return adns_s_querydomainwrong;
-    }
-    assert(foundj >= 0 && f == (1 << foundj)); /* collapsed to a single type */
-
-    ap->ai = expectdomain[foundj].ai;
-    ap->ai->rev_mkaddr(&ap->addr, ipv[foundj]);
-  }
-
   st= adns__mkquery_frdgram(pai->ads, &pai->qu->vb, &id,
 			    pai->dgram, pai->dglen, dmstart,
-			    ap->ai->rrtype, adns_qf_quoteok_query);
+			    rrtype, adns_qf_quoteok_query);
   if (st) return st;
 
   ctx.ext= 0;
   ctx.callback= icb_ptr;
-  memset(&ctx.info,0,sizeof(ctx.info));
-  st= adns__internal_submit(pai->ads, &nqu, adns__findtype(ap->ai->rrtype),
-			    ap->ai->rrtype, &pai->qu->vb, id,
+  memset(&ctx.pinfo,0,sizeof(ctx.pinfo));
+  memset(&ctx.tinfo,0,sizeof(ctx.tinfo));
+  st= adns__internal_submit(pai->ads, &nqu, adns__findtype(rrtype),
+			    rrtype, &pai->qu->vb, id,
 			    adns_qf_quoteok_query, pai->now, &ctx);
   if (st) return st;
 
@@ -1264,36 +1406,18 @@ static adns_status cs_soa(vbuf *vb, const void *datap) {
 }
 
 /*
- * _srv*  (pa*2,di,cs*2,qdpl,postsort)
+ * _srv*  (pa*2,di,cs*2,ckl,postsort)
  */
 
-static adns_status qdpl_srv(adns_state ads,
-			    const char **p_io, const char *pe, int labelnum,
-			    char label_r[DNS_MAXDOMAIN], int *ll_io,
-			    adns_queryflags flags,
-			    const typeinfo *typei) {
-  int useflags;
-  const char *p_orig;
-  adns_status st;
-
-  if (labelnum < 2 && !(flags & adns_qf_quoteok_query)) {
-    useflags= adns_qf_quoteok_query;
-    p_orig= *p_io;
-  } else {
-    useflags= flags;
-    p_orig= 0;
-  }
-  st= adns__qdpl_normal(ads, p_io,pe, labelnum,label_r, ll_io, useflags,typei);
-  if (st) return st;
-
-  if (p_orig) {
-    int ll= *ll_io;
-    if (!ll || label_r[0]!='_')
-      return adns_s_querydomaininvalid;
-    if (memchr(p_orig+1, '\\', pe - (p_orig+1)))
-      return adns_s_querydomaininvalid;
+static adns_status ckl_srv(adns_state ads, adns_queryflags flags,
+			   union checklabel_state *css, qcontext *ctx,
+			   int labnum, const char *label, int lablen)
+{
+  if (labnum < 2 && !(flags & adns_qf_quoteok_query)) {
+    if (!lablen || label[0] != '_') return adns_s_querydomaininvalid;
+    label++; lablen--;
   }
-  return adns_s_ok;
+  return adns__ckl_hostname(ads, flags, css, ctx, labnum, label, lablen);
 }
 
 static adns_status pap_srv_begin(const parseinfo *pai, int *cbyte_io, int max,
@@ -1509,14 +1633,14 @@ static void mf_flat(adns_query qu, void *data) { }
 
 #define DEEP_TYPE(code,rrt,fmt,memb,parser,comparer,printer)	\
 { adns_r_##code & adns_rrt_reprmask, rrt,fmt,TYPESZ_M(memb),	\
-    mf_##memb, printer,parser,comparer, adns__qdpl_normal,0,0 }
+    mf_##memb, printer,parser,comparer, adns__ckl_hostname,0,0,0 }
 #define FLAT_TYPE(code,rrt,fmt,memb,parser,comparer,printer)	\
 { adns_r_##code & adns_rrt_reprmask, rrt,fmt,TYPESZ_M(memb),	\
-     mf_flat, printer,parser,comparer, adns__qdpl_normal,0,0 }
+    mf_flat, printer,parser,comparer, adns__ckl_hostname,0,0,0 }
 #define XTRA_TYPE(code,rrt,fmt,memb,parser,comparer,printer,		   \
-		  makefinal,qdpl,postsort,sender)			   \
+		  makefinal,ckl,postsort,getrrsz,sender)		   \
 { adns_r_##code & adns_rrt_reprmask, rrt,fmt,TYPESZ_M(memb), makefinal,	   \
-    printer,parser,comparer,qdpl,postsort,sender }
+    printer,parser,comparer,ckl,postsort,getrrsz,sender }
 
 static const typeinfo typeinfos[] = {
 /* Must be in ascending order of rrtype ! */
@@ -1533,20 +1657,25 @@ DEEP_TYPE(txt,    "TXT",   0,   manyistr,pa_txt,     0,        cs_txt        ),
 DEEP_TYPE(rp_raw, "RP",   "raw",strpair, pa_rp,      0,        cs_rp         ),
 FLAT_TYPE(aaaa,   "AAAA",  0,   in6addr, pa_in6addr, di_in6addr,cs_in6addr   ),
 XTRA_TYPE(srv_raw,"SRV",  "raw",srvraw , pa_srvraw,  di_srv,   cs_srvraw,
-					 mf_srvraw, qdpl_srv, postsort_srv, 0),
+				       mf_srvraw, ckl_srv, postsort_srv, 0, 0),
 
 XTRA_TYPE(addr,   "A",  "addr", addr,    pa_addr,    di_addr,  cs_addr,
-				       mf_flat, adns__qdpl_normal, 0, qs_addr),
+			    mf_flat, adns__ckl_hostname, 0, gsz_addr, qs_addr),
 DEEP_TYPE(ns,     "NS", "+addr",hostaddr,pa_hostaddr,di_hostaddr,cs_hostaddr ),
-DEEP_TYPE(ptr,    "PTR","checked",str,   pa_ptr,     0,        cs_domain     ),
+XTRA_TYPE(ptr,    "PTR","checked",str,   pa_ptr,     0,        cs_domain,
+						     mf_str, ckl_ptr, 0, 0, 0),
 DEEP_TYPE(mx,     "MX", "+addr",inthostaddr,pa_mx,   di_mx,    cs_inthostaddr),
 XTRA_TYPE(srv,    "SRV","+addr",srvha,   pa_srvha,   di_srv,   cs_srvha,
-					  mf_srvha, qdpl_srv, postsort_srv, 0),
+					mf_srvha, ckl_srv, postsort_srv, 0, 0),
 
 DEEP_TYPE(soa,    "SOA","822",  soa,     pa_soa,     0,        cs_soa        ),
 DEEP_TYPE(rp,     "RP", "822",  strpair, pa_rp,      0,        cs_rp         ),
 };
 
+static const typeinfo tinfo_addrsub =
+XTRA_TYPE(none,	  "<addr>","sub",addr,	 pa_addr,    0,	       cs_addr,
+				  mf_flat, adns__ckl_hostname, 0, gsz_addr, 0);
+
 static const typeinfo typeinfo_unknown=
 DEEP_TYPE(unknown,0, "unknown",byteblock,pa_opaque,  0,        cs_opaque     );