From: Florian Weimer <fweimer@redhat.com>
To: libc-alpha@sourceware.org
Subject: [PATCH 19/30] resolv: Move res_isourserver to its own file and reformat to GNU style
Date: Fri, 02 Jul 2021 20:49:10 +0200 [thread overview]
Message-ID: <402773f53e18cffa655d0a8342d106df5b4528c8.1625251245.git.fweimer@redhat.com> (raw)
In-Reply-To: <cover.1625251244.git.fweimer@redhat.com>
---
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);
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 \
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.
+ 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 <resolv-internal.h>
+#include <resolv.h>
+#include <string.h>
+
+/* author: paul vixie, 29may94 */
+static 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);
+}
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);
-}
-
/* int
* res_nameinquery(name, type, class, buf, eom)
* look for (name,type,class) in the query section of packet (buf,eom)
--
2.31.1
next prev parent reply other threads:[~2021-07-02 18:49 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-02 18:47 [PATCH 00/30] Move nss_dns into libc Florian Weimer
2021-07-02 18:47 ` [PATCH 01/30] socket: Add hidden prototype for setsockopt Florian Weimer
2021-07-02 18:47 ` [PATCH 02/30] resolv: Deprecate legacy interfaces in <resolv.h> Florian Weimer
2021-07-02 18:47 ` [PATCH 03/30] resolv: Sort Makefile routines and Versions lexicographically Florian Weimer
2021-07-02 18:47 ` [PATCH 04/30] nss_dns: Do not use deprecated packet parsing functions Florian Weimer
2021-07-02 18:47 ` [PATCH 05/30] resolv: Move ns_name_ntop to its own file and into libc Florian Weimer
2021-07-02 18:48 ` [PATCH 06/30] resolv: Move ns_name_unpack " Florian Weimer
2021-07-02 18:48 ` [PATCH 07/30] resolv: Move ns_name_skip " Florian Weimer
2021-07-02 18:48 ` [PATCH 08/30] resolv: Move ns_name_uncompress into " Florian Weimer
2021-07-02 18:48 ` [PATCH 09/30] resolv: Move ns_name_pton " Florian Weimer
2021-07-02 18:48 ` [PATCH 10/30] resolv: Move ns_name_pack " Florian Weimer
2021-07-02 18:48 ` [PATCH 11/30] resolv: Move ns_name_compress " Florian Weimer
2021-07-02 18:48 ` [PATCH 12/30] resolv: Move dn_expand to " Florian Weimer
2021-07-02 18:48 ` [PATCH 13/30] resolv: Move _getlong, _getshort, __putlong, __putshort to res-putget Florian Weimer
2021-07-02 18:48 ` [PATCH 14/30] resolv: Move dn_comp to its own file and into libc Florian Weimer
2021-07-02 18:48 ` [PATCH 15/30] resolv: Move dn_skipname " Florian Weimer
2021-07-02 18:48 ` [PATCH 16/30] resolv: Rename res_comp.c to res-name-checking.c and move " Florian Weimer
2021-07-02 18:49 ` [PATCH 17/30] resolv: Remove unnecessary res_isourserver_p call from send_dg Florian Weimer
2021-07-02 18:49 ` [PATCH 18/30] resolv: Move __res_get_nsaddr to its own file and into libc Florian Weimer
2021-07-02 18:49 ` Florian Weimer [this message]
2021-07-02 18:49 ` [PATCH 20/30] resolv: Move ns_makecanon into its own file, " Florian Weimer
2021-07-02 18:49 ` [PATCH 21/30] resolv: Move ns_samename " Florian Weimer
2021-07-02 18:49 ` [PATCH 22/30] resolv: Move res_nameinquery to its own file " Florian Weimer
2021-07-02 18:49 ` [PATCH 23/30] resolv: Move res_queriesmatch " Florian Weimer
2021-07-02 18:49 ` [PATCH 24/30] resolv: Move __res_context_hostalias into " Florian Weimer
2021-07-02 18:49 ` [PATCH 25/30] resolv: Move res_hostalias into its own file, along with hostalias Florian Weimer
2021-07-02 18:49 ` [PATCH 26/30] resolv: Move res_send, res_nsend into libc Florian Weimer
2021-07-02 18:49 ` [PATCH 27/30] resolv: Move res_mkquery, res_nmkquery " Florian Weimer
2021-07-02 18:49 ` [PATCH 28/30] resolv: Move res_query functions " Florian Weimer
2021-07-02 18:49 ` [PATCH 29/30] resolv: Move nss_dns " Florian Weimer
2021-07-02 18:50 ` [PATCH 30/30] nss: Directly load nss_dns, without going through dlsym/dlopen Florian Weimer
2021-07-08 14:59 [PATCH v2 00/30] nss_dns move into libc Florian Weimer
2021-07-08 15:05 ` [PATCH 19/30] resolv: Move res_isourserver to its own file and reformat to GNU style Florian Weimer
2021-07-15 5:01 ` Carlos O'Donell
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=402773f53e18cffa655d0a8342d106df5b4528c8.1625251245.git.fweimer@redhat.com \
--to=fweimer@redhat.com \
--cc=libc-alpha@sourceware.org \
/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).