From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-4.2 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI,NICE_REPLY_A, RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 243EE1F8C6 for ; Thu, 15 Jul 2021 05:15:15 +0000 (UTC) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 592AF39DC4E2 for ; Thu, 15 Jul 2021 05:15:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 592AF39DC4E2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1626326114; bh=0qXw1FoEEAOWX363fFDHK2sdqyJiEY+rigiOCueTyOQ=; h=Subject:To:References:Date:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=agIELfHeJHRgDiaXq4nJTdraqKwN/k77e3u46NkF3bhVSFOiySgxMmSKNiK6TJsnJ GpGCx9qMthE/mjKRZmba+oNXnnvIfDWRFEQok6qYrTZnWeW8zaCqtg8VxddmRv6nAE sVC8tYLWWcE16qd04pNTtrAgOtxe1QV05pyDjXsg= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id D3383399C039 for ; Thu, 15 Jul 2021 05:01:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D3383399C039 Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-420-_mGrfid5N_Cm8NoAkpFuMw-1; Thu, 15 Jul 2021 01:01:44 -0400 X-MC-Unique: _mGrfid5N_Cm8NoAkpFuMw-1 Received: by mail-qt1-f200.google.com with SMTP id d9-20020ac84e290000b0290256a44e9034so3365490qtw.22 for ; Wed, 14 Jul 2021 22:01:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=0qXw1FoEEAOWX363fFDHK2sdqyJiEY+rigiOCueTyOQ=; b=jZm2wATSs1J4bF/CMAy5u/tUGGa57WBGDBy+/CE2ppx8RNRRj88OzZ+pgBfkWxcSQq PWRlMgQZixq2vhp/qtXgfX3pL4RI5q8g/07d24r/ZSaQRlNawEUK/n1sxeoaV7dDcU61 ohu9lWHUi4Qq0u3oqYvbpyaPl6+DwEnGpn6s6rUTmZy+rghwBfwLambt9fFHDhze7H9N 1OqmifiR6DY7KTRTrJG+aFIr4LHRgh73jtayfiSjZGKRe6CpMjKDVQju5JjVF4ehNfDy 2rrI/eLaE+mXOMTvMDJdLJnjogswgG46/sj1RDjW9pff41qGcb7xV6hzoEyljCszBtG9 lW7A== X-Gm-Message-State: AOAM5316oPrllcsxlJ4SN+/W/aiM4GoehdZBFi82/jzDP2rDy99q1eAW R5y0tkcl7jfYkLNg0PWVsD3QG/O66Xqyx4xhXBrXJHaDGe8fubBIb3WE3Bnms9XnQOO5KCAT5rA W5zP0gYuqzzCPpHscMJLTMqK0XTpJGMHvzVaTSy5gx0kBZuOyyAEPlAl+aDh58CQ4HPgL1w== X-Received: by 2002:a05:6214:1347:: with SMTP id b7mr2263891qvw.50.1626325303484; Wed, 14 Jul 2021 22:01:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJysAQMr1xaylLnv0nLOOylQ3mC/+GnX8UolbrHwA0KAjkgWrgoFlcAKDfijEBGMCFzJ4gd1yg== X-Received: by 2002:a05:6214:1347:: with SMTP id b7mr2263877qvw.50.1626325303302; Wed, 14 Jul 2021 22:01:43 -0700 (PDT) Received: from [192.168.1.16] (198-84-214-74.cpe.teksavvy.com. [198.84.214.74]) by smtp.gmail.com with ESMTPSA id x21sm2117709qkn.0.2021.07.14.22.01.42 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 14 Jul 2021 22:01:42 -0700 (PDT) Subject: Re: [PATCH 19/30] resolv: Move res_isourserver to its own file and reformat to GNU style To: Florian Weimer , libc-alpha@sourceware.org References: <4a102c2633b8f54a5d6e8f20f09492a3fbc656dd.1625755446.git.fweimer@redhat.com> Organization: Red Hat Message-ID: Date: Thu, 15 Jul 2021 01:01:41 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <4a102c2633b8f54a5d6e8f20f09492a3fbc656dd.1625755446.git.fweimer@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit 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: , From: Carlos O'Donell via Libc-alpha Reply-To: Carlos O'Donell Errors-To: libc-alpha-bounces+e=80x24.org@sourceware.org Sender: "Libc-alpha" On 7/8/21 11:05 AM, Florian Weimer via Libc-alpha wrote: OK for glibc 2.34. Tested without regression on x86_64 and i686. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell > --- > include/resolv.h | 2 - > resolv/Makefile | 1 + > resolv/res_isourserver.c | 134 +++++++++++++++++++++++++++++++++++++++ > resolv/res_send.c | 51 --------------- > 4 files changed, 135 insertions(+), 53 deletions(-) > create mode 100644 resolv/res_isourserver.c > > diff --git a/include/resolv.h b/include/resolv.h > index 0c8db600d6..a70e9e5723 100644 > --- a/include/resolv.h > +++ b/include/resolv.h > @@ -31,8 +31,6 @@ extern struct hostent *_gethtbyname2 (const char *__name, int __af); > struct hostent *_gethtbyaddr (const char *addr, size_t __len, int __af); > extern uint32_t _getlong (const unsigned char *__src); > extern uint16_t _getshort (const unsigned char *__src); > -extern int res_ourserver_p (const res_state __statp, > - const struct sockaddr_in6 *__inp); OK. > extern void __res_iclose (res_state statp, bool free_addr); > libc_hidden_proto (__res_ninit) > libc_hidden_proto (__res_nclose) > diff --git a/resolv/Makefile b/resolv/Makefile > index 6eed73de87..221bdc153d 100644 > --- a/resolv/Makefile > +++ b/resolv/Makefile > @@ -147,6 +147,7 @@ libresolv-routines := \ > res_data \ > res_debug \ > res_enable_icmp \ > + res_isourserver \ OK. > res_mkquery \ > res_query \ > res_send \ > diff --git a/resolv/res_isourserver.c b/resolv/res_isourserver.c > new file mode 100644 > index 0000000000..1e3576fb88 > --- /dev/null > +++ b/resolv/res_isourserver.c > @@ -0,0 +1,134 @@ > +/* Legacy function for expected server checking. OK. > + Copyright (C) 2016-2021 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + . */ > + > +/* > + * Copyright (c) 1985, 1989, 1993 > + * The Regents of the University of California. All rights reserved. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * 2. Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in the > + * documentation and/or other materials provided with the distribution. > + * 4. Neither the name of the University nor the names of its contributors > + * may be used to endorse or promote products derived from this software > + * without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE > + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > + * SUCH DAMAGE. > + */ > + > +/* > + * Portions Copyright (c) 1993 by Digital Equipment Corporation. > + * > + * Permission to use, copy, modify, and distribute this software for any > + * purpose with or without fee is hereby granted, provided that the above > + * copyright notice and this permission notice appear in all copies, and that > + * the name of Digital Equipment Corporation not be used in advertising or > + * publicity pertaining to distribution of the document or software without > + * specific, written prior permission. > + * > + * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL > + * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES > + * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT > + * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL > + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR > + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS > + * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS > + * SOFTWARE. > + */ > + > +/* > + * Portions Copyright (c) 1996-1999 by Internet Software Consortium. > + * > + * Permission to use, copy, modify, and distribute this software for any > + * purpose with or without fee is hereby granted, provided that the above > + * copyright notice and this permission notice appear in all copies. > + * > + * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS > + * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES > + * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE > + * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL > + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR > + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS > + * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS > + * SOFTWARE. > + */ > + > +#include > +#include > +#include > + > +/* author: paul vixie, 29may94 */ > +static int > +res_ourserver_p (const res_state statp, const struct sockaddr_in6 *inp) > +{ > + int ns; OK. > + > + if (inp->sin6_family == AF_INET) > + { > + struct sockaddr_in *in4p = (struct sockaddr_in *) inp; > + in_port_t port = in4p->sin_port; > + in_addr_t addr = in4p->sin_addr.s_addr; OK. > + > + for (ns = 0; ns < statp->nscount; ns++) > + { > + const struct sockaddr_in *srv = > + (struct sockaddr_in *) __res_get_nsaddr (statp, ns); > + > + if ((srv->sin_family == AF_INET) && > + (srv->sin_port == port) && > + (srv->sin_addr.s_addr == INADDR_ANY || > + srv->sin_addr.s_addr == addr)) > + return 1; OK. > + } > + } else if (inp->sin6_family == AF_INET6) > + { > + for (ns = 0; ns < statp->nscount; ns++) > + { > + const struct sockaddr_in6 *srv > + = (struct sockaddr_in6 *) __res_get_nsaddr (statp, ns); > + if ((srv->sin6_family == AF_INET6) && > + (srv->sin6_port == inp->sin6_port) && > + !(memcmp (&srv->sin6_addr, &in6addr_any, > + sizeof (struct in6_addr)) && > + memcmp (&srv->sin6_addr, &inp->sin6_addr, > + sizeof (struct in6_addr)))) > + return 1; > + } > + } > + return 0; OK. > +} > + > +int > +res_isourserver (const struct sockaddr_in *inp) > +{ > + return res_ourserver_p (&_res, (const struct sockaddr_in6 *) inp); > +} OK. > diff --git a/resolv/res_send.c b/resolv/res_send.c > index 78f564ee85..915fc6d2c6 100644 > --- a/resolv/res_send.c > +++ b/resolv/res_send.c > @@ -193,57 +193,6 @@ static int sock_eq(struct sockaddr_in6 *, struct sockaddr_in6 *); > > /* Public. */ > > -/* int > - * res_isourserver(ina) > - * looks up "ina" in _res.ns_addr_list[] > - * returns: > - * 0 : not found > - * >0 : found > - * author: > - * paul vixie, 29may94 > - */ > -int > -res_ourserver_p(const res_state statp, const struct sockaddr_in6 *inp) > -{ > - int ns; > - > - if (inp->sin6_family == AF_INET) { > - struct sockaddr_in *in4p = (struct sockaddr_in *) inp; > - in_port_t port = in4p->sin_port; > - in_addr_t addr = in4p->sin_addr.s_addr; > - > - for (ns = 0; ns < statp->nscount; ns++) { > - const struct sockaddr_in *srv = > - (struct sockaddr_in *) __res_get_nsaddr (statp, ns); > - > - if ((srv->sin_family == AF_INET) && > - (srv->sin_port == port) && > - (srv->sin_addr.s_addr == INADDR_ANY || > - srv->sin_addr.s_addr == addr)) > - return (1); > - } > - } else if (inp->sin6_family == AF_INET6) { > - for (ns = 0; ns < statp->nscount; ns++) { > - const struct sockaddr_in6 *srv > - = (struct sockaddr_in6 *) __res_get_nsaddr (statp, ns); > - if ((srv->sin6_family == AF_INET6) && > - (srv->sin6_port == inp->sin6_port) && > - !(memcmp(&srv->sin6_addr, &in6addr_any, > - sizeof (struct in6_addr)) && > - memcmp(&srv->sin6_addr, &inp->sin6_addr, > - sizeof (struct in6_addr)))) > - return (1); > - } > - } > - return (0); > -} > - > -int > -res_isourserver (const struct sockaddr_in *inp) > -{ > - return res_ourserver_p (&_res, (const struct sockaddr_in6 *) inp); > -} > - OK. Remove. > /* int > * res_nameinquery(name, type, class, buf, eom) > * look for (name,type,class) in the query section of packet (buf,eom) > -- Cheers, Carlos.