* - query submission and cancellation (user-visible and internal)
*/
/*
- * This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
+ * This file is
+ * Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ *
+ * It is part of adns, which is
+ * Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
+ * Copyright (C) 1999 Tony Finch <dot@dotat.at>
*
* 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 <stdlib.h>
#include <unistd.h>
#include <errno.h>
-#include <string.h>
#include <sys/time.h>
qu->answer= malloc(sizeof(*qu->answer)); if (!qu->answer) { free(qu); return 0; }
qu->ads= ads;
- qu->state= query_udp;
+ qu->state= query_tosend;
qu->back= qu->next= qu->parent= 0;
LIST_INIT(qu->children);
LINK_INIT(qu->siblings);
LIST_INIT(qu->allocations);
qu->interim_allocd= 0;
+ qu->preserved_allocd= 0;
qu->final_allocspace= 0;
qu->typei= typei;
qu->id= 0;
qu->flags= flags;
- qu->udpretries= 0;
+ qu->retries= 0;
qu->udpnextserver= 0;
- qu->udpsent= qu->tcpfailed= 0;
+ qu->udpsent= 0;
timerclear(&qu->timeout);
qu->expires= now.tv_sec + MAXTTLBELIEVE;
qu->answer->type= typei->type;
qu->answer->expires= -1;
qu->answer->nrrs= 0;
- qu->answer->rrs= 0;
+ qu->answer->rrs.untyped= 0;
qu->answer->rrsz= typei->rrsz;
return qu;
qu->query_dglen= qu->vb.used;
memcpy(qu->query_dgram,qu->vb.buf,qu->vb.used);
- adns__query_udp(qu,now);
- adns__autosys(ads,now);
+ adns__query_send(qu,now);
}
adns_status adns__internal_submit(adns_state ads, adns_query *query_r,
ans= qu->answer;
assert(!ans->owner);
- ans->owner= adns__alloc_interim(qu,ol+1); if (!ans->owner) return 0;
+ ans->owner= adns__alloc_preserved(qu,ol+1); if (!ans->owner) return 0;
memcpy(ans->owner,owner,ol);
ans->owner[ol]= 0;
adns_query qu;
const char *p;
+ adns__consistency(ads,0,cc_entex);
+
typei= adns__findtype(type);
- if (!typei) return adns_s_unknownrrtype;
+ 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;
if (ol>=1 && owner[ol-1]=='.' && (ol<2 || owner[ol-2]!='\\')) {
flags &= ~adns_qf_search;
+ qu->flags= flags;
ol--;
}
}
query_simple(ads,qu, owner,ol, typei,flags, now);
}
+ adns__autosys(ads,now);
+ adns__consistency(ads,qu,cc_entex);
return 0;
x_adnsfail:
adns__query_fail(qu,stat);
+ adns__consistency(ads,qu,cc_entex);
return 0;
x_errno:
r= errno;
assert(r);
+ adns__consistency(ads,0,cc_entex);
return r;
}
+int adns_submit_reverse(adns_state ads,
+ const struct sockaddr *addr,
+ adns_rrtype type,
+ adns_queryflags flags,
+ void *context,
+ adns_query *query_r) {
+ const unsigned char *iaddr;
+ char buf[30];
+
+ if (type != adns_r_ptr && type != adns_r_ptr_raw) return EINVAL;
+ flags &= ~adns_qf_search;
+
+ if (addr->sa_family != AF_INET) return ENOSYS;
+ iaddr= (const unsigned char*) &(((const struct sockaddr_in*)addr) -> sin_addr);
+
+ sprintf(buf, "%d.%d.%d.%d.in-addr.arpa",
+ iaddr[3], iaddr[2], iaddr[1], iaddr[0]);
+
+ return adns_submit(ads,buf,type,flags,context,query_r);
+}
+
int adns_synchronous(adns_state ads,
const char *owner,
adns_rrtype type,
}
void *adns__alloc_interim(adns_query qu, size_t sz) {
+ void *rv;
+
sz= MEM_ROUND(sz);
+ rv= alloc_common(qu,sz);
+ if (!rv) return 0;
qu->interim_allocd += sz;
- return alloc_common(qu,sz);
+ return rv;
+}
+
+void *adns__alloc_preserved(adns_query qu, size_t sz) {
+ void *rv;
+
+ sz= MEM_ROUND(sz);
+ rv= adns__alloc_interim(qu,sz);
+ if (!rv) return 0;
+ qu->preserved_allocd += sz;
+ return rv;
}
void *adns__alloc_mine(adns_query qu, size_t sz) {
ncqu= cqu->siblings.next;
adns_cancel(cqu);
}
- LIST_INIT(qu->children);
}
-void adns__reset_cnameonly(adns_query qu) {
+void adns__reset_preserved(adns_query qu) {
assert(!qu->final_allocspace);
cancel_children(qu);
qu->answer->nrrs= 0;
- qu->answer->rrs= 0;
- qu->interim_allocd= qu->answer->cname ? MEM_ROUND(strlen(qu->answer->cname)+1) : 0;
+ qu->answer->rrs.untyped= 0;
+ qu->interim_allocd= qu->preserved_allocd;
}
static void free_query_allocs(adns_query qu) {
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);
+ free(qu->query_dgram);
}
void adns_cancel(adns_query qu) {
+ adns_state ads;
+
+ ads= qu->ads;
+ adns__consistency(ads,qu,cc_entex);
+ if (qu->parent) LIST_UNLINK_PART(qu->parent->children,qu,siblings.);
switch (qu->state) {
- case query_udp: case query_tcpwait: case query_tcpsent:
- LIST_UNLINK(qu->ads->timew,qu);
+ case query_tosend:
+ LIST_UNLINK(ads->udpw,qu);
break;
- case query_child:
- LIST_UNLINK(qu->ads->childw,qu);
+ case query_tcpw:
+ LIST_UNLINK(ads->tcpw,qu);
+ break;
+ case query_childw:
+ LIST_UNLINK(ads->childw,qu);
break;
case query_done:
- LIST_UNLINK(qu->ads->output,qu);
+ LIST_UNLINK(ads->output,qu);
break;
default:
abort();
free_query_allocs(qu);
free(qu->answer);
free(qu);
+ adns__consistency(ads,0,cc_entex);
}
void adns__update_expires(adns_query qu, unsigned long ttl, struct timeval now) {
return;
x_nomem:
- qu->answer->status= adns_s_nomemory;
+ qu->preserved_allocd= 0;
qu->answer->cname= 0;
- adns__reset_cnameonly(qu);
+ qu->answer->owner= 0;
+ adns__reset_preserved(qu); /* (but we just threw away the preserved stuff) */
+
+ qu->answer->status= adns_s_nomemory;
free_query_allocs(qu);
}
adns_answer *ans;
adns_query parent;
+ cancel_children(qu);
+
qu->id= -1;
ans= qu->answer;
parent= qu->parent;
if (parent) {
LIST_UNLINK_PART(parent->children,qu,siblings.);
+ LIST_UNLINK(qu->ads->childw,parent);
qu->ctx.callback(parent,qu);
free_query_allocs(qu);
+ free(qu->answer);
free(qu);
} else {
makefinal_query(qu);
LIST_LINK_TAIL(qu->ads->output,qu);
+ qu->state= query_done;
}
}
void adns__query_fail(adns_query qu, adns_status stat) {
- adns__reset_cnameonly(qu);
+ adns__reset_preserved(qu);
qu->answer->status= stat;
adns__query_done(qu);
}
~mdw / adns / blobdiff