X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=src%2Ftypes.c;h=55a7709373532421d31f4363bf7f54e3e6531f3c;hp=c1d235ebb389fb27e2f9881d2e01afb18964d867;hb=991b3d579770b5914ac00b77aa8c59457bc5f753;hpb=1bc731c6994dda2c1ab12fb2d8261246bcbc139c diff --git a/src/types.c b/src/types.c index c1d235e..55a7709 100644 --- a/src/types.c +++ b/src/types.c @@ -263,27 +263,26 @@ 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; + struct in_addr a4; int i; int v6mappedp= 0; if (af == AF_INET6) { - a6= ad; + const struct in6_addr *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)); + a4.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_matches(af,ad, &slp->base,&slp->mask) && !(v6mappedp && - adns__addr_match_p(AF_INET,&a, slp->af,&slp->base,&slp->mask)); + adns__addr_matches(AF_INET,&a4, &slp->base,&slp->mask)); i++, slp++); return i; } @@ -311,7 +310,7 @@ static adns_status csp_genaddr(vbuf *vb, int af, const void *p) { memset(&a, 0, sizeof(a)); a.addr.sa.sa_family= af; - adns__sockaddr_inject(p, 0, &a.addr.sa); + adns__addr_inject(p, &a.addr); err= adns_addr2text(&a.addr.sa,0, buf,&len, 0); assert(!err); CSP_ADDSTR(buf); return adns_s_ok; @@ -366,7 +365,7 @@ enum { addr_nrrtypes, #define RRTY_FLAG(ty) addr_rf_##ty = 1 << addr__ri_##ty, ADDR_RRTYPES(RRTY_FLAG) - addr__rrty_hunoz + addr__rrty_eat_final_comma #undef RRTY_FLAG }; @@ -456,9 +455,8 @@ static adns_status pa_addr(const parseinfo *pai, int cbyte, } static int search_sortlist_sa(adns_state ads, const struct sockaddr *sa) { - union gen_addr a; - adns__sockaddr_extract(sa, &a, 0); - return search_sortlist(ads, sa->sa_family, &a); + const void *pa = adns__sockaddr_addr(sa); + return search_sortlist(ads, sa->sa_family, pa); } static int dip_sockaddr(adns_state ads, @@ -519,7 +517,26 @@ static unsigned addr_rrtypes(adns_state ads, adns_rrtype type, /* Return a mask of addr_rf_... flags indicating which address families are * wanted, given a query type and flags. */ - return addr_rf_a; + + adns_queryflags permitaf= 0; + unsigned want= 0; + + if (!(type & adns__qtf_bigaddr)) + qf= (qf & ~adns_qf_want_allaf) | adns_qf_want_ipv4; + else { + if (!(qf & adns_qf_want_allaf)) { + qf |= (type & adns__qtf_manyaf) ? + adns_qf_want_allaf : adns_qf_want_ipv4; + } + if (ads->iflags & adns_if_permit_ipv4) permitaf |= adns_qf_want_ipv4; + if (ads->iflags & adns_if_permit_ipv6) permitaf |= adns_qf_want_ipv6; + if (qf & permitaf) qf &= permitaf | ~adns_qf_want_allaf; + } + + if (qf & adns_qf_want_ipv4) want |= addr_rf_a; + if (qf & adns_qf_want_ipv6) want |= addr_rf_aaaa; + + return want; } static void icb_addr(adns_query parent, adns_query child); @@ -927,7 +944,8 @@ static adns_status pap_hostaddr(const parseinfo *pai, int *cbyte_io, ctx.callback= icb_hostaddr; ctx.pinfo.hostaddr= rrp; - nflags= adns_qf_quoteok_query | (pai->qu->flags & adns_qf_ipv6_mapv4); + nflags= adns_qf_quoteok_query | (pai->qu->flags & (adns_qf_want_allaf | + adns_qf_ipv6_mapv4)); if (!(pai->qu->flags & adns_qf_cname_loose)) nflags |= adns_qf_cname_forbid; st= addr_submit(pai->qu, &nqu, &pai->qu->vb, id, want, @@ -1117,14 +1135,15 @@ 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) { + int labnum, const char *dgram, + int labstart, int lablen) { if (lablen) { - if (adns__revparse_label(&cls->ptr, labnum, label,lablen)) + if (!adns__revparse_label(&cls->ptr, labnum, dgram,labstart,lablen)) return adns_s_querydomainwrong; } else { - if (adns__revparse_done(&cls->ptr, labnum, - &ctx->tinfo.ptr.rev_rrtype, - &ctx->tinfo.ptr.addr)) + if (!adns__revparse_done(&cls->ptr, dgram, labnum, + &ctx->tinfo.ptr.rev_rrtype, + &ctx->tinfo.ptr.addr)) return adns_s_querydomainwrong; } return adns_s_ok; @@ -1132,7 +1151,7 @@ static adns_status ckl_ptr(adns_state ads, adns_queryflags flags, static void icb_ptr(adns_query parent, adns_query child) { adns_answer *cans= child->answer; - const struct af_addr *queried; + const adns_sockaddr *queried; const unsigned char *found; adns_state ads= parent->ads; int i; @@ -1147,8 +1166,8 @@ static void icb_ptr(adns_query parent, adns_query child) { queried= &parent->ctx.tinfo.ptr.addr; for (i=0, found=cans->rrs.bytes; inrrs; i++, found+=cans->rrsz) { - if (adns__genaddr_equal_p(queried->af,&queried->addr, - parent->ctx.tinfo.ptr.addr.af,found)) { + if (adns__addrs_equal_raw(&queried->sa, + parent->ctx.tinfo.ptr.addr.sa.sa_family,found)) { if (!parent->children.head) { adns__query_done(parent); return; @@ -1400,12 +1419,15 @@ static adns_status cs_soa(vbuf *vb, const void *datap) { static adns_status ckl_srv(adns_state ads, adns_queryflags flags, union checklabel_state *cls, qcontext *ctx, - int labnum, const char *label, int lablen) { - if (labnum < 2 && !(flags & adns_qf_quoteok_query)) { + int labnum, const char *dgram, + int labstart, int lablen) { + const char *label = dgram+labstart; + if (labnum < 2) { + if (flags & adns_qf_quoteok_query) return adns_s_ok; if (!lablen || label[0] != '_') return adns_s_querydomaininvalid; return adns_s_ok; } - return adns__ckl_hostname(ads, flags, cls, ctx, labnum, label, lablen); + return adns__ckl_hostname(ads,flags, cls,ctx, labnum, dgram,labstart,lablen); } static adns_status pap_srv_begin(const parseinfo *pai, int *cbyte_io, int max,