diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c index 528098a077..4a2e88fecf 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c @@ -2442,7 +2442,7 @@ setup_lookup(dig_lookup_t *lookup) { lookup->sendspace = isc_mem_get(mctx, COMMSIZE); - result = dns_compress_init(&cctx, -1, mctx); + result = dns_compress_init(&cctx, mctx); check_result(result, "dns_compress_init"); debug("starting to render the message"); @@ -3053,7 +3053,9 @@ failure_tls: } else { next = NULL; } - query_detach(&connectquery); + if (connectquery != NULL) { + query_detach(&connectquery); + } query_detach(&query); if (next == NULL) { clear_current_lookup(); diff --git a/bin/tests/wire_test.c b/bin/tests/wire_test.c index 5dcc0951f7..d4224d68f6 100644 --- a/bin/tests/wire_test.c +++ b/bin/tests/wire_test.c @@ -303,7 +303,7 @@ process_message(isc_buffer_t *source) { message->counts[i] = 0; /* Another hack XXX */ } - result = dns_compress_init(&cctx, -1, mctx); + result = dns_compress_init(&cctx, mctx); CHECKRESULT(result, "dns_compress_init() failed"); result = dns_message_renderbegin(message, &cctx, &buffer); diff --git a/bin/tools/dnstap-read.c b/bin/tools/dnstap-read.c index dc7ae919ff..fe215715e4 100644 --- a/bin/tools/dnstap-read.c +++ b/bin/tools/dnstap-read.c @@ -298,7 +298,7 @@ print_yaml(dns_dtdata_t *dt) { isc_buffer_init(&b, m->query_zone.data, m->query_zone.len); isc_buffer_add(&b, m->query_zone.len); - dns_decompress_init(&dctx, -1, DNS_DECOMPRESS_NONE); + dns_decompress_init(&dctx, DNS_DECOMPRESS_NONE); result = dns_name_fromwire(name, &b, &dctx, 0, NULL); if (result == ISC_R_SUCCESS) { printf(" query_zone: "); diff --git a/doc/dev/rdata.md b/doc/dev/rdata.md index 511ada9697..90d140df5f 100644 --- a/doc/dev/rdata.md +++ b/doc/dev/rdata.md @@ -208,13 +208,11 @@ security area and must be paranoid about its input. bool downcase, isc_buffer_t *target); -`fromwire_classname_typename()` is required to set the valid -decompression methods if there is a domain name in the rdata. +`fromwire_classname_typename()` is required to set whether +name compression is allowed, according to RFC 3597. - if (dns_decompress_edns(dctx) >= # || !dns_decompress_strict(dctx)) - dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL); - else - dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14); + dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14); + /* or DNS_COMPRESS_NONE */ |Parameter|Description | |---------|-----------------------| @@ -245,14 +243,11 @@ will return `DNS_R_EXTRADATA`. dns_compress_t *cctx, isc_buffer_t *target); -`towire_classname_typename()` is required to set the -allowed name compression methods based on the EDNS version, if there -is a domain name in the rdata. +`towire_classname_typename()` is required to set whether +name compression is allowed, according to RFC 3597. - if (dns_compress_getedns(cctx) >= #) - dns_compress_setmethods(cctx, DNS_COMPRESS_ALL); - else - dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14); + dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14); + /* or DNS_COMPRESS_NONE */ |Parameter|Description | |---------|-----------------------| diff --git a/fuzz/dns_message_parse.c b/fuzz/dns_message_parse.c index 02006a86ec..d0caa245ee 100644 --- a/fuzz/dns_message_parse.c +++ b/fuzz/dns_message_parse.c @@ -112,7 +112,7 @@ render_message(dns_message_t **messagep) { message->counts[i] = 0; } - result = dns_compress_init(&cctx, -1, mctx); + result = dns_compress_init(&cctx, mctx); if (result != ISC_R_SUCCESS) { return (result); } diff --git a/fuzz/dns_rdata_fromwire_text.c b/fuzz/dns_rdata_fromwire_text.c index f05ddd4be5..3f71538b5f 100644 --- a/fuzz/dns_rdata_fromwire_text.c +++ b/fuzz/dns_rdata_fromwire_text.c @@ -136,7 +136,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { callbacks.warn = callbacks.error = nullmsg; /* Disallow decompression as we are reading a packet */ - dns_decompress_init(&dctx, -1, DNS_DECOMPRESS_NONE); + dns_decompress_init(&dctx, DNS_DECOMPRESS_NONE); isc_buffer_constinit(&source, data, size); isc_buffer_add(&source, size); @@ -206,7 +206,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { /* * Convert rdata back to wire. */ - CHECK(dns_compress_init(&cctx, -1, mctx)); + CHECK(dns_compress_init(&cctx, mctx)); dns_compress_disable(&cctx); isc_buffer_init(&target, towire, sizeof(towire)); result = dns_rdata_towire(&rdata1, &cctx, &target); diff --git a/lib/dns/client.c b/lib/dns/client.c index 675b78c8b3..cbe70337cc 100644 --- a/lib/dns/client.c +++ b/lib/dns/client.c @@ -1285,7 +1285,7 @@ dns_client_addtrustedkey(dns_client_t *client, dns_rdataclass_t rdclass, } isc_buffer_init(&b, rdatabuf, sizeof(rdatabuf)); - dns_decompress_init(&dctx, -1, DNS_DECOMPRESS_NONE); + dns_decompress_init(&dctx, DNS_DECOMPRESS_NONE); dns_rdata_init(&rdata); isc_buffer_setactive(databuf, isc_buffer_usedlength(databuf)); CHECK(dns_rdata_fromwire(&rdata, rdclass, rdtype, databuf, &dctx, 0, diff --git a/lib/dns/compress.c b/lib/dns/compress.c index 583a0eab68..7a06d4fa1e 100644 --- a/lib/dns/compress.c +++ b/lib/dns/compress.c @@ -123,11 +123,10 @@ static unsigned char tableindex[256] = { ***/ isc_result_t -dns_compress_init(dns_compress_t *cctx, int edns, isc_mem_t *mctx) { +dns_compress_init(dns_compress_t *cctx, isc_mem_t *mctx) { REQUIRE(cctx != NULL); REQUIRE(mctx != NULL); /* See: rdataset.c:towiresorted(). */ - cctx->edns = edns; cctx->mctx = mctx; cctx->count = 0; cctx->allowed = DNS_COMPRESS_ENABLED; @@ -164,7 +163,6 @@ dns_compress_invalidate(dns_compress_t *cctx) { cctx->magic = 0; cctx->allowed = 0; - cctx->edns = -1; } void @@ -205,12 +203,6 @@ dns_compress_getsensitive(dns_compress_t *cctx) { return (cctx->allowed & DNS_COMPRESS_CASESENSITIVE); } -int -dns_compress_getedns(dns_compress_t *cctx) { - REQUIRE(VALID_CCTX(cctx)); - return (cctx->edns); -} - /* * Find the longest match of name in the table. * If match is found return true. prefix, suffix and offset are updated. @@ -521,13 +513,10 @@ dns_compress_rollback(dns_compress_t *cctx, uint16_t offset) { ***/ void -dns_decompress_init(dns_decompress_t *dctx, int edns, - dns_decompresstype_t type) { +dns_decompress_init(dns_decompress_t *dctx, dns_decompresstype_t type) { REQUIRE(dctx != NULL); - REQUIRE(edns >= -1 && edns <= 255); dctx->allowed = DNS_COMPRESS_NONE; - dctx->edns = edns; dctx->type = type; dctx->magic = DCTX_MAGIC; } @@ -562,17 +551,3 @@ dns_decompress_getmethods(dns_decompress_t *dctx) { return (dctx->allowed); } - -int -dns_decompress_edns(dns_decompress_t *dctx) { - REQUIRE(VALID_DCTX(dctx)); - - return (dctx->edns); -} - -dns_decompresstype_t -dns_decompress_type(dns_decompress_t *dctx) { - REQUIRE(VALID_DCTX(dctx)); - - return (dctx->type); -} diff --git a/lib/dns/include/dns/compress.h b/lib/dns/include/dns/compress.h index 5476dd92a9..6f497f639c 100644 --- a/lib/dns/include/dns/compress.h +++ b/lib/dns/include/dns/compress.h @@ -68,7 +68,6 @@ struct dns_compressnode { struct dns_compress { unsigned int magic; /*%< Magic number. */ unsigned int allowed; /*%< Allowed methods. */ - int edns; /*%< Edns version or -1. */ /*% Global compression table. */ dns_compressnode_t *table[DNS_COMPRESS_TABLESIZE]; /*% Preallocated arena for names. */ @@ -89,12 +88,11 @@ typedef enum { struct dns_decompress { unsigned int magic; /*%< Magic number. */ unsigned int allowed; /*%< Allowed methods. */ - int edns; /*%< Edns version or -1. */ dns_decompresstype_t type; /*%< Strict checking */ }; isc_result_t -dns_compress_init(dns_compress_t *cctx, int edns, isc_mem_t *mctx); +dns_compress_init(dns_compress_t *cctx, isc_mem_t *mctx); /*%< * Initialise the compression context structure pointed to by * 'cctx'. A freshly initialized context has name compression @@ -175,19 +173,6 @@ dns_compress_getsensitive(dns_compress_t *cctx); * 'cctx' to be initialized. */ -int -dns_compress_getedns(dns_compress_t *cctx); - -/*%< - * Gets edns value. - * - * Requires: - *\li 'cctx' to be initialized. - * - * Returns: - *\li -1 .. 255 - */ - bool dns_compress_findglobal(dns_compress_t *cctx, const dns_name_t *name, dns_name_t *prefix, uint16_t *offset); @@ -235,8 +220,7 @@ dns_compress_rollback(dns_compress_t *cctx, uint16_t offset); */ void -dns_decompress_init(dns_decompress_t *dctx, int edns, - dns_decompresstype_t type); +dns_decompress_init(dns_decompress_t *dctx, dns_decompresstype_t type); /*%< * Initializes 'dctx'. @@ -276,24 +260,4 @@ dns_decompress_getmethods(dns_decompress_t *dctx); *\li 'dctx' to be initialized */ -int -dns_decompress_edns(dns_decompress_t *dctx); - -/*%< - * Returns 'dctx->edns' - * - * Requires: - *\li 'dctx' to be initialized - */ - -dns_decompresstype_t -dns_decompress_type(dns_decompress_t *dctx); - -/*%< - * Returns 'dctx->type' - * - * Requires: - *\li 'dctx' to be initialized - */ - ISC_LANG_ENDDECLS diff --git a/lib/dns/journal.c b/lib/dns/journal.c index 23534115ed..9732682d03 100644 --- a/lib/dns/journal.c +++ b/lib/dns/journal.c @@ -738,7 +738,7 @@ journal_open(isc_mem_t *mctx, const char *filename, bool writable, bool create, */ isc_buffer_init(&j->it.source, NULL, 0); isc_buffer_init(&j->it.target, NULL, 0); - dns_decompress_init(&j->it.dctx, -1, DNS_DECOMPRESS_NONE); + dns_decompress_init(&j->it.dctx, DNS_DECOMPRESS_NONE); j->state = writable ? JOURNAL_STATE_WRITE : JOURNAL_STATE_READ; diff --git a/lib/dns/master.c b/lib/dns/master.c index 7399729161..ccedc1af84 100644 --- a/lib/dns/master.c +++ b/lib/dns/master.c @@ -2342,7 +2342,7 @@ load_raw(dns_loadctx_t *lctx) { dns_decompress_t dctx; callbacks = lctx->callbacks; - dns_decompress_init(&dctx, -1, DNS_DECOMPRESS_NONE); + dns_decompress_init(&dctx, DNS_DECOMPRESS_NONE); if (lctx->first) { result = load_header(lctx); diff --git a/lib/dns/message.c b/lib/dns/message.c index d89c4f8301..ac23ebab7a 100644 --- a/lib/dns/message.c +++ b/lib/dns/message.c @@ -1681,11 +1681,7 @@ dns_message_parse(dns_message_t *msg, isc_buffer_t *source, msg->header_ok = 1; msg->state = DNS_SECTION_QUESTION; - /* - * -1 means no EDNS. - */ - dns_decompress_init(&dctx, -1, DNS_DECOMPRESS_ANY); - + dns_decompress_init(&dctx, DNS_DECOMPRESS_ANY); dns_decompress_setmethods(&dctx, DNS_COMPRESS_GLOBAL14); ret = getquestions(source, msg, &dctx, options); diff --git a/lib/dns/nsec3.c b/lib/dns/nsec3.c index c553cdaf1e..5644f1e9e7 100644 --- a/lib/dns/nsec3.c +++ b/lib/dns/nsec3.c @@ -988,7 +988,7 @@ dns_nsec3param_fromprivate(dns_rdata_t *src, dns_rdata_t *target, isc_buffer_add(&buf1, src->length - 1); isc_buffer_setactive(&buf1, src->length - 1); isc_buffer_init(&buf2, buf, (unsigned int)buflen); - dns_decompress_init(&dctx, -1, DNS_DECOMPRESS_NONE); + dns_decompress_init(&dctx, DNS_DECOMPRESS_NONE); result = dns_rdata_fromwire(target, src->rdclass, dns_rdatatype_nsec3param, &buf1, &dctx, 0, &buf2); diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c index 76e25955f7..44e3030723 100644 --- a/lib/dns/rdata.c +++ b/lib/dns/rdata.c @@ -613,7 +613,7 @@ check_private(isc_buffer_t *source, dns_secalg_t alg) { dns_fixedname_t fixed; dns_decompress_t dctx; - dns_decompress_init(&dctx, -1, DNS_DECOMPRESS_STRICT); + dns_decompress_init(&dctx, DNS_DECOMPRESS_STRICT); RETERR(dns_name_fromwire(dns_fixedname_initname(&fixed), source, &dctx, 0, NULL)); /* @@ -927,7 +927,7 @@ rdata_validate(isc_buffer_t *src, isc_buffer_t *dest, dns_rdataclass_t rdclass, dns_decompress_t dctx; isc_result_t result; - dns_decompress_init(&dctx, -1, DNS_DECOMPRESS_NONE); + dns_decompress_init(&dctx, DNS_DECOMPRESS_NONE); isc_buffer_setactive(src, isc_buffer_usedlength(src)); result = dns_rdata_fromwire(NULL, rdclass, type, src, &dctx, 0, dest); dns_decompress_invalidate(&dctx); diff --git a/lib/dns/request.c b/lib/dns/request.c index 54db330833..729ae6417e 100644 --- a/lib/dns/request.c +++ b/lib/dns/request.c @@ -764,7 +764,7 @@ req_render(dns_message_t *message, isc_buffer_t **bufferp, unsigned int options, */ isc_buffer_allocate(mctx, &buf1, 65535); - result = dns_compress_init(&cctx, -1, mctx); + result = dns_compress_init(&cctx, mctx); if (result != ISC_R_SUCCESS) { return (result); } diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index 08498c368d..901da4b353 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -2530,7 +2530,7 @@ resquery_send(resquery_t *query) { /* * Convert the question to wire format. */ - result = dns_compress_init(&cctx, -1, fctx->res->mctx); + result = dns_compress_init(&cctx, fctx->res->mctx); if (result != ISC_R_SUCCESS) { goto cleanup_message; } @@ -9822,7 +9822,7 @@ rctx_logpacket(respctx_t *rctx) { * Log the response via dnstap. */ memset(&zr, 0, sizeof(zr)); - result = dns_compress_init(&cctx, -1, fctx->res->mctx); + result = dns_compress_init(&cctx, fctx->res->mctx); if (result == ISC_R_SUCCESS) { isc_buffer_init(&zb, zone, sizeof(zone)); dns_compress_setmethods(&cctx, DNS_COMPRESS_NONE); diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c index 4f3afd216e..aae27c2fc3 100644 --- a/lib/dns/xfrin.c +++ b/lib/dns/xfrin.c @@ -1192,7 +1192,7 @@ render(dns_message_t *msg, isc_mem_t *mctx, isc_buffer_t *buf) { bool cleanup_cctx = false; isc_result_t result; - CHECK(dns_compress_init(&cctx, -1, mctx)); + CHECK(dns_compress_init(&cctx, mctx)); cleanup_cctx = true; CHECK(dns_message_renderbegin(msg, &cctx, buf)); CHECK(dns_message_rendersection(msg, DNS_SECTION_QUESTION, 0)); diff --git a/lib/ns/client.c b/lib/ns/client.c index 7596bb62e5..b620483d8b 100644 --- a/lib/ns/client.c +++ b/lib/ns/client.c @@ -537,7 +537,7 @@ ns_client_send(ns_client_t *client) { client_allocsendbuf(client, &buffer, &data); - result = dns_compress_init(&cctx, -1, client->manager->mctx); + result = dns_compress_init(&cctx, client->manager->mctx); if (result != ISC_R_SUCCESS) { goto cleanup; } diff --git a/lib/ns/xfrout.c b/lib/ns/xfrout.c index 8d71c3c572..e3290b0b1e 100644 --- a/lib/ns/xfrout.c +++ b/lib/ns/xfrout.c @@ -1526,7 +1526,7 @@ sendstream(xfrout_ctx_t *xfr) { if (is_tcp) { isc_region_t used; - CHECK(dns_compress_init(&cctx, -1, xfr->mctx)); + CHECK(dns_compress_init(&cctx, xfr->mctx)); dns_compress_setsensitive(&cctx, true); cleanup_cctx = true; CHECK(dns_message_renderbegin(msg, &cctx, &xfr->txbuf)); diff --git a/tests/dns/dnstap_test.c b/tests/dns/dnstap_test.c index 8fdb952a38..ed0ccaab25 100644 --- a/tests/dns/dnstap_test.c +++ b/tests/dns/dnstap_test.c @@ -171,7 +171,7 @@ ISC_RUN_TEST_IMPL(dns_dt_send) { memset(&zr, 0, sizeof(zr)); isc_buffer_init(&zb, zone, sizeof(zone)); - result = dns_compress_init(&cctx, -1, mctx); + result = dns_compress_init(&cctx, mctx); assert_int_equal(result, ISC_R_SUCCESS); dns_compress_setmethods(&cctx, DNS_COMPRESS_NONE); result = dns_name_towire(zname, &cctx, &zb); diff --git a/tests/dns/name_test.c b/tests/dns/name_test.c index 511ee3c8b3..f1852194d0 100644 --- a/tests/dns/name_test.c +++ b/tests/dns/name_test.c @@ -191,9 +191,9 @@ ISC_RUN_TEST_IMPL(compression) { /* Test 1: NONE */ allowed = DNS_COMPRESS_NONE; - assert_int_equal(dns_compress_init(&cctx, -1, mctx), ISC_R_SUCCESS); + assert_int_equal(dns_compress_init(&cctx, mctx), ISC_R_SUCCESS); dns_compress_setmethods(&cctx, allowed); - dns_decompress_init(&dctx, -1, DNS_DECOMPRESS_STRICT); + dns_decompress_init(&dctx, DNS_DECOMPRESS_STRICT); dns_decompress_setmethods(&dctx, allowed); compress_test(&name1, &name2, &name3, plain, sizeof(plain), &cctx, @@ -204,9 +204,9 @@ ISC_RUN_TEST_IMPL(compression) { /* Test2: GLOBAL14 */ allowed = DNS_COMPRESS_GLOBAL14; - assert_int_equal(dns_compress_init(&cctx, -1, mctx), ISC_R_SUCCESS); + assert_int_equal(dns_compress_init(&cctx, mctx), ISC_R_SUCCESS); dns_compress_setmethods(&cctx, allowed); - dns_decompress_init(&dctx, -1, DNS_DECOMPRESS_STRICT); + dns_decompress_init(&dctx, DNS_DECOMPRESS_STRICT); dns_decompress_setmethods(&dctx, allowed); compress_test(&name1, &name2, &name3, plain, sizeof(plain), &cctx, @@ -217,9 +217,9 @@ ISC_RUN_TEST_IMPL(compression) { /* Test3: ALL */ allowed = DNS_COMPRESS_ALL; - assert_int_equal(dns_compress_init(&cctx, -1, mctx), ISC_R_SUCCESS); + assert_int_equal(dns_compress_init(&cctx, mctx), ISC_R_SUCCESS); dns_compress_setmethods(&cctx, allowed); - dns_decompress_init(&dctx, -1, DNS_DECOMPRESS_STRICT); + dns_decompress_init(&dctx, DNS_DECOMPRESS_STRICT); dns_decompress_setmethods(&dctx, allowed); compress_test(&name1, &name2, &name3, plain, sizeof(plain), &cctx, @@ -230,10 +230,10 @@ ISC_RUN_TEST_IMPL(compression) { /* Test4: NONE disabled */ allowed = DNS_COMPRESS_NONE; - assert_int_equal(dns_compress_init(&cctx, -1, mctx), ISC_R_SUCCESS); + assert_int_equal(dns_compress_init(&cctx, mctx), ISC_R_SUCCESS); dns_compress_setmethods(&cctx, allowed); dns_compress_disable(&cctx); - dns_decompress_init(&dctx, -1, DNS_DECOMPRESS_STRICT); + dns_decompress_init(&dctx, DNS_DECOMPRESS_STRICT); dns_decompress_setmethods(&dctx, allowed); compress_test(&name1, &name2, &name3, plain, sizeof(plain), &cctx, @@ -244,10 +244,10 @@ ISC_RUN_TEST_IMPL(compression) { /* Test5: GLOBAL14 disabled */ allowed = DNS_COMPRESS_GLOBAL14; - assert_int_equal(dns_compress_init(&cctx, -1, mctx), ISC_R_SUCCESS); + assert_int_equal(dns_compress_init(&cctx, mctx), ISC_R_SUCCESS); dns_compress_setmethods(&cctx, allowed); dns_compress_disable(&cctx); - dns_decompress_init(&dctx, -1, DNS_DECOMPRESS_STRICT); + dns_decompress_init(&dctx, DNS_DECOMPRESS_STRICT); dns_decompress_setmethods(&dctx, allowed); compress_test(&name1, &name2, &name3, plain, sizeof(plain), &cctx, @@ -258,10 +258,10 @@ ISC_RUN_TEST_IMPL(compression) { /* Test6: ALL disabled */ allowed = DNS_COMPRESS_ALL; - assert_int_equal(dns_compress_init(&cctx, -1, mctx), ISC_R_SUCCESS); + assert_int_equal(dns_compress_init(&cctx, mctx), ISC_R_SUCCESS); dns_compress_setmethods(&cctx, allowed); dns_compress_disable(&cctx); - dns_decompress_init(&dctx, -1, DNS_DECOMPRESS_STRICT); + dns_decompress_init(&dctx, DNS_DECOMPRESS_STRICT); dns_decompress_setmethods(&dctx, allowed); compress_test(&name1, &name2, &name3, plain, sizeof(plain), &cctx, @@ -650,7 +650,7 @@ ISC_RUN_TEST_IMPL(fromwire_thread(void *arg) { UNUSED(arg); - dns_decompress_init(&dctx, -1, DNS_DECOMPRESS_STRICT); + dns_decompress_init(&dctx, DNS_DECOMPRESS_STRICT); dns_decompress_setmethods(&dctx, DNS_COMPRESS_NONE); isc_buffer_init(&source, data, sizeof(data)); diff --git a/tests/dns/rdata_test.c b/tests/dns/rdata_test.c index 71149eafaf..8549cc528b 100644 --- a/tests/dns/rdata_test.c +++ b/tests/dns/rdata_test.c @@ -150,7 +150,7 @@ wire_to_rdata(const unsigned char *src, size_t srclen, dns_rdataclass_t rdclass, /* * Try converting input data into uncompressed wire form. */ - dns_decompress_init(&dctx, -1, DNS_DECOMPRESS_ANY); + dns_decompress_init(&dctx, DNS_DECOMPRESS_ANY); result = dns_rdata_fromwire(rdata, rdclass, type, &source, &dctx, 0, &target); dns_decompress_invalidate(&dctx); @@ -176,7 +176,7 @@ rdata_towire(dns_rdata_t *rdata, unsigned char *dst, size_t dstlen, /* * Try converting input data into uncompressed wire form. */ - dns_compress_init(&cctx, -1, mctx); + dns_compress_init(&cctx, mctx); result = dns_rdata_towire(rdata, &cctx, &target); dns_compress_invalidate(&cctx); diff --git a/tests/dns/tsig_test.c b/tests/dns/tsig_test.c index f94a0fa016..b1fe184972 100644 --- a/tests/dns/tsig_test.c +++ b/tests/dns/tsig_test.c @@ -105,7 +105,7 @@ add_tsig(dst_context_t *tsigctx, dns_tsigkey_t *key, isc_buffer_t *target) { memset(&tsig, 0, sizeof(tsig)); - CHECK(dns_compress_init(&cctx, -1, mctx)); + CHECK(dns_compress_init(&cctx, mctx)); invalidate_ctx = true; tsig.common.rdclass = dns_rdataclass_any; @@ -232,7 +232,7 @@ render(isc_buffer_t *buf, unsigned flags, dns_tsigkey_t *key, assert_int_equal(result, ISC_R_SUCCESS); } - result = dns_compress_init(&cctx, -1, mctx); + result = dns_compress_init(&cctx, mctx); assert_int_equal(result, ISC_R_SUCCESS); result = dns_message_renderbegin(msg, &cctx, buf); diff --git a/tests/libtest/ns.c b/tests/libtest/ns.c index 6de395b6ab..b85a215401 100644 --- a/tests/libtest/ns.c +++ b/tests/libtest/ns.c @@ -336,7 +336,7 @@ attach_query_msg_to_client(ns_client_t *client, const char *qnamestr, /* * Render the query. */ - dns_compress_init(&cctx, -1, mctx); + dns_compress_init(&cctx, mctx); isc_buffer_init(&querybuf, query, sizeof(query)); result = dns_message_renderbegin(message, &cctx, &querybuf); if (result != ISC_R_SUCCESS) {