if (qumsg_vb->used) {
qu->query_dgram= malloc(qumsg_vb->used);
if (!qu->query_dgram) {
- adns__query_fail(qu,adns_s_nolocalmem);
+ adns__query_fail(qu,adns_s_nomemory);
return adns_s_ok;
}
memcpy(qu->query_dgram,qumsg_vb->buf,qumsg_vb->used);
free(qu);
x_nomemory:
adns__vbuf_free(qumsg_vb);
- return adns_s_nolocalmem;
+ return adns_s_nomemory;
}
int adns_submit(adns_state ads,
struct timeval now;
typei= adns__findtype(type);
- if (!typei) return adns_s_notimplemented;
+ if (!typei) return adns_s_unknownrrtype;
ctx.ext= context;
ctx.callback= 0;
adns__vbuf_init(&vb);
ol= strlen(owner);
- if (ol<=1 || ol>DNS_MAXDOMAIN+1) { stat= adns_s_domaintoolong; goto xit; }
+ if (ol<=1 || ol>DNS_MAXDOMAIN+1) { stat= adns_s_querydomaintoolong; goto xit; }
if (owner[ol-1]=='.' && owner[ol-2]!='\\') { flags &= ~adns_qf_search; ol--; }
return rp;
}
+static void cancel_children(adns_query qu) {
+ adns_query cqu, ncqu;
+
+ for (cqu= qu->children.head; cqu; cqu= ncqu) {
+ ncqu= cqu->siblings.next;
+ adns_cancel(cqu);
+ }
+ LIST_INIT(qu->children);
+}
+
void adns__reset_cnameonly(adns_query qu) {
- /* fixme: cancel children */
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;
static void free_query_allocs(adns_query qu) {
allocnode *an, *ann;
- adns_query cqu, ncqu;
- for (cqu= qu->children.head; cqu; cqu= ncqu) {
- ncqu= cqu->siblings.next;
- adns_cancel(cqu);
- }
+ cancel_children(qu);
for (an= qu->allocations.head; an; an= ann) { ann= an->next; free(an); }
adns__vbuf_free(&qu->vb);
}
return;
x_nomem:
- qu->answer->status= adns_s_nolocalmem;
+ qu->answer->status= adns_s_nomemory;
qu->answer->cname= 0;
adns__reset_cnameonly(qu);
free_query_allocs(qu);
if (ans->nrrs && qu->typei->diff_needswap) {
if (!adns__vbuf_ensure(&qu->vb,qu->typei->rrsz)) {
- adns__query_fail(qu,adns_s_nolocalmem);
+ adns__query_fail(qu,adns_s_nomemory);
return;
}
adns__isort(ans->rrs.bytes, ans->nrrs, ans->rrsz,