From: Wouter Wijngaards Date: Tue, 5 Nov 2013 21:16:02 +0000 (+0000) Subject: - Patch from Neel Goyal to fix async id assignment if callback X-Git-Tag: release-1.4.22rc1~77 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=789ccae281030fe6e275cdba40696792c72a6403;p=thirdparty%2Funbound.git - Patch from Neel Goyal to fix async id assignment if callback is called by libunbound in the mesh attach. git-svn-id: file:///svn/unbound/trunk@3013 be551aaa-1e26-0410-a405-d3ace91eadb9 --- diff --git a/doc/Changelog b/doc/Changelog index 111e720e7..542a57174 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,7 @@ +5 Nov 2013: Wouter + - Patch from Neel Goyal to fix async id assignment if callback + is called by libunbound in the mesh attach. + 4 Nov 2013: Wouter - Patch from Neel Goyal to fix callback in libunbound. diff --git a/libunbound/libworker.c b/libunbound/libworker.c index a855b7968..74a6476e3 100644 --- a/libunbound/libworker.c +++ b/libunbound/libworker.c @@ -679,14 +679,14 @@ int libworker_attach_mesh(struct ub_ctx* ctx, struct ctx_query* q, return UB_NOERROR; } /* process new query */ + if(async_id) + *async_id = q->querynum; if(!mesh_new_callback(w->env->mesh, &qinfo, qflags, &edns, w->back->udp_buff, qid, libworker_event_done_cb, q)) { free(qinfo.qname); return UB_NOMEM; } free(qinfo.qname); - if(async_id) - *async_id = q->querynum; return UB_NOERROR; }