* - 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
adns_query qu;
const char *p;
- adns__consistency(ads,cc_entex);
+ adns__consistency(ads,0,cc_entex);
typei= adns__findtype(type);
if (!typei) return ENOSYS;
}
query_simple(ads,qu, owner,ol, typei,flags, now);
}
- adns__consistency(ads,cc_entex);
+ adns__consistency(ads,qu,cc_entex);
return 0;
x_adnsfail:
adns__query_fail(qu,stat);
- adns__consistency(ads,cc_entex);
+ adns__consistency(ads,qu,cc_entex);
return 0;
x_errno:
r= errno;
assert(r);
- adns__consistency(ads,cc_entex);
+ adns__consistency(ads,0,cc_entex);
return r;
}
ncqu= cqu->siblings.next;
adns_cancel(cqu);
}
- LIST_INIT(qu->children);
}
void adns__reset_preserved(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);
}
adns_state ads;
ads= qu->ads;
- adns__consistency(ads,cc_entex);
+ 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);
free_query_allocs(qu);
free(qu->answer);
free(qu);
- adns__consistency(ads,cc_entex);
+ adns__consistency(ads,0,cc_entex);
}
void adns__update_expires(adns_query qu, unsigned long ttl, struct timeval now) {
} else {
makefinal_query(qu);
LIST_LINK_TAIL(qu->ads->output,qu);
+ qu->state= query_done;
}
- qu->state= query_done;
}
void adns__query_fail(adns_query qu, adns_status stat) {