From: Yuri Schaeffer <yuri@nlnetlabs.nl>
Date: Tue, 21 Apr 2015 13:47:57 +0000 (+0000)
Subject: Don't do deduplication at all for this branch.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e91ae4b903b7a9f8cf3160fb83f3b125ed23a95;p=thirdparty%2Funbound.git

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 3db636ef9..b1638fbad 100644
--- 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 c0b040372..cb1068021 100644
--- 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)