mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

Check for edns1 and strict decompression once and for all in

Browse Source 
dns_[de]compress_setmethods instead of separately in every caller
This commit is contained in:
Andreas Gustafsson
2000-05-04 22:19:34 +00:00
parent fd63a046d6
commit 94a08e09db
30 changed files with 88 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/dns/compress.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: compress.c,v 1.30 2000/05/02 03:53:52 tale Exp $ */
/* $Id: compress.c,v 1.31 2000/05/04 22:19:00 gson Exp $ */
#define DNS_NAME_USEINLINE 1
@@ -224,7 +224,10 @@ dns_decompress_setmethods(dns_decompress_t *dctx, unsigned int allowed) {
REQUIRE(VALID_DCTX(dctx));
if (dns_decompress_strict(dctx))
dctx->allowed = allowed;
else
dctx->allowed = DNS_COMPRESS_ALL;
}
unsigned int

4
lib/dns/message.c
View File

@@ -1375,12 +1375,8 @@ dns_message_parse(dns_message_t *msg, isc_buffer_t *source,
*/
dns_decompress_init(&dctx, -1, ISC_FALSE);
if (dns_decompress_edns(&dctx) > 1 || !dns_decompress_strict(&dctx))
dns_decompress_setmethods(&dctx, DNS_COMPRESS_GLOBAL);
else
dns_decompress_setmethods(&dctx, DNS_COMPRESS_GLOBAL14);
ret = getquestions(source, msg, &dctx);
if (ret != ISC_R_SUCCESS)
return (ret);

6
lib/dns/ncache.c
View File

@@ -281,11 +281,6 @@ dns_ncache_towire(dns_rdataset_t *rdataset, dns_compress_t *cctx,
isc_buffer_init(&source, rdata.data, rdata.length);
isc_buffer_add(&source, rdata.length);
if (dns_compress_getedns(cctx) >= 1)
dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL);
else
dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14);
savedbuffer = *target;
count = 0;
@@ -320,6 +315,7 @@ dns_ncache_towire(dns_rdataset_t *rdataset, dns_compress_t *cctx,
/*
* Write the name.
*/
dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14);
result = dns_name_towire(&name, cctx, target);
if (result != ISC_R_SUCCESS)
goto rollback;

9
lib/dns/rdata/any_255/tsig_250.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: tsig_250.c,v 1.31 2000/04/28 22:40:08 tale Exp $ */
/* $Id: tsig_250.c,v 1.32 2000/05/04 22:19:05 gson Exp $ */
/* Reviewed: Thu Mar 16 13:39:43 PST 2000 by gson */
@@ -201,9 +201,6 @@ fromwire_any_tsig(dns_rdataclass_t rdclass, dns_rdatatype_t type,
REQUIRE(type == 250);
REQUIRE(rdclass == 255);
if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx))
dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL);
else
dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
/* Algorithm Name */
@@ -255,11 +252,7 @@ towire_any_tsig(dns_rdata_t *rdata, dns_compress_t *cctx,
REQUIRE(rdata->type == 250);
REQUIRE(rdata->rdclass == 255);
if (dns_compress_getedns(cctx) >= 1)
dns_compress_setmethods(cctx, DNS_COMPRESS_ALL);
else
dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
dns_rdata_toregion(rdata, &sr);
dns_name_init(&name, NULL);
dns_name_fromregion(&name, &sr);

9
lib/dns/rdata/generic/afsdb_18.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: afsdb_18.c,v 1.23 2000/04/28 01:23:59 gson Exp $ */
/* $Id: afsdb_18.c,v 1.24 2000/05/04 22:19:06 gson Exp $ */
/* Reviewed: Wed Mar 15 14:59:00 PST 2000 by explorer */
@@ -90,9 +90,6 @@ fromwire_afsdb(dns_rdataclass_t rdclass, dns_rdatatype_t type,
REQUIRE(type == 18);
if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx))
dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL);
else
dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
dns_name_init(&name, NULL);
@@ -118,11 +115,7 @@ towire_afsdb(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
REQUIRE(rdata->type == 18);
if (dns_compress_getedns(cctx) >= 1)
dns_compress_setmethods(cctx, DNS_COMPRESS_ALL);
else
dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
isc_buffer_availableregion(target, &tr);
dns_rdata_toregion(rdata, &sr);
if (tr.length < 2)

8
lib/dns/rdata/generic/cname_5.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: cname_5.c,v 1.27 2000/04/28 01:24:00 gson Exp $ */
/* $Id: cname_5.c,v 1.28 2000/05/04 22:19:07 gson Exp $ */
/* reviewed: Wed Mar 15 16:48:45 PST 2000 by brister */
@@ -78,9 +78,6 @@ fromwire_cname(dns_rdataclass_t rdclass, dns_rdatatype_t type,
UNUSED(rdclass);
if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx))
dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL);
else
dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14);
dns_name_init(&name, NULL);
@@ -95,9 +92,6 @@ towire_cname(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
REQUIRE(rdata->type == 5);
if (dns_compress_getedns(cctx) >= 1)
dns_compress_setmethods(cctx, DNS_COMPRESS_ALL);
else
dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14);
dns_name_init(&name, NULL);

