From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 01A89384146E for ; Fri, 24 Jun 2022 15:46:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 01A89384146E Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-269-nqgbW_uHPdO5gYAcpyWZcA-1; Fri, 24 Jun 2022 11:46:20 -0400 X-MC-Unique: nqgbW_uHPdO5gYAcpyWZcA-1 Received: by mail-qk1-f197.google.com with SMTP id o10-20020a05620a2a0a00b006a77a64cd23so2969472qkp.21 for ; Fri, 24 Jun 2022 08:46:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:organization:in-reply-to :content-transfer-encoding; bh=HJXr9R2a1DNN2vllb5fEnVOxN3SScHln3NkjyBgiO2k=; b=PyTrvComax6gz5o4PV8CtTgWC6vtzNbKELSyCGXVyJJzIIo9OQHudK8iem+gBBqTda 34dA/7ZPmaExrBQuW8xBUWIKakwPRzghU2sLWGiE2fPDde+JfdMdjVO7RdsITBOh1bM9 Q+nn+cdr9VPg4RHf5gdNgoEvt290TzVHsVfvp13agVR1T1SldaqZ8alMpfY5gbvCxB5O CYaLv87ssZ0Rcdj19/rf/Zk2kpKRw/JD9VrKWEMEL3t9754ZGlRqRm1ehx8uD00fE42m CCasZz77QfZ9b2m/Tnoao6pdw3kCG5X1/66Z16ma2QaKIBKvFvLgNzmlUBqmRUoTjNWl pgCQ== X-Gm-Message-State: AJIora9rmu+KJ71n0d6ESVdGOAfy9O4JIyq9lE45aAQNM5kH5ASiHn3d HufsfKbf/LY9chFwrPf1YgosHnrD+GdInDlyqXSJDl1DcxZNCauzTViL8FW0q5N/+nllDSAlrGN qDGQQmjBGsUHYVDH5jGZf X-Received: by 2002:a0c:a951:0:b0:470:a6cf:b032 with SMTP id z17-20020a0ca951000000b00470a6cfb032mr323845qva.23.1656085579566; Fri, 24 Jun 2022 08:46:19 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tam6ahN3DdT9hxoHzBLQQsupe7FKAZfb3KRHAyiMj9z1YWums91qsYeOSWZKWab+n53K4j/A== X-Received: by 2002:a0c:a951:0:b0:470:a6cf:b032 with SMTP id z17-20020a0ca951000000b00470a6cfb032mr323828qva.23.1656085579295; Fri, 24 Jun 2022 08:46:19 -0700 (PDT) Received: from [192.168.0.241] (135-23-175-80.cpe.pppoe.ca. [135.23.175.80]) by smtp.gmail.com with ESMTPSA id m22-20020a05620a291600b006aef641865esm1978963qkp.128.2022.06.24.08.46.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 24 Jun 2022 08:46:18 -0700 (PDT) Message-ID: Date: Fri, 24 Jun 2022 11:46:17 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Subject: Re: [PATCH v2 1/2] support: Change non-address output format of support_format_dns_packet To: Florian Weimer , libc-alpha@sourceware.org References: <8df136914557c843ebc4f05fe3e423a8e610e077.1654633752.git.fweimer@redhat.com> From: Carlos O'Donell Organization: Red Hat In-Reply-To: <8df136914557c843ebc4f05fe3e423a8e610e077.1654633752.git.fweimer@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-16.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, HK_OBFDOM, KAM_SHORT, NICE_REPLY_A, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP, T_FILL_THIS_FORM_SHORT, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jun 2022 15:46:23 -0000 On 6/7/22 16:29, Florian Weimer via Libc-alpha wrote: > It makes sense to include the owner name (LHS) and record type in the > output, so that they can be checked for correctness. LGTM. Reviewed-by: Carlos O'Donell > --- > v2: New patch. > 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)) OK. extract_name() is just above which uses dn_expand() API. > + 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; OK. The split here allows you to distinguish in the logs if it was a CNAME or PTR that failed. This allows checking for exact CNAME or PTR message in the logs. > 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" OK. Data adjusted. > "address: 192.0.2.1\n"); > } > > > base-commit: 5082a287d5e9a1f9cb98b7c982a708a3684f1d5c -- Cheers, Carlos.