From: Mark Wooding Date: Sun, 4 May 2014 17:51:35 +0000 (+0100) Subject: src/types.c: Support multiple address families in adns_rr_addr lookups. X-Git-Tag: wip.base.getaddrinfo~25 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/adns/commitdiff_plain/5f8085b735dac86cc516b40bf5b8bc57763ab360 src/types.c: Support multiple address families in adns_rr_addr lookups. This is now largely working. A query for adns_r_addr now causes (via a new type hook) concurrent child queries for all of the wanted address families; we then stitch the answers together and report the result. Astonishingly, we have NS, MX, and SRV queries doing approximately the right thing. Significant pieces missing: * init flags and configuration aren't yet processed; * (pap_hostaddr) we should query for wanted rrtypes but which aren't in the additional section, even if we got some other rrtypes for the name; * CNAME records aren't handled at all. --- diff --git a/src/adns.h b/src/adns.h index 3989f4f..6a19024 100644 --- a/src/adns.h +++ b/src/adns.h @@ -71,6 +71,23 @@ extern "C" { /* I really dislike this - iwj. */ #endif +/* Whether to support address families other than IPv4 in responses which use + * the `adns_rr_addr' structure. This is a source-compatibility issue: old + * clients may not expect to find address families other than AF_INET in + * their query results. There's a separate binary compatibility issue to do + * with the size of the `adns_rr_addr' structure, but we'll assume you can + * cope with that because you have this header file. Define + * `ADNS_FEATURE_IPV4ONLY' if you only want to see AF_INET addresses, or + * `ADNS_FEATURE_MANYAF' to allow multiple address families; the default is + * currently to stick with AF_INET only, but this is likely to change in a + * later release of ADNS. + */ +#if !defined(ADNS_FEATURE_IPV4ONLY) && !defined(ADNS_FEATURE_MANYAF) +# define ADNS_FEATURE_IPV4ONLY +#elif defined(ADNS_FEATURE_IPV4ONLY) && defined(ADNS_FEATURE_MANYAF) +# error "Feature flags ADNS_FEATURE_IPV4ONLY and ..._MANYAF are incompatible" +#endif + /* All struct in_addr anywhere in adns are in NETWORK byte order. */ typedef struct adns__state *adns_state; @@ -101,12 +118,18 @@ typedef enum { /* In general, or together the desired flags: */ adns_qf_quotefail_cname=0x00000080,/* refuse if quote-req chars in CNAME we go via */ adns_qf_cname_loose= 0x00000100,/* allow refs to CNAMEs - without, get _s_cname */ adns_qf_cname_forbid= 0x00000200,/* don't follow CNAMEs, instead give _s_cname */ + adns_qf_ipv4_only= 0x00000400,/* only ever return IPv4 addresses */ + adns_qf_ipv6_ok= 0x00000800,/* returning IPv6 addresses is acceptable */ + adns_qf_ipv6_mapv4= 0x00001800,/* ... and IPv4 addresses should be v6-mapped */ + adns_qf_ipv6_only= 0x00002800,/* ... and don't bother looking for IPv4 */ + adns__qf_afmask= 0x00003800,/* all the above flag bits */ adns__qf_internalmask= 0x0ff00000 } adns_queryflags; typedef enum { adns_rrt_typemask= 0x0ffff, - adns__qtf_deref= 0x10000,/* dereference domains; perhaps get extra data */ + adns_rrt_reprmask= 0xffffff, + adns__qtf_deref_bit=0x10000,/* internal version of ..._deref below */ adns__qtf_mail822= 0x20000,/* return mailboxes in RFC822 rcpt field fmt */ adns_r_unknown= 0x40000, @@ -127,6 +150,15 @@ typedef enum { * * Don't forget adns_qf_quoteok if that's what you want. */ + adns__qtf_bigaddr=0x1000000,/* use the new larger sockaddr union */ + adns__qtf_manyaf= 0x2000000,/* permitted to return multiple address families */ + + adns__qtf_deref= adns__qtf_deref_bit|adns__qtf_bigaddr +#ifdef ADNS_FEATURE_MANYAF + |adns__qtf_manyaf +#endif + ,/* dereference domains; perhaps get extra data */ + adns_r_none= 0, adns_r_a= 1, @@ -284,14 +316,28 @@ typedef enum { } adns_status; +typedef union { + struct sockaddr sa; + struct sockaddr_in inet; +} adns_sockaddr_v4only; + +typedef union { + struct sockaddr sa; + struct sockaddr_in inet; + struct sockaddr_in6 inet6; + char adns__padding[240]; /* Good idea? I'm inclined to think not. */ +} adns_sockaddr; + typedef struct { int len; - union { - struct sockaddr sa; - struct sockaddr_in inet; - } addr; + adns_sockaddr addr; } adns_rr_addr; +typedef struct { + int len; + adns_sockaddr_v4only addr; +} adns_rr_addr_v4only; + typedef struct { char *host; adns_status astatus; diff --git a/src/internal.h b/src/internal.h index 2c5a073..26d8746 100644 --- a/src/internal.h +++ b/src/internal.h @@ -42,6 +42,7 @@ typedef unsigned char byte; #include +#define ADNS_FEATURE_MANYAF #include "adns.h" #include "dlist.h" @@ -91,6 +92,10 @@ typedef enum { rcode_refused } dns_rcode; +enum { + adns__qf_senddirect = 0x00100000 /* don't call the `query_send' type hook */ +}; + /* Shared data structures */ typedef union { @@ -194,6 +199,12 @@ typedef struct typeinfo { * them. (This is really for the benefit of SRV's bizarre weighting * stuff.) May be 0 to mean nothing needs to be done. */ + + void (*query_send)(adns_query qu, struct timeval now); + /* Send the query to nameservers, and hook it into the appropriate queue. + * Normal behaviour is to call adns__query_send, but this can be overridden + * for special effects. + */ } typeinfo; adns_status adns__qdpl_normal(adns_state ads, @@ -206,6 +217,7 @@ adns_status adns__qdpl_normal(adns_state ads, typedef struct allocnode { struct allocnode *next, *back; + size_t sz; } allocnode; union maxalign { @@ -473,8 +485,8 @@ void adns__query_send(adns_query qu, struct timeval now); /* From query.c: */ adns_status adns__internal_submit(adns_state ads, adns_query *query_r, - const typeinfo *typei, vbuf *qumsg_vb, - int id, + const typeinfo *typei, adns_rrtype, + vbuf *qumsg_vb, int id, adns_queryflags flags, struct timeval now, const qcontext *ctx); /* Submits a query (for internal use, called during external submits). @@ -550,6 +562,10 @@ void adns__transfer_interim(adns_query from, adns_query to, * TTLs get inherited by their parents. */ +void adns__free_interim(adns_query qu, void *p); +/* Forget about a block allocated by adns__alloc_interim. + */ + void *adns__alloc_mine(adns_query qu, size_t sz); /* Like _interim, but does not record the length for later * copying into the answer. This just ensures that the memory @@ -573,6 +589,7 @@ void adns__reset_preserved(adns_query qu); void adns__query_done(adns_query qu); void adns__query_fail(adns_query qu, adns_status stat); +void adns__cancel_children(adns_query qu); /* From reply.c: */ diff --git a/src/query.c b/src/query.c index a544518..31adfc4 100644 --- a/src/query.c +++ b/src/query.c @@ -104,18 +104,21 @@ static void query_submit(adns_state ads, adns_query qu, qu->id= id; qu->query_dglen= qu->vb.used; memcpy(qu->query_dgram,qu->vb.buf,qu->vb.used); - - adns__query_send(qu,now); + + if (typei->query_send && !(qu->flags & adns__qf_senddirect)) + typei->query_send(qu,now); + else + adns__query_send(qu, now); } adns_status adns__internal_submit(adns_state ads, adns_query *query_r, - const typeinfo *typei, vbuf *qumsg_vb, - int id, + const typeinfo *typei, adns_rrtype type, + vbuf *qumsg_vb, int id, adns_queryflags flags, struct timeval now, const qcontext *ctx) { adns_query qu; - qu= query_alloc(ads,typei,typei->typekey,flags,now); + qu= query_alloc(ads,typei,type,flags,now); if (!qu) { adns__vbuf_free(qumsg_vb); return adns_s_nomemory; } *query_r= qu; @@ -222,6 +225,9 @@ int adns_submit(adns_state ads, adns__consistency(ads,0,cc_entex); + if (!(type & adns__qtf_bigaddr) || !(type & adns__qtf_manyaf)) + flags = (flags & ~adns__qf_afmask) | adns_qf_ipv4_only; + typei= adns__findtype(type); if (!typei) return ENOSYS; @@ -358,6 +364,7 @@ static void *alloc_common(adns_query qu, size_t sz) { an= malloc(MEM_ROUND(MEM_ROUND(sizeof(*an)) + sz)); if (!an) return 0; LIST_LINK_TAIL(qu->allocations,an); + an->sz = sz; return (byte*)an + MEM_ROUND(sizeof(*an)); } @@ -381,6 +388,18 @@ void *adns__alloc_preserved(adns_query qu, size_t sz) { return rv; } +void adns__free_interim(adns_query qu, void *p) { + allocnode *an; + size_t sz; + + if (!p) return; + an = (allocnode *)((byte *)p - MEM_ROUND(sizeof(allocnode))); + sz = MEM_ROUND(an->sz); + LIST_UNLINK(qu->allocations, an); + free(an); + qu->interim_allocd -= sz; +} + void *adns__alloc_mine(adns_query qu, size_t sz) { return alloc_common(qu,MEM_ROUND(sz)); } @@ -421,7 +440,7 @@ void *adns__alloc_final(adns_query qu, size_t sz) { return rp; } -static void cancel_children(adns_query qu) { +void adns__cancel_children(adns_query qu) { adns_query cqu, ncqu; for (cqu= qu->children.head; cqu; cqu= ncqu) { @@ -432,7 +451,7 @@ static void cancel_children(adns_query qu) { void adns__reset_preserved(adns_query qu) { assert(!qu->final_allocspace); - cancel_children(qu); + adns__cancel_children(qu); qu->answer->nrrs= 0; qu->answer->rrs.untyped= 0; qu->interim_allocd= qu->preserved_allocd; @@ -441,7 +460,7 @@ void adns__reset_preserved(adns_query qu) { static void free_query_allocs(adns_query qu) { allocnode *an, *ann; - cancel_children(qu); + adns__cancel_children(qu); for (an= qu->allocations.head; an; an= ann) { ann= an->next; free(an); } LIST_INIT(qu->allocations); adns__vbuf_free(&qu->vb); @@ -529,7 +548,7 @@ void adns__query_done(adns_query qu) { adns_answer *ans; adns_query parent; - cancel_children(qu); + adns__cancel_children(qu); qu->id= -1; ans= qu->answer; @@ -542,7 +561,7 @@ void adns__query_done(adns_query qu) { } if (ans->nrrs && qu->typei->diff_needswap) { - if (!adns__vbuf_ensure(&qu->vb,qu->typei->rrsz)) { + if (!adns__vbuf_ensure(&qu->vb,ans->rrsz)) { adns__query_fail(qu,adns_s_nomemory); return; } diff --git a/src/reply.c b/src/reply.c index 64b41d7..aa3e08f 100644 --- a/src/reply.c +++ b/src/reply.c @@ -312,7 +312,7 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, /* Now, we have some RRs which we wanted. */ - qu->answer->rrs.untyped= adns__alloc_interim(qu,qu->typei->rrsz*wantedrrs); + qu->answer->rrs.untyped= adns__alloc_interim(qu,qu->answer->rrsz*wantedrrs); if (!qu->answer->rrs.untyped) { adns__query_fail(qu,adns_s_nomemory); return; @@ -342,7 +342,8 @@ void adns__procdgram(adns_state ads, const byte *dgram, int dglen, !ownermatched) continue; adns__update_expires(qu,ttl,now); - st= typei->parse(&pai, rdstart,rdstart+rdlength, rrsdata+nrrs*typei->rrsz); + st= typei->parse(&pai, rdstart,rdstart+rdlength, + rrsdata+nrrs*qu->answer->rrsz); if (st) { adns__query_fail(qu,st); return; } if (rdstart==-1) goto x_truncated; nrrs++; diff --git a/src/types.c b/src/types.c index a34f046..045415c 100644 --- a/src/types.c +++ b/src/types.c @@ -24,12 +24,14 @@ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include #include #include #include #include +#include #include "internal.h" @@ -49,7 +51,8 @@ * _txt (pa) * _inaddr (pa,cs,di, +search_sortlist, dip_genaddr) * _in6addr (pa,cs,di) - * _addr (pa,di,csp,cs, +search_sortlist_sa, dip_sockaddr) + * _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) @@ -319,7 +322,7 @@ static adns_status pa_in6addr(const parseinfo *pai, int cbyte, static int di_in6addr(adns_state ads, const void *datap_a, const void *datap_b) { - return dip_genaddr(ads,AF_INET6,datap_a,AF_INET6,datap_b); + return dip_genaddr(ads,AF_INET6,datap_a,datap_b); } static adns_status cs_in6addr(vbuf *vb, const void *datap) { @@ -332,25 +335,69 @@ static adns_status cs_in6addr(vbuf *vb, const void *datap) { } /* - * _addr (pa,di,csp,cs, +search_sortlist_sa, dip_sockaddr) + * _addr (pap,pa,di,csp,cs,qs, +search_sortlist_sa, dip_sockaddr, + * addr_rrtypes, addr_rrsz) */ -static adns_status pa_addr(const parseinfo *pai, int cbyte, - int max, void *datap) { - adns_rr_addr *storeto= datap; +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_ipv6_mapv4) { + 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); + + 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); - 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); + 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 struct afinfo *ai = 0; + const afinfo *ai = 0; switch (sa->sa_family) { case AF_INET: ai = &adns__inet_afinfo; break; @@ -382,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; - 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); @@ -405,6 +458,118 @@ 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 ((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; + + *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 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; + + /* 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) { + adns__query_fail(parent, cans->status); + return; + } + + 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; + + if (parent->children.head) LIST_LINK_TAIL(ads->childw, parent); + else adns__query_done(parent); +} + +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.); + } + return; + +x_error: + adns__query_fail(qu, err); +} + /* * _domain (pap,csp,cs) * _dom_raw (pa) @@ -476,10 +641,17 @@ 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; + int rri, naddrs, j; + 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; rriqu, pai->serv, pai->dgram, @@ -487,28 +659,32 @@ static adns_status pap_findaddrs(const parseinfo *pai, adns_rr_hostaddr *ha, &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 (!ownermatched || class != DNS_CLASS_IN) { if (naddrs>0) break; else continue; } if (naddrs == -1) { naddrs= 0; } - if (!adns__vbuf_ensure(&pai->qu->vb, (naddrs+1)*sizeof(adns_rr_addr))) + 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; 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)); + ha->addrs= adns__alloc_interim(pai->qu, naddrs*addrsz); if (!ha->addrs) R_NOMEM; - memcpy(ha->addrs, pai->qu->vb.buf, naddrs*sizeof(adns_rr_addr)); + memcpy(ha->addrs, pai->qu->vb.buf, naddrs*addrsz); ha->naddrs= naddrs; ha->astatus= adns_s_ok; - adns__isort(ha->addrs, naddrs, sizeof(adns_rr_addr), pai->qu->vb.buf, + adns__isort(ha->addrs, naddrs, addrsz, pai->qu->vb.buf, div_addr, pai->ads); } return adns_s_ok; @@ -524,8 +700,7 @@ static void icb_hostaddr(adns_query parent, adns_query child) { 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)); + adns__transfer_interim(child, parent, rrp->addrs, rrp->naddrs*cans->rrsz); if (parent->children.head) { LIST_LINK_TAIL(ads->childw,parent); @@ -576,6 +751,8 @@ static adns_status pap_hostaddr(const parseinfo *pai, int *cbyte_io, 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); if (st) return st; @@ -614,10 +791,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; } @@ -877,7 +1055,7 @@ static adns_status pa_ptr(const parseinfo *pai, int dmstart, ctx.callback= icb_ptr; memset(&ctx.info,0,sizeof(ctx.info)); st= adns__internal_submit(pai->ads, &nqu, adns__findtype(ap->ai->rrtype), - &pai->qu->vb, id, + ap->ai->rrtype, &pai->qu->vb, id, adns_qf_quoteok_query, pai->now, &ctx); if (st) return st; @@ -1330,14 +1508,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 ! */ @@ -1354,14 +1533,15 @@ 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 ), @@ -1374,6 +1554,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));