9
lib/dns/rdata/generic/dname_39.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: dname_39.c,v 1.19 2000/04/28 01:24:00 gson Exp $ */
/* $Id: dname_39.c,v 1.20 2000/05/04 22:19:09 gson Exp $ */
/* Reviewed: Wed Mar 15 16:52:38 PST 2000 by explorer */
@@ -80,9 +80,6 @@ fromwire_dname(dns_rdataclass_t rdclass, dns_rdatatype_t type,
REQUIRE(type == 39);
if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx))
dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL);
else
dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
dns_name_init(&name, NULL);
@@ -97,11 +94,7 @@ towire_dname(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
REQUIRE(rdata->type == 39);
if (dns_compress_getedns(cctx) >= 1)
dns_compress_setmethods(cctx, DNS_COMPRESS_ALL);
else
dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
dns_name_init(&name, NULL);
dns_rdata_toregion(rdata, &region);
dns_name_fromregion(&name, &region);

8
lib/dns/rdata/generic/mb_7.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: mb_7.c,v 1.26 2000/04/28 01:24:03 gson Exp $ */
/* $Id: mb_7.c,v 1.27 2000/05/04 22:19:10 gson Exp $ */
/* Reviewed: Wed Mar 15 17:31:26 PST 2000 by bwelling */
@@ -78,9 +78,6 @@ fromwire_mb(dns_rdataclass_t rdclass, dns_rdatatype_t type,
REQUIRE(type == 7);
if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx))
dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL);
else
dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14);
dns_name_init(&name, NULL);
@@ -94,9 +91,6 @@ towire_mb(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
REQUIRE(rdata->type == 7);
if (dns_compress_getedns(cctx) >= 1)
dns_compress_setmethods(cctx, DNS_COMPRESS_ALL);
else
dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14);
dns_name_init(&name, NULL);

8
lib/dns/rdata/generic/md_3.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: md_3.c,v 1.28 2000/04/28 01:24:03 gson Exp $ */
/* $Id: md_3.c,v 1.29 2000/05/04 22:19:11 gson Exp $ */
/* Reviewed: Wed Mar 15 17:48:20 PST 2000 by bwelling */
@@ -78,9 +78,6 @@ fromwire_md(dns_rdataclass_t rdclass, dns_rdatatype_t type,
REQUIRE(type == 3);
if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx))
dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL);
else
dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14);
dns_name_init(&name, NULL);
@@ -94,9 +91,6 @@ towire_md(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
REQUIRE(rdata->type == 3);
if (dns_compress_getedns(cctx) >= 1)
dns_compress_setmethods(cctx, DNS_COMPRESS_ALL);
else
dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14);
dns_name_init(&name, NULL);

