X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/7d0aaee4dc7c78c81b609d678c63e194a3cbcbc7..4678dd22d0e6358e88864ed87e03bcbbd4532787:/src/types.c diff --git a/src/types.c b/src/types.c index e0b9698..0f672bf 100644 --- a/src/types.c +++ b/src/types.c @@ -3,12 +3,11 @@ * - RR-type-specific code, and the machinery to call it */ /* - * This file is - * Copyright (C) 1997-1999 Ian Jackson - * - * It is part of adns, which is - * Copyright (C) 1997-2000 Ian Jackson - * Copyright (C) 1999-2000 Tony Finch + * This file is part of adns, which is + * Copyright (C) 1997-2000,2003,2006 Ian Jackson + * Copyright (C) 1999-2000,2003,2006 Tony Finch + * Copyright (C) 1991 Massachusetts Institute of Technology + * (See the file INSTALL for full details.) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,12 +24,14 @@ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include #include #include #include #include +#include #include "internal.h" @@ -48,8 +49,10 @@ * _intstr (mf,csp,cs) * _manyistr (mf,cs) * _txt (pa) - * _inaddr (pa,dip,di) - * _addr (pa,di,csp,cs) + * _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) * _domain (pap) * _host_raw (pa) * _hostaddr (pap,pa,dip,di,mfp,mf,csp,cs +pap_findaddrs) @@ -240,7 +243,7 @@ static adns_status cs_hinfo(vbuf *vb, const void *datap) { } /* - * _inaddr (pa,dip,di) + * _inaddr (pa,di,cs +search_sortlist, dip_genaddr) */ static adns_status pa_inaddr(const parseinfo *pai, int cbyte, @@ -252,32 +255,47 @@ static adns_status pa_inaddr(const parseinfo *pai, int cbyte, return adns_s_ok; } -static int search_sortlist(adns_state ads, struct in_addr ad) { +static int search_sortlist(adns_state ads, int af, const void *ad) { const struct sortlist *slp; + const struct in6_addr *a6; + union gen_addr a; int i; - + int v6mappedp = 0; + + if (af == AF_INET6) { + a6 = ad; + if (IN6_IS_ADDR_V4MAPPED(a6)) { + a.v4.s_addr = htonl(((unsigned long)a6->s6_addr[12] << 24) | + ((unsigned long)a6->s6_addr[13] << 16) | + ((unsigned long)a6->s6_addr[14] << 8) | + ((unsigned long)a6->s6_addr[15] << 0)); + v6mappedp = 1; + } + } + for (i=0, slp=ads->sortlist; insortlist && - !((ad.s_addr & slp->mask.s_addr) == slp->base.s_addr); + !(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)); i++, slp++); return i; } -static int dip_inaddr(adns_state ads, struct in_addr a, struct in_addr b) { +static int dip_genaddr(adns_state ads, int af, const void *a, const void *b) { int ai, bi; if (!ads->nsortlist) return 0; - ai= search_sortlist(ads,a); - bi= search_sortlist(ads,b); + ai= search_sortlist(ads,af,a); + bi= search_sortlist(ads,af,b); return bis6_addr, pai->dgram + cbyte, 16); + return adns_s_ok; +} + +static int di_in6addr(adns_state ads, + const void *datap_a, const void *datap_b) { + return dip_genaddr(ads,AF_INET6,datap_a,datap_b); +} + +static adns_status cs_in6addr(vbuf *vb, const void *datap) { + char buf[INET6_ADDRSTRLEN]; + const char *ia; + + ia= inet_ntop(AF_INET6, datap, buf, sizeof(buf)); assert(ia); + CSP_ADDSTR(ia); + return adns_s_ok; +} + +/* + * _addr (pap,pa,di,csp,cs,qs, +search_sortlist_sa, dip_sockaddr, + * addr_rrtypes, addr_rrsz) + */ + +static adns_status pap_addr(const parseinfo *pai, int rrty, size_t rrsz, + int *cbyte_io, int max, adns_rr_addr *storeto) +{ const byte *dgram= pai->dgram; + int af, addrlen, salen; + struct in6_addr v6map; + const void *oaddr = dgram + *cbyte_io; + int avail = max - *cbyte_io; + int step = -1; + void *addrp = 0; + + switch (rrty) { + case adns_r_a: + 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); + memcpy(v6map.s6_addr + 12, oaddr, 4); + oaddr = v6map.s6_addr; avail = sizeof(v6map.s6_addr); + if (step < 0) step = 4; + goto aaaa; + } + af = AF_INET; addrlen = 4; + addrp = &storeto->addr.inet.sin_addr; + salen = sizeof(storeto->addr.inet); + break; + case adns_r_aaaa: + aaaa: + af = AF_INET6; addrlen = 16; + addrp = storeto->addr.inet6.sin6_addr.s6_addr; + salen = sizeof(storeto->addr.inet6); + break; + } + assert(addrp); - if (max-cbyte != 4) return adns_s_invaliddata; - storeto->len= sizeof(storeto->addr.inet); - memset(&storeto->addr,0,sizeof(storeto->addr.inet)); - storeto->addr.inet.sin_family= AF_INET; - memcpy(&storeto->addr.inet.sin_addr,dgram+cbyte,4); + assert(offsetof(adns_rr_addr, addr) + salen <= rrsz); + if (addrlen < avail) return adns_s_invaliddata; + if (step < 0) step = addrlen; + *cbyte_io += step; + memset(&storeto->addr, 0, salen); + storeto->len = salen; + storeto->addr.sa.sa_family = af; + memcpy(addrp, oaddr, addrlen); + + return adns_s_ok; +} + +static adns_status pa_addr(const parseinfo *pai, int cbyte, + int max, void *datap) { + int err = pap_addr(pai, pai->qu->answer->type & adns_rrt_typemask, + pai->qu->answer->rrsz, &cbyte, max, datap); + if (err) return err; + if (cbyte != max) return adns_s_invaliddata; return adns_s_ok; } +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)); +} + +static int dip_sockaddr(adns_state ads, + const struct sockaddr *sa, + const struct sockaddr *sb) +{ + if (!ads->sortlist) return 0; + return search_sortlist_sa(ads, sa) > search_sortlist_sa(ads, sb); +} + static int di_addr(adns_state ads, const void *datap_a, const void *datap_b) { const adns_rr_addr *ap= datap_a, *bp= datap_b; - assert(ap->addr.sa.sa_family == AF_INET); - return dip_inaddr(ads, ap->addr.inet.sin_addr, bp->addr.inet.sin_addr); + return dip_sockaddr(ads, &ap->addr.sa, &bp->addr.sa); } static int div_addr(void *context, const void *datap_a, const void *datap_b) { @@ -320,14 +429,20 @@ static int div_addr(void *context, const void *datap_a, const void *datap_b) { } static adns_status csp_addr(vbuf *vb, const adns_rr_addr *rrp) { - const char *ia; - static char buf[30]; + char buf[128]; + int err; switch (rrp->addr.inet.sin_family) { case AF_INET: CSP_ADDSTR("INET "); - ia= inet_ntoa(rrp->addr.inet.sin_addr); assert(ia); - CSP_ADDSTR(ia); + goto ntop; + case AF_INET6: + CSP_ADDSTR("INET6 "); + goto ntop; + ntop: + err= getnameinfo(&rrp->addr.sa, rrp->len, buf, sizeof(buf), 0, 0, + NI_NUMERICHOST); assert(!err); + CSP_ADDSTR(buf); break; default: sprintf(buf,"AF=%u",rrp->addr.sa.sa_family); @@ -343,6 +458,167 @@ 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) +{ + size_t n = 0; + adns_rrtype qtf = type & adns__qtf_deref; + + if (!(type & adns__qtf_bigaddr) || !(type & adns__qtf_manyaf)) + qf = (qf & adns__qf_afmask) | adns_qf_ipv4_only; + + 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) +{ + return qu->answer->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 = 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) +{ + adns_state ads = parent->ads; + adns_answer *pans = parent->answer, *cans = child->answer; + struct timeval tvbuf; + adns_status err; + const struct timeval *now = 0; + + /* Must handle CNAMEs correctly. This gets very hairy if the answers we + * get are inconsistent. + */ + + 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 addr_subqueries(adns_query qu, struct timeval now, + const adns_rrtype *rrty, size_t nrrty) +{ + int i, err, id; + adns_query cqu; + adns_queryflags qf = + (qu->flags | adns__qf_senddirect) & + ~(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); + 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.); + } + 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, + const adns_rrtype *rrty, size_t nrrty, + adns_queryflags flags, struct timeval now, + const 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). + */ + + adns_state ads = parent->ads; + 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), + 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); + return adns_s_ok; +} + +static void qs_addr(adns_query qu, struct timeval now) +{ + adns_rrtype rrty[ADDR_MAXRRTYPES]; + size_t nrrty; + + addr_rrtypes(qu->ads, qu->answer->type, qu->flags, rrty, &nrrty); + addr_subqueries(qu, now, rrty, nrrty); +} + /* * _domain (pap,csp,cs) * _dom_raw (pa) @@ -413,41 +689,49 @@ static adns_status pa_host_raw(const parseinfo *pai, int cbyte, */ static adns_status pap_findaddrs(const parseinfo *pai, adns_rr_hostaddr *ha, - int *cbyte_io, int count, int dmstart) { - int rri, naddrs; - int type, class, rdlen, rdstart, ownermatched; + adns_rrtype *rrty, size_t *nrrty_io, + size_t addrsz, int *cbyte_io, int count, + int dmstart) { + int rri, naddrs, j; + int type, class, rdlen, rdend, rdstart, ownermatched; + size_t nrrty = *nrrty_io; unsigned long ttl; adns_status st; - for (rri=0, naddrs=-1; rriqu, 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 || type != adns_r_a) { - if (naddrs>0) break; else continue; - } - if (naddrs == -1) { - naddrs= 0; + 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; } - if (!adns__vbuf_ensure(&pai->qu->vb, (naddrs+1)*sizeof(adns_rr_addr))) - R_NOMEM; + if (!adns__vbuf_ensure(&pai->qu->vb, (naddrs+1)*addrsz)) R_NOMEM; adns__update_expires(pai->qu,ttl,pai->now); - st= pa_addr(pai, rdstart,rdstart+rdlen, - pai->qu->vb.buf + naddrs*sizeof(adns_rr_addr)); + rdend = rdstart + rdlen; + st= pap_addr(pai, type, addrsz, &rdstart, rdend, + (adns_rr_addr *)(pai->qu->vb.buf + naddrs*addrsz)); if (st) return st; + if (rdstart != rdend) return adns_s_invaliddata; naddrs++; } - if (naddrs >= 0) { - ha->addrs= adns__alloc_interim(pai->qu, naddrs*sizeof(adns_rr_addr)); - if (!ha->addrs) R_NOMEM; - memcpy(ha->addrs, pai->qu->vb.buf, naddrs*sizeof(adns_rr_addr)); - 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, sizeof(adns_rr_addr), pai->qu->vb.buf, - div_addr, pai->ads); + if (!*nrrty_io) { + adns__isort(ha->addrs, naddrs, addrsz, pai->qu->vb.buf, + div_addr, pai->ads); + } } return adns_s_ok; } @@ -457,13 +741,29 @@ static void icb_hostaddr(adns_query parent, adns_query child) { adns_rr_hostaddr *rrp= child->ctx.info.hostaddr; adns_state ads= parent->ads; adns_status st; + size_t addrsz = addr_rrsz(parent); - st= cans->status; + st= cans->status == adns_s_nodata ? adns_s_ok : 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*sizeof(adns_rr_addr)); + + 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 : cans->nrrs; + } if (parent->children.head) { LIST_LINK_TAIL(ads->childw,parent); @@ -480,6 +780,9 @@ static adns_status pap_hostaddr(const parseinfo *pai, int *cbyte_io, int id; adns_query nqu; adns_queryflags nflags; + adns_rrtype rrty[ADDR_MAXRRTYPES]; + size_t nrrty; + size_t addrsz = addr_rrsz(pai->qu); dmstart= cbyte= *cbyte_io; st= pap_domain(pai, &cbyte, max, &rrp->host, @@ -488,18 +791,23 @@ 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); + addr_rrtypes(pai->ads, pai->qu->answer->type, + pai->qu->flags, rrty, &nrrty); + + st= pap_findaddrs(pai, rrp, rrty, &nrrty, addrsz, + &cbyte, pai->nscount, dmstart); if (st) return st; - if (rrp->naddrs != -1) return adns_s_ok; + if (!nrrty) return adns_s_ok; - st= pap_findaddrs(pai, rrp, &cbyte, pai->arcount, dmstart); + st= pap_findaddrs(pai, rrp, rrty, &nrrty, addrsz, + &cbyte, pai->arcount, dmstart); if (st) return st; - if (rrp->naddrs != -1) return adns_s_ok; + if (!nrrty) return adns_s_ok; st= adns__mkquery_frdgram(pai->ads, &pai->qu->vb, &id, pai->dgram, pai->dglen, dmstart, @@ -510,16 +818,13 @@ static adns_status pap_hostaddr(const parseinfo *pai, int *cbyte_io, ctx.callback= icb_hostaddr; ctx.info.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), - &pai->qu->vb, id, nflags, pai->now, &ctx); + st= addr_submit(pai->qu, &nqu, &pai->qu->vb, id, rrty, nrrty, + 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; } @@ -540,11 +845,7 @@ static int dip_hostaddr(adns_state ads, if (ap->astatus != bp->astatus) return ap->astatus; if (ap->astatus) return 0; - assert(ap->addrs[0].addr.sa.sa_family == AF_INET); - assert(bp->addrs[0].addr.sa.sa_family == AF_INET); - return dip_inaddr(ads, - ap->addrs[0].addr.inet.sin_addr, - bp->addrs[0].addr.inet.sin_addr); + return dip_sockaddr(ads, &ap->addrs[0].addr.sa, &bp->addrs[0].addr.sa); } static int di_hostaddr(adns_state ads, @@ -556,10 +857,11 @@ static int di_hostaddr(adns_state ads, static void mfp_hostaddr(adns_query qu, adns_rr_hostaddr *rrp) { void *tablev; - + size_t sz = qu->answer->type & adns__qtf_bigaddr ? + sizeof(adns_rr_addr) : sizeof(adns_rr_addr_v4only); adns__makefinal_str(qu,&rrp->host); tablev= rrp->addrs; - adns__makefinal_block(qu, &tablev, rrp->naddrs*sizeof(*rrp->addrs)); + adns__makefinal_block(qu, &tablev, rrp->naddrs*sz); rrp->addrs= tablev; } @@ -706,7 +1008,8 @@ static adns_status cs_inthost(vbuf *vb, const void *datap) { static void icb_ptr(adns_query parent, adns_query child) { adns_answer *cans= child->answer; - const adns_rr_addr *queried, *found; + const union gen_addr *queried; + const unsigned char *found; adns_state ads= parent->ads; int i; @@ -718,10 +1021,9 @@ static void icb_ptr(adns_query parent, adns_query child) { return; } - queried= &parent->ctx.info.ptr_parent_addr; - for (i=0, found=cans->rrs.addr; inrrs; i++, found++) { - if (queried->len == found->len && - !memcmp(&queried->addr,&found->addr,queried->len)) { + queried= &parent->ctx.info.ptr_parent_addr.addr; + for (i=0, found=cans->rrs.bytes; inrrs; i++, found += cans->rrsz) { + if (!memcmp(queried,found,cans->rrsz)) { if (!parent->children.head) { adns__query_done(parent); return; @@ -737,16 +1039,22 @@ static void icb_ptr(adns_query parent, adns_query child) { static adns_status pa_ptr(const parseinfo *pai, int dmstart, int max, void *datap) { - static const char *(expectdomain[])= { DNS_INADDR_ARPA }; + 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; - adns_rr_addr *ap; + struct afinfo_addr *ap; findlabel_state fls; - char *ep; - byte ipv[4]; - char labbuf[4]; - int cbyte, i, lablen, labstart, l, id; + byte ipv[n_ed][32]; + int cbyte, i, j, foundj = -1, lablen, labstart, id, f, ac; + const char *tp; adns_query nqu; qcontext ctx; @@ -757,47 +1065,63 @@ static adns_status pa_ptr(const parseinfo *pai, int dmstart, if (cbyte != max) return adns_s_invaliddata; ap= &pai->qu->ctx.info.ptr_parent_addr; - if (!ap->len) { + 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); - for (i=0; i<4; i++) { + + 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 || lablen>3) return adns_s_querydomainwrong; - memcpy(labbuf, pai->qu->query_dgram + labstart, lablen); - labbuf[lablen]= 0; - ipv[3-i]= strtoul(labbuf,&ep,10); - if (*ep) return adns_s_querydomainwrong; - if (lablen>1 && pai->qu->query_dgram[labstart]=='0') - return adns_s_querydomainwrong; + 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; + } } - for (i=0; iqu->query_dgram + labstart, expectdomain[i], l)) - 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; } - st= adns__findlabel_next(&fls,&lablen,0); assert(!st); - if (lablen) return adns_s_querydomainwrong; - - ap->len= sizeof(struct sockaddr_in); - memset(&ap->addr,0,sizeof(ap->addr.inet)); - ap->addr.inet.sin_family= AF_INET; - ap->addr.inet.sin_addr.s_addr= - htonl((ipv[0]<<24) | (ipv[1]<<16) | (ipv[2]<<8) | (ipv[3])); + 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, - adns_r_addr, adns_qf_quoteok_query); + ap->ai->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(adns_r_addr), - &pai->qu->vb, id, + 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); if (st) return st; @@ -1250,14 +1574,15 @@ static void mf_flat(adns_query qu, void *data) { } #define FLAT_MEMB(memb) TYPESZ_M(memb), mf_flat, cs_##memb #define DEEP_TYPE(code,rrt,fmt,memb,parser,comparer,printer) \ - { adns_r_##code, rrt,fmt,TYPESZ_M(memb), mf_##memb, \ - printer,parser,comparer, adns__qdpl_normal,0 } +{ adns_r_##code & adns_rrt_reprmask, rrt,fmt,TYPESZ_M(memb), \ + mf_##memb, printer,parser,comparer, adns__qdpl_normal,0,0 } #define FLAT_TYPE(code,rrt,fmt,memb,parser,comparer,printer) \ - { adns_r_##code, rrt,fmt,TYPESZ_M(memb), mf_flat, \ - printer,parser,comparer, adns__qdpl_normal,0 } -#define XTRA_TYPE(code,rrt,fmt,memb,parser,comparer,printer,qdpl,postsort) \ - { adns_r_##code, rrt,fmt,TYPESZ_M(memb), mf_##memb, \ - printer,parser,comparer,qdpl,postsort } +{ adns_r_##code & adns_rrt_reprmask, rrt,fmt,TYPESZ_M(memb), \ + mf_flat, printer,parser,comparer, adns__qdpl_normal,0,0 } +#define XTRA_TYPE(code,rrt,fmt,memb,parser,comparer,printer, \ + makefinal,qdpl,postsort,sender) \ +{ adns_r_##code & adns_rrt_reprmask, rrt,fmt,TYPESZ_M(memb), makefinal, \ + printer,parser,comparer,qdpl,postsort,sender } static const typeinfo typeinfos[] = { /* Must be in ascending order of rrtype ! */ @@ -1272,15 +1597,17 @@ DEEP_TYPE(hinfo, "HINFO", 0, intstrpair,pa_hinfo, 0, cs_hinfo ), DEEP_TYPE(mx_raw, "MX", "raw",intstr, pa_mx_raw, di_mx_raw,cs_inthost ), 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, - qdpl_srv, postsort_srv), + mf_srvraw, qdpl_srv, postsort_srv, 0), -FLAT_TYPE(addr, "A", "addr", addr, pa_addr, di_addr, cs_addr ), +XTRA_TYPE(addr, "A", "addr", addr, pa_addr, di_addr, cs_addr, + mf_flat, adns__qdpl_normal, 0, 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, - qdpl_srv, postsort_srv), + mf_srvha, qdpl_srv, postsort_srv, 0), DEEP_TYPE(soa, "SOA","822", soa, pa_soa, 0, cs_soa ), DEEP_TYPE(rp, "RP", "822", strpair, pa_rp, 0, cs_rp ), @@ -1293,6 +1620,7 @@ const typeinfo *adns__findtype(adns_rrtype type) { const typeinfo *begin, *end, *mid; if (type & adns_r_unknown) return &typeinfo_unknown; + type &= adns_rrt_reprmask; begin= typeinfos; end= typeinfos+(sizeof(typeinfos)/sizeof(typeinfo));