mirror of
https://sourceware.org/git/glibc.git
synced 2025-08-08 17:42:12 +03:00
resolv: Move res_isourserver to its own file and reformat to GNU style
Reviewed-by: Carlos O'Donell <carlos@redhat.com> Tested-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Florian Weimer
@@ -31,8 +31,6 @@ extern struct hostent *_gethtbyname2 (const char *__name, int __af);
|
|||||||
struct hostent *_gethtbyaddr (const char *addr, size_t __len, int __af);
|
struct hostent *_gethtbyaddr (const char *addr, size_t __len, int __af);
|
||||||
extern uint32_t _getlong (const unsigned char *__src);
|
extern uint32_t _getlong (const unsigned char *__src);
|
||||||
extern uint16_t _getshort (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);
|
extern void __res_iclose (res_state statp, bool free_addr);
|
||||||
libc_hidden_proto (__res_ninit)
|
libc_hidden_proto (__res_ninit)
|
||||||
libc_hidden_proto (__res_nclose)
|
libc_hidden_proto (__res_nclose)
|
||||||
|
|||||||
@@ -147,6 +147,7 @@ libresolv-routines := \
|
|||||||
res_data \
|
res_data \
|
||||||
res_debug \
|
res_debug \
|
||||||
res_enable_icmp \
|
res_enable_icmp \
|
||||||
|
res_isourserver \
|
||||||
res_mkquery \
|
res_mkquery \
|
||||||
res_query \
|
res_query \
|
||||||
res_send \
|
res_send \
|
||||||
|
|||||||
134
resolv/res_isourserver.c
Normal file
134
resolv/res_isourserver.c
Normal file
@@ -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);
|
||||||
|
}
|
||||||
@@ -193,57 +193,6 @@ static int sock_eq(struct sockaddr_in6 *, struct sockaddr_in6 *);
|
|||||||
|
|
||||||
/* Public. */
|
/* 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
|
/* int
|
||||||
* res_nameinquery(name, type, class, buf, eom)
|
* res_nameinquery(name, type, class, buf, eom)
|
||||||
* look for (name,type,class) in the query section of packet (buf,eom)
|
* look for (name,type,class) in the query section of packet (buf,eom)
|
||||||
|
|||||||
Reference in New Issue
Block a user