8
lib/dns/rdata/generic/mf_4.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: mf_4.c,v 1.26 2000/04/28 01:24:04 gson Exp $ */
/* $Id: mf_4.c,v 1.27 2000/05/04 22:19:12 gson Exp $ */
/* reviewed: Wed Mar 15 17:47:33 PST 2000 by brister */
@@ -78,9 +78,6 @@ fromwire_mf(dns_rdataclass_t rdclass, dns_rdatatype_t type,
UNUSED(rdclass);
if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx))
dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL);
else
dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14);
dns_name_init(&name, NULL);
@@ -95,9 +92,6 @@ towire_mf(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
REQUIRE(rdata->type == 4);
if (dns_compress_getedns(cctx) >= 1)
dns_compress_setmethods(cctx, DNS_COMPRESS_ALL);
else
dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14);
dns_name_init(&name, NULL);

8
lib/dns/rdata/generic/mg_8.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: mg_8.c,v 1.24 2000/04/28 01:24:04 gson Exp $ */
/* $Id: mg_8.c,v 1.25 2000/05/04 22:19:14 gson Exp $ */
/* reviewed: Wed Mar 15 17:49:21 PST 2000 by brister */
@@ -78,9 +78,6 @@ fromwire_mg(dns_rdataclass_t rdclass, dns_rdatatype_t type,
UNUSED(rdclass);
if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx))
dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL);
else
dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14);
dns_name_init(&name, NULL);
@@ -95,9 +92,6 @@ towire_mg(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
REQUIRE(rdata->type == 8);
if (dns_compress_getedns(cctx) >= 1)
dns_compress_setmethods(cctx, DNS_COMPRESS_ALL);
else
dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14);
dns_name_init(&name, NULL);

8
lib/dns/rdata/generic/minfo_14.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: minfo_14.c,v 1.25 2000/04/28 01:24:05 gson Exp $ */
/* $Id: minfo_14.c,v 1.26 2000/05/04 22:19:15 gson Exp $ */
/* reviewed: Wed Mar 15 17:45:32 PST 2000 by brister */
@@ -94,9 +94,6 @@ fromwire_minfo(dns_rdataclass_t rdclass, dns_rdatatype_t type,
REQUIRE(type == 14);
if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx))
dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL);
else
dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14);
UNUSED(rdclass);
@@ -117,9 +114,6 @@ towire_minfo(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
REQUIRE(rdata->type == 14);
if (dns_compress_getedns(cctx) >= 1)
dns_compress_setmethods(cctx, DNS_COMPRESS_ALL);
else
dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14);
dns_name_init(&rmail, NULL);

8
lib/dns/rdata/generic/mr_9.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: mr_9.c,v 1.23 2000/04/28 01:24:05 gson Exp $ */
/* $Id: mr_9.c,v 1.24 2000/05/04 22:19:16 gson Exp $ */
/* Reviewed: Wed Mar 15 21:30:35 EST 2000 by tale */
@@ -77,9 +77,6 @@ fromwire_mr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
UNUSED(rdclass);
if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx))
dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL);
else
dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14);
dns_name_init(&name, NULL);
@@ -93,9 +90,6 @@ towire_mr(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
REQUIRE(rdata->type == 9);
if (dns_compress_getedns(cctx) >= 1)
dns_compress_setmethods(cctx, DNS_COMPRESS_ALL);
else
dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14);
dns_name_init(&name, NULL);

