Don't do deduplication at all for this branch.

Don't crash if there was no response.

git-svn-id: file:///svn/unbound/branches/edns-subnet@3406 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/edns-subnet/subnetmod.c b/edns-subnet/subnetmod.c
index 3db636ef959654a94f15fcc9c2b723b520a96a6d..b1638fbadec0a9a35650336c3a72212d4052216d 100644 (file)
--- a/edns-subnet/subnetmod.c
+++ b/edns-subnet/subnetmod.c
@@ -368,7 +368,8 @@ subnetmod_operate(struct module_qstate *qstate, enum module_ev event,
        /* Query handed back by next module, we have a 'final' answer */
        if(event == module_event_moddone) {
                verbose(VERB_QUERY, "subnet: done");
-               qstate->ext_state[id] = eval_response(qstate, id);
+               if (qstate->return_msg)
+                       qstate->ext_state[id] = eval_response(qstate, id);
                return;
        }
        /* We are being revisited */

diff --git a/services/mesh.c b/services/mesh.c
index c0b040372c2d3a8f0e7e91d4abfc6ef58764ba9d..cb1068021f198ca8cc37b3b58e26c8d26c4ce797 100644 (file)
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -197,6 +197,10 @@ mesh_state_compare(const void* ap, const void* bp)
        struct mesh_state* b = (struct mesh_state*)bp;
 #ifdef CLIENT_SUBNET
        int r;
+
+       if (ap < bp) return -1;
+       if (ap > bp) return 1;
+       return 0;
 #endif
 
        if(ap == bp)