remove dns_name_towire2()

we don't need two versions of dns_name_towire(), we can just add NULL
to the calls that don't need to specify a compression offset.

diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h
index e02eca3b6861414f3c9d5818e9ea10db484e8edc..b04130699ccbceccc81be38b89b14c809853ab99 100644 (file)
--- a/lib/dns/include/dns/name.h
+++ b/lib/dns/include/dns/name.h
@@ -720,10 +720,7 @@ dns_name_fromwire(dns_name_t *name, isc_buffer_t *source, dns_decompress_t dctx,
 
 isc_result_t
 dns_name_towire(const dns_name_t *name, dns_compress_t *cctx,
-               isc_buffer_t *target);
-isc_result_t
-dns_name_towire2(const dns_name_t *name, dns_compress_t *cctx,
-                isc_buffer_t *target, uint16_t *comp_offsetp);
+               isc_buffer_t *target, uint16_t *comp_offsetp);
 /*%<
  * Convert 'name' into wire format, compressing it as specified by the
  * compression context 'cctx', and storing the result in 'target'.

diff --git a/lib/dns/name.c b/lib/dns/name.c
index fa1dda64d82d8e0cea3666545a5ce9ac62263180..0333ac3e64a5318b8823dcda2901cb0e5ae36f36 100644 (file)
--- a/lib/dns/name.c
+++ b/lib/dns/name.c
@@ -1663,13 +1663,7 @@ root_label:;
 
 isc_result_t
 dns_name_towire(const dns_name_t *name, dns_compress_t *cctx,
-               isc_buffer_t *target) {
-       return (dns_name_towire2(name, cctx, target, NULL));
-}
-
-isc_result_t
-dns_name_towire2(const dns_name_t *name, dns_compress_t *cctx,
-                isc_buffer_t *target, uint16_t *name_coff) {
+               isc_buffer_t *target, uint16_t *name_coff) {
        bool compress;
        dns_offsets_t clo;
        dns_name_t clname;

diff --git a/lib/dns/ncache.c b/lib/dns/ncache.c
index 7a85368145b153490b86958a5f95aa11a376e800..26c92317a8c2656b6b34e4021264488e28fb2cc7 100644 (file)
--- a/lib/dns/ncache.c
+++ b/lib/dns/ncache.c
@@ -352,7 +352,7 @@ dns_ncache_towire(dns_rdataset_t *rdataset, dns_compress_t *cctx,
                         * Write the name.
                         */
                        dns_compress_setpermitted(cctx, true);
-                       result = dns_name_towire(&name, cctx, target);
+                       result = dns_name_towire(&name, cctx, target, NULL);
                        if (result != ISC_R_SUCCESS) {
                                goto rollback;
                        }

diff --git a/lib/dns/rdata/any_255/tsig_250.c b/lib/dns/rdata/any_255/tsig_250.c
index b75f3c81ae9efa9e85459a5bc7170586b6b5327c..9bbe567783e85787f77444f260db6bf1c9adb8f7 100644 (file)
--- a/lib/dns/rdata/any_255/tsig_250.c
+++ b/lib/dns/rdata/any_255/tsig_250.c
@@ -335,7 +335,7 @@ towire_any_tsig(ARGS_TOWIRE) {
        dns_rdata_toregion(rdata, &sr);
        dns_name_init(&name, offsets);
        dns_name_fromregion(&name, &sr);
-       RETERR(dns_name_towire(&name, cctx, target));
+       RETERR(dns_name_towire(&name, cctx, target, NULL));
        isc_region_consume(&sr, name_length(&name));
        return (mem_tobuffer(target, sr.base, sr.length));
 }

