i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolv.h & netdb.h: Clean up and simplify.

Browse Source 
* Remove all functions and a number of constants that neither
   glibc nor musl define or support (and even FreeBSD does not
   declare a good number of these anymore.)
 * Redeclare the primary flags in terms of (1 << X) instead
   of raw 0x... for readability (the constants at the end
   do NOT match up to their definitions in glibc, musl, and BSDs!)
 * Remove usage of unneeded headers, and __BEGIN/END_DECLS.
 * Replace non-Haiku license headers with the ones from FreeBSD,
   which notably contain a removal of the advertising clause.

ABIs remain unchanged, but a small set of applications that
use these esoteric APIs may not compile anymore (are there
any remaining?)
This commit is contained in:
Augustin Cavalier
2020-07-02 19:33:51 -04:00
parent d91d9fe552
commit 2ed1a36d4b
2 changed files with 121 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/posix/netdb.h
+16 -56
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 Haiku, Inc. All Rights Reserved. * Copyright 2002-2020, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software * 3. Neither the name of the University nor the names of its contributors
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 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 * may be used to endorse or promote products derived from this software
* without specific prior written permission. * without specific prior written permission.
* *
@@ -34,7 +30,9 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * 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 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* - */
/*
* Portions Copyright (c) 1993 by Digital Equipment Corporation. * Portions Copyright (c) 1993 by Digital Equipment Corporation.
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
@@ -52,57 +50,23 @@
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS * 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 * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE. * SOFTWARE.
* -
* Portions Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* 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.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by WIDE Project and
* its contributors.
* 4. Neither the name of the project 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 PROJECT 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 PROJECT 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.
*/ */
#ifndef _NETDB_H_ #ifndef _NETDB_H_
#define _NETDB_H_ #define _NETDB_H_
#include <stdint.h>
#include <sys/param.h>
#include <sys/types.h>
#include <sys/cdefs.h>
#include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <stdio.h>
#ifdef __cplusplus
extern "C" {
#endif
#ifndef _PATH_NETWORKS #ifndef _PATH_NETWORKS
#define _PATH_NETWORKS "/etc/networks" #define _PATH_NETWORKS "/etc/networks"
#endif #endif
__BEGIN_DECLS
extern int * __h_errno(void); extern int * __h_errno(void);
__END_DECLS
#define h_errno (*__h_errno()) #define h_errno (*__h_errno())
/* /*
@@ -116,13 +80,9 @@ struct hostent {
int h_addrtype; /* host address type */ int h_addrtype; /* host address type */
int h_length; /* length of address */ int h_length; /* length of address */
char **h_addr_list; /* list of addresses from name server */ char **h_addr_list; /* list of addresses from name server */
#define h_addr h_addr_list[0] /* address, for backward compatiblity */ #define h_addr h_addr_list[0] /* address, for backward compatibility */
}; };
/*
* Assumption here is that a network number
* fits in an unsigned long -- probably a poor one.
*/
struct netent { struct netent {
char *n_name; /* official name of net */ char *n_name; /* official name of net */
char **n_aliases; /* alias list */ char **n_aliases; /* alias list */
@@ -230,8 +190,6 @@ struct addrinfo {
*/ */
#define SCOPE_DELIMITER '%' #define SCOPE_DELIMITER '%'
__BEGIN_DECLS
void endhostent(void); void endhostent(void);
void endnetent(void); void endnetent(void);
void endprotoent(void); void endprotoent(void);
@@ -255,7 +213,6 @@ struct servent *getservent(void);
void herror(const char *); void herror(const char *);
const char *hstrerror(int); const char *hstrerror(int);
void sethostent(int); void sethostent(int);
/* void sethostfile(const char *); */
void setnetent(int); void setnetent(int);
void setprotoent(int); void setprotoent(int);
void setservent(int); void setservent(int);
@@ -296,6 +253,9 @@ struct servent *getservbyport_r(int port, const char *,
struct servent *getservent_r(struct servent *, struct servent_data *); struct servent *getservent_r(struct servent *, struct servent_data *);
void setservent_r(int, struct servent_data *); void setservent_r(int, struct servent_data *);
void endservent_r(struct servent_data *); void endservent_r(struct servent_data *);
__END_DECLS
#ifdef __cplusplus
}
#endif
#endif /* _NETDB_H_ */ #endif /* _NETDB_H_ */
headers/posix/resolv.h
+105 -281
View File
@@ -1,23 +1,23 @@
/* /*
* Copyright 2009-2012 Haiku, Inc. All Rights Reserved. * Copyright 2009-2020, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
/* /*
* Portions Copyright (C) 2004, 2005, 2008, 2009 Internet Systems Consortium, Inc. ("ISC") * Portions Copyright (c) 1996-1999 by Internet Software Consortium.
* Portions Copyright (C) 1995-2003 Internet Software Consortium.
* *
* Permission to use, copy, modify, and/or distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies. * copyright notice and this permission notice appear in all copies.
* *
* THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
* REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
* AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
* INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
* LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
* OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
* PERFORMANCE OF THIS SOFTWARE. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE.
*/ */
/* /*
@@ -32,11 +32,7 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software * 3. Neither the name of the University nor the names of its contributors
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 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 * may be used to endorse or promote products derived from this software
* without specific prior written permission. * without specific prior written permission.
* *
@@ -56,67 +52,16 @@
#ifndef _RESOLV_H_ #ifndef _RESOLV_H_
#define _RESOLV_H_ #define _RESOLV_H_
#include <stdint.h>
#include <stdio.h>
#include <arpa/nameser.h> #include <arpa/nameser.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet6/in6.h>
#include <stdio.h>
#include <sys/param.h>
#include <sys/types.h>
#include <sys/cdefs.h>
#include <sys/socket.h>
/* #ifdef __cplusplus
* Revision information. This is the release date in YYYYMMDD format. extern "C" {
* It can change every day so the right thing to do with it is use it
* in preprocessor commands such as "#if (__RES > 19931104)". Do not
* compare for equality; rather, use it to determine whether your resolver
* is new enough to contain a certain feature.
*/
#define __RES 20090302
/*
* This used to be defined in res_query.c, now it's in herror.c.
* [XXX no it's not. It's in irs/irs_data.c]
* It was
* never extern'd by any *.h file before it was placed here. For thread
* aware programs, the last h_errno value set is stored in res->h_errno.
*
* XXX: There doesn't seem to be a good reason for exposing RES_SET_H_ERRNO
* (and __h_errno_set) to the public via <resolv.h>.
* XXX: __h_errno_set is really part of IRS, not part of the resolver.
* If somebody wants to build and use a resolver that doesn't use IRS,
* what do they do? Perhaps something like
* #ifdef WANT_IRS
* # define RES_SET_H_ERRNO(r,x) __h_errno_set(r,x)
* #else
* # define RES_SET_H_ERRNO(r,x) (h_errno = (r)->res_h_errno = (x))
* #endif
*/
#define RES_SET_H_ERRNO(r,x) __h_errno_set(r,x)
struct __res_state; /* forward */
__BEGIN_DECLS
void __h_errno_set(struct __res_state *res, int err);
__END_DECLS
typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error }
res_sendhookact;
#ifndef __PMT
#if defined(__STDC__) || defined(__cplusplus)
#define __PMT(args) args
#else
#define __PMT(args) ()
#endif
#endif #endif
typedef res_sendhookact (*res_send_qhook)(struct sockaddr * const *, #define __RES 19991006
const u_char **, int *, u_char *, int, int *);
typedef res_sendhookact (*res_send_rhook)(const struct sockaddr *,
const u_char *, int, u_char *, int, int *);
struct res_sym { struct res_sym {
int number; /* Identifying number, like T_MX */ int number; /* Identifying number, like T_MX */
@@ -138,48 +83,38 @@ struct res_sym {
#define RES_MAXRETRY 5 /* only for resolv.conf/RES_OPTIONS */ #define RES_MAXRETRY 5 /* only for resolv.conf/RES_OPTIONS */
#define RES_DFLRETRY 2 /* Default #/tries. */ #define RES_DFLRETRY 2 /* Default #/tries. */
#define RES_MAXTIME 65535 /* Infinity, in milliseconds. */ #define RES_MAXTIME 65535 /* Infinity, in milliseconds. */
struct __res_state_ext;
struct __res_state { struct __res_state {
int retrans; /* retransmission time interval */ int retrans; /* retransmission time interval */
int retry; /* number of times to retransmit */ int retry; /* number of times to retransmit */
#ifdef sun unsigned long options; /* option flags - see below. */
u_int options; /* option flags - see below. */
#else
u_long options; /* option flags - see below. */
#endif
int nscount; /* number of name servers */ int nscount; /* number of name servers */
struct sockaddr_in struct sockaddr_in
nsaddr_list[MAXNS]; /* address of name server */ nsaddr_list[MAXNS]; /* address of name server */
#define nsaddr nsaddr_list[0] /* for backward compatibility */ unsigned short id; /* current message id */
u_short id; /* current message id */
char *dnsrch[MAXDNSRCH+1]; /* components of domain to search */ char *dnsrch[MAXDNSRCH+1]; /* components of domain to search */
char defdname[256]; /* default domain (deprecated) */ char defdname[256]; /* default domain (deprecated) */
#ifdef sun unsigned long pfcode; /* RES_PRF_ flags - see below. */
u_int pfcode; /* RES_PRF_ flags - see below. */
#else
u_long pfcode; /* RES_PRF_ flags - see below. */
#endif
unsigned ndots:4; /* threshold for initial abs. query */ unsigned ndots:4; /* threshold for initial abs. query */
unsigned nsort:4; /* number of elements in sort_list[] */ unsigned nsort:4; /* number of elements in sort_list[] */
char unused[3]; char unused[3];
struct { struct {
struct in_addr addr; struct in_addr addr;
u_int32_t mask; uint32_t mask;
} sort_list[MAXRESOLVSORT]; } sort_list[MAXRESOLVSORT];
res_send_qhook qhook; /* query hook */ void* qhook; /* query hook */
res_send_rhook rhook; /* response hook */ void* rhook; /* response hook */
int res_h_errno; /* last one set for this context */ int res_h_errno; /* last one set for this context */
int _vcsock; /* PRIVATE: for res_send VC i/o */ int _vcsock; /* PRIVATE: for res_send VC i/o */
u_int _flags; /* PRIVATE: see below */ unsigned int _flags; /* PRIVATE: see below */
u_char _rnd[16]; /* PRIVATE: random state */ unsigned char _rnd[16]; /* PRIVATE: random state */
u_int _pad; /* make _u 64 bit aligned */ unsigned int _pad; /* make _u 64 bit aligned */
union { union {
/* On an 32-bit arch this means 512b total. */ /* On an 32-bit arch this means 512b total. */
char pad[56 - 4*sizeof (int) - 2*sizeof (void *)]; char pad[56 - 4*sizeof (int) - 2*sizeof (void *)];
struct { struct {
u_int16_t nscount; uint16_t nscount;
u_int16_t nstimes[MAXNS]; /* ms. */ uint16_t nstimes[MAXNS]; /* ms. */
int nssocks[MAXNS]; int nssocks[MAXNS];
struct __res_state_ext *ext; /* extention for IPv6 */ struct __res_state_ext *ext; /* extention for IPv6 */
} _ext; } _ext;
@@ -188,70 +123,49 @@ struct __res_state {
typedef struct __res_state *res_state; typedef struct __res_state *res_state;
union res_sockaddr_union { /* resolver flags; for _flags in __res_state. */
struct sockaddr_in sin;
struct sockaddr_in6 sin6;
#ifdef ISC_ALIGN64
int64_t __align64; /* 64bit alignment */
#else
int32_t __align32; /* 32bit alignment */
#endif
char __space[128]; /* max size */
};
/*
* Resolver flags (used to be discrete per-module statics ints).
*/
#define RES_F_VC 0x00000001 /* socket is TCP */ #define RES_F_VC 0x00000001 /* socket is TCP */
#define RES_F_CONN 0x00000002 /* socket is connected */ #define RES_F_CONN 0x00000002 /* socket is connected */
#define RES_F_EDNS0ERR 0x00000004 /* EDNS0 caused errors */ #define RES_F_EDNS0ERR 0x00000004 /* EDNS0 caused errors */
#define RES_F__UNUSED 0x00000008 /* (unused) */
#define RES_F_LASTMASK 0x000000F0 /* ordinal server of last res_nsend */
#define RES_F_LASTSHIFT 4 /* bit position of LASTMASK "flag" */
#define RES_GETLAST(res) (((res)._flags & RES_F_LASTMASK) >> RES_F_LASTSHIFT)
/* res_findzonecut2() options */ /* res_findzonecut2() options */
#define RES_EXHAUSTIVE 0x00000001 /* always do all queries */ #define RES_EXHAUSTIVE 0x00000001 /* always do all queries */
#define RES_IPV4ONLY 0x00000002 /* IPv4 only */ #define RES_IPV4ONLY 0x00000002 /* IPv4 only */
#define RES_IPV6ONLY 0x00000004 /* IPv6 only */ #define RES_IPV6ONLY 0x00000004 /* IPv6 only */
/* /* resolver options */
* Resolver options (keep these in synch with res_debug.c, please) #define RES_INIT (1 << 0) /* address initialized */
*/ #define RES_DEBUG (1 << 1) /* print debug messages */
#define RES_INIT 0x00000001 /* address initialized */ #define RES_AAONLY (1 << 2) /* authoritative answers only (!IMPL)*/
#define RES_DEBUG 0x00000002 /* print debug messages */ #define RES_USEVC (1 << 3) /* use virtual circuit */
#define RES_AAONLY 0x00000004 /* authoritative answers only (!IMPL)*/ #define RES_PRIMARY (1 << 4) /* query primary server only (!IMPL) */
#define RES_USEVC 0x00000008 /* use virtual circuit */ #define RES_IGNTC (1 << 5) /* ignore trucation errors */
#define RES_PRIMARY 0x00000010 /* query primary server only (!IMPL) */ #define RES_RECURSE (1 << 6) /* recursion desired */
#define RES_IGNTC 0x00000020 /* ignore trucation errors */ #define RES_DEFNAMES (1 << 7) /* use default domain name */
#define RES_RECURSE 0x00000040 /* recursion desired */ #define RES_STAYOPEN (1 << 8) /* Keep TCP socket open */
#define RES_DEFNAMES 0x00000080 /* use default domain name */ #define RES_DNSRCH (1 << 9) /* search up local domain tree */
#define RES_STAYOPEN 0x00000100 /* Keep TCP socket open */ #define RES_INSECURE1 (1 << 10) /* type 1 security disabled */
#define RES_DNSRCH 0x00000200 /* search up local domain tree */ #define RES_INSECURE2 (1 << 11) /* type 2 security disabled */
#define RES_INSECURE1 0x00000400 /* type 1 security disabled */ #define RES_NOALIASES (1 << 12) /* shuts off HOSTALIASES feature */
#define RES_INSECURE2 0x00000800 /* type 2 security disabled */ #define RES_USE_INET6 (1 << 13) /* use/map IPv6 in gethostbyname() */
#define RES_NOALIASES 0x00001000 /* shuts off HOSTALIASES feature */ #define RES_ROTATE (1 << 14) /* rotate ns list after each query */
#define RES_USE_INET6 0x00002000 /* use/map IPv6 in gethostbyname() */ #define RES_NOCHECKNAME (1 << 15) /* do not check names for sanity. */
#define RES_ROTATE 0x00004000 /* rotate ns list after each query */ #define RES_KEEPTSIG (1 << 16) /* do not strip TSIG records */
#define RES_NOCHECKNAME 0x00008000 /* do not check names for sanity. */ #define RES_BLAST (1 << 17) /* blast all recursive servers */
#define RES_KEEPTSIG 0x00010000 /* do not strip TSIG records */
#define RES_BLAST 0x00020000 /* blast all recursive servers */ #define RES_NOTLDQUERY (1 << 20) /* don't unqualified name as a tld */
#define RES_NSID 0x00040000 /* request name server ID */ #define RES_USE_DNSSEC (1 << 21) /* use DNSSEC using OK bit in OPT */
#define RES_NOTLDQUERY 0x00100000 /* don't unqualified name as a tld */
#define RES_USE_DNSSEC 0x00200000 /* use DNSSEC using OK bit in OPT */ #define RES_USE_INET4 (1 << 23) /* use IPv4 in gethostbyname() */
/* #define RES_DEBUG2 0x00400000 */ /* nslookup internal */
#define RES_USE_INET4 0x00800000 /* use IPv4 in gethostbyname() */
/* KAME extensions: use higher bit to avoid conflict with ISC use */ /* KAME extensions: use higher bit to avoid conflict with ISC use */
#define RES_USE_DNAME 0x10000000 /* use DNAME */
#define RES_USE_EDNS0 0x40000000 /* use EDNS0 if configured */ #define RES_USE_EDNS0 0x40000000 /* use EDNS0 if configured */
#define RES_NO_NIBBLE2 0x80000000 /* disable alternate nibble lookup */ #define RES_NO_NIBBLE2 0x80000000 /* disable alternate nibble lookup */
#define RES_DEFAULT \ #define RES_DEFAULT \
(RES_RECURSE | RES_DEFNAMES | RES_DNSRCH | RES_NO_NIBBLE2) (RES_RECURSE | RES_DEFNAMES | RES_DNSRCH | RES_NO_NIBBLE2)
/* /* resolver "pfcode" values, used by dig. */
* Resolver "pfcode" values. Used by dig.
*/
#define RES_PRF_STATS 0x00000001 #define RES_PRF_STATS 0x00000001
#define RES_PRF_UPDATE 0x00000002 #define RES_PRF_UPDATE 0x00000002
#define RES_PRF_CLASS 0x00000004 #define RES_PRF_CLASS 0x00000004
@@ -267,23 +181,11 @@ union res_sockaddr_union {
#define RES_PRF_QUERY 0x00001000 #define RES_PRF_QUERY 0x00001000
#define RES_PRF_REPLY 0x00002000 #define RES_PRF_REPLY 0x00002000
#define RES_PRF_INIT 0x00004000 #define RES_PRF_INIT 0x00004000
#define RES_PRF_TRUNC 0x00008000
/* 0x00010000 */
/* Things involving an internal (static) resolver context. */ /* Things involving an internal (static) resolver context. */
__BEGIN_DECLS extern struct __res_state *__res_state(void) __attribute__ ((__const__));
extern struct __res_state *__res_get_state(void);
extern void __res_put_state(struct __res_state *);
/*
* Source and Binary compatibility; _res will not work properly
* with multi-threaded programs.
*/
extern struct __res_state *__res_state(void);
#define _res (*__res_state()) #define _res (*__res_state())
__END_DECLS
#ifndef __BIND_NOSTATIC
#define fp_nquery __fp_nquery #define fp_nquery __fp_nquery
#define fp_query __fp_query #define fp_query __fp_query
#define hostalias __hostalias #define hostalias __hostalias
@@ -296,42 +198,21 @@ __END_DECLS
#define res_querydomain __res_querydomain #define res_querydomain __res_querydomain
#define res_search __res_search #define res_search __res_search
#define res_send __res_send #define res_send __res_send
#define res_sendsigned __res_sendsigned
__BEGIN_DECLS void fp_nquery(const unsigned char *, int, FILE *);
void fp_nquery(const u_char *, int, FILE *); void fp_query(const unsigned char *, FILE *);
void fp_query(const u_char *, FILE *);
const char *hostalias(const char *); const char *hostalias(const char *);
void p_query(const u_char *); void p_query(const unsigned char *);
void res_close(void); void res_close(void);
int res_init(void); int res_init(void);
int res_isourserver(const struct sockaddr_in *); int res_isourserver(const struct sockaddr_in *);
int res_mkquery(int, const char *, int, int, const u_char *, int res_mkquery(int, const char *, int, int, const unsigned char *,
int, const u_char *, u_char *, int); int, const unsigned char *, unsigned char *, int);
int res_query(const char *, int, int, u_char *, int); int res_query(const char *, int, int, unsigned char *, int);
int res_querydomain(const char *, const char *, int, int, int res_querydomain(const char *, const char *, int, int,
u_char *, int); unsigned char *, int);
int res_search(const char *, int, int, u_char *, int); int res_search(const char *, int, int, unsigned char *, int);
int res_send(const u_char *, int, u_char *, int); int res_send(const unsigned char *, int, unsigned char *, int);
int res_sendsigned(const u_char *, int, ns_tsig_key *,
u_char *, int);
__END_DECLS
#endif
#if !defined(SHARED_LIBBIND) || defined(LIB)
/*
* If libbind is a shared object (well, DLL anyway)
* these externs break the linker when resolv.h is
* included by a lib client (like named)
* Make them go away if a client is including this
*
*/
extern const struct res_sym __p_key_syms[];
extern const struct res_sym __p_cert_syms[];
extern const struct res_sym __p_class_syms[];
extern const struct res_sym __p_type_syms[];
extern const struct res_sym __p_rcode_syms[];
#endif /* SHARED_LIBBIND */
#define b64_ntop __b64_ntop #define b64_ntop __b64_ntop
#define b64_pton __b64_pton #define b64_pton __b64_pton
@@ -348,17 +229,10 @@ extern const struct res_sym __p_rcode_syms[];
#define p_fqname __p_fqname #define p_fqname __p_fqname
#define p_fqnname __p_fqnname #define p_fqnname __p_fqnname
#define p_option __p_option #define p_option __p_option
#define p_secstodate __p_secstodate
#define p_section __p_section
#define p_time __p_time #define p_time __p_time
#define p_type __p_type #define p_type __p_type
#define p_rcode __p_rcode #define p_rcode __p_rcode
#define p_sockun __p_sockun
#define putlong __putlong
#define putshort __putshort
#define res_dnok __res_dnok #define res_dnok __res_dnok
#define res_findzonecut __res_findzonecut
#define res_findzonecut2 __res_findzonecut2
#define res_hnok __res_hnok #define res_hnok __res_hnok
#define res_hostalias __res_hostalias #define res_hostalias __res_hostalias
#define res_mailok __res_mailok #define res_mailok __res_mailok
@@ -366,42 +240,17 @@ extern const struct res_sym __p_rcode_syms[];
#define res_nclose __res_nclose #define res_nclose __res_nclose
#define res_ninit __res_ninit #define res_ninit __res_ninit
#define res_nmkquery __res_nmkquery #define res_nmkquery __res_nmkquery
#define res_pquery __res_pquery
#define res_nquery __res_nquery #define res_nquery __res_nquery
#define res_nquerydomain __res_nquerydomain #define res_nquerydomain __res_nquerydomain
#define res_nsearch __res_nsearch #define res_nsearch __res_nsearch
#define res_nsend __res_nsend #define res_nsend __res_nsend
#define res_nsendsigned __res_nsendsigned
#define res_nisourserver __res_nisourserver
#define res_ownok __res_ownok #define res_ownok __res_ownok
#define res_queriesmatch __res_queriesmatch #define res_queriesmatch __res_queriesmatch
#define res_rndinit __res_rndinit
#define res_randomid __res_randomid #define res_randomid __res_randomid
#define res_nrandomid __res_nrandomid
#define sym_ntop __sym_ntop #define sym_ntop __sym_ntop
#define sym_ntos __sym_ntos #define sym_ntos __sym_ntos
#define sym_ston __sym_ston #define sym_ston __sym_ston
#define res_nopt __res_nopt
#define res_nopt_rdata __res_nopt_rdata
#define res_ndestroy __res_ndestroy
#define res_nametoclass __res_nametoclass
#define res_nametotype __res_nametotype
#define res_setservers __res_setservers
#define res_getservers __res_getservers
#define res_buildprotolist __res_buildprotolist
#define res_destroyprotolist __res_destroyprotolist
#define res_destroyservicelist __res_destroyservicelist
#define res_get_nibblesuffix __res_get_nibblesuffix
#define res_get_nibblesuffix2 __res_get_nibblesuffix2
#define res_ourserver_p __res_ourserver_p
#define res_protocolname __res_protocolname
#define res_protocolnumber __res_protocolnumber
#define res_send_setqhook __res_send_setqhook
#define res_send_setrhook __res_send_setrhook
#define res_servicename __res_servicename
#define res_servicenumber __res_servicenumber
__BEGIN_DECLS
int res_hnok(const char *); int res_hnok(const char *);
int res_ownok(const char *); int res_ownok(const char *);
int res_mailok(const char *); int res_mailok(const char *);
@@ -409,79 +258,54 @@ int res_dnok(const char *);
int sym_ston(const struct res_sym *, const char *, int *); int sym_ston(const struct res_sym *, const char *, int *);
const char * sym_ntos(const struct res_sym *, int, int *); const char * sym_ntos(const struct res_sym *, int, int *);
const char * sym_ntop(const struct res_sym *, int, int *); const char * sym_ntop(const struct res_sym *, int, int *);
int b64_ntop(u_char const *, size_t, char *, size_t); int b64_ntop(unsigned char const *, size_t, char *, size_t);
int b64_pton(char const *, u_char *, size_t); int b64_pton(char const *, unsigned char *, size_t);
int loc_aton(const char *, u_char *); int loc_aton(const char *, unsigned char *);
const char * loc_ntoa(const u_char *, char *); const char * loc_ntoa(const unsigned char *, char *);
int dn_skipname(const u_char *, const u_char *); int dn_skipname(const unsigned char *, const unsigned char *);
void putlong(u_int32_t, u_char *);
void putshort(u_int16_t, u_char *);
#if !defined(__ultrix__)
u_int16_t _getshort(const u_char *);
u_int32_t _getlong(const u_char *);
#endif
const char * p_class(int); const char * p_class(int);
const char * p_time(u_int32_t); const char * p_time(uint32_t);
const char * p_type(int); const char * p_type(int);
const char * p_rcode(int); const char * p_rcode(int);
const char * p_sockun(union res_sockaddr_union, char *, size_t); const unsigned char * p_cdnname(const unsigned char *, const unsigned char *,
const u_char * p_cdnname(const u_char *, const u_char *, int, FILE *); int, FILE *);
const u_char * p_cdname(const u_char *, const u_char *, FILE *); const unsigned char * p_cdname(const unsigned char *, const unsigned char *,
const u_char * p_fqnname(const u_char *, const u_char *, int, char *, int); FILE *);
const u_char * p_fqname(const u_char *, const u_char *, FILE *); const unsigned char * p_fqnname(const unsigned char *, const unsigned char *,
const char * p_option(u_long); int, char *, int);
char * p_secstodate(u_long); const unsigned char * p_fqname(const unsigned char *, const unsigned char *,
FILE *);
const char * p_option(unsigned long);
int dn_count_labels(const char *); int dn_count_labels(const char *);
int dn_comp(const char *, u_char *, int, u_char **, u_char **); int dn_comp(const char *, unsigned char *, int, unsigned char **,
int dn_expand(const u_char *, const u_char *, const u_char *, unsigned char **);
char *, int); int dn_expand(const unsigned char *, const unsigned char *,
void res_rndinit(res_state); const unsigned char *, char *, int);
u_int res_randomid(void); unsigned int res_randomid(void);
u_int res_nrandomid(res_state); int res_nameinquery(const char *, int, int, const unsigned char *,
int res_nameinquery(const char *, int, int, const u_char *, const unsigned char *);
const u_char *); int res_queriesmatch(const unsigned char *, const unsigned char *,
int res_queriesmatch(const u_char *, const u_char *, const u_char *, const unsigned char *, const unsigned char *);
const u_char *);
const char * p_section(int, int);
/* Things involving a resolver context. */ /* Things involving a resolver context. */
int res_ninit(res_state); int res_ninit(res_state);
int res_nisourserver(const res_state, const struct sockaddr_in *);
void fp_resstat(const res_state, FILE *); void fp_resstat(const res_state, FILE *);
void res_pquery(const res_state, const u_char *, int, FILE *);
const char * res_hostalias(const res_state, const char *, char *, size_t); const char * res_hostalias(const res_state, const char *, char *, size_t);
int res_nquery(res_state, const char *, int, int, u_char *, int); int res_nquery(res_state, const char *, int, int, unsigned char *,
int res_nsearch(res_state, const char *, int, int, u_char *, int);
int res_nquerydomain(res_state, const char *, const char *, int,
int, u_char *, int);
int res_nmkquery(res_state, int, const char *, int, int,
const u_char *, int, const u_char *, u_char *, int);
int res_nsend(res_state, const u_char *, int, u_char *, int);
int res_nsendsigned(res_state, const u_char *, int, ns_tsig_key *,
u_char *, int);
int res_findzonecut(res_state, const char *, ns_class, int, char *,
size_t, struct in_addr *, int);
int res_findzonecut2(res_state, const char *, ns_class, int, char *,
size_t, union res_sockaddr_union *, int);
void res_nclose(res_state);
int res_nopt(res_state, int, u_char *, int, int);
int res_nopt_rdata(res_state, int, u_char *, int, u_char *, u_short,
u_short, u_char *);
void res_send_setqhook(res_send_qhook);
void res_send_setrhook(res_send_rhook);
int __res_vinit(res_state, int);
void res_destroyservicelist(void);
const char * res_servicename(u_int16_t, const char *);
const char * res_protocolname(int);
void res_destroyprotolist(void);
void res_buildprotolist(void);
const char * res_get_nibblesuffix(res_state);
const char * res_get_nibblesuffix2(res_state);
void res_ndestroy(res_state);
u_int16_t res_nametoclass(const char *, int *);
u_int16_t res_nametotype(const char *, int *);
void res_setservers(res_state, const union res_sockaddr_union *,
int); int);
int res_getservers(res_state, union res_sockaddr_union *, int); int res_nsearch(res_state, const char *, int, int, unsigned char *,
__END_DECLS int);
int res_nquerydomain(res_state, const char *, const char *, int,
int, unsigned char *, int);
int res_nmkquery(res_state, int, const char *, int, int,
const unsigned char *, int, const unsigned char *,
unsigned char *, int);
int res_nsend(res_state, const unsigned char *, int, unsigned char *,
int);
void res_nclose(res_state);
#ifdef __cplusplus
}
#endif
#endif /* !_RESOLV_H_ */ #endif /* !_RESOLV_H_ */