From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id EBB103841466; Fri, 24 Jun 2022 16:41:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EBB103841466 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc] support: Change non-address output format of support_format_dns_packet X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/master X-Git-Oldrev: 58fc66a91ca511cc12901cb599914f31948e02d5 X-Git-Newrev: 62a321b12d0e397af88fa422db65079332f971dc Message-Id: <20220624164108.EBB103841466@sourceware.org> Date: Fri, 24 Jun 2022 16:41:08 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jun 2022 16:41:09 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=62a321b12d0e397af88fa422db65079332f971dc commit 62a321b12d0e397af88fa422db65079332f971dc Author: Florian Weimer Date: Fri Jun 24 18:16:41 2022 +0200 support: Change non-address output format of support_format_dns_packet It makes sense to include the owner name (LHS) and record type in the output, so that they can be checked for correctness. Reviewed-by: Carlos O'Donell Diff: --- support/support_format_dns_packet.c | 22 +++++++++++++++------- support/tst-support_format_dns_packet.c | 4 ++-- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/support/support_format_dns_packet.c b/support/support_format_dns_packet.c index e8b3c125e3..14344bc1bf 100644 --- a/support/support_format_dns_packet.c +++ b/support/support_format_dns_packet.c @@ -90,6 +90,17 @@ extract_name (struct in_buffer full, struct in_buffer *in, struct dname *value) return true; } +static void +extract_name_data (struct in_buffer full, struct in_buffer *rdata, + const struct dname *owner, const char *typename, FILE *out) +{ + struct dname name; + if (extract_name (full, rdata, &name)) + fprintf (out, "data: %s %s %s\n", owner->name, typename, name.name); + else + fprintf (out, "error: malformed CNAME/PTR record\n"); +} + char * support_format_dns_packet (const unsigned char *buffer, size_t length) { @@ -195,14 +206,11 @@ support_format_dns_packet (const unsigned char *buffer, size_t length) } break; case T_CNAME: + extract_name_data (full, &rdata, &rname, "CNAME", mem.out); + break; case T_PTR: - { - struct dname name; - if (extract_name (full, &rdata, &name)) - fprintf (mem.out, "name: %s\n", name.name); - else - fprintf (mem.out, "error: malformed CNAME/PTR record\n"); - } + extract_name_data (full, &rdata, &rname, "PTR", mem.out); + break; } } diff --git a/support/tst-support_format_dns_packet.c b/support/tst-support_format_dns_packet.c index cb7ff53b87..9839aa767e 100644 --- a/support/tst-support_format_dns_packet.c +++ b/support/tst-support_format_dns_packet.c @@ -85,8 +85,8 @@ test_multiple_cnames (void) "\xc0\x00\x02\x01"; check_packet (packet, sizeof (packet) - 1, __func__, "name: www.example\n" - "name: www1.example\n" - "name: www2.example\n" + "data: www.example CNAME www1.example\n" + "data: www1.example CNAME www2.example\n" "address: 192.0.2.1\n"); }