qu->query_dglen= qu->vb.used;
memcpy(qu->query_dgram,qu->vb.buf,qu->vb.used);
- if (typei->query_send && !(qu->flags & adns__qf_senddirect))
+ if (flags & adns__qf_nosend)
+ ;
+ else if (typei->query_send && !(flags & adns__qf_senddirect))
typei->query_send(qu,now);
else
adns__query_send(qu, now);
const qcontext *ctx) {
adns_query qu;
- qu= query_alloc(ads,typei,type,flags,now);
+ qu= query_alloc(ads,typei,type,flags & ~adns__qf_nosend,now);
if (!qu) { adns__vbuf_free(qumsg_vb); return adns_s_nomemory; }
*query_r= qu;
return rv;
}
-void adns__free_interim(adns_query qu, void *p) {
+static allocnode *alloc_info(adns_query qu, void *p, size_t *sz_r)
+{
allocnode *an;
- size_t sz;
- if (!p) return;
+ if (!p || p == qu) { *sz_r = 0; return 0; }
an = (allocnode *)((byte *)p - MEM_ROUND(sizeof(allocnode)));
- sz = MEM_ROUND(an->sz);
+ *sz_r = MEM_ROUND(an->sz);
+ return an;
+}
+
+void adns__free_interim(adns_query qu, void *p) {
+ size_t sz;
+ allocnode *an = alloc_info(qu, p, &sz);
+
+ if (!an) return;
+ assert(!qu->final_allocspace);
LIST_UNLINK(qu->allocations, an);
free(an);
qu->interim_allocd -= sz;
return alloc_common(qu,MEM_ROUND(sz));
}
-void adns__transfer_interim(adns_query from, adns_query to,
- void *block, size_t sz) {
- allocnode *an;
+void adns__transfer_interim(adns_query from, adns_query to, void *block) {
+ size_t sz;
+ allocnode *an = alloc_info(from, block, &sz);
- if (!block) return;
- an= (void*)((byte*)block - MEM_ROUND(sizeof(*an)));
+ if (!an) return;
assert(!to->final_allocspace);
assert(!from->final_allocspace);
LIST_UNLINK(from->allocations,an);
LIST_LINK_TAIL(to->allocations,an);
- sz= MEM_ROUND(sz);
from->interim_allocd -= sz;
to->interim_allocd += sz;