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;
const typeinfo *typei, vbuf *qumsg_vb, int id,
adns_queryflags flags, struct timeval now) {
/* Fills in the query message in for a previously-allocated query,
- * and submits it. Cannot fail.
+ * and submits it. Cannot fail. Takes over the memory for qumsg_vb.
*/
qu->vb= *qumsg_vb;
int id;
adns_status stat;
- adns__vbuf_init(&vb);
+ vb= qu->vb;
stat= adns__mkquery(ads,&vb,&id, owner,ol, typei,flags);
if (stat) { adns__query_fail(qu,stat); return; }
if (ol>=1 && owner[ol-1]=='.' && (ol<2 || owner[ol-2]!='\\')) {
flags &= ~adns_qf_search;
+ qu->flags= flags;
ol--;
}
for (an= qu->allocations.head; an; an= ann) { ann= an->next; free(an); }
LIST_INIT(qu->allocations);
adns__vbuf_free(&qu->vb);
+ adns__vbuf_free(&qu->search_vb);
+ free(qu->query_dgram);
}
void adns_cancel(adns_query qu) {
adns__consistency(ads,qu,cc_entex);
if (qu->parent) LIST_UNLINK_PART(qu->parent->children,qu,siblings.);
switch (qu->state) {
- case query_tosend: case query_tcpwait: case query_tcpsent:
- LIST_UNLINK(ads->timew,qu);
+ case query_tosend:
+ LIST_UNLINK(ads->udpw,qu);
+ break;
+ case query_tcpw:
+ LIST_UNLINK(ads->tcpw,qu);
break;
- case query_child:
+ case query_childw:
LIST_UNLINK(ads->childw,qu);
break;
case query_done:
LIST_UNLINK(qu->ads->childw,parent);
qu->ctx.callback(parent,qu);
free_query_allocs(qu);
+ free(qu->answer);
free(qu);
} else {
makefinal_query(qu);