* _intstr (mf,csp,cs)
* _manyistr (mf,cs)
* _txt (pa)
- * _inaddr (pa,dip,di,cs +search_sortlist)
- * _addr (pa,di,div,csp,cs)
+ * _inaddr (pa,di,cs
+ * +search_sortlist, dip_genaddr, csp_genaddr)
+ * _addr (pa,di,div,csp,cs,gsz
+ * +search_sortlist_sa, dip_sockaddr)
* _domain (pap,csp,cs)
* _dom_raw (pa)
* _host_raw (pa)
* mf_*
* csp_*
* cs_*
+ * gsz_*
* postsort_*
*/
}
/*
- * _inaddr (pa,dip,di,cs +search_sortlist)
+ * _inaddr (pa,di,cs +search_sortlist, dip_genaddr, csp_genaddr)
*/
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;
int i;
for (i=0, slp=ads->sortlist;
i<ads->nsortlist &&
- !((ad.s_addr & slp->mask.s_addr) == slp->base.s_addr);
+ !adns__addr_match_p(af,ad, slp->af,&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 bi<ai;
}
static int di_inaddr(adns_state ads,
const void *datap_a, const void *datap_b) {
- const struct in_addr *ap= datap_a, *bp= datap_b;
-
- return dip_inaddr(ads,*ap,*bp);
+ return dip_genaddr(ads,AF_INET,datap_a,datap_b);
}
-static adns_status cs_inaddr(vbuf *vb, const void *datap) {
- const struct in_addr *rrp= datap, rr= *rrp;
- const char *ia;
+static adns_status csp_genaddr(vbuf *vb, int af, const void *p) {
+ char buf[ADNS_ADDR2TEXT_BUFLEN];
+ int len= sizeof(buf);
+ adns_rr_addr a;
+ int err;
- ia= inet_ntoa(rr); assert(ia);
- CSP_ADDSTR(ia);
+ memset(&a, 0, sizeof(a));
+ a.addr.sa.sa_family= af;
+ adns__sockaddr_inject(p, 0, &a.addr.sa);
+ err= adns_addr2text(&a.addr.sa,0, buf,&len, 0); assert(!err);
+ CSP_ADDSTR(buf);
return adns_s_ok;
}
+static adns_status cs_inaddr(vbuf *vb, const void *datap) {
+ return csp_genaddr(vb, AF_INET,datap);
+}
+
/*
- * _addr (pa,di,div,csp,cs)
+ * _addr (pa,di,div,csp,cs,gsz +search_sortlist_sa, dip_sockaddr)
*/
static adns_status pa_addr(const parseinfo *pai, int cbyte,
return adns_s_ok;
}
+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);
+}
+
+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) {
}
static adns_status csp_addr(vbuf *vb, const adns_rr_addr *rrp) {
- const char *ia;
- char buf[30];
+ char buf[ADNS_ADDR2TEXT_BUFLEN];
+ int len= sizeof(buf);
+ 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 a2t;
+ case AF_INET6:
+ CSP_ADDSTR("INET6 ");
+ goto a2t;
+ a2t:
+ err= adns_addr2text(&rrp->addr.sa,0, buf,&len, 0); assert(!err);
+ CSP_ADDSTR(buf);
break;
default:
sprintf(buf,"AF=%u",rrp->addr.sa.sa_family);
return csp_addr(vb,rrp);
}
+static int gsz_addr(const typeinfo *typei, adns_rrtype type) {
+ return type & adns__qtf_bigaddr ?
+ sizeof(adns_rr_addr) : sizeof(adns_rr_addr_v4only);
+}
+
/*
* _domain (pap,csp,cs)
* _dom_raw (pa)
*/
static adns_status pap_findaddrs(const parseinfo *pai, adns_rr_hostaddr *ha,
+ size_t addrsz,
int *cbyte_io, int count, int dmstart) {
int rri, naddrs;
int type, class, rdlen, rdstart, ownermatched;
if (naddrs == -1) {
naddrs= 0;
}
- if (!adns__vbuf_ensure(&pai->qu->vb, (naddrs+1)*sizeof(adns_rr_addr)))
+ 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));
+ st= pa_addr(pai, rdstart,rdstart+rdlen, pai->qu->vb.buf + naddrs*addrsz);
if (st) return st;
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;
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*sizeof(adns_rr_addr));
+ adns__transfer_interim(child, parent, rrp->addrs, rrp->naddrs*addrsz);
if (parent->children.head) {
LIST_LINK_TAIL(ads->childw,parent);
int id;
adns_query nqu;
adns_queryflags nflags;
+ size_t addrsz= gsz_addr(0, pai->qu->answer->type);
dmstart= cbyte= *cbyte_io;
st= pap_domain(pai, &cbyte, max, &rrp->host,
cbyte= pai->nsstart;
- st= pap_findaddrs(pai, rrp, &cbyte, pai->nscount, dmstart);
+ st= pap_findaddrs(pai, rrp,addrsz, &cbyte, pai->nscount, dmstart);
if (st) return st;
if (rrp->naddrs != -1) return adns_s_ok;
- st= pap_findaddrs(pai, rrp, &cbyte, pai->arcount, dmstart);
+ st= pap_findaddrs(pai, rrp,addrsz, &cbyte, pai->arcount, dmstart);
if (st) return st;
if (rrp->naddrs != -1) return adns_s_ok;
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;
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,
static void mfp_hostaddr(adns_query qu, adns_rr_hostaddr *rrp) {
void *tablev;
+ size_t addrsz= gsz_addr(0, qu->answer->type);
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*addrsz);
rrp->addrs= tablev;
}
if (lablen != l || memcmp(label, ed, l)) return adns_s_querydomainwrong;
} else {
if (lablen) return adns_s_querydomainwrong;
- ctx->tinfo.ptr.addr.s_addr=
+ 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]));
}
static void icb_ptr(adns_query parent, adns_query child) {
adns_answer *cans= child->answer;
- const struct in_addr *queried;
+ const struct af_addr *queried;
const unsigned char *found;
adns_state ads= parent->ads;
int i;
}
queried= &parent->ctx.tinfo.ptr.addr;
+ assert(cans->type == adns_r_a);
for (i=0, found=cans->rrs.bytes; i<cans->nrrs; i++, found+=cans->rrsz) {
- if (!memcmp(queried,found,cans->rrsz)) {
+ if (adns__genaddr_equal_p(queried->af,&queried->addr, AF_INET,found)) {
if (!parent->children.head) {
adns__query_done(parent);
return;
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),
- &pai->qu->vb, id,
- adns_qf_quoteok_query, pai->now, &ctx);
+ adns_r_a, &pai->qu->vb, id, adns_qf_quoteok_query,
+ pai->now, &ctx);
if (st) return st;
nqu->parent= pai->qu;
return csp_hostaddr(vb,&rrp->ha);
}
-static void postsort_srv(adns_state ads, void *array, int nrrs,
+static void postsort_srv(adns_state ads, void *array, int nrrs,int rrsz,
const struct typeinfo *typei) {
/* we treat everything in the array as if it were an adns_rr_srvha
* even though the array might be of adns_rr_srvraw. That's OK
* because they have the same prefix, which is all we access.
- * We use typei->rrsz, too, rather than naive array indexing, of course.
+ * We use rrsz, too, rather than naive array indexing, of course.
*/
char *workbegin, *workend, *search, *arrayend;
const adns_rr_srvha *rr;
int cpriority, totalweight, runtotal;
long randval;
- for (workbegin= array, arrayend= workbegin + typei->rrsz * nrrs;
+ assert(rrsz <= sizeof(rrtmp));
+ for (workbegin= array, arrayend= workbegin + rrsz * nrrs;
workbegin < arrayend;
workbegin= workend) {
cpriority= (rr=(void*)workbegin)->priority;
for (workend= workbegin, totalweight= 0;
workend < arrayend && (rr=(void*)workend)->priority == cpriority;
- workend += typei->rrsz) {
+ workend += rrsz) {
totalweight += rr->weight;
}
* workbegin (swapping with the one that was there, and then
* advance workbegin. */
for (;
- workbegin + typei->rrsz < workend; /* don't bother if just one */
- workbegin += typei->rrsz) {
+ workbegin + rrsz < workend; /* don't bother if just one */
+ workbegin += rrsz) {
randval= nrand48(ads->rand48xsubi);
randval %= (totalweight + 1);
for (search=workbegin, runtotal=0;
(runtotal += (rr=(void*)search)->weight) < randval;
- search += typei->rrsz);
+ search += rrsz);
assert(search < arrayend);
totalweight -= rr->weight;
if (search != workbegin) {
- memcpy(&rrtmp, workbegin, typei->rrsz);
- memcpy(workbegin, search, typei->rrsz);
- memcpy(search, &rrtmp, typei->rrsz);
+ memcpy(&rrtmp, workbegin, rrsz);
+ memcpy(workbegin, search, rrsz);
+ memcpy(search, &rrtmp, rrsz);
}
}
}
#define TYPESZ_M(member) (sizeof(*((adns_answer*)0)->rrs.member))
#define DEEP_TYPE(code,rrt,fmt,memb,parser,comparer,/*printer*/...) \
- { adns_r_##code, rrt,fmt,TYPESZ_M(memb), mf_##memb, \
+ { 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, CDR(__VA_ARGS__) }
+ adns__ckl_hostname, 0, adns__getrrsz_default, CDR(__VA_ARGS__) }
#define FLAT_TYPE(code,rrt,fmt,memb,parser,comparer,/*printer*/...) \
- { adns_r_##code, rrt,fmt,TYPESZ_M(memb), mf_flat, \
+ { 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, CDR(__VA_ARGS__) }
+ adns__ckl_hostname, 0, adns__getrrsz_default, CDR(__VA_ARGS__) }
#define di_0 0
DEEP_TYPE(srv_raw,"SRV", "raw",srvraw , srvraw, srv, srvraw,
.checklabel= ckl_srv, .postsort= postsort_srv),
-FLAT_TYPE(addr, "A", "addr", addr, addr, addr, addr ),
+FLAT_TYPE(addr, "A", "addr", addr, addr, addr, addr,
+ .getrrsz= gsz_addr),
DEEP_TYPE(ns, "NS", "+addr",hostaddr, hostaddr,hostaddr,hostaddr ),
DEEP_TYPE(ptr, "PTR","checked",str, ptr, 0, domain,
.checklabel= ckl_ptr),
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));