* _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)
* _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_*
}
/*
- * _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
return csp_addr(vb,rrp);
}
-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) {
qf &= hackaf | permitaf | ~adns__qf_afmask;
}
+ if (qf & adns_qf_ipv4_only) want |= addr_rf_a;
+ if (qf & adns_qf_ipv6_only) want |= addr_rf_aaaa;
- 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;
+ 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);
}
size_t drrsz = *dlen*rrsz, srrsz = slen*rrsz;
byte *p;
- /* if (!slen) return adns_s_ok; */
+ if (!slen) return adns_s_ok;
p = adns__alloc_interim(qu, drrsz + srrsz);
if (!p) R_NOMEM;
if (*dlen) {
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_senddirect) &
- ~(adns_qf_search);
+ 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;
- 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;
- qu->t.addr.onrrty = qu->t.addr.nrrty;
- for (i = 0; i < qu->t.addr.nrrty; i++) {
+ 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, qu->t.addr.rrty[i], qf);
+ DNS_HDRSIZE, addr_all_rrtypes[i], qf);
if (err) goto x_error;
- err = adns__internal_submit(qu->ads, &cqu, qu->typei, qu->t.addr.rrty[i],
+ 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;
}
static adns_status addr_submit(adns_query parent, adns_query *query_r,
- vbuf *qumsg_vb, int id,
- const adns_rrtype *rrty, size_t nrrty,
+ vbuf *qumsg_vb, int id, unsigned want,
adns_queryflags flags, struct timeval now,
- const qcontext *ctx)
+ 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
*
* 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).
+ * 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_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 | adns__qf_nosend,
- now, ctx);
+ type, qumsg_vb, id, flags, now, ctx);
if (err) return err;
qu->parent = parent;
LIST_LINK_TAIL_PART(parent->children, qu, siblings.);
-
- memcpy(qu->t.addr.rrty, rrty, nrrty*sizeof(*rrty));
- qu->t.addr.nrrty = nrrty;
- addr_subqueries(qu, now, qu->query_dgram, qu->query_dglen);
*query_r = qu;
return adns_s_ok;
}
}
static void done_addr_type(adns_query qu, adns_rrtype type)
-{
- size_t i;
-
- for (i = 0; i < qu->t.addr.nrrty && type != qu->t.addr.rrty[i]; i++);
- assert(i < qu->t.addr.nrrty);
- qu->t.addr.rrty[i] = qu->t.addr.rrty[--qu->t.addr.nrrty];
- qu->t.addr.rrty[qu->t.addr.nrrty] = 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;
+ struct timeval now;
adns_status err;
- const struct timeval *now = 0;
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))) {
+ (!!pans->cname != !!cans->cname ||
+ (pans->cname && strcmp(pans->cname, cans->cname) != 0))) {
/* We've detected an inconsistency in CNAME records, and must deploy
* countermeasures.
*/
adns__transfer_interim(child, parent, cans->rrs.bytes);
pans->rrs.bytes = cans->rrs.bytes;
pans->nrrs = cans->nrrs;
- parent->t.addr.nrrty = parent->t.addr.onrrty;
+ parent->ctx.tinfo.addr.have = 0;
done_addr_type(parent, cans->type);
err = copy_cname_from_child(parent, child); if (err) goto x_err;
}
* 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),
+ strlen(pans->cname), &tinfo_addrsub,
adns_r_addr, parent->flags);
if (err) goto x_err;
* settled on.
*/
adns__cancel_children(parent);
- adns__must_gettimeofday(ads, &now, &tvbuf);
- if (now) addr_subqueries(parent, *now, child->vb.buf, child->vb.used);
+ if (gettimeofday(&now, 0)) goto x_gtod;
+ addr_subqueries(parent, now, adns__qf_addr_cname,
+ child->vb.buf, child->vb.used);
return;
}
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;
}
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->t.addr.rrty, &qu->t.addr.nrrty);
- addr_subqueries(qu, now, qu->query_dgram, qu->query_dglen);
+ 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;
+ }
+ addr_subqueries(qu, now, 0, qu->query_dgram, qu->query_dglen);
}
/*
*/
static adns_status pap_findaddrs(const parseinfo *pai, adns_rr_hostaddr *ha,
- adns_rrtype *rrty, size_t *nrrty_io,
- size_t addrsz, int *cbyte_io, int count,
- int dmstart) {
- int rri, naddrs, j;
+ unsigned *want_io, size_t addrsz,
+ int *cbyte_io, int count, int dmstart) {
+ int rri, naddrs;
+ unsigned typef, want = *want_io;
int type, class, rdlen, rdend, rdstart, ownermatched;
- size_t nrrty = *nrrty_io;
unsigned long ttl;
adns_status st;
pai->dgram, pai->dglen, dmstart, &ownermatched);
if (st) return st;
if (!ownermatched || class != DNS_CLASS_IN) continue;
- for (j = 0; j < nrrty && type != (rrty[j] & adns_rrt_typemask); j++);
- if (j >= nrrty) continue;
- if (j < *nrrty_io) {
- (*nrrty_io)--;
- adns_rrtype t = rrty[j];
- rrty[j] = rrty[*nrrty_io];
- rrty[*nrrty_io] = t;
- }
+ 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;
if (st) return st;
ha->astatus= adns_s_ok;
- if (!*nrrty_io) {
+ 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 = addr_rrsz(parent);
+ size_t addrsz = gsz_addr(parent->answer->type);
st= cans->status == adns_s_nodata ? adns_s_ok : cans->status;
int id;
adns_query nqu;
adns_queryflags nflags;
- adns_rrtype rrty[ADDR_MAXRRTYPES];
- size_t nrrty;
- size_t addrsz = addr_rrsz(pai->qu);
+ unsigned want;
+ size_t addrsz = gsz_addr(pai->qu->answer->type);
dmstart= cbyte= *cbyte_io;
st= pap_domain(pai, &cbyte, max, &rrp->host,
cbyte= pai->nsstart;
- addr_rrtypes(pai->ads, pai->qu->answer->type,
- pai->qu->flags, rrty, &nrrty);
+ want = addr_rrtypes(pai->ads, pai->qu->answer->type, pai->qu->flags);
- st= pap_findaddrs(pai, rrp, rrty, &nrrty, addrsz,
- &cbyte, pai->nscount, dmstart);
+ st= pap_findaddrs(pai, rrp, &want, addrsz, &cbyte, pai->nscount, dmstart);
if (st) return st;
- if (!nrrty) return adns_s_ok;
+ if (!want) return adns_s_ok;
- st= pap_findaddrs(pai, rrp, rrty, &nrrty, addrsz,
- &cbyte, pai->arcount, dmstart);
+ st= pap_findaddrs(pai, rrp, &want, addrsz, &cbyte, pai->arcount, dmstart);
if (st) return st;
- if (!nrrty) 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,
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;
- st= addr_submit(pai->qu, &nqu, &pai->qu->vb, id, rrty, nrrty,
+ st= addr_submit(pai->qu, &nqu, &pai->qu->vb, id, want,
nflags, pai->now, &ctx);
if (st) return st;
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);
}
/*
- * _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,
#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 ! */
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 ),
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 );
~mdw / adns / blobdiff