for (i=0, slp=ads->sortlist;
i<ads->nsortlist &&
- !(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));
+ !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;
}
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));
+ return search_sortlist(ads, sa->sa_family, adns__sockaddr_to_inaddr(sa));
}
static int dip_sockaddr(adns_state ads,
return;
}
- queried= &parent->ctx.pinfo.ptr_parent_addr.addr;
+ queried= &parent->ctx.tinfo.ptr.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) {
adns__query_fail(parent,adns_s_inconsistent);
}
+static adns_status ckl_ptr(adns_state ads, adns_queryflags flags,
+ union checklabel_state *css, qcontext *ctx,
+ int labnum, const char *label, int lablen)
+{
+ if (lablen) {
+ if (adns__revparse_label(&css->ptr, labnum, label,lablen))
+ return adns_s_querydomainwrong;
+ } else {
+ if (adns__revparse_done(&css->ptr, labnum,
+ &ctx->tinfo.ptr.rev_rrtype,
+ &ctx->tinfo.ptr.addr))
+ return adns_s_querydomainwrong;
+ }
+ return adns_s_ok;
+}
+
static adns_status pa_ptr(const parseinfo *pai, int dmstart,
int max, void *datap) {
- 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;
- struct afinfo_addr *ap;
- findlabel_state fls;
- byte ipv[n_ed][32];
- int cbyte, i, j, foundj = -1, lablen, labstart, id, f, ac;
- const char *tp;
+ adns_rrtype rrtype = pai->qu->ctx.tinfo.ptr.rev_rrtype;
+ int cbyte, id;
adns_query nqu;
qcontext ctx;
if (st) return st;
if (cbyte != max) return adns_s_invaliddata;
- 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,
- pai->qu->query_dglen, DNS_HDRSIZE, 0);
-
- 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) 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;
- }
- }
-
- 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;
- }
- 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,
- ap->ai->rrtype, 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(ap->ai->rrtype),
- ap->ai->rrtype, &pai->qu->vb, id,
+ st= adns__internal_submit(pai->ads, &nqu, adns__findtype(rrtype),
+ rrtype, &pai->qu->vb, id,
adns_qf_quoteok_query, pai->now, &ctx);
if (st) return st;
XTRA_TYPE(addr, "A", "addr", addr, pa_addr, di_addr, cs_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 ),
+XTRA_TYPE(ptr, "PTR","checked",str, pa_ptr, 0, cs_domain,
+ mf_str, ckl_ptr, 0, 0, 0),
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, ckl_srv, postsort_srv, 0, 0),
~ianmdlvl / adns.git / blobdiff