8
lib/dns/rdata/generic/mx_15.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: mx_15.c,v 1.30 2000/04/28 01:24:05 gson Exp $ */
/* $Id: mx_15.c,v 1.31 2000/05/04 22:19:17 gson Exp $ */
/* reviewed: Wed Mar 15 18:05:46 PST 2000 by brister */
@@ -88,9 +88,6 @@ fromwire_mx(dns_rdataclass_t rdclass, dns_rdatatype_t type,
UNUSED(rdclass);
if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx))
dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL);
else
dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14);
dns_name_init(&name, NULL);
@@ -111,9 +108,6 @@ towire_mx(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
REQUIRE(rdata->type == 15);
if (dns_compress_getedns(cctx) >= 1)
dns_compress_setmethods(cctx, DNS_COMPRESS_ALL);
else
dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14);
dns_rdata_toregion(rdata, &region);

8
lib/dns/rdata/generic/ns_2.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: ns_2.c,v 1.25 2000/04/27 00:02:33 tale Exp $ */
/* $Id: ns_2.c,v 1.26 2000/05/04 22:19:18 gson Exp $ */
/* Reviewed: Wed Mar 15 18:15:00 PST 2000 by bwelling */
@@ -78,9 +78,6 @@ fromwire_ns(dns_rdataclass_t rdclass, dns_rdatatype_t type,
REQUIRE(type == 2);
if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx))
dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL);
else
dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14);
dns_name_init(&name, NULL);
@@ -94,9 +91,6 @@ towire_ns(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
REQUIRE(rdata->type == 2);
if (dns_compress_getedns(cctx) >= 1)
dns_compress_setmethods(cctx, DNS_COMPRESS_ALL);
else
dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14);
dns_name_init(&name, NULL);

9
lib/dns/rdata/generic/nxt_30.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: nxt_30.c,v 1.30 2000/05/03 23:52:35 gson Exp $ */
/* $Id: nxt_30.c,v 1.31 2000/05/04 22:19:19 gson Exp $ */
/* reviewed: Wed Mar 15 18:21:15 PST 2000 by brister */
@@ -139,9 +139,6 @@ fromwire_nxt(dns_rdataclass_t rdclass, dns_rdatatype_t type,
UNUSED(rdclass);
if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx))
dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL);
else
dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
dns_name_init(&name, NULL);
@@ -164,11 +161,7 @@ towire_nxt(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
REQUIRE(rdata->type == 30);
if (dns_compress_getedns(cctx) >= 1)
dns_compress_setmethods(cctx, DNS_COMPRESS_ALL);
else
dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
dns_name_init(&name, NULL);
dns_rdata_toregion(rdata, &sr);
dns_name_fromregion(&name, &sr);

8
lib/dns/rdata/generic/proforma.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: proforma.c,v 1.21 2000/04/07 03:54:29 explorer Exp $ */
/* $Id: proforma.c,v 1.22 2000/05/04 22:19:20 gson Exp $ */
#ifndef RDATA_GENERIC_#_#_C
#define RDATA_GENERIC_#_#_C
@@ -55,9 +55,6 @@ fromwire_#(dns_rdataclass_t rdclass, dns_rdatatype_t type,
REQUIRE(type == #);
REQUIRE(rdclass == #);
if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx))
dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL);
else
/* NONE or GLOBAL14 */
dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
@@ -70,9 +67,6 @@ towire_#(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
REQUIRE(rdata->type == #);
REQUIRE(rdata->rdclass == #);
if (dns_compress_getedns(cctx) >= 1)
dns_compress_setmethods(cctx, DNS_COMPRESS_ALL):
else
/* NONE or GLOBAL14 */
dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);

8
lib/dns/rdata/generic/ptr_12.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: ptr_12.c,v 1.24 2000/04/28 01:24:07 gson Exp $ */
/* $Id: ptr_12.c,v 1.25 2000/05/04 22:19:21 gson Exp $ */
/* Reviewed: Thu Mar 16 14:05:12 PST 2000 by explorer */
@@ -78,9 +78,6 @@ fromwire_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
REQUIRE(type == 12);
if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx))
dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL);
else
dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14);
dns_name_init(&name, NULL);
@@ -95,9 +92,6 @@ towire_ptr(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
REQUIRE(rdata->type == 12);
if (dns_compress_getedns(cctx) >= 1)
dns_compress_setmethods(cctx, DNS_COMPRESS_ALL);
else
dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14);
dns_name_init(&name, NULL);

