Last lot of DNS_NAME_INIT*() macro calls --- lib/dns/master.c | 27 ++----------- lib/dns/rdata.c | 11 +----- lib/dns/rdata/generic/ptr_12.c | 27 ++----------- lib/dns/tsig.c | 88 +++++++++--------------------------------- 4 files changed, 26 insertions(+), 127 deletions(-) diff --git a/lib/dns/master.c b/lib/dns/master.c index 6e983c6..4075bc5 100644 --- a/lib/dns/master.c +++ b/lib/dns/master.c @@ -323,38 +323,17 @@ loadctx_destroy(dns_loadctx_t *lctx); static unsigned char in_addr_arpa_data[] = "\007IN-ADDR\004ARPA"; static unsigned char in_addr_arpa_offsets[] = { 0, 8, 13 }; static const dns_name_t in_addr_arpa = -{ - DNS_NAME_MAGIC, - in_addr_arpa_data, 14, 3, - DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE, - in_addr_arpa_offsets, NULL, - {(void *)-1, (void *)-1}, - {NULL, NULL} -}; + DNS_NAME_INITABSOLUTE(in_addr_arpa_data, in_addr_arpa_offsets); static unsigned char ip6_int_data[] = "\003IP6\003INT"; static unsigned char ip6_int_offsets[] = { 0, 4, 8 }; static const dns_name_t ip6_int = -{ - DNS_NAME_MAGIC, - ip6_int_data, 9, 3, - DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE, - ip6_int_offsets, NULL, - {(void *)-1, (void *)-1}, - {NULL, NULL} -}; + DNS_NAME_INITABSOLUTE(ip6_int_data, ip6_int_offsets); static unsigned char ip6_arpa_data[] = "\003IP6\004ARPA"; static unsigned char ip6_arpa_offsets[] = { 0, 4, 9 }; static const dns_name_t ip6_arpa = -{ - DNS_NAME_MAGIC, - ip6_arpa_data, 10, 3, - DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE, - ip6_arpa_offsets, NULL, - {(void *)-1, (void *)-1}, - {NULL, NULL} -}; + DNS_NAME_INITABSOLUTE(ip6_arpa_data, ip6_arpa_offsets); static inline isc_result_t gettoken(isc_lex_t *lex, unsigned int options, isc_token_t *token, diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c index 5cc4b58..37519d2 100644 --- a/lib/dns/rdata.c +++ b/lib/dns/rdata.c @@ -312,15 +312,8 @@ generic_freestruct_tlsa(ARGS_FREESTRUCT); */ static unsigned char gc_msdcs_data[] = "\002gc\006_msdcs"; static unsigned char gc_msdcs_offset [] = { 0, 3 }; - -static const dns_name_t gc_msdcs = { - DNS_NAME_MAGIC, - gc_msdcs_data, 10, 2, - DNS_NAMEATTR_READONLY, - gc_msdcs_offset, NULL, - {(void *)-1, (void *)-1}, - {NULL, NULL} -}; +static const dns_name_t gc_msdcs = + DNS_NAME_INITNONABSOLUTE(gc_msdcs_data, gc_msdcs_offset); /*% * convert presentation level address to network order binary form. diff --git a/lib/dns/rdata/generic/ptr_12.c b/lib/dns/rdata/generic/ptr_12.c index 652e3df..7e56f29 100644 --- a/lib/dns/rdata/generic/ptr_12.c +++ b/lib/dns/rdata/generic/ptr_12.c @@ -222,38 +222,17 @@ checkowner_ptr(ARGS_CHECKOWNER) { static unsigned char ip6_arpa_data[] = "\003IP6\004ARPA"; static unsigned char ip6_arpa_offsets[] = { 0, 4, 9 }; static const dns_name_t ip6_arpa = -{ - DNS_NAME_MAGIC, - ip6_arpa_data, 10, 3, - DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE, - ip6_arpa_offsets, NULL, - {(void *)-1, (void *)-1}, - {NULL, NULL} -}; + DNS_NAME_INITABSOLUTE(ip6_arpa_data, ip6_arpa_offsets); static unsigned char ip6_int_data[] = "\003IP6\003INT"; static unsigned char ip6_int_offsets[] = { 0, 4, 8 }; static const dns_name_t ip6_int = -{ - DNS_NAME_MAGIC, - ip6_int_data, 9, 3, - DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE, - ip6_int_offsets, NULL, - {(void *)-1, (void *)-1}, - {NULL, NULL} -}; + DNS_NAME_INITABSOLUTE(ip6_int_data, ip6_int_offsets); static unsigned char in_addr_arpa_data[] = "\007IN-ADDR\004ARPA"; static unsigned char in_addr_arpa_offsets[] = { 0, 8, 13 }; static const dns_name_t in_addr_arpa = -{ - DNS_NAME_MAGIC, - in_addr_arpa_data, 14, 3, - DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE, - in_addr_arpa_offsets, NULL, - {(void *)-1, (void *)-1}, - {NULL, NULL} -}; + DNS_NAME_INITABSOLUTE(in_addr_arpa_data, in_addr_arpa_offsets); static inline isc_boolean_t checknames_ptr(ARGS_CHECKNAMES) { diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c index 400efe9..222c6ab 100644 --- a/lib/dns/tsig.c +++ b/lib/dns/tsig.c @@ -72,29 +72,17 @@ #ifndef PK11_MD5_DISABLE static unsigned char hmacmd5_ndata[] = "\010hmac-md5\007sig-alg\003reg\003int"; static unsigned char hmacmd5_offsets[] = { 0, 9, 17, 21, 25 }; - -static dns_name_t hmacmd5 = { - DNS_NAME_MAGIC, - hmacmd5_ndata, 26, 5, - DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE, - hmacmd5_offsets, NULL, - {(void *)-1, (void *)-1}, - {NULL, NULL} -}; +static dns_name_t hmacmd5 = + DNS_NAME_INITABSOLUTE(hmacmd5_ndata, hmacmd5_offsets); LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_hmacmd5_name = &hmacmd5; #endif static unsigned char gsstsig_ndata[] = "\010gss-tsig"; static unsigned char gsstsig_offsets[] = { 0, 9 }; -static dns_name_t gsstsig = { - DNS_NAME_MAGIC, - gsstsig_ndata, 10, 2, - DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE, - gsstsig_offsets, NULL, - {(void *)-1, (void *)-1}, - {NULL, NULL} -}; +static dns_name_t gsstsig = + DNS_NAME_INITABSOLUTE(gsstsig_ndata, gsstsig_offsets); + LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_gssapi_name = &gsstsig; /* @@ -103,83 +91,43 @@ LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_gssapi_name = &gsstsig; */ static unsigned char gsstsigms_ndata[] = "\003gss\011microsoft\003com"; static unsigned char gsstsigms_offsets[] = { 0, 4, 14, 18 }; -static dns_name_t gsstsigms = { - DNS_NAME_MAGIC, - gsstsigms_ndata, 19, 4, - DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE, - gsstsigms_offsets, NULL, - {(void *)-1, (void *)-1}, - {NULL, NULL} -}; +static dns_name_t gsstsigms = + DNS_NAME_INITABSOLUTE(gsstsigms_ndata, gsstsigms_offsets); + LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_gssapims_name = &gsstsigms; static unsigned char hmacsha1_ndata[] = "\011hmac-sha1"; static unsigned char hmacsha1_offsets[] = { 0, 10 }; - -static dns_name_t hmacsha1 = { - DNS_NAME_MAGIC, - hmacsha1_ndata, 11, 2, - DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE, - hmacsha1_offsets, NULL, - {(void *)-1, (void *)-1}, - {NULL, NULL} -}; +static dns_name_t hmacsha1 = + DNS_NAME_INITABSOLUTE(hmacsha1_ndata, hmacsha1_offsets); LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_hmacsha1_name = &hmacsha1; static unsigned char hmacsha224_ndata[] = "\013hmac-sha224"; static unsigned char hmacsha224_offsets[] = { 0, 12 }; - -static dns_name_t hmacsha224 = { - DNS_NAME_MAGIC, - hmacsha224_ndata, 13, 2, - DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE, - hmacsha224_offsets, NULL, - {(void *)-1, (void *)-1}, - {NULL, NULL} -}; +static dns_name_t hmacsha224 = + DNS_NAME_INITABSOLUTE(hmacsha224_ndata, hmacsha224_offsets); LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_hmacsha224_name = &hmacsha224; static unsigned char hmacsha256_ndata[] = "\013hmac-sha256"; static unsigned char hmacsha256_offsets[] = { 0, 12 }; - -static dns_name_t hmacsha256 = { - DNS_NAME_MAGIC, - hmacsha256_ndata, 13, 2, - DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE, - hmacsha256_offsets, NULL, - {(void *)-1, (void *)-1}, - {NULL, NULL} -}; +static dns_name_t hmacsha256 = + DNS_NAME_INITABSOLUTE(hmacsha256_ndata, hmacsha256_offsets); LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_hmacsha256_name = &hmacsha256; static unsigned char hmacsha384_ndata[] = "\013hmac-sha384"; static unsigned char hmacsha384_offsets[] = { 0, 12 }; - -static dns_name_t hmacsha384 = { - DNS_NAME_MAGIC, - hmacsha384_ndata, 13, 2, - DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE, - hmacsha384_offsets, NULL, - {(void *)-1, (void *)-1}, - {NULL, NULL} -}; +static dns_name_t hmacsha384 = + DNS_NAME_INITABSOLUTE(hmacsha384_ndata, hmacsha384_offsets); LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_hmacsha384_name = &hmacsha384; static unsigned char hmacsha512_ndata[] = "\013hmac-sha512"; static unsigned char hmacsha512_offsets[] = { 0, 12 }; - -static dns_name_t hmacsha512 = { - DNS_NAME_MAGIC, - hmacsha512_ndata, 13, 2, - DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE, - hmacsha512_offsets, NULL, - {(void *)-1, (void *)-1}, - {NULL, NULL} -}; +static dns_name_t hmacsha512 = + DNS_NAME_INITABSOLUTE(hmacsha512_ndata, hmacsha512_offsets); LIBDNS_EXTERNAL_DATA const dns_name_t *dns_tsig_hmacsha512_name = &hmacsha512; -- 2.10.1.445.g3cdd5d1