- Patch from Neel Goyal to fix callback in libunbound.

git-svn-id: file:///svn/unbound/trunk@3012 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 951c7aa54008bc40f6feb4548666abdd1bd2ccdd..111e720e74ee9b08ac84aa7da2aae0024a5fc57f 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+4 Nov 2013: Wouter
+       - Patch from Neel Goyal to fix callback in libunbound.
+
 3 Nov 2013: Wouter
        - if configured --with-libunbound-only fix make install.
 

diff --git a/libunbound/libworker.c b/libunbound/libworker.c
index 0863887e9e1d16b7b66e752c1eea1aba26a73671..a855b796866c58635c5afd8c722991ac601a13ff 100644 (file)
--- a/libunbound/libworker.c
+++ b/libunbound/libworker.c
@@ -632,6 +632,7 @@ libworker_event_done_cb(void* arg, int rcode, ldns_buffer* buf,
        struct ctx_query* q = (struct ctx_query*)arg;
        ub_event_callback_t cb = (ub_event_callback_t)q->cb;
        void* cb_arg = q->cb_arg;
+       int cancelled = q->cancelled;
 
        /* delete it now */
        struct ub_ctx* ctx = q->w->ctx;
@@ -641,7 +642,7 @@ libworker_event_done_cb(void* arg, int rcode, ldns_buffer* buf,
        context_query_delete(q);
        lock_basic_unlock(&ctx->cfglock);
 
-       if(!q->cancelled) {
+       if(!cancelled) {
                /* call callback */
                int sec = 0;
                if(s == sec_status_bogus)