Date: Wed, 21 Jun 2017 19:05:00 +0100 Return-Path: X-Cam-Scannerinfo: http://help.uis.cam.ac.uk/email-scanner-virus Delivered-To: bind9-confidential@bugs.isc.org Received: from mx.pao1.isc.org (mx.pao1.isc.org [149.20.64.53]) by bugs.isc.org (Postfix) with ESMTP id 3A790D78A7C for ; Wed, 21 Jun 2017 18:05:05 +0000 (UTC) Received: from ppsw-30.csi.cam.ac.uk (ppsw-30.csi.cam.ac.uk [131.111.8.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx.pao1.isc.org (Postfix) with ESMTPS id 39B0F3495AD for ; Wed, 21 Jun 2017 18:05:02 +0000 (UTC) Received: from grey.csi.cam.ac.uk ([131.111.57.57]:54906) by ppsw-30.csi.cam.ac.uk (ppsw.cam.ac.uk [131.111.8.136]:25) with esmtps (TLSv1:ECDHE-RSA-AES256-SHA:256) id 1dNjzw-0008GH-eJ (Exim 4.89) for bind9-confidential@isc.org (return-path ); Wed, 21 Jun 2017 19:05:00 +0100 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL autolearn=ham autolearn_force=no version=3.4.0 References: To: "Tony Finch via RT" Message-ID: MIME-Version: 1.0 X-RT-Interface: Email In-Reply-To: X-RT-Original-Encoding: utf-8 User-Agent: Alpine 2.11 (DEB 23 2013-08-11) X-Original-To: bind9-confidential@bugs.isc.org From: "Tony Finch" content-type: TEXT/PLAIN; charset="utf-8" X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mx.pao1.isc.org X-RT-Incoming-Encryption: Not encrypted Subject: Re: [ISC-Bugs #45433] AutoReply: [PATCH] Use DNS_NAME_INITABSOLUTE() in query.c From dot@dotat.at Wed Jun 21 18:05:05 2017 X-Cam-Antivirus: no malware found RT-Message-ID: Content-Length: 4654 More DNS_NAME_INIT*() macro calls --- lib/dns/name.c | 94 ++++++++++++++++------------------------------------------ 1 file changed, 25 insertions(+), 69 deletions(-) diff --git a/lib/dns/name.c b/lib/dns/name.c index 50b47b0..ed00353 100644 --- a/lib/dns/name.c +++ b/lib/dns/name.c @@ -2546,46 +2546,11 @@ static unsigned char lb_dns_sd_udp_data[] = "\002lb\007_dns-sd\004_udp"; static unsigned char lb_dns_sd_udp_offsets[] = { 0, 3, 11 }; static const dns_name_t dns_sd[] = { - { - DNS_NAME_MAGIC, - b_dns_sd_udp_data, 15, 3, - DNS_NAMEATTR_READONLY, - b_dns_sd_udp_offsets, NULL, - {(void *)-1, (void *)-1}, - {NULL, NULL} - }, - { - DNS_NAME_MAGIC, - db_dns_sd_udp_data, 16, 3, - DNS_NAMEATTR_READONLY, - db_dns_sd_udp_offsets, NULL, - {(void *)-1, (void *)-1}, - {NULL, NULL} - }, - { - DNS_NAME_MAGIC, - r_dns_sd_udp_data, 15, 3, - DNS_NAMEATTR_READONLY, - r_dns_sd_udp_offsets, NULL, - {(void *)-1, (void *)-1}, - {NULL, NULL} - }, - { - DNS_NAME_MAGIC, - dr_dns_sd_udp_data, 16, 3, - DNS_NAMEATTR_READONLY, - dr_dns_sd_udp_offsets, NULL, - {(void *)-1, (void *)-1}, - {NULL, NULL} - }, - { - DNS_NAME_MAGIC, - lb_dns_sd_udp_data, 16, 3, - DNS_NAMEATTR_READONLY, - lb_dns_sd_udp_offsets, NULL, - {(void *)-1, (void *)-1}, - {NULL, NULL} - } + DNS_NAME_INITNONABSOLUTE(b_dns_sd_udp_data, b_dns_sd_udp_offsets), + DNS_NAME_INITNONABSOLUTE(db_dns_sd_udp_data, db_dns_sd_udp_offsets), + DNS_NAME_INITNONABSOLUTE(r_dns_sd_udp_data, r_dns_sd_udp_offsets), + DNS_NAME_INITNONABSOLUTE(dr_dns_sd_udp_data, dr_dns_sd_udp_offsets), + DNS_NAME_INITNONABSOLUTE(lb_dns_sd_udp_data, lb_dns_sd_udp_offsets), }; isc_boolean_t @@ -2604,15 +2569,6 @@ dns_name_isdnssd(const dns_name_t *name) { return (ISC_FALSE); } -#define NS_NAME_INIT(A,B) \ - { \ - DNS_NAME_MAGIC, \ - A, sizeof(A), sizeof(B), \ - DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE, \ - B, NULL, { (void *)-1, (void *)-1}, \ - {NULL, NULL} \ - } - static unsigned char inaddr10_offsets[] = { 0, 3, 11, 16 }; static unsigned char inaddr172_offsets[] = { 0, 3, 7, 15, 20 }; static unsigned char inaddr192_offsets[] = { 0, 4, 8, 16, 21 }; @@ -2639,24 +2595,24 @@ static unsigned char inaddr31172[] = "\00231\003172\007IN-ADDR\004ARPA"; static unsigned char inaddr168192[] = "\003168\003192\007IN-ADDR\004ARPA"; static dns_name_t const rfc1918names[] = { - NS_NAME_INIT(inaddr10, inaddr10_offsets), - NS_NAME_INIT(inaddr16172, inaddr172_offsets), - NS_NAME_INIT(inaddr17172, inaddr172_offsets), - NS_NAME_INIT(inaddr18172, inaddr172_offsets), - NS_NAME_INIT(inaddr19172, inaddr172_offsets), - NS_NAME_INIT(inaddr20172, inaddr172_offsets), - NS_NAME_INIT(inaddr21172, inaddr172_offsets), - NS_NAME_INIT(inaddr22172, inaddr172_offsets), - NS_NAME_INIT(inaddr23172, inaddr172_offsets), - NS_NAME_INIT(inaddr24172, inaddr172_offsets), - NS_NAME_INIT(inaddr25172, inaddr172_offsets), - NS_NAME_INIT(inaddr26172, inaddr172_offsets), - NS_NAME_INIT(inaddr27172, inaddr172_offsets), - NS_NAME_INIT(inaddr28172, inaddr172_offsets), - NS_NAME_INIT(inaddr29172, inaddr172_offsets), - NS_NAME_INIT(inaddr30172, inaddr172_offsets), - NS_NAME_INIT(inaddr31172, inaddr172_offsets), - NS_NAME_INIT(inaddr168192, inaddr192_offsets) + DNS_NAME_INITABSOLUTE(inaddr10, inaddr10_offsets), + DNS_NAME_INITABSOLUTE(inaddr16172, inaddr172_offsets), + DNS_NAME_INITABSOLUTE(inaddr17172, inaddr172_offsets), + DNS_NAME_INITABSOLUTE(inaddr18172, inaddr172_offsets), + DNS_NAME_INITABSOLUTE(inaddr19172, inaddr172_offsets), + DNS_NAME_INITABSOLUTE(inaddr20172, inaddr172_offsets), + DNS_NAME_INITABSOLUTE(inaddr21172, inaddr172_offsets), + DNS_NAME_INITABSOLUTE(inaddr22172, inaddr172_offsets), + DNS_NAME_INITABSOLUTE(inaddr23172, inaddr172_offsets), + DNS_NAME_INITABSOLUTE(inaddr24172, inaddr172_offsets), + DNS_NAME_INITABSOLUTE(inaddr25172, inaddr172_offsets), + DNS_NAME_INITABSOLUTE(inaddr26172, inaddr172_offsets), + DNS_NAME_INITABSOLUTE(inaddr27172, inaddr172_offsets), + DNS_NAME_INITABSOLUTE(inaddr28172, inaddr172_offsets), + DNS_NAME_INITABSOLUTE(inaddr29172, inaddr172_offsets), + DNS_NAME_INITABSOLUTE(inaddr30172, inaddr172_offsets), + DNS_NAME_INITABSOLUTE(inaddr31172, inaddr172_offsets), + DNS_NAME_INITABSOLUTE(inaddr168192, inaddr192_offsets) }; isc_boolean_t @@ -2674,8 +2630,8 @@ static unsigned char ip6fc[] = "\001c\001f\003ip6\004ARPA"; static unsigned char ip6fd[] = "\001d\001f\003ip6\004ARPA"; static dns_name_t const ulanames[] = { - NS_NAME_INIT(ip6fc, ulaoffsets), - NS_NAME_INIT(ip6fd, ulaoffsets), + DNS_NAME_INITABSOLUTE(ip6fc, ulaoffsets), + DNS_NAME_INITABSOLUTE(ip6fd, ulaoffsets), }; isc_boolean_t -- 2.10.1.445.g3cdd5d1