* _txt (pa)
* _inaddr (pa,cs,di, +search_sortlist, dip_genaddr)
* _in6addr (pa,cs,di)
- * _addr (pap,pa,di,csp,cs,qs, +search_sortlist_sa,
+ * _addr (pap,pa,di,csp,cs,gsz,qs, +search_sortlist_sa,
* dip_sockaddr, rrtypes)
* _domain (pap)
* _host_raw (pa)
}
/*
- * _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)
*/
/* About CNAME handling in addr queries.
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)
{
size_t n = 0;
adns_rrtype qtf = type & adns__qtf_deref;
+ adns_queryflags permitaf = 0, hackaf = 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_ipv4_only) rrty[n++] = adns_r_a | qtf;
if (qf & adns_qf_ipv6_only) rrty[n++] = adns_r_aaaa | qtf;
*nrrty = n;
}
-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);
}
const adns_rr_addr *sp, int slen)
{
size_t drrsz = *dlen*rrsz, srrsz = slen*rrsz;
- byte *p = adns__alloc_interim(qu, drrsz + srrsz);
+ 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);
return adns_s_ok;
}
-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;
- adns_status err;
- const struct timeval *now = 0;
-
- if (child->cname || parent->cname) {
- }
-
- if ((parent->flags & adns_qf_search) &&
- cans->status == adns_s_nxdomain) {
- 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);
- return;
- }
-
- if (cans->status && cans->status != adns_s_nodata) {
- adns__query_fail(parent, cans->status);
- return;
- }
-
- assert(pans->rrsz == cans->rrsz);
- err = append_addrs(parent, child, pans->rrsz,
- &pans->rrs.addr, &pans->nrrs,
- cans->rrs.addr, cans->nrrs);
- if (err) { adns__query_fail(parent, err); return; }
-
- 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);
-}
+static void icb_addr(adns_query parent, adns_query child);
static void addr_subqueries(adns_query qu, struct timeval now,
- const adns_rrtype *rrty, size_t nrrty)
+ const byte *qd_dgram, int qd_dglen)
{
int i, err, id;
adns_query cqu;
~(adns_qf_search);
qcontext ctx;
- 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);
+ qu->ctx.tinfo.addr.onrrty = qu->ctx.tinfo.addr.nrrty;
+ for (i = 0; i < qu->ctx.tinfo.addr.nrrty; i++) {
+ err = adns__mkquery_frdgram(qu->ads, &qu->vb, &id, qd_dgram, qd_dglen,
+ DNS_HDRSIZE, qu->ctx.tinfo.addr.rrty[i], qf);
if (err) goto x_error;
- err = adns__internal_submit(qu->ads, &cqu, qu->typei, rrty[i],
+ err = adns__internal_submit(qu->ads, &cqu, qu->typei,
+ qu->ctx.tinfo.addr.rrty[i],
&qu->vb, id, qf, now, &ctx);
if (err) goto x_error;
cqu->answer->rrsz = qu->answer->rrsz;
*/
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);
- err = adns__internal_submit(ads, query_r, adns__findtype(adns_r_addr),
+ err = adns__internal_submit(ads, &qu, adns__findtype(adns_r_addr),
type, qumsg_vb, id, flags | adns__qf_nosend,
now, ctx);
if (err) return err;
- (*query_r)->parent = parent;
- LIST_LINK_TAIL_PART(parent->children, *query_r, siblings.);
- addr_subqueries(*query_r, now, rrty, nrrty);
+ qu->parent = parent;
+ LIST_LINK_TAIL_PART(parent->children, qu, siblings.);
+
+ memcpy(qu->ctx.tinfo.addr.rrty, rrty, nrrty*sizeof(*rrty));
+ qu->ctx.tinfo.addr.nrrty = nrrty;
+ addr_subqueries(qu, now, qu->query_dgram, qu->query_dglen);
+ *query_r = qu;
return adns_s_ok;
}
-static void qs_addr(adns_query qu, struct timeval now)
+static adns_status copy_cname_from_child(adns_query parent, adns_query child)
{
- adns_rrtype rrty[ADDR_MAXRRTYPES];
- size_t nrrty;
+ adns_answer *pans = parent->answer, *cans = child->answer;
+ size_t n = strlen(cans->cname) + 1;
- addr_rrtypes(qu->ads, qu->answer->type, qu->flags, rrty, &nrrty);
- addr_subqueries(qu, now, rrty, nrrty);
+ 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)
+{
+ size_t i;
+
+ for (i = 0;
+ i < qu->ctx.tinfo.addr.nrrty &&
+ type != qu->ctx.tinfo.addr.rrty[i];
+ i++);
+ assert(i < qu->ctx.tinfo.addr.nrrty);
+ qu->ctx.tinfo.addr.rrty[i] =
+ qu->ctx.tinfo.addr.rrty[--qu->ctx.tinfo.addr.nrrty];
+ qu->ctx.tinfo.addr.rrty[qu->ctx.tinfo.addr.nrrty] = 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 now;
+ adns_status err;
+ int id;
+
+ if (!(child->flags & adns__qf_addr_cname) &&
+ (parent->flags & adns__qf_addr_answer) &&
+ (!pans->cname != !cans->cname ||
+ (pans->cname && strcmp(pans->cname, pans->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.nrrty = parent->ctx.tinfo.addr.onrrty;
+ 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), adns__findtype(adns_r_addr),
+ 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, 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) &&
+ !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;
+ if (gettimeofday(&now, 0)) goto x_gtod;
+ adns__search_next(ads, parent, now);
+ return;
+ }
+
+ if (cans->status && cans->status != adns_s_nodata)
+ { err = cans->status; goto x_err; }
+
+ assert(pans->rrsz == cans->rrsz);
+ 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)
+{
+ addr_rrtypes(qu->ads, qu->answer->type, qu->flags,
+ qu->ctx.tinfo.addr.rrty, &qu->ctx.tinfo.addr.nrrty);
+ addr_subqueries(qu, now, qu->query_dgram, qu->query_dglen);
}
/*
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 = addr_rrsz(parent);
+ size_t addrsz = gsz_addr(parent->answer->type);
st= cans->status == adns_s_nodata ? adns_s_ok : cans->status;
- rrp->astatus= st;
if (st) goto done;
assert(addrsz == cans->rrsz);
done:
if (st) {
adns__free_interim(parent, rrp->addrs);
- rrp->naddrs= (st>0 && st<=adns_s_max_tempfail) ? -1 : cans->nrrs;
+ rrp->naddrs= (st>0 && st<=adns_s_max_tempfail) ? -1 : 0;
}
+ rrp->astatus= st;
if (parent->children.head) {
LIST_LINK_TAIL(ads->childw,parent);
} else {
adns_queryflags nflags;
adns_rrtype rrty[ADDR_MAXRRTYPES];
size_t nrrty;
- size_t addrsz = addr_rrsz(pai->qu);
+ size_t addrsz = gsz_addr(pai->qu->answer->type);
dmstart= cbyte= *cbyte_io;
st= pap_domain(pai, &cbyte, max, &rrp->host,
ctx.ext= 0;
ctx.callback= icb_hostaddr;
- ctx.info.hostaddr= rrp;
+ ctx.pinfo.hostaddr= rrp;
nflags= adns_qf_quoteok_query | (pai->qu->flags & adns__qf_afmask);
if (!(pai->qu->flags & adns_qf_cname_loose)) nflags |= adns_qf_cname_forbid;
return;
}
- queried= &parent->ctx.info.ptr_parent_addr.addr;
+ queried= &parent->ctx.pinfo.ptr_parent_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) {
if (st) return st;
if (cbyte != max) return adns_s_invaliddata;
- ap= &pai->qu->ctx.info.ptr_parent_addr;
+ ap= &pai->qu->ctx.pinfo.ptr_parent_addr;
if (!ap->ai) {
adns__findlabel_start(&fls, pai->ads, -1, pai->qu,
pai->qu->query_dgram, pai->qu->query_dglen,
ctx.ext= 0;
ctx.callback= icb_ptr;
- memset(&ctx.info,0,sizeof(ctx.info));
+ memset(&ctx.pinfo,0,sizeof(ctx.pinfo));
+ memset(&ctx.tinfo,0,sizeof(ctx.tinfo));
st= adns__internal_submit(pai->ads, &nqu, adns__findtype(ap->ai->rrtype),
ap->ai->rrtype, &pai->qu->vb, id,
adns_qf_quoteok_query, pai->now, &ctx);
#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__qdpl_normal,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__qdpl_normal,0,0,0 }
#define XTRA_TYPE(code,rrt,fmt,memb,parser,comparer,printer, \
- makefinal,qdpl,postsort,sender) \
+ makefinal,qdpl,postsort,getrrsz,sender) \
{ adns_r_##code & adns_rrt_reprmask, rrt,fmt,TYPESZ_M(memb), makefinal, \
- printer,parser,comparer,qdpl,postsort,sender }
+ printer,parser,comparer,qdpl,postsort,getrrsz,sender }
static const typeinfo typeinfos[] = {
/* Must be in ascending order of rrtype ! */
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, qdpl_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__qdpl_normal, 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 ),
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, qdpl_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 ),
~mdw / adns / blobdiff