* - query submission and cancellation (user-visible and internal)
*/
/*
- * This file is
- * Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
- *
- * It is part of adns, which is
- * Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
- * Copyright (C) 1999 Tony Finch <dot@dotat.at>
+ * This file is part of adns, which is
+ * Copyright (C) 1997-2000,2003,2006 Ian Jackson
+ * Copyright (C) 1999-2000,2003,2006 Tony Finch
+ * Copyright (C) 1991 Massachusetts Institute of Technology
+ * (See the file INSTALL for full details.)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "internal.h"
-static adns_query query_alloc(adns_state ads, const typeinfo *typei,
+static adns_query query_alloc(adns_state ads,
+ const typeinfo *typei, adns_rrtype type,
adns_queryflags flags, struct timeval now) {
/* Allocate a virgin query and return it. */
adns_query qu;
qu= malloc(sizeof(*qu)); if (!qu) return 0;
- qu->answer= malloc(sizeof(*qu->answer)); if (!qu->answer) { free(qu); return 0; }
+ qu->answer= malloc(sizeof(*qu->answer));
+ if (!qu->answer) { free(qu); return 0; }
qu->ads= ads;
qu->state= query_tosend;
qu->answer->status= adns_s_ok;
qu->answer->cname= qu->answer->owner= 0;
- qu->answer->type= typei->type;
+ qu->answer->type= type;
qu->answer->expires= -1;
qu->answer->nrrs= 0;
qu->answer->rrs.untyped= 0;
qu->id= id;
qu->query_dglen= qu->vb.used;
memcpy(qu->query_dgram,qu->vb.buf,qu->vb.used);
-
- adns__query_send(qu,now);
+
+ if (typei->query_send && !(qu->flags & adns__qf_senddirect))
+ typei->query_send(qu,now);
+ else
+ adns__query_send(qu, now);
}
adns_status adns__internal_submit(adns_state ads, adns_query *query_r,
- const typeinfo *typei, vbuf *qumsg_vb, int id,
+ const typeinfo *typei, adns_rrtype type,
+ vbuf *qumsg_vb, int id,
adns_queryflags flags, struct timeval now,
const qcontext *ctx) {
adns_query qu;
- qu= query_alloc(ads,typei,flags,now);
+ qu= query_alloc(ads,typei,type,flags,now);
if (!qu) { adns__vbuf_free(qumsg_vb); return adns_s_nomemory; }
*query_r= qu;
int id;
adns_status stat;
- stat= adns__mkquery(ads,&qu->vb,&id, owner,ol, typei,flags);
+ stat= adns__mkquery(ads,&qu->vb,&id, owner,ol,
+ typei,qu->answer->type, flags);
if (stat) {
if (stat == adns_s_querydomaintoolong && (flags & adns_qf_search)) {
adns__search_next(ads,qu,now);
} else {
if (qu->search_pos >= ads->nsearchlist) {
if (qu->search_doneabs) {
+ qu->search_vb.used= qu->search_origlen;
stat= adns_s_nxdomain; goto x_fail;
- return;
} else {
nextentry= 0;
qu->search_doneabs= 1;
qu->search_vb.used= qu->search_origlen;
if (nextentry) {
if (!adns__vbuf_append(&qu->search_vb,".",1) ||
- !adns__vbuf_appendstr(&qu->search_vb,nextentry)) {
- stat= adns_s_nomemory; goto x_fail;
- }
+ !adns__vbuf_appendstr(&qu->search_vb,nextentry))
+ goto x_nomemory;
}
free(qu->query_dgram);
qu->query_dgram= 0; qu->query_dglen= 0;
- query_simple(ads,qu, qu->search_vb.buf, qu->search_vb.used, qu->typei, qu->flags, now);
+ query_simple(ads,qu, qu->search_vb.buf, qu->search_vb.used,
+ qu->typei, qu->flags, now);
return;
-
+
+x_nomemory:
+ stat= adns_s_nomemory;
x_fail:
adns__query_fail(qu,stat);
}
/* Returns 1 if OK, otherwise there was no memory. */
adns_answer *ans;
+ if (!(qu->flags & adns_qf_owner)) return 1;
+
ans= qu->answer;
assert(!ans->owner);
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;
r= gettimeofday(&now,0); if (r) goto x_errno;
- qu= query_alloc(ads,typei,flags,now); if (!qu) goto x_errno;
+ qu= query_alloc(ads,typei,type,flags,now); if (!qu) goto x_errno;
qu->ctx.ext= context;
qu->ctx.callback= 0;
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) {
- const unsigned char *iaddr;
- char *buf, *buf_free;
+ char *buf, *buf_free, *p;
char shortbuf[100];
+ const afinfo *ai;
int r, lreq;
flags &= ~adns_qf_search;
- if (addr->sa_family != AF_INET) return ENOSYS;
- iaddr= (const unsigned char*) &(((const struct sockaddr_in*)addr) -> sin_addr);
+ 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) + 4*4 + 1;
+ lreq= strlen(zone) + ai->nrevcomp*(ai->revcompwd + 1) + 1;
if (lreq > sizeof(shortbuf)) {
- buf= malloc(strlen(zone) + 4*4 + 1);
+ buf= malloc(lreq);
if (!buf) return errno;
buf_free= buf;
} else {
buf= shortbuf;
buf_free= 0;
}
- sprintf(buf, "%d.%d.%d.%d.%s", iaddr[3], iaddr[2], iaddr[1], iaddr[0], zone);
+
+ p = ai->rev_mkname(addr, buf);
+ *p++ = '.';
+ strcpy(p, zone);
r= adns_submit(ads,buf,type,flags,context,query_r);
free(buf_free);
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,"in-addr.arpa",type,flags,context,query_r);
+ return adns_submit_reverse_any(ads,addr,default_zone,
+ type,flags,context,query_r);
}
int adns_synchronous(adns_state ads,
an= malloc(MEM_ROUND(MEM_ROUND(sizeof(*an)) + sz));
if (!an) return 0;
LIST_LINK_TAIL(qu->allocations,an);
+ an->sz = sz;
return (byte*)an + MEM_ROUND(sizeof(*an));
}
return rv;
}
+void adns__free_interim(adns_query qu, void *p) {
+ allocnode *an;
+ size_t sz;
+
+ if (!p) return;
+ an = (allocnode *)((byte *)p - MEM_ROUND(sizeof(allocnode)));
+ sz = MEM_ROUND(an->sz);
+ LIST_UNLINK(qu->allocations, an);
+ free(an);
+ qu->interim_allocd -= sz;
+}
+
void *adns__alloc_mine(adns_query qu, size_t sz) {
return alloc_common(qu,MEM_ROUND(sz));
}
-void adns__transfer_interim(adns_query from, adns_query to, void *block, size_t sz) {
+void adns__transfer_interim(adns_query from, adns_query to,
+ void *block, size_t sz) {
allocnode *an;
if (!block) return;
return rp;
}
-static void cancel_children(adns_query qu) {
+void adns__cancel_children(adns_query qu) {
adns_query cqu, ncqu;
for (cqu= qu->children.head; cqu; cqu= ncqu) {
void adns__reset_preserved(adns_query qu) {
assert(!qu->final_allocspace);
- cancel_children(qu);
+ adns__cancel_children(qu);
qu->answer->nrrs= 0;
qu->answer->rrs.untyped= 0;
qu->interim_allocd= qu->preserved_allocd;
static void free_query_allocs(adns_query qu) {
allocnode *an, *ann;
- cancel_children(qu);
+ adns__cancel_children(qu);
for (an= qu->allocations.head; an; an= ann) { ann= an->next; free(an); }
LIST_INIT(qu->allocations);
adns__vbuf_free(&qu->vb);
adns__consistency(ads,0,cc_entex);
}
-void adns__update_expires(adns_query qu, unsigned long ttl, struct timeval now) {
+void adns__update_expires(adns_query qu, unsigned long ttl,
+ struct timeval now) {
time_t max;
assert(ttl <= MAXTTLBELIEVE);
ans= qu->answer;
if (qu->interim_allocd) {
- ans= realloc(qu->answer, MEM_ROUND(MEM_ROUND(sizeof(*ans)) + qu->interim_allocd));
+ ans= realloc(qu->answer,
+ MEM_ROUND(MEM_ROUND(sizeof(*ans)) + qu->interim_allocd));
if (!ans) goto x_nomem;
qu->answer= ans;
}
adns_answer *ans;
adns_query parent;
- cancel_children(qu);
+ adns__cancel_children(qu);
qu->id= -1;
ans= qu->answer;
- if (qu->flags & adns_qf_owner && qu->flags & adns_qf_search &&
- ans->status != adns_s_nomemory) {
+ if (qu->flags & adns_qf_search && ans->status != adns_s_nomemory) {
if (!save_owner(qu, qu->search_vb.buf, qu->search_vb.used)) {
adns__query_fail(qu,adns_s_nomemory);
return;
}
if (ans->nrrs && qu->typei->diff_needswap) {
- if (!adns__vbuf_ensure(&qu->vb,qu->typei->rrsz)) {
+ if (!adns__vbuf_ensure(&qu->vb,ans->rrsz)) {
adns__query_fail(qu,adns_s_nomemory);
return;
}
adns__isort(ans->rrs.bytes, ans->nrrs, ans->rrsz,
qu->vb.buf,
- (int(*)(void*, const void*, const void*))qu->typei->diff_needswap,
+ (int(*)(void*, const void*, const void*))
+ qu->typei->diff_needswap,
qu->ads);
}
+ if (ans->nrrs && qu->typei->postsort) {
+ qu->typei->postsort(qu->ads, ans->rrs.bytes, ans->nrrs, qu->typei);
+ }
ans->expires= qu->expires;
parent= qu->parent;
~mdw / adns / blobdiff