Fixed CH TXT unit test.

src/libknot/nameserver/chaos.c

@@ -92,8 +92,9 @@ static int answer_txt(knot_nameserver_t *nameserver, knot_pkt_t *response)
 {
 	const knot_dname_t *qname = knot_pkt_qname(response);
 	const char *response_str = get_txt_response_string(nameserver, qname);
-	if (response_str == NULL || response_str[0] == '\0')
+	if (response_str == NULL || response_str[0] == '\0') {
 		return KNOT_RCODE_REFUSED;
+	}
 
 	knot_rrset_t *rrset = create_txt_rrset(qname, response_str);
 	if (!rrset)

src/libknot/nameserver/ns_proc_query.c

@@ -127,8 +127,8 @@ int ns_proc_query_out(knot_pkt_t *pkt, ns_proc_context_t *ctx)
 	int ret = prepare_answer(data->pkt, pkt, ctx->ns);
 	if (ret != KNOT_EOK) {
 		data->rcode = KNOT_RCODE_SERVFAIL;
-		next_state = NS_PROC_FAIL;
-		goto finish;
+		rcu_read_unlock();
+		return NS_PROC_FAIL;
 	} else {
 		data->rcode = KNOT_RCODE_NOERROR;
 	}
@@ -148,8 +148,6 @@ int ns_proc_query_out(knot_pkt_t *pkt, ns_proc_context_t *ctx)
 		break;
 	}
 
-finish:
-
 	rcu_read_unlock();
 	return next_state;
 }
@@ -208,6 +206,7 @@ int answer_chaos(knot_pkt_t *pkt, ns_proc_context_t *ctx)
 
 	data->rcode = knot_chaos_answer(pkt, ctx->ns);
 	if (data->rcode != KNOT_RCODE_NOERROR) {
+		dbg_ns("%s: failed with RCODE=%d\n", __func__, data->rcode);
 		return NS_PROC_FAIL;
 	}
 

tests/ns.c

@@ -67,6 +67,8 @@ int main(int argc, char *argv[])
 	ns->opt_rr = knot_edns_new();
 	knot_edns_set_version(ns->opt_rr, EDNS_VERSION); 
 	knot_edns_set_payload(ns->opt_rr, 4096);
+	ns->identity = "bogus.ns";
+	ns->version = "0.11";
 
 	/* Insert root zone. */
 	knot_dname_t *root_name = knot_dname_from_str(".");
@@ -105,7 +107,7 @@ int main(int argc, char *argv[])
 	ok(state & NS_PROC_FULL, "ns: process CH query");
 	wire_len = sizeof(wire);
 	state = ns_proc_out(wire, &wire_len, &query_ctx);
-	ok(state & NS_PROC_FINISH, "ns: answer CH query");
+	is_int(NS_PROC_FINISH, state, "ns: answer CH query");
 	/* Brief response check. */
 	ok(wire_len > KNOT_WIRE_HEADER_SIZE, "ns: CH response > DNS header");
 	ok(knot_wire_get_qr(wire), "ns: CH response has QR=1");