diff --git a/lib/dns/rdata/ch_3/a_1.c b/lib/dns/rdata/ch_3/a_1.c
index 55c0adb0bb212a08eefab3999f1f2c6cbae9ee25..9fd96c0d7cd52cc8bd28bc94d4861ffe957c53ec 100644 (file)
--- a/lib/dns/rdata/ch_3/a_1.c
+++ b/lib/dns/rdata/ch_3/a_1.c
@@ -146,7 +146,7 @@ towire_ch_a(ARGS_TOWIRE) {
 
        dns_name_fromregion(&name, &sregion);
        isc_region_consume(&sregion, name_length(&name));
-       RETERR(dns_name_towire(&name, cctx, target));
+       RETERR(dns_name_towire(&name, cctx, target, NULL));
 
        isc_buffer_availableregion(target, &tregion);
        if (tregion.length < 2) {

diff --git a/lib/dns/rdata/generic/afsdb_18.c b/lib/dns/rdata/generic/afsdb_18.c
index 04b55f16b73fed5b73d0a301234539685e46389e..69bc39e4ff434c4a68da672d02c7b5c70da72818 100644 (file)
--- a/lib/dns/rdata/generic/afsdb_18.c
+++ b/lib/dns/rdata/generic/afsdb_18.c
@@ -142,7 +142,7 @@ towire_afsdb(ARGS_TOWIRE) {
        dns_name_init(&name, offsets);
        dns_name_fromregion(&name, &sr);
 
-       return (dns_name_towire(&name, cctx, target));
+       return (dns_name_towire(&name, cctx, target, NULL));
 }
 
 static int

diff --git a/lib/dns/rdata/generic/cname_5.c b/lib/dns/rdata/generic/cname_5.c
index 754aef90604abaaff8f684b74e40a1b24141c44e..7e78c6cf21f0f68a6e73533992029f4964a536c4 100644 (file)
--- a/lib/dns/rdata/generic/cname_5.c
+++ b/lib/dns/rdata/generic/cname_5.c
@@ -92,7 +92,7 @@ towire_cname(ARGS_TOWIRE) {
        dns_rdata_toregion(rdata, &region);
        dns_name_fromregion(&name, &region);
 
-       return (dns_name_towire(&name, cctx, target));
+       return (dns_name_towire(&name, cctx, target, NULL));
 }
 
 static int

diff --git a/lib/dns/rdata/generic/dname_39.c b/lib/dns/rdata/generic/dname_39.c
index d1d1f5208349f86de87028b23a09407d333888d0..14c085fe478af02c83118b101d51203c3d7d4639 100644 (file)
--- a/lib/dns/rdata/generic/dname_39.c
+++ b/lib/dns/rdata/generic/dname_39.c
@@ -92,7 +92,7 @@ towire_dname(ARGS_TOWIRE) {
        dns_rdata_toregion(rdata, &region);
        dns_name_fromregion(&name, &region);
 
-       return (dns_name_towire(&name, cctx, target));
+       return (dns_name_towire(&name, cctx, target, NULL));
 }
 
 static int

diff --git a/lib/dns/rdata/generic/mb_7.c b/lib/dns/rdata/generic/mb_7.c
index 0903673b3dcf20517efaa4e380b3486c9e0e3109..8d09c456f511d912920d2b8ccc9a17d21682f87e 100644 (file)
--- a/lib/dns/rdata/generic/mb_7.c
+++ b/lib/dns/rdata/generic/mb_7.c
@@ -91,7 +91,7 @@ towire_mb(ARGS_TOWIRE) {
        dns_rdata_toregion(rdata, &region);
        dns_name_fromregion(&name, &region);
 
-       return (dns_name_towire(&name, cctx, target));
+       return (dns_name_towire(&name, cctx, target, NULL));
 }
 
 static int

diff --git a/lib/dns/rdata/generic/md_3.c b/lib/dns/rdata/generic/md_3.c
index 49188482460b4e64fa65aae3a09066118e9664ff..945ee8c6baca2770b75f3aa224ffc0b788741363 100644 (file)
--- a/lib/dns/rdata/generic/md_3.c
+++ b/lib/dns/rdata/generic/md_3.c
@@ -91,7 +91,7 @@ towire_md(ARGS_TOWIRE) {
        dns_rdata_toregion(rdata, &region);
        dns_name_fromregion(&name, &region);
 
-       return (dns_name_towire(&name, cctx, target));
+       return (dns_name_towire(&name, cctx, target, NULL));
 }
 
 static int

diff --git a/lib/dns/rdata/generic/mf_4.c b/lib/dns/rdata/generic/mf_4.c
index 602e86559610ff56b9613cb4f172fc7c2996d444..f9946effcccbd2cc008eaf9fd31f1408da3a9637 100644 (file)
--- a/lib/dns/rdata/generic/mf_4.c
+++ b/lib/dns/rdata/generic/mf_4.c
@@ -91,7 +91,7 @@ towire_mf(ARGS_TOWIRE) {
        dns_rdata_toregion(rdata, &region);
        dns_name_fromregion(&name, &region);
 
-       return (dns_name_towire(&name, cctx, target));
+       return (dns_name_towire(&name, cctx, target, NULL));
 }
 
 static int

diff --git a/lib/dns/rdata/generic/mg_8.c b/lib/dns/rdata/generic/mg_8.c
index a4da9912945bd588be93b014818f1ffa4d2f4a50..9d8aa28608606d24a69b1606b06626a227a34ff1 100644 (file)
--- a/lib/dns/rdata/generic/mg_8.c
+++ b/lib/dns/rdata/generic/mg_8.c
@@ -91,7 +91,7 @@ towire_mg(ARGS_TOWIRE) {
        dns_rdata_toregion(rdata, &region);
        dns_name_fromregion(&name, &region);
 
-       return (dns_name_towire(&name, cctx, target));
+       return (dns_name_towire(&name, cctx, target, NULL));
 }
 
 static int

diff --git a/lib/dns/rdata/generic/minfo_14.c b/lib/dns/rdata/generic/minfo_14.c
index 25671f8a534398520636880d42645c660a7c306a..1816d1c651a26287e7be9c57a79cb3c47e1438b9 100644 (file)
--- a/lib/dns/rdata/generic/minfo_14.c
+++ b/lib/dns/rdata/generic/minfo_14.c
@@ -128,12 +128,12 @@ towire_minfo(ARGS_TOWIRE) {
        dns_name_fromregion(&rmail, &region);
        isc_region_consume(&region, name_length(&rmail));
 
-       RETERR(dns_name_towire(&rmail, cctx, target));
+       RETERR(dns_name_towire(&rmail, cctx, target, NULL));
 
        dns_name_fromregion(&rmail, &region);
        isc_region_consume(&region, rmail.length);
 
-       return (dns_name_towire(&rmail, cctx, target));
+       return (dns_name_towire(&rmail, cctx, target, NULL));
 }
 
 static int

diff --git a/lib/dns/rdata/generic/mr_9.c b/lib/dns/rdata/generic/mr_9.c
index c88bc6f00746d5b1c2d9f59b5b7b2e3e9c6e194a..863afd89f39e2204b6e42a3d11fb82544136fbbf 100644 (file)
--- a/lib/dns/rdata/generic/mr_9.c
+++ b/lib/dns/rdata/generic/mr_9.c
@@ -91,7 +91,7 @@ towire_mr(ARGS_TOWIRE) {
        dns_rdata_toregion(rdata, &region);
        dns_name_fromregion(&name, &region);
 
-       return (dns_name_towire(&name, cctx, target));
+       return (dns_name_towire(&name, cctx, target, NULL));
 }
 
 static int

diff --git a/lib/dns/rdata/generic/mx_15.c b/lib/dns/rdata/generic/mx_15.c
index 1d822832f3f303b61ba79f496e8e9869dd53f24d..b5f1318ea6acc06b540402479b43cd1d64a5fe6b 100644 (file)
--- a/lib/dns/rdata/generic/mx_15.c
+++ b/lib/dns/rdata/generic/mx_15.c
@@ -165,7 +165,7 @@ towire_mx(ARGS_TOWIRE) {
        dns_name_init(&name, offsets);
        dns_name_fromregion(&name, &region);
 
-       return (dns_name_towire(&name, cctx, target));
+       return (dns_name_towire(&name, cctx, target, NULL));
 }
 
 static int

diff --git a/lib/dns/rdata/generic/naptr_35.c b/lib/dns/rdata/generic/naptr_35.c
index 0956d1d504d53c16e490a08fd6b7cf365e09d441..a9a3df8bb689b9e13d472b4caeb9093e69944a22 100644 (file)
--- a/lib/dns/rdata/generic/naptr_35.c
+++ b/lib/dns/rdata/generic/naptr_35.c
@@ -388,7 +388,7 @@ towire_naptr(ARGS_TOWIRE) {
         */
        dns_name_init(&name, offsets);
        dns_name_fromregion(&name, &sr);
-       return (dns_name_towire(&name, cctx, target));
+       return (dns_name_towire(&name, cctx, target, NULL));
 }
 
 static int

diff --git a/lib/dns/rdata/generic/ns_2.c b/lib/dns/rdata/generic/ns_2.c
index e80f4fe7a47809b160fd96b51921c8267c27bc1b..7b6d4532b97ced6d6df9d3b02d695855482d8737 100644 (file)
--- a/lib/dns/rdata/generic/ns_2.c
+++ b/lib/dns/rdata/generic/ns_2.c
@@ -102,7 +102,7 @@ towire_ns(ARGS_TOWIRE) {
        dns_rdata_toregion(rdata, &region);
        dns_name_fromregion(&name, &region);
 
-       return (dns_name_towire(&name, cctx, target));
+       return (dns_name_towire(&name, cctx, target, NULL));
 }
 
 static int

diff --git a/lib/dns/rdata/generic/nsec_47.c b/lib/dns/rdata/generic/nsec_47.c
index ef3403473b0bce868d95837c6166aa97018aeb21..748c23f74ec6b1269d96e1b1938c1a723aa301f5 100644 (file)
--- a/lib/dns/rdata/generic/nsec_47.c
+++ b/lib/dns/rdata/generic/nsec_47.c
@@ -111,7 +111,7 @@ towire_nsec(ARGS_TOWIRE) {
        dns_rdata_toregion(rdata, &sr);
        dns_name_fromregion(&name, &sr);
        isc_region_consume(&sr, name_length(&name));
-       RETERR(dns_name_towire(&name, cctx, target));
+       RETERR(dns_name_towire(&name, cctx, target, NULL));
 
        return (mem_tobuffer(target, sr.base, sr.length));
 }

diff --git a/lib/dns/rdata/generic/nxt_30.c b/lib/dns/rdata/generic/nxt_30.c
index bdeac7e4d3eab84eb908f22ec49e72c3ea7aa6ce..5eb1fa55f28cc7693eb6966db9b669d3c0ab72aa 100644 (file)
--- a/lib/dns/rdata/generic/nxt_30.c
+++ b/lib/dns/rdata/generic/nxt_30.c
@@ -174,7 +174,7 @@ towire_nxt(ARGS_TOWIRE) {
        dns_rdata_toregion(rdata, &sr);
        dns_name_fromregion(&name, &sr);
        isc_region_consume(&sr, name_length(&name));
-       RETERR(dns_name_towire(&name, cctx, target));
+       RETERR(dns_name_towire(&name, cctx, target, NULL));
 
        return (mem_tobuffer(target, sr.base, sr.length));
 }

diff --git a/lib/dns/rdata/generic/ptr_12.c b/lib/dns/rdata/generic/ptr_12.c
index 8e30909191a3a138a8dba8016517867357de9a5b..d0df61996b1b26dc9a0443371e3995c80e5c53b0 100644 (file)
--- a/lib/dns/rdata/generic/ptr_12.c
+++ b/lib/dns/rdata/generic/ptr_12.c
@@ -104,7 +104,7 @@ towire_ptr(ARGS_TOWIRE) {
        dns_rdata_toregion(rdata, &region);
        dns_name_fromregion(&name, &region);
 
-       return (dns_name_towire(&name, cctx, target));
+       return (dns_name_towire(&name, cctx, target, NULL));
 }
 
 static int

diff --git a/lib/dns/rdata/generic/rp_17.c b/lib/dns/rdata/generic/rp_17.c
index 61b5a8685218e625f41427120b8506f1b7f3ced3..f165ae45d30229be25ad80ded91fc9266345bdc7 100644 (file)
--- a/lib/dns/rdata/generic/rp_17.c
+++ b/lib/dns/rdata/generic/rp_17.c
@@ -128,12 +128,12 @@ towire_rp(ARGS_TOWIRE) {
        dns_name_fromregion(&rmail, &region);
        isc_region_consume(&region, rmail.length);
 
-       RETERR(dns_name_towire(&rmail, cctx, target));
+       RETERR(dns_name_towire(&rmail, cctx, target, NULL));
 
        dns_name_fromregion(&rmail, &region);
        isc_region_consume(&region, rmail.length);
 
-       return (dns_name_towire(&rmail, cctx, target));
+       return (dns_name_towire(&rmail, cctx, target, NULL));
 }
 
 static int

diff --git a/lib/dns/rdata/generic/rrsig_46.c b/lib/dns/rdata/generic/rrsig_46.c
index e73042062227870253c3ffa4d8ef625435e589b3..7fb0bf5762291263eeee434485f1747435cc911b 100644 (file)
--- a/lib/dns/rdata/generic/rrsig_46.c
+++ b/lib/dns/rdata/generic/rrsig_46.c
@@ -378,7 +378,7 @@ towire_rrsig(ARGS_TOWIRE) {
        dns_name_init(&name, offsets);
        dns_name_fromregion(&name, &sr);
        isc_region_consume(&sr, name_length(&name));
-       RETERR(dns_name_towire(&name, cctx, target));
+       RETERR(dns_name_towire(&name, cctx, target, NULL));
 
        /*
         * Signature.

diff --git a/lib/dns/rdata/generic/rt_21.c b/lib/dns/rdata/generic/rt_21.c
index 017aee54e7896b0a4344f88514be1ef54bd7fcdd..f54e84362345ba220dfe6bdfe43c4b5f290b9743 100644 (file)
--- a/lib/dns/rdata/generic/rt_21.c
+++ b/lib/dns/rdata/generic/rt_21.c
@@ -138,7 +138,7 @@ towire_rt(ARGS_TOWIRE) {
        dns_name_init(&name, offsets);
        dns_name_fromregion(&name, &region);
 
-       return (dns_name_towire(&name, cctx, target));
+       return (dns_name_towire(&name, cctx, target, NULL));
 }
 
 static int

diff --git a/lib/dns/rdata/generic/sig_24.c b/lib/dns/rdata/generic/sig_24.c
index 74e536f1ace2332882b247831ad3a648dfe7dfa1..eac8ec9d02500b4f29176df2c9b0e2dd7064cc5b 100644 (file)
--- a/lib/dns/rdata/generic/sig_24.c
+++ b/lib/dns/rdata/generic/sig_24.c
@@ -341,7 +341,7 @@ towire_sig(ARGS_TOWIRE) {
        dns_name_init(&name, offsets);
        dns_name_fromregion(&name, &sr);
        isc_region_consume(&sr, name_length(&name));
-       RETERR(dns_name_towire(&name, cctx, target));
+       RETERR(dns_name_towire(&name, cctx, target, NULL));
 
        /*
         * Signature.

diff --git a/lib/dns/rdata/generic/soa_6.c b/lib/dns/rdata/generic/soa_6.c
index b8656ceedbd43a7eeeaffa374b8b820417072bd3..2345f686785b1db9688a9a9d6cd4ccd0c1bdcd9c 100644 (file)
--- a/lib/dns/rdata/generic/soa_6.c
+++ b/lib/dns/rdata/generic/soa_6.c
@@ -211,11 +211,11 @@ towire_soa(ARGS_TOWIRE) {
 
        dns_name_fromregion(&mname, &sregion);
        isc_region_consume(&sregion, name_length(&mname));
-       RETERR(dns_name_towire(&mname, cctx, target));
+       RETERR(dns_name_towire(&mname, cctx, target, NULL));
 
        dns_name_fromregion(&rname, &sregion);
        isc_region_consume(&sregion, name_length(&rname));
-       RETERR(dns_name_towire(&rname, cctx, target));
+       RETERR(dns_name_towire(&rname, cctx, target, NULL));
 
        isc_buffer_availableregion(target, &tregion);
        if (tregion.length < 20) {

diff --git a/lib/dns/rdata/generic/talink_58.c b/lib/dns/rdata/generic/talink_58.c
index 6c3838434865bf8ba6e42689b5e7e9fcd96a850c..fa591d7cda1562e1e8c84b52564df680a8370369 100644 (file)
--- a/lib/dns/rdata/generic/talink_58.c
+++ b/lib/dns/rdata/generic/talink_58.c
@@ -117,11 +117,11 @@ towire_talink(ARGS_TOWIRE) {
 
        dns_name_fromregion(&prev, &sregion);
        isc_region_consume(&sregion, name_length(&prev));
-       RETERR(dns_name_towire(&prev, cctx, target));
+       RETERR(dns_name_towire(&prev, cctx, target, NULL));
 
        dns_name_fromregion(&next, &sregion);
        isc_region_consume(&sregion, name_length(&next));
-       return (dns_name_towire(&next, cctx, target));
+       return (dns_name_towire(&next, cctx, target, NULL));
 }
 
 static int

diff --git a/lib/dns/rdata/generic/tkey_249.c b/lib/dns/rdata/generic/tkey_249.c
index 0c77c3733f015f5f9d1a744bdefbcb89b8c31c2a..217bf766075deb54052e67b243462f1561dff8cc 100644 (file)
--- a/lib/dns/rdata/generic/tkey_249.c
+++ b/lib/dns/rdata/generic/tkey_249.c
@@ -320,7 +320,7 @@ towire_tkey(ARGS_TOWIRE) {
        dns_rdata_toregion(rdata, &sr);
        dns_name_init(&name, offsets);
        dns_name_fromregion(&name, &sr);
-       RETERR(dns_name_towire(&name, cctx, target));
+       RETERR(dns_name_towire(&name, cctx, target, NULL));
        isc_region_consume(&sr, name_length(&name));
 
        return (mem_tobuffer(target, sr.base, sr.length));

diff --git a/lib/dns/rdata/in_1/a6_38.c b/lib/dns/rdata/in_1/a6_38.c
index 983cab4b2c100a1f55c0734e43a6e89097c49837..8589f49d601ade2c72bb624fc41cfb92cd217fd1 100644 (file)
--- a/lib/dns/rdata/in_1/a6_38.c
+++ b/lib/dns/rdata/in_1/a6_38.c
@@ -226,7 +226,7 @@ towire_in_a6(ARGS_TOWIRE) {
 
        dns_name_init(&name, offsets);
        dns_name_fromregion(&name, &sr);
-       return (dns_name_towire(&name, cctx, target));
+       return (dns_name_towire(&name, cctx, target, NULL));
 }
 
 static int

diff --git a/lib/dns/rdata/in_1/kx_36.c b/lib/dns/rdata/in_1/kx_36.c
index 7b13897e6deffdffd47dddd89ed3965c9d4a3fdb..a8c2abcca350e5749f6cf6680ec9962bb09d27a6 100644 (file)
--- a/lib/dns/rdata/in_1/kx_36.c
+++ b/lib/dns/rdata/in_1/kx_36.c
@@ -120,7 +120,7 @@ towire_in_kx(ARGS_TOWIRE) {
        dns_name_init(&name, offsets);
        dns_name_fromregion(&name, &region);
 
-       return (dns_name_towire(&name, cctx, target));
+       return (dns_name_towire(&name, cctx, target, NULL));
 }
 
 static int

diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.c b/lib/dns/rdata/in_1/nsap-ptr_23.c
index b36b049a9cd5950574c24533adb8abacb5894035..a468b80940b1f8d29b6da65aa54f1cbf981e9ddb 100644 (file)
--- a/lib/dns/rdata/in_1/nsap-ptr_23.c
+++ b/lib/dns/rdata/in_1/nsap-ptr_23.c
@@ -96,7 +96,7 @@ towire_in_nsap_ptr(ARGS_TOWIRE) {
        dns_rdata_toregion(rdata, &region);
        dns_name_fromregion(&name, &region);
 
-       return (dns_name_towire(&name, cctx, target));
+       return (dns_name_towire(&name, cctx, target, NULL));
 }
 
 static int

diff --git a/lib/dns/rdata/in_1/px_26.c b/lib/dns/rdata/in_1/px_26.c
index 21d63dccce3a6a1cdb456122fe26c8c62cd532f8..c172b851f1e75b4ad5793b536de1b86c656ae01f 100644 (file)
--- a/lib/dns/rdata/in_1/px_26.c
+++ b/lib/dns/rdata/in_1/px_26.c
@@ -167,7 +167,7 @@ towire_in_px(ARGS_TOWIRE) {
         */
        dns_name_init(&name, offsets);
        dns_name_fromregion(&name, &region);
-       RETERR(dns_name_towire(&name, cctx, target));
+       RETERR(dns_name_towire(&name, cctx, target, NULL));
        isc_region_consume(&region, name_length(&name));
 
        /*
@@ -175,7 +175,7 @@ towire_in_px(ARGS_TOWIRE) {
         */
        dns_name_init(&name, offsets);
        dns_name_fromregion(&name, &region);
-       return (dns_name_towire(&name, cctx, target));
+       return (dns_name_towire(&name, cctx, target, NULL));
 }
 
 static int

diff --git a/lib/dns/rdata/in_1/srv_33.c b/lib/dns/rdata/in_1/srv_33.c
index 46da0d0326dd7dd2b82d1c113d8602c3c586db37..ce0cbc46213e86b087864542bfea2c4f24456aaf 100644 (file)
--- a/lib/dns/rdata/in_1/srv_33.c
+++ b/lib/dns/rdata/in_1/srv_33.c
@@ -191,7 +191,7 @@ towire_in_srv(ARGS_TOWIRE) {
         */
        dns_name_init(&name, offsets);
        dns_name_fromregion(&name, &sr);
-       return (dns_name_towire(&name, cctx, target));
+       return (dns_name_towire(&name, cctx, target, NULL));
 }
 
 static int

diff --git a/lib/dns/rdata/in_1/svcb_64.c b/lib/dns/rdata/in_1/svcb_64.c
index 545dd52bf9d996f06ac27cfa72137ccec918548f..cd0fbe5b92cb5143c2b28795cc5c668602d98f1b 100644 (file)
--- a/lib/dns/rdata/in_1/svcb_64.c
+++ b/lib/dns/rdata/in_1/svcb_64.c
@@ -966,7 +966,7 @@ generic_towire_in_svcb(ARGS_TOWIRE) {
         */
        dns_name_init(&name, offsets);
        dns_name_fromregion(&name, &region);
-       RETERR(dns_name_towire(&name, cctx, target));
+       RETERR(dns_name_towire(&name, cctx, target, NULL));
        isc_region_consume(&region, name_length(&name));
 
        /*

diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c
index 38bf6136daf88f3f2bc3c5889760d541c281aa1e..f179893fa5bafacdc2f024edc2de52b877ad38d2 100644 (file)
--- a/lib/dns/rdataset.c
+++ b/lib/dns/rdataset.c
@@ -385,7 +385,7 @@ towiresorted(dns_rdataset_t *rdataset, const dns_name_t *owner_name,
 
                rrbuffer = *target;
                dns_compress_setpermitted(cctx, true);
-               result = dns_name_towire2(name, cctx, target, &offset);
+               result = dns_name_towire(name, cctx, target, &offset);
                if (result != ISC_R_SUCCESS) {
                        goto rollback;
                }

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 43e3d41fbfb443ea8d7134e89571de93b13c8762..481e318367437a11accd098f5380b2a699f03467 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -2676,7 +2676,7 @@ resquery_send(resquery_t *query) {
        memset(&zr, 0, sizeof(zr));
        isc_buffer_init(&zb, zone, sizeof(zone));
        dns_compress_setpermitted(&cctx, false);
-       result = dns_name_towire(fctx->domain, &cctx, &zb);
+       result = dns_name_towire(fctx->domain, &cctx, &zb, NULL);
        if (result == ISC_R_SUCCESS) {
                isc_buffer_usedregion(&zb, &zr);
        }
@@ -9627,7 +9627,7 @@ rctx_logpacket(respctx_t *rctx) {
        dns_compress_init(&cctx, fctx->mctx, 0);
        dns_compress_setpermitted(&cctx, false);
        isc_buffer_init(&zb, zone, sizeof(zone));
-       result = dns_name_towire(fctx->domain, &cctx, &zb);
+       result = dns_name_towire(fctx->domain, &cctx, &zb, NULL);
        if (result == ISC_R_SUCCESS) {
                isc_buffer_usedregion(&zb, &zr);
        }

diff --git a/lib/ns/client.c b/lib/ns/client.c
index 061d8760b7ee098d94275232a0ee62f74cbeccca..2c87a845fcff66399a5087b53915d8aa42466be3 100644 (file)
--- a/lib/ns/client.c
+++ b/lib/ns/client.c
@@ -626,7 +626,7 @@ renderend:
 
                isc_buffer_init(&b, zone, sizeof(zone));
                dns_compress_setpermitted(&cctx, false);
-               eresult = dns_name_towire(zo, &cctx, &b);
+               eresult = dns_name_towire(zo, &cctx, &b, NULL);
                if (eresult == ISC_R_SUCCESS) {
                        isc_buffer_usedregion(&b, &zr);
                }

diff --git a/tests/bench/compress.c b/tests/bench/compress.c
index bbd57a57e752e6227f90942b2e0598cb3dc19bfa..88c25f4d90bf55c601e3f43f5f1d85025d7f12eb 100644 (file)
--- a/tests/bench/compress.c
+++ b/tests/bench/compress.c
@@ -78,7 +78,7 @@ main(void) {
 
                for (unsigned int i = 0; i < count; i++) {
                        dns_name_t *name = dns_fixedname_name(&fixedname[i]);
-                       result = dns_name_towire(name, &cctx, &buf);
+                       result = dns_name_towire(name, &cctx, &buf, NULL);
                        if (result == ISC_R_NOSPACE) {
                                dns_compress_invalidate(&cctx);
                                dns_compress_init(&cctx, mctx, 0);

diff --git a/tests/dns/dnstap_test.c b/tests/dns/dnstap_test.c
index e25a5dfeff6528c1b460c978646e5cc614410f64..8c82461b28edd2b930a97f6809c2a012fb6dba0f 100644 (file)
--- a/tests/dns/dnstap_test.c
+++ b/tests/dns/dnstap_test.c
@@ -173,7 +173,7 @@ ISC_RUN_TEST_IMPL(dns_dt_send) {
        isc_buffer_init(&zb, zone, sizeof(zone));
        dns_compress_init(&cctx, mctx, 0);
        dns_compress_setpermitted(&cctx, false);
-       result = dns_name_towire(zname, &cctx, &zb);
+       result = dns_name_towire(zname, &cctx, &zb, NULL);
        assert_int_equal(result, ISC_R_SUCCESS);
        dns_compress_invalidate(&cctx);
        isc_buffer_usedregion(&zb, &zr);

diff --git a/tests/dns/name_test.c b/tests/dns/name_test.c
index bb4d2679ce783ac7aa92f9823670be25ceae62be..6e9017c465d753dc7e901159e11e86f72243efb5 100644 (file)
--- a/tests/dns/name_test.c
+++ b/tests/dns/name_test.c
@@ -144,33 +144,29 @@ compress_test(const dns_name_t *name1, const dns_name_t *name2,
 
        if (rdata) {
                /* RDATA compression */
-               assert_int_equal(dns_name_towire(name1, cctx, &source),
+               assert_int_equal(dns_name_towire(name1, cctx, &source, NULL),
                                 ISC_R_SUCCESS);
-               assert_int_equal(dns_name_towire(name2, cctx, &source),
+               assert_int_equal(dns_name_towire(name2, cctx, &source, NULL),
                                 ISC_R_SUCCESS);
-               assert_int_equal(dns_name_towire(name2, cctx, &source),
+               assert_int_equal(dns_name_towire(name2, cctx, &source, NULL),
                                 ISC_R_SUCCESS);
-               assert_int_equal(dns_name_towire(name3, cctx, &source),
+               assert_int_equal(dns_name_towire(name3, cctx, &source, NULL),
                                 ISC_R_SUCCESS);
        } else {
                /* Owner name compression */
                uint16_t offset = 0xffff;
-               assert_int_equal(
-                       dns_name_towire2(name1, cctx, &source, &offset),
-                       ISC_R_SUCCESS);
+               assert_int_equal(dns_name_towire(name1, cctx, &source, &offset),
+                                ISC_R_SUCCESS);
 
                offset = 0xffff;
-               assert_int_equal(
-                       dns_name_towire2(name2, cctx, &source, &offset),
-                       ISC_R_SUCCESS);
-               assert_int_equal(
-                       dns_name_towire2(name2, cctx, &source, &offset),
-                       ISC_R_SUCCESS);
+               assert_int_equal(dns_name_towire(name2, cctx, &source, &offset),
+                                ISC_R_SUCCESS);
+               assert_int_equal(dns_name_towire(name2, cctx, &source, &offset),
+                                ISC_R_SUCCESS);
 
                offset = 0xffff;
-               assert_int_equal(
-                       dns_name_towire2(name3, cctx, &source, &offset),
-                       ISC_R_SUCCESS);
+               assert_int_equal(dns_name_towire(name3, cctx, &source, &offset),
+                                ISC_R_SUCCESS);
        }
        assert_int_equal(source.used, compressed_length);
        assert_true(memcmp(source.base, compressed, source.used) == 0);
@@ -434,7 +430,7 @@ ISC_RUN_TEST_IMPL(collision) {
                }
                dns_compress_rollback(&cctx, coff);
 
-               result = dns_name_towire(&name, &cctx, &message);
+               result = dns_name_towire(&name, &cctx, &message, NULL);
                assert_int_equal(result, ISC_R_SUCCESS);
 
                /* we must be able to find the name we just added */