X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/50e2b0c3e23c15b58d834a753f074dd232aff30f..b582ca0f999ffd51e26c5543d2023ea137af3bec:/src/types.c diff --git a/src/types.c b/src/types.c index abe0c88..cb343be 100644 --- a/src/types.c +++ b/src/types.c @@ -85,6 +85,7 @@ * cs_* * gsz_* * postsort_* + * qs_* */ /* @@ -260,11 +261,27 @@ static adns_status pa_inaddr(const parseinfo *pai, int cbyte, 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 && - !adns__addr_match_p(af,ad, slp->af,&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; } @@ -514,13 +531,12 @@ static void icb_hostaddr(adns_query parent, adns_query child) { adns_rr_hostaddr *rrp= child->ctx.pinfo.hostaddr; adns_state ads= parent->ads; adns_status st; - size_t addrsz= gsz_addr(0, parent->answer->type); 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*addrsz); + adns__transfer_interim(child, parent, rrp->addrs); if (parent->children.head) { LIST_LINK_TAIL(ads->childw,parent); @@ -572,15 +588,13 @@ static adns_status pap_hostaddr(const parseinfo *pai, int *cbyte_io, nflags= adns_qf_quoteok_query; 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), + st= adns__internal_submit(pai->ads, &nqu, pai->qu, + 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; - nqu->parent= pai->qu; - LIST_LINK_TAIL_PART(pai->qu->children,nqu,siblings.); - return adns_s_ok; } @@ -765,29 +779,14 @@ static adns_status cs_inthost(vbuf *vb, const void *datap) { static adns_status ckl_ptr(adns_state ads, adns_queryflags flags, union checklabel_state *cls, qcontext *ctx, int labnum, const char *label, int lablen) { - static const char *const (expectdomain[])= { DNS_INADDR_ARPA }; - char *ep; - const char *ed; - char labbuf[4]; - int l; - - if (labnum < 4) { - if (lablen<=0 || lablen>3) return adns_s_querydomainwrong; - memcpy(labbuf, label, lablen); - labbuf[lablen]= 0; - cls->ptr.ipv[3-labnum]= strtoul(labbuf,&ep,10); - if (*ep) return adns_s_querydomainwrong; - if (lablen>1 && *label=='0') return adns_s_querydomainwrong; - } else if (labnum < 4 + sizeof(expectdomain)/sizeof(*expectdomain)) { - ed= expectdomain[labnum-4]; - l= strlen(ed); - if (lablen != l || memcmp(label, ed, l)) return adns_s_querydomainwrong; + if (lablen) { + if (adns__revparse_label(&cls->ptr, labnum, label,lablen)) + return adns_s_querydomainwrong; } else { - if (lablen) return adns_s_querydomainwrong; - ctx->tinfo.ptr.addr.af= AF_INET; - ctx->tinfo.ptr.addr.addr.v4.s_addr= - htonl((cls->ptr.ipv[0]<<24) | (cls->ptr.ipv[1]<<16) | - (cls->ptr.ipv[2]<< 8) | (cls->ptr.ipv[3])); + if (adns__revparse_done(&cls->ptr, labnum, + &ctx->tinfo.ptr.rev_rrtype, + &ctx->tinfo.ptr.addr)) + return adns_s_querydomainwrong; } return adns_s_ok; } @@ -808,9 +807,9 @@ static void icb_ptr(adns_query parent, adns_query child) { } queried= &parent->ctx.tinfo.ptr.addr; - assert(cans->type == adns_r_a); for (i=0, found=cans->rrs.bytes; inrrs; i++, found+=cans->rrsz) { - if (adns__genaddr_equal_p(queried->af,&queried->addr, AF_INET,found)) { + if (adns__genaddr_equal_p(queried->af,&queried->addr, + parent->ctx.tinfo.ptr.addr.af,found)) { if (!parent->children.head) { adns__query_done(parent); return; @@ -828,6 +827,7 @@ static adns_status pa_ptr(const parseinfo *pai, int dmstart, int max, void *datap) { char **rrp= datap; adns_status st; + adns_rrtype rrtype= pai->qu->ctx.tinfo.ptr.rev_rrtype; int cbyte, id; adns_query nqu; qcontext ctx; @@ -840,20 +840,19 @@ static adns_status pa_ptr(const parseinfo *pai, int dmstart, st= adns__mkquery_frdgram(pai->ads, &pai->qu->vb, &id, pai->dgram, pai->dglen, dmstart, - adns_r_a, adns_qf_quoteok_query); + rrtype, adns_qf_quoteok_query); if (st) return st; ctx.ext= 0; ctx.callback= icb_ptr; memset(&ctx.pinfo,0,sizeof(ctx.pinfo)); memset(&ctx.tinfo,0,sizeof(ctx.tinfo)); - st= adns__internal_submit(pai->ads, &nqu, adns__findtype(adns_r_a), - adns_r_a, &pai->qu->vb, id, adns_qf_quoteok_query, - pai->now, &ctx); + st= adns__internal_submit(pai->ads, &nqu, pai->qu, + adns__findtype(rrtype), + rrtype, &pai->qu->vb, id, + adns_qf_quoteok_query, pai->now, &ctx); if (st) return st; - nqu->parent= pai->qu; - LIST_LINK_TAIL_PART(pai->qu->children,nqu,siblings.); return adns_s_ok; } @@ -1282,11 +1281,13 @@ 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, \ GLUE(cs_, CAR(__VA_ARGS__)),pa_##parser,di_##comparer, \ - adns__ckl_hostname, 0, adns__getrrsz_default, CDR(__VA_ARGS__) } + adns__ckl_hostname, 0, adns__getrrsz_default, adns__query_send, \ + CDR(__VA_ARGS__) } #define FLAT_TYPE(code,rrt,fmt,memb,parser,comparer,/*printer*/...) \ { adns_r_##code&adns_rrt_reprmask, rrt,fmt,TYPESZ_M(memb), mf_flat, \ GLUE(cs_, CAR(__VA_ARGS__)),pa_##parser,di_##comparer, \ - adns__ckl_hostname, 0, adns__getrrsz_default, CDR(__VA_ARGS__) } + adns__ckl_hostname, 0, adns__getrrsz_default, adns__query_send, \ + CDR(__VA_ARGS__) } #define di_0 0