qu->answer->expires= -1;
qu->answer->nrrs= 0;
qu->answer->rrs.untyped= 0;
- qu->answer->rrsz= typei->rrsz;
+ qu->answer->rrsz= typei->getrrsz ? typei->getrrsz(type) : typei->rrsz;
return qu;
}
qu->query_dglen= qu->vb.used;
memcpy(qu->query_dgram,qu->vb.buf,qu->vb.used);
- if (flags & adns__qf_nosend)
- ;
- else if (typei->query_send && !(flags & adns__qf_senddirect))
- typei->query_send(qu,now);
- else
- adns__query_send(qu, now);
+ if (typei->query_send) typei->query_send(qu,now);
+ else adns__query_send(qu, now);
+}
+
+adns_status adns__ckl_hostname(adns_state ads, adns_queryflags flags,
+ union checklabel_state *css,
+ qcontext *ctx, int labnum,
+ const char *label, int lablen)
+{
+ int i, c;
+
+ if (flags & adns_qf_quoteok_query) return adns_s_ok;
+ for (i=0; i<lablen; i++) {
+ c= label[i];
+ if (c == '-') {
+ if (!i) return adns_s_querydomaininvalid;
+ } else if (!ctype_alpha(c) && !ctype_digit(c)) {
+ return adns_s_querydomaininvalid;
+ }
+ }
+ return adns_s_ok;
+}
+
+static adns_status check_domain_name(adns_state ads, adns_queryflags flags,
+ qcontext *ctx, const typeinfo *typei,
+ const byte *dgram, int dglen)
+{
+ findlabel_state fls;
+ adns_status err;
+ int labnum= 0, labstart, lablen;
+ union checklabel_state css;
+
+ adns__findlabel_start(&fls,ads, -1,0, dgram,dglen,dglen, DNS_HDRSIZE,0);
+ do {
+ err= adns__findlabel_next(&fls, &lablen,&labstart);
+ assert(!err); assert(lablen >= 0);
+ err= typei->checklabel(ads,flags, &css,ctx,
+ labnum++, dgram+labstart,lablen);
+ if (err) return err;
+ } while (lablen);
+ return adns_s_ok;
}
adns_status adns__internal_submit(adns_state ads, adns_query *query_r,
const typeinfo *typei, adns_rrtype type,
vbuf *qumsg_vb, int id,
adns_queryflags flags, struct timeval now,
- const qcontext *ctx) {
+ qcontext *ctx) {
adns_query qu;
+ adns_status err;
- qu= query_alloc(ads,typei,type,flags & ~adns__qf_nosend,now);
- if (!qu) { adns__vbuf_free(qumsg_vb); return adns_s_nomemory; }
+ err= check_domain_name(ads, flags,ctx,typei, qumsg_vb->buf,qumsg_vb->used);
+ if (err) goto x_err;
+ qu= query_alloc(ads,typei,type,flags,now);
+ if (!qu) { err = adns_s_nomemory; goto x_err; }
*query_r= qu;
memcpy(&qu->ctx,ctx,sizeof(qu->ctx));
query_submit(ads,qu, typei,qumsg_vb,id,flags,now);
return adns_s_ok;
+
+x_err:
+ adns__vbuf_free(qumsg_vb);
+ return err;
}
static void query_simple(adns_state ads, adns_query qu,
}
}
+ stat= check_domain_name(ads, flags,&qu->ctx,typei, qu->vb.buf,qu->vb.used);
+ if (stat) { adns__query_fail(qu,stat); return; }
+
vb_new= qu->vb;
adns__vbuf_init(&qu->vb);
query_submit(ads,qu, typei,&vb_new,id, flags,now);
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;
qu->ctx.ext= context;
qu->ctx.callback= 0;
- memset(&qu->ctx.info,0,sizeof(qu->ctx.info));
+ memset(&qu->ctx.pinfo,0,sizeof(qu->ctx.pinfo));
+ memset(&qu->ctx.tinfo,0,sizeof(qu->ctx.tinfo));
*query_r= qu;
return r;
}
-static const char *default_zone = "<magic>";
-
int adns_submit_reverse_any(adns_state ads,
const struct sockaddr *addr,
const char *zone,
adns_queryflags flags,
void *context,
adns_query *query_r) {
- char *buf, *buf_free, *p;
+ char *buf, *buf_free = 0;
char shortbuf[100];
- const afinfo *ai;
- int r, lreq;
+ int r;
flags &= ~adns_qf_search;
- switch (addr->sa_family) {
- case AF_INET:
- ai = &adns__inet_afinfo;
- if (zone == default_zone) zone = "in-addr.arpa";
- break;
- case AF_INET6:
- ai = &adns__inet6_afinfo;
- if (zone == default_zone) zone = "ip6.arpa";
- break;
- default:
- return ENOSYS;
- }
-
- lreq= strlen(zone) + ai->nrevcomp*(ai->revcompwd + 1) + 1;
- if (lreq > sizeof(shortbuf)) {
- buf= malloc(lreq);
- if (!buf) return errno;
- buf_free= buf;
- } else {
- buf= shortbuf;
- buf_free= 0;
- }
-
- p = ai->rev_mkname(addr, buf);
- *p++ = '.';
- strcpy(p, zone);
-
+ buf = shortbuf;
+ r= adns__make_reverse_domain(addr,zone, &buf,sizeof(shortbuf),&buf_free);
+ if (r) return r;
r= adns_submit(ads,buf,type,flags,context,query_r);
free(buf_free);
return r;
void *context,
adns_query *query_r) {
if (type != adns_r_ptr && type != adns_r_ptr_raw) return EINVAL;
- return adns_submit_reverse_any(ads,addr,default_zone,
- type,flags,context,query_r);
+ return adns_submit_reverse_any(ads,addr,0,type,flags,context,query_r);
}
int adns_synchronous(adns_state ads,
return rv;
}
-static allocnode *alloc_info(void *p, size_t *sz_r)
+static allocnode *alloc_info(adns_query qu, void *p, size_t *sz_r)
{
allocnode *an;
- if (!p) { *sz_r = 0; return 0; }
+ if (!p || p == qu) { *sz_r = 0; return 0; }
an = (allocnode *)((byte *)p - MEM_ROUND(sizeof(allocnode)));
*sz_r = MEM_ROUND(an->sz);
return an;
void adns__free_interim(adns_query qu, void *p) {
size_t sz;
- allocnode *an = alloc_info(p, &sz);
+ allocnode *an = alloc_info(qu, p, &sz);
if (!an) return;
assert(!qu->final_allocspace);
void adns__transfer_interim(adns_query from, adns_query to, void *block) {
size_t sz;
- allocnode *an = alloc_info(block, &sz);
+ allocnode *an = alloc_info(from, block, &sz);
if (!an) return;