From: Evan Hunt Date: Sun, 18 Mar 2018 11:40:51 +0000 (+0000) Subject: initial implementation of ANAME rrtype, using type code point 65532 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c0f8a7c0c86ca04d04eb060ca82e28cedb2114b;p=thirdparty%2Fbind9.git initial implementation of ANAME rrtype, using type code point 65532 - this is only the bare type represetation, with no special processing --- diff --git a/bin/tests/system/genzone.sh b/bin/tests/system/genzone.sh index 264d4ae674f..e0850b6c3ac 100644 --- a/bin/tests/system/genzone.sh +++ b/bin/tests/system/genzone.sh @@ -457,6 +457,10 @@ dlv DLV 30795 1 1 ( ; type 32770 -- 65279 (unassigned) ; type 65280-65534 (private use) +aname01 ANAME aname-target. +aname02 ANAME aname-target +aname03 ANAME aname.example. +aname04 ANAME . ; keydata (internal type used for managed-keys) keydata TYPE65533 \# 0 diff --git a/bin/tests/system/rrchecker/privatelist.good b/bin/tests/system/rrchecker/privatelist.good index e69de29bb2d..6f67f430182 100644 --- a/bin/tests/system/rrchecker/privatelist.good +++ b/bin/tests/system/rrchecker/privatelist.good @@ -0,0 +1 @@ +ANAME diff --git a/bin/tests/system/xfer/dig1.good b/bin/tests/system/xfer/dig1.good index 5af1e5928a6..b6eee44ff75 100644 --- a/bin/tests/system/xfer/dig1.good +++ b/bin/tests/system/xfer/dig1.good @@ -9,6 +9,10 @@ a601.example. 3600 IN A6 127 ::1 foo. a601.example. 3600 IN A6 128 . aaaa01.example. 3600 IN AAAA ::1 aaaa02.example. 3600 IN AAAA fd92:7065:b8e:ffff::5 +aname01.example. 3600 IN ANAME aname-target. +aname02.example. 3600 IN ANAME aname-target.example. +aname03.example. 3600 IN ANAME aname.example. +aname04.example. 3600 IN ANAME . afsdb01.example. 3600 IN AFSDB 0 hostname.example. afsdb02.example. 3600 IN AFSDB 65535 . apl01.example. 3600 IN APL !1:10.0.0.1/32 1:10.0.0.0/24 diff --git a/bin/tests/system/xfer/dig2.good b/bin/tests/system/xfer/dig2.good index e12ec118c5d..fbd512e3709 100644 --- a/bin/tests/system/xfer/dig2.good +++ b/bin/tests/system/xfer/dig2.good @@ -9,6 +9,10 @@ a601.example. 3600 IN A6 127 ::1 foo. a601.example. 3600 IN A6 128 . aaaa01.example. 3600 IN AAAA ::1 aaaa02.example. 3600 IN AAAA fd92:7065:b8e:ffff::5 +aname01.example. 3600 IN ANAME aname-target. +aname02.example. 3600 IN ANAME aname-target.example. +aname03.example. 3600 IN ANAME aname.example. +aname04.example. 3600 IN ANAME . afsdb01.example. 3600 IN AFSDB 0 hostname.example. afsdb02.example. 3600 IN AFSDB 65535 . apl01.example. 3600 IN APL !1:10.0.0.1/32 1:10.0.0.1/24 diff --git a/lib/dns/rdata/generic/aname_65532.c b/lib/dns/rdata/generic/aname_65532.c new file mode 100644 index 00000000000..a7c2c1c62a0 --- /dev/null +++ b/lib/dns/rdata/generic/aname_65532.c @@ -0,0 +1,228 @@ +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * See the COPYRIGHT file distributed with this work for additional + * information regarding copyright ownership. + */ + +#ifndef RDATA_GENERIC_ANAME_65532_C +#define RDATA_GENERIC_ANAME_65532_C + +#define RRTYPE_ANAME_ATTRIBUTES \ + (DNS_RDATATYPEATTR_EXCLUSIVE | DNS_RDATATYPEATTR_SINGLETON) + +static inline isc_result_t +fromtext_aname(ARGS_FROMTEXT) { + isc_token_t token; + dns_name_t name; + isc_buffer_t buffer; + + REQUIRE(type == dns_rdatatype_aname); + + UNUSED(type); + UNUSED(rdclass); + UNUSED(callbacks); + + RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string, + ISC_FALSE)); + + dns_name_init(&name, NULL); + buffer_fromregion(&buffer, &token.value.as_region); + if (origin == NULL) + origin = dns_rootname; + RETTOK(dns_name_fromtext(&name, &buffer, origin, options, target)); + return (ISC_R_SUCCESS); +} + +static inline isc_result_t +totext_aname(ARGS_TOTEXT) { + isc_region_t region; + dns_name_t name; + dns_name_t prefix; + isc_boolean_t sub; + + REQUIRE(rdata->type == dns_rdatatype_aname); + REQUIRE(rdata->length != 0); + + dns_name_init(&name, NULL); + dns_name_init(&prefix, NULL); + + dns_rdata_toregion(rdata, ®ion); + dns_name_fromregion(&name, ®ion); + + sub = name_prefix(&name, tctx->origin, &prefix); + + return (dns_name_totext(&prefix, sub, target)); +} + +static inline isc_result_t +fromwire_aname(ARGS_FROMWIRE) { + dns_name_t name; + + REQUIRE(type == dns_rdatatype_aname); + + UNUSED(type); + UNUSED(rdclass); + + dns_decompress_setmethods(dctx, DNS_COMPRESS_GLOBAL14); + + dns_name_init(&name, NULL); + return (dns_name_fromwire(&name, source, dctx, options, target)); +} + +static inline isc_result_t +towire_aname(ARGS_TOWIRE) { + dns_name_t name; + dns_offsets_t offsets; + isc_region_t region; + + REQUIRE(rdata->type == dns_rdatatype_aname); + REQUIRE(rdata->length != 0); + + dns_compress_setmethods(cctx, DNS_COMPRESS_GLOBAL14); + + dns_name_init(&name, offsets); + dns_rdata_toregion(rdata, ®ion); + dns_name_fromregion(&name, ®ion); + + return (dns_name_towire(&name, cctx, target)); +} + +static inline int +compare_aname(ARGS_COMPARE) { + dns_name_t name1; + dns_name_t name2; + isc_region_t region1; + isc_region_t region2; + + REQUIRE(rdata1->type == rdata2->type); + REQUIRE(rdata1->rdclass == rdata2->rdclass); + REQUIRE(rdata1->type == dns_rdatatype_aname); + REQUIRE(rdata1->length != 0); + REQUIRE(rdata2->length != 0); + + dns_name_init(&name1, NULL); + dns_name_init(&name2, NULL); + + dns_rdata_toregion(rdata1, ®ion1); + dns_rdata_toregion(rdata2, ®ion2); + + dns_name_fromregion(&name1, ®ion1); + dns_name_fromregion(&name2, ®ion2); + + return (dns_name_rdatacompare(&name1, &name2)); +} + +static inline isc_result_t +fromstruct_aname(ARGS_FROMSTRUCT) { + dns_rdata_aname_t *aname = source; + isc_region_t region; + + REQUIRE(type == dns_rdatatype_aname); + REQUIRE(source != NULL); + REQUIRE(aname->common.rdtype == type); + REQUIRE(aname->common.rdclass == rdclass); + + UNUSED(type); + UNUSED(rdclass); + + dns_name_toregion(&aname->target, ®ion); + return (isc_buffer_copyregion(target, ®ion)); +} + +static inline isc_result_t +tostruct_aname(ARGS_TOSTRUCT) { + isc_region_t region; + dns_rdata_aname_t *aname = target; + dns_name_t name; + + REQUIRE(rdata->type == dns_rdatatype_aname); + REQUIRE(target != NULL); + REQUIRE(rdata->length != 0); + + aname->common.rdclass = rdata->rdclass; + aname->common.rdtype = rdata->type; + ISC_LINK_INIT(&aname->common, link); + + dns_name_init(&name, NULL); + dns_rdata_toregion(rdata, ®ion); + dns_name_fromregion(&name, ®ion); + dns_name_init(&aname->target, NULL); + RETERR(name_duporclone(&name, mctx, &aname->target)); + aname->mctx = mctx; + return (ISC_R_SUCCESS); +} + +static inline void +freestruct_aname(ARGS_FREESTRUCT) { + dns_rdata_aname_t *aname = source; + + REQUIRE(source != NULL); + + if (aname->mctx == NULL) + return; + + dns_name_free(&aname->target, aname->mctx); + aname->mctx = NULL; +} + +static inline isc_result_t +additionaldata_aname(ARGS_ADDLDATA) { + UNUSED(rdata); + UNUSED(add); + UNUSED(arg); + + REQUIRE(rdata->type == dns_rdatatype_aname); + + return (ISC_R_SUCCESS); +} + +static inline isc_result_t +digest_aname(ARGS_DIGEST) { + isc_region_t r; + dns_name_t name; + + REQUIRE(rdata->type == dns_rdatatype_aname); + + dns_rdata_toregion(rdata, &r); + dns_name_init(&name, NULL); + dns_name_fromregion(&name, &r); + + return (dns_name_digest(&name, digest, arg)); +} + +static inline isc_boolean_t +checkowner_aname(ARGS_CHECKOWNER) { + + REQUIRE(type == dns_rdatatype_aname); + + UNUSED(name); + UNUSED(type); + UNUSED(rdclass); + UNUSED(wildcard); + + return (ISC_TRUE); +} + +static inline isc_boolean_t +checknames_aname(ARGS_CHECKNAMES) { + + REQUIRE(rdata->type == dns_rdatatype_aname); + + UNUSED(rdata); + UNUSED(owner); + UNUSED(bad); + + return (ISC_TRUE); +} + +static inline int +casecompare_aname(ARGS_COMPARE) { + return (compare_aname(rdata1, rdata2)); +} + +#endif /* RDATA_GENERIC_ANAME_65532_C */ diff --git a/lib/dns/rdata/generic/aname_65532.h b/lib/dns/rdata/generic/aname_65532.h new file mode 100644 index 00000000000..8699a4bf043 --- /dev/null +++ b/lib/dns/rdata/generic/aname_65532.h @@ -0,0 +1,21 @@ +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * See the COPYRIGHT file distributed with this work for additional + * information regarding copyright ownership. + */ + +#ifndef GENERIC_ANAME_65532_H +#define GENERIC_ANAME_65532_H 1 + +typedef struct dns_rdata_aname { + dns_rdatacommon_t common; + isc_mem_t *mctx; + dns_name_t target; +} dns_rdata_aname_t; + +#endif /* GENERIC_ANAME_65532_H */