From e720cfc1cebb577dfb32f45e18631f39e05332df Mon Sep 17 00:00:00 2001
From: Marek Vavrusa <marek.vavrusa@nic.cz>
Date: Wed, 12 Jun 2013 15:06:47 +0200
Subject: [PATCH] Fixed RRL tests with removed packet question.
---
src/tests/knot/rrl_tests.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/tests/knot/rrl_tests.c b/src/tests/knot/rrl_tests.c
index 8a24aa6b02..ef3f602df8 100644
--- a/src/tests/knot/rrl_tests.c
+++ b/src/tests/knot/rrl_tests.c
@@ -120,24 +120,22 @@ static int rrl_tests_count(int argc, char *argv[])
static int rrl_tests_run(int argc, char *argv[])
{
/* Prepare query. */
- knot_question_t qst;
- qst.qclass = KNOT_CLASS_IN;
- qst.qtype = KNOT_RRTYPE_A;
- qst.qname = knot_dname_new_from_str("beef.", 5, NULL);
knot_packet_t *query = knot_packet_new();
if (knot_packet_set_max_size(query, 512) < 0) {
- knot_dname_free(&qst.qname);
knot_packet_free(&query);
return KNOT_ERROR; /* Fatal */
}
knot_query_init(query);
- int ret = knot_query_set_question(query, &qst);
+
+ knot_dname_t *qname = knot_dname_new_from_str("beef.", 5, NULL);
+ int ret = knot_query_set_question(query, qname, KNOT_CLASS_IN, KNOT_RRTYPE_A);
+ knot_dname_free(&qname);
if (ret != KNOT_EOK) {
- knot_dname_free(&qst.qname);
knot_packet_free(&query);
return KNOT_ERROR; /* Fatal */
}
+
/* Prepare response */
knot_nameserver_t *ns = knot_ns_create();
uint8_t rbuf[65535];
@@ -148,7 +146,7 @@ static int rrl_tests_run(int argc, char *argv[])
rrl_req_t rq;
rq.w = rbuf;
rq.len = rlen;
- rq.qst = &qst;
+ rq.query = query;
rq.flags = 0;
/* 1. create rrl table */
@@ -220,7 +218,6 @@ static int rrl_tests_run(int argc, char *argv[])
ok(rd.passed, "rrl: hashtable is ~ consistent");
#endif
- knot_dname_release(qst.qname);
knot_dname_release(apex);
knot_zone_deep_free(&zone);
knot_ns_destroy(&ns);
--
GitLab