9
lib/dns/rdata/generic/rp_17.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: rp_17.c,v 1.21 2000/04/28 01:24:08 gson Exp $ */
/* $Id: rp_17.c,v 1.22 2000/05/04 22:19:23 gson Exp $ */
/* RFC 1183 */
@@ -96,9 +96,6 @@ fromwire_rp(dns_rdataclass_t rdclass, dns_rdatatype_t type,
REQUIRE(type == 17);
if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx))
dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL);
else
dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
dns_name_init(&rmail, NULL);
@@ -117,11 +114,7 @@ towire_rp(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
REQUIRE(rdata->type == 17);
if (dns_compress_getedns(cctx) >= 1)
dns_compress_setmethods(cctx, DNS_COMPRESS_ALL);
else
dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
dns_name_init(&rmail, NULL);
dns_name_init(&email, NULL);

9
lib/dns/rdata/generic/rt_21.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: rt_21.c,v 1.21 2000/04/28 01:24:08 gson Exp $ */
/* $Id: rt_21.c,v 1.22 2000/05/04 22:19:24 gson Exp $ */
/* reviewed: Thu Mar 16 15:02:31 PST 2000 by brister */
@@ -90,9 +90,6 @@ fromwire_rt(dns_rdataclass_t rdclass, dns_rdatatype_t type,
REQUIRE(type == 21);
UNUSED(rdclass);
if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx))
dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL);
else
dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
dns_name_init(&name, NULL);
@@ -118,11 +115,7 @@ towire_rt(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
REQUIRE(rdata->type == 21);
if (dns_compress_getedns(cctx) >= 1)
dns_compress_setmethods(cctx, DNS_COMPRESS_ALL);
else
dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
isc_buffer_availableregion(target, &tr);
dns_rdata_toregion(rdata, &region);
if (tr.length < 2)

9
lib/dns/rdata/generic/sig_24.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: sig_24.c,v 1.35 2000/04/28 02:08:32 marka Exp $ */
/* $Id: sig_24.c,v 1.36 2000/05/04 22:19:25 gson Exp $ */
/* Reviewed: Fri Mar 17 09:05:02 PST 2000 by gson */
@@ -193,9 +193,6 @@ fromwire_sig(dns_rdataclass_t rdclass, dns_rdatatype_t type,
REQUIRE(type == 24);
if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx))
dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL);
else
dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
UNUSED(rdclass);
@@ -233,11 +230,7 @@ towire_sig(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
REQUIRE(rdata->type == 24);
if (dns_compress_getedns(cctx) >= 1)
dns_compress_setmethods(cctx, DNS_COMPRESS_ALL);
else
dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
dns_rdata_toregion(rdata, &sr);
/*
* type covered: 2

8
lib/dns/rdata/generic/soa_6.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: soa_6.c,v 1.34 2000/04/27 23:57:56 gson Exp $ */
/* $Id: soa_6.c,v 1.35 2000/05/04 22:19:26 gson Exp $ */
/* Reviewed: Thu Mar 16 15:18:32 PST 2000 by explorer */
@@ -150,9 +150,6 @@ fromwire_soa(dns_rdataclass_t rdclass, dns_rdatatype_t type,
REQUIRE(type == 6);
if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx))
dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL);
else
dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14);
dns_name_init(&mname, NULL);
@@ -186,9 +183,6 @@ towire_soa(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
REQUIRE(rdata->type == 6);
if (dns_compress_getedns(cctx) >= 1)
dns_compress_setmethods(cctx, DNS_COMPRESS_ALL);
else
dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14);
dns_name_init(&mname, NULL);

9
lib/dns/rdata/generic/tkey_249.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: tkey_249.c,v 1.28 2000/04/28 02:08:34 marka Exp $ */
/* $Id: tkey_249.c,v 1.29 2000/05/04 22:19:27 gson Exp $ */
/*
* Reviewed: Thu Mar 16 17:35:30 PST 2000 by halley.
@@ -206,9 +206,6 @@ fromwire_tkey(dns_rdataclass_t rdclass, dns_rdatatype_t type,
REQUIRE(type == 249);
if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx))
dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL);
else
dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
/* Algorithm */
@@ -255,11 +252,7 @@ towire_tkey(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
REQUIRE(rdata->type == 249);
if (dns_compress_getedns(cctx) >= 1)
dns_compress_setmethods(cctx, DNS_COMPRESS_ALL);
else
dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
/* Algorithm */
dns_rdata_toregion(rdata, &sr);
dns_name_init(&name, NULL);

9
lib/dns/rdata/in_1/a6_38.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: a6_38.c,v 1.26 2000/04/28 01:24:13 gson Exp $ */
/* $Id: a6_38.c,v 1.27 2000/05/04 22:19:29 gson Exp $ */
/* draft-ietf-ipngwg-dns-lookups-03.txt */
@@ -142,9 +142,6 @@ fromwire_in_a6(dns_rdataclass_t rdclass, dns_rdatatype_t type,
REQUIRE(type == 38);
REQUIRE(rdclass == 1);
if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx))
dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL);
else
dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
isc_buffer_activeregion(source, &sr);
@@ -186,11 +183,7 @@ towire_in_a6(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
REQUIRE(rdata->type == 38);
REQUIRE(rdata->rdclass == 1);
if (dns_compress_getedns(cctx) >= 1)
dns_compress_setmethods(cctx, DNS_COMPRESS_ALL);
else
dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
dns_rdata_toregion(rdata, &sr);
prefixlen = sr.base[0];
INSIST(prefixlen <= 128);

9
lib/dns/rdata/in_1/kx_36.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: kx_36.c,v 1.22 2000/04/27 00:02:48 tale Exp $ */
/* $Id: kx_36.c,v 1.23 2000/05/04 22:19:30 gson Exp $ */
/* Reviewed: Thu Mar 16 17:24:54 PST 2000 by explorer */
@@ -89,9 +89,6 @@ fromwire_in_kx(dns_rdataclass_t rdclass, dns_rdatatype_t type,
REQUIRE(type == 36);
REQUIRE(rdclass == 1);
if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx))
dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL);
else
dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
dns_name_init(&name, NULL);
@@ -113,11 +110,7 @@ towire_in_kx(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
REQUIRE(rdata->type == 36);
REQUIRE(rdata->rdclass == 1);
if (dns_compress_getedns(cctx) >= 1)
dns_compress_setmethods(cctx, DNS_COMPRESS_ALL);
else
dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
dns_rdata_toregion(rdata, &region);
RETERR(mem_tobuffer(target, region.base, 2));
isc_region_consume(&region, 2);

9
lib/dns/rdata/in_1/naptr_35.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: naptr_35.c,v 1.22 2000/04/28 01:24:14 gson Exp $ */
/* $Id: naptr_35.c,v 1.23 2000/05/04 22:19:31 gson Exp $ */
/* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
@@ -128,9 +128,6 @@ fromwire_in_naptr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
REQUIRE(type == 35);
REQUIRE(rdclass == 1);
if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx))
dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL);
else
dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
dns_name_init(&name, NULL);
@@ -163,11 +160,7 @@ towire_in_naptr(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target)
REQUIRE(rdata->type == 35);
REQUIRE(rdata->rdclass == 1);
if (dns_compress_getedns(cctx) >= 1)
dns_compress_setmethods(cctx, DNS_COMPRESS_ALL);
else
dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
/* order, preference */
dns_rdata_toregion(rdata, &sr);
RETERR(mem_tobuffer(target, sr.base, 4));

9
lib/dns/rdata/in_1/nsap-ptr_23.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: nsap-ptr_23.c,v 1.18 2000/04/28 01:24:15 gson Exp $ */
/* $Id: nsap-ptr_23.c,v 1.19 2000/05/04 22:19:32 gson Exp $ */
/* Reviewed: Fri Mar 17 10:16:02 PST 2000 by gson */
@@ -79,9 +79,6 @@ fromwire_in_nsap_ptr(dns_rdataclass_t rdclass, dns_rdatatype_t type,
REQUIRE(type == 23);
REQUIRE(rdclass == 1);
if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx))
dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL);
else
dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
dns_name_init(&name, NULL);
@@ -98,11 +95,7 @@ towire_in_nsap_ptr(dns_rdata_t *rdata, dns_compress_t *cctx,
REQUIRE(rdata->type == 23);
REQUIRE(rdata->rdclass == 1);
if (dns_compress_getedns(cctx) >= 1)
dns_compress_setmethods(cctx, DNS_COMPRESS_ALL);
else
dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
dns_name_init(&name, NULL);
dns_rdata_toregion(rdata, &region);
dns_name_fromregion(&name, &region);

9
lib/dns/rdata/in_1/px_26.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: px_26.c,v 1.19 2000/04/28 01:24:16 gson Exp $ */
/* $Id: px_26.c,v 1.20 2000/05/04 22:19:33 gson Exp $ */
/* Reviewed: Mon Mar 20 10:44:27 PST 2000 */
@@ -106,9 +106,6 @@ fromwire_in_px(dns_rdataclass_t rdclass, dns_rdatatype_t type,
REQUIRE(type == 26);
REQUIRE(rdclass == 1);
if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx))
dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL);
else
dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
dns_name_init(&name, NULL);
@@ -135,11 +132,7 @@ towire_in_px(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
REQUIRE(rdata->type == 26);
REQUIRE(rdata->rdclass == 1);
if (dns_compress_getedns(cctx) >= 1)
dns_compress_setmethods(cctx, DNS_COMPRESS_ALL);
else
dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
/* preference */
dns_rdata_toregion(rdata, &region);
RETERR(mem_tobuffer(target, region.base, 2));

9
lib/dns/rdata/in_1/srv_33.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE.
*/
/* $Id: srv_33.c,v 1.20 2000/04/28 01:24:16 gson Exp $ */
/* $Id: srv_33.c,v 1.21 2000/05/04 22:19:34 gson Exp $ */
/* Reviewed: Fri Mar 17 13:01:00 PST 2000 by bwelling */
@@ -114,9 +114,6 @@ fromwire_in_srv(dns_rdataclass_t rdclass, dns_rdatatype_t type,
REQUIRE(type == 33);
REQUIRE(rdclass == 1);
if (dns_decompress_edns(dctx) >= 1 || !dns_decompress_strict(dctx))
dns_decompress_setmethods(dctx, DNS_COMPRESS_ALL);
else
dns_decompress_setmethods(dctx, DNS_COMPRESS_NONE);
dns_name_init(&name, NULL);
@@ -139,11 +136,7 @@ towire_in_srv(dns_rdata_t *rdata, dns_compress_t *cctx, isc_buffer_t *target) {
REQUIRE(rdata->type == 33);
if (dns_compress_getedns(cctx) >= 1)
dns_compress_setmethods(cctx, DNS_COMPRESS_ALL);
else
dns_compress_setmethods(cctx, DNS_COMPRESS_NONE);
/* priority, weight, port */
dns_rdata_toregion(rdata, &sr);
RETERR(mem_tobuffer(target, sr.base, 6));

3
lib/dns/rdataset.c
View File

@@ -361,9 +361,6 @@ dns_rdataset_towire(dns_rdataset_t *rdataset,
/*
* copy out the name, type, class, ttl.
*/
if (dns_compress_getedns(cctx) >= 1)
dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL);
else
dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14);
result = dns_name_towire(owner_name, cctx, target);
if (result != ISC_R_SUCCESS)