From: Carlos O'Donell via Libc-alpha <libc-alpha@sourceware.org>
To: Florian Weimer <fweimer@redhat.com>, libc-alpha@sourceware.org
Subject: Re: [PATCH 22/30] resolv: Move res_nameinquery to its own file and into libc
Date: Thu, 15 Jul 2021 01:01:55 -0400 [thread overview]
Message-ID: <7c6308c8-9c6a-2050-5219-3645de42dc1d@redhat.com> (raw)
In-Reply-To: <fadd9814ca6fc7c8502131308650b4ef781cef7d.1625755446.git.fweimer@redhat.com>
On 7/8/21 11:05 AM, Florian Weimer via Libc-alpha wrote:
> And reformat to GNU style.
OK for glibc 2.34.
Tested without regression on x86_64 and i686.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
> This deprecated function is used in the implementation of the stub
> resolver (for now). Keep the public symbol in libresolv for now
> (so that no new symbol version is needed), and add a forwarder to
> libresolv.
> ---
> include/resolv.h | 3 +-
> resolv/Makefile | 1 +
> resolv/Versions | 1 +
> resolv/res_nameinquery.c | 115 +++++++++++++++++++++++++++++++++++++
> resolv/res_send.c | 43 +-------------
> resolv/resolv-deprecated.c | 8 +++
> 6 files changed, 128 insertions(+), 43 deletions(-)
> create mode 100644 resolv/res_nameinquery.c
>
> diff --git a/include/resolv.h b/include/resolv.h
> index a70e9e5723..4d328fe914 100644
> --- a/include/resolv.h
> +++ b/include/resolv.h
> @@ -54,7 +54,6 @@ libresolv_hidden_proto (__p_type)
> libresolv_hidden_proto (__loc_ntoa)
> libresolv_hidden_proto (__fp_nquery)
> libresolv_hidden_proto (__fp_query)
> -libresolv_hidden_proto (__res_nameinquery)
OK.
> libresolv_hidden_proto (__res_queriesmatch)
> libresolv_hidden_proto (__b64_ntop)
> libresolv_hidden_proto (__dn_count_labels)
> @@ -67,6 +66,8 @@ extern __typeof (res_dnok) __libc_res_dnok;
> libc_hidden_proto (__libc_res_dnok)
> extern __typeof (res_hnok) __libc_res_hnok;
> libc_hidden_proto (__libc_res_hnok)
> +extern __typeof (__res_nameinquery) __libc_res_nameinquery;
> +libc_hidden_proto (__libc_res_nameinquery)
OK.
>
> # endif /* _RESOLV_H_ && !_ISOMAC */
> #endif
> diff --git a/resolv/Makefile b/resolv/Makefile
> index 744da951ae..c4c59dcac0 100644
> --- a/resolv/Makefile
> +++ b/resolv/Makefile
> @@ -52,6 +52,7 @@ routines := \
> res_hconf \
> res_init \
> res_libc \
> + res_nameinquery \
OK.
> res_randomid \
> resolv_conf \
> resolv_context \
> diff --git a/resolv/Versions b/resolv/Versions
> index 2201d4224c..f3482793dd 100644
> --- a/resolv/Versions
> +++ b/resolv/Versions
> @@ -76,6 +76,7 @@ libc {
> __libc_ns_samename;
> __libc_res_dnok;
> __libc_res_hnok;
> + __libc_res_nameinquery;
OK.
> __ns_name_compress;
> __ns_name_ntop;
> __ns_name_pack;
> diff --git a/resolv/res_nameinquery.c b/resolv/res_nameinquery.c
> new file mode 100644
> index 0000000000..c8404ea9d6
> --- /dev/null
> +++ b/resolv/res_nameinquery.c
> @@ -0,0 +1,115 @@
> +/* Check if a DNS packet matches a specific DNS query.
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
> + <https://www.gnu.org/licenses/>. */
> +
> +/*
> + * 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 <arpa/nameser.h>
> +#include <resolv.h>
> +
> +/* Author: paul vixie, 29may94. */
> +int
> +__libc_res_nameinquery (const char *name, int type, int class,
> + const unsigned char *buf, const unsigned char *eom)
OK.
> +{
> + const unsigned char *cp = buf + HFIXEDSZ;
> + int qdcount = ntohs (((HEADER *) buf)->qdcount);
OK.
> +
> + while (qdcount-- > 0)
> + {
> + char tname[MAXDNAME+1];
> + int n, ttype, tclass;
> +
> + n = __libc_dn_expand (buf, eom, cp, tname, sizeof tname);
> + if (n < 0)
> + return -1;
> + cp += n;
> + if (cp + 2 * INT16SZ > eom)
> + return -1;
> + NS_GET16 (ttype, cp);
> + NS_GET16 (tclass, cp);
> + if (ttype == type && tclass == class
> + && __libc_ns_samename (tname, name) == 1)
> + return 1;
OK. Match.
> + }
> + return 0;
OK.
> +}
> +libc_hidden_def (__libc_res_nameinquery)
> diff --git a/resolv/res_send.c b/resolv/res_send.c
> index dfea9fc7fa..a5a33e6f3b 100644
> --- a/resolv/res_send.c
> +++ b/resolv/res_send.c
> @@ -191,47 +191,6 @@ static int send_dg(res_state, const u_char *, int,
> u_char **, int *, int *, int *);
> static int sock_eq(struct sockaddr_in6 *, struct sockaddr_in6 *);
>
> -/* Public. */
> -
> -/* int
> - * res_nameinquery(name, type, class, buf, eom)
> - * look for (name,type,class) in the query section of packet (buf,eom)
> - * requires:
> - * buf + HFIXEDSZ <= eom
> - * returns:
> - * -1 : format error
> - * 0 : not found
> - * >0 : found
> - * author:
> - * paul vixie, 29may94
> - */
> -int
> -res_nameinquery(const char *name, int type, int class,
> - const u_char *buf, const u_char *eom)
> -{
> - const u_char *cp = buf + HFIXEDSZ;
> - int qdcount = ntohs(((HEADER*)buf)->qdcount);
> -
> - while (qdcount-- > 0) {
> - char tname[MAXDNAME+1];
> - int n, ttype, tclass;
> -
> - n = __libc_dn_expand (buf, eom, cp, tname, sizeof tname);
> - if (n < 0)
> - return (-1);
> - cp += n;
> - if (cp + 2 * INT16SZ > eom)
> - return (-1);
> - NS_GET16(ttype, cp);
> - NS_GET16(tclass, cp);
> - if (ttype == type && tclass == class
> - && __libc_ns_samename (tname, name) == 1)
> - return (1);
> - }
> - return (0);
> -}
> -libresolv_hidden_def (res_nameinquery)
> -
OK. Remove.
> /* Returns a shift value for the name server index. Used to implement
> RES_ROTATE. */
> static unsigned int
> @@ -337,7 +296,7 @@ res_queriesmatch(const u_char *buf1, const u_char *eom1,
> return (-1);
> NS_GET16(ttype, cp);
> NS_GET16(tclass, cp);
> - if (!res_nameinquery(tname, ttype, tclass, buf2, eom2))
> + if (!__libc_res_nameinquery (tname, ttype, tclass, buf2, eom2))
OK.
> return (0);
> }
> return (1);
> diff --git a/resolv/resolv-deprecated.c b/resolv/resolv-deprecated.c
> index d8344f8f39..0fe9e4fda6 100644
> --- a/resolv/resolv-deprecated.c
> +++ b/resolv/resolv-deprecated.c
> @@ -27,6 +27,7 @@
> functions. */
>
> #include <arpa/nameser.h>
> +#include <resolv.h>
>
> int
> ns_makecanon (const char *src, char *dst, size_t dstsize)
> @@ -39,3 +40,10 @@ ns_samename (const char *a, const char *b)
> {
> return __libc_ns_samename (a, b);
> }
> +
> +int
> +res_nameinquery (const char *name, int type, int class,
> + const unsigned char *buf, const unsigned char *eom)
> +{
> + return __libc_res_nameinquery (name, type, class, buf, eom);
OK. Add forwarder.
> +}
>
--
Cheers,
Carlos.
next prev parent reply other threads:[~2021-07-15 5:17 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-08 14:59 [PATCH v2 00/30] nss_dns move into libc Florian Weimer via Libc-alpha
2021-07-08 14:59 ` [PATCH 01/30] socket: Add hidden prototype for setsockopt Florian Weimer via Libc-alpha
2021-07-08 18:02 ` Adhemerval Zanella via Libc-alpha
2021-07-15 4:59 ` Carlos O'Donell via Libc-alpha
2021-07-08 14:59 ` [PATCH 02/30] resolv: Deprecate legacy interfaces in <resolv.h> Florian Weimer via Libc-alpha
2021-07-08 18:32 ` Adhemerval Zanella via Libc-alpha
2021-07-15 4:59 ` Carlos O'Donell via Libc-alpha
2021-07-08 14:59 ` [PATCH 03/30] resolv: Sort Makefile routines and Versions lexicographically Florian Weimer via Libc-alpha
2021-07-08 18:33 ` Adhemerval Zanella via Libc-alpha
2021-07-15 4:59 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:00 ` [PATCH 04/30] nss_dns: Do not use deprecated packet parsing functions Florian Weimer via Libc-alpha
2021-07-15 5:00 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:00 ` [PATCH 05/30] resolv: Move ns_name_ntop to its own file and into libc Florian Weimer via Libc-alpha
2021-07-15 5:00 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:00 ` [PATCH 06/30] resolv: Move ns_name_unpack " Florian Weimer via Libc-alpha
2021-07-15 5:00 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:00 ` [PATCH 07/30] resolv: Move ns_name_skip " Florian Weimer via Libc-alpha
2021-07-15 5:00 ` Carlos O'Donell via Libc-alpha
2021-07-15 6:53 ` Florian Weimer via Libc-alpha
2021-07-08 15:00 ` [PATCH 08/30] resolv: Move ns_name_uncompress into " Florian Weimer via Libc-alpha
2021-07-15 5:00 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:01 ` [PATCH 09/30] resolv: Move ns_name_pton " Florian Weimer via Libc-alpha
2021-07-15 5:00 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:01 ` [PATCH 10/30] resolv: Move ns_name_pack " Florian Weimer via Libc-alpha
2021-07-15 5:00 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:01 ` [PATCH 11/30] resolv: Move ns_name_compress " Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:02 ` [PATCH 12/30] resolv: Move dn_expand to " Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:02 ` [PATCH 13/30] resolv: Move _getlong, _getshort, __putlong, __putshort to res-putget Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:03 ` [PATCH 14/30] resolv: Move dn_comp to its own file and into libc Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:03 ` [PATCH 15/30] resolv: Move dn_skipname " Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:03 ` [PATCH 16/30] resolv: Rename res_comp.c to res-name-checking.c and move " Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:04 ` [PATCH 17/30] resolv: Remove unnecessary res_isourserver_p call from send_dg Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:04 ` [PATCH 18/30] resolv: Move __res_get_nsaddr to its own file and into libc Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:05 ` [PATCH 19/30] resolv: Move res_isourserver to its own file and reformat to GNU style Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:05 ` [PATCH 20/30] resolv: Move ns_makecanon into its own file, and into libc Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:05 ` [PATCH 21/30] resolv: Move ns_samename " Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:05 ` [PATCH 22/30] resolv: Move res_nameinquery to its own file " Florian Weimer via Libc-alpha
2021-07-15 5:01 ` Carlos O'Donell via Libc-alpha [this message]
2021-07-08 15:06 ` [PATCH 23/30] resolv: Move res_queriesmatch " Florian Weimer via Libc-alpha
2021-07-15 5:02 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:06 ` [PATCH 24/30] resolv: Move __res_context_hostalias into " Florian Weimer via Libc-alpha
2021-07-15 5:02 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:06 ` [PATCH 25/30] resolv: Move res_hostalias into its own file, along with hostalias Florian Weimer via Libc-alpha
2021-07-15 5:02 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:06 ` [PATCH 26/30] resolv: Move res_send, res_nsend into libc Florian Weimer via Libc-alpha
2021-07-15 5:02 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:06 ` [PATCH 27/30] resolv: Move res_mkquery, res_nmkquery " Florian Weimer via Libc-alpha
2021-07-15 5:02 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:07 ` [PATCH 28/30] resolv: Move res_query functions " Florian Weimer via Libc-alpha
2021-07-15 5:02 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:07 ` [PATCH 29/30] resolv: Move nss_dns " Florian Weimer via Libc-alpha
2021-07-15 5:02 ` Carlos O'Donell via Libc-alpha
2021-07-08 15:07 ` [PATCH 30/30] nss: Directly load nss_dns, without going through dlsym/dlopen Florian Weimer via Libc-alpha
2021-07-08 15:42 ` Florian Weimer via Libc-alpha
2021-07-15 5:02 ` Carlos O'Donell via Libc-alpha
2021-07-15 7:09 ` Florian Weimer via Libc-alpha
2021-07-15 12:21 ` Carlos O'Donell via Libc-alpha
2021-07-15 4:58 ` [PATCH v2 00/30] nss_dns move into libc Carlos O'Donell via Libc-alpha
-- strict thread matches above, loose matches on Subject: below --
2021-07-02 18:47 [PATCH 00/30] Move nss_dns " Florian Weimer via Libc-alpha
2021-07-02 18:49 ` [PATCH 22/30] resolv: Move res_nameinquery to its own file and " Florian Weimer via Libc-alpha
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7c6308c8-9c6a-2050-5219-3645de42dc1d@redhat.com \
--to=libc-alpha@sourceware.org \
--cc=carlos@redhat.com \
--cc=fweimer@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).