Skip to content
Snippets Groups Projects
Commit 6c7c5597 authored by Jan Kadlec's avatar Jan Kadlec
Browse files

Tests modified to use new RRSet API.

parent 9e263dfc
No related branches found
No related tags found
1 merge request!174RRSet refactoring - remove RRSIGs, custom memory allocator
......@@ -55,8 +55,8 @@ int main(int argc, char *argv[])
'a', 'b', 'c', 'd' // salt
};
rrset = knot_rrset_new(NULL, KNOT_RRTYPE_NSEC3PARAM, KNOT_CLASS_IN, 0);
result = knot_rrset_add_rdata(rrset, rdata, sizeof(rdata));
rrset = knot_rrset_new(NULL, KNOT_RRTYPE_NSEC3PARAM, KNOT_CLASS_IN, 0, NULL);
result = knot_rrset_add_rdata(rrset, rdata, sizeof(rdata), NULL);
if (result == KNOT_EOK) {
result = knot_nsec3_params_from_wire(&params, rrset);
}
......@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
is_int(4, params.salt_length, "parse salt length from wire");
is_int(0, memcmp(params.salt, "abcd", 4), "parse salt from wire");
knot_rrset_deep_free(&rrset, 1);
knot_rrset_deep_free(&rrset, 1, NULL);
knot_nsec3_params_free(&params);
// hash computation
......
......@@ -103,9 +103,9 @@ int main(int argc, char *argv[])
ok(ret == KNOT_EOK, "pkt: begin ANSWER");
/* Write ANSWER section. */
rrsets[0] = knot_rrset_new(dnames[0], KNOT_RRTYPE_A, KNOT_CLASS_IN, TTL);
knot_rrset_add_rdata(rrsets[0], RDVAL(0), RDLEN(0));
ret = knot_pkt_put(out, COMPR_HINT_QNAME, rrsets[0], 0);
rrsets[0] = knot_rrset_new(dnames[0], KNOT_RRTYPE_A, KNOT_CLASS_IN, TTL, NULL);
knot_rrset_add_rdata(rrsets[0], RDVAL(0), RDLEN(0), NULL);
ret = knot_pkt_put(out, COMPR_HINT_QNAME, rrsets[0], NULL, 0);
ok(ret == KNOT_EOK, "pkt: write ANSWER");
/* Begin AUTHORITY. */
......@@ -115,9 +115,9 @@ int main(int argc, char *argv[])
/* Write rest to AUTHORITY. */
ret = KNOT_EOK;
for (unsigned i = 1; i < NAMECOUNT; ++i) {
rrsets[i] = knot_rrset_new(dnames[i], KNOT_RRTYPE_NS, KNOT_CLASS_IN, TTL);
knot_rrset_add_rdata(rrsets[i], RDVAL(i), RDLEN(i));
ret |= knot_pkt_put(out, COMPR_HINT_NONE, rrsets[i], 0);
rrsets[i] = knot_rrset_new(dnames[i], KNOT_RRTYPE_NS, KNOT_CLASS_IN, TTL, NULL);
knot_rrset_add_rdata(rrsets[i], RDVAL(i), RDLEN(i), NULL);
ret |= knot_pkt_put(out, COMPR_HINT_NONE, rrsets[i], NULL, 0);
}
ok(ret == KNOT_EOK, "pkt: write AUTHORITY(%u)", NAMECOUNT - 1);
......@@ -176,7 +176,7 @@ int main(int argc, char *argv[])
/* Free extra data. */
for (unsigned i = 0; i < NAMECOUNT; ++i) {
knot_rrset_deep_free(&rrsets[i], 1);
knot_rrset_deep_free(&rrsets[i], 1, NULL);
}
free(tsig_key.secret.data);
mp_delete((struct mempool *)mm.ctx);
......
......@@ -51,8 +51,8 @@ void create_root_zone(server_t *server, mm_ctx_t *mm)
knot_dname_t *root_name = knot_dname_copy(root->name);
knot_rrset_t *soa_rrset = knot_rrset_new(root_name,
KNOT_RRTYPE_SOA, KNOT_CLASS_IN,
7200);
knot_rrset_add_rdata(soa_rrset, SOA_RDATA, SOA_RDLEN);
7200, NULL);
knot_rrset_add_rdata(soa_rrset, SOA_RDATA, SOA_RDLEN, NULL);
knot_node_add_rrset(root->contents->apex, soa_rrset);
/* Bake the zone. */
......@@ -193,7 +193,7 @@ int main(int argc, char *argv[])
/* Append SOA RR. */
knot_rrset_t *soa_rr = knot_node_get_rrset(zone->contents->apex, KNOT_RRTYPE_SOA);
knot_pkt_begin(query, KNOT_AUTHORITY);
knot_pkt_put(query, COMPR_HINT_NONE, soa_rr, 0);
knot_pkt_put(query, COMPR_HINT_NONE, soa_rr, NULL, 0);
exec_query(&query_ctx, "IN/ixfr", query->wire, query->size, KNOT_RCODE_NOTAUTH);
/* \note Tests below are not possible without proper zone and zone data. */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment