Fincer
/
openntpd-openbsd
mirror of https://github.com/Fincer/openntpd-openbsd
1
0
Fork 0
Code Issues 0 Projects 0 Releases 61 Wiki Activity
Browse Source

netbsd: bind 4.9.3

OPENBSD_2_0
dm 29 years ago
parent
e96fcc515c
commit
eb15958f85
4 changed files with 419 additions and 168 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +45
    -16
      src/include/arpa/inet.h
  2. +179
    -80
      src/include/arpa/nameser.h
  3. +56
    -12
      src/include/netdb.h
  4. +139
    -60
      src/include/resolv.h

+ 45
- 16
src/include/arpa/inet.h View File

@ -1,9 +1,9 @@
/* $NetBSD: inet.h,v 1.4 1994/10/26 00:56:44 cgd Exp $ */
/* /*
* Copyright (c) 1983 Regents of the University of California.
* All rights reserved.
*
* ++Copyright++ 1983, 1993
* -
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
* are met: * are met:
@ -14,12 +14,12 @@
* 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. All advertising materials mentioning features or use of this software
* must display the following acknowledgement: * must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 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 * 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.
*
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@ -31,8 +31,31 @@
* 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.
*
* @(#)inet.h 5.7 (Berkeley) 4/3/91
* -
* 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.
* -
* --Copyright--
*/
/*
* @(#)inet.h 8.1 (Berkeley) 6/2/93
* $Id: inet.h,v 8.1 1994/12/15 06:24:07 vixie Exp
*/ */
#ifndef _INET_H_ #ifndef _INET_H_
@ -40,15 +63,21 @@
/* External definitions for functions in inet(3) */ /* External definitions for functions in inet(3) */
#include <sys/param.h>
#if (!defined(BSD)) || (BSD < 199306)
# include <sys/bitypes.h>
#else
# include <sys/types.h>
#endif
#include <sys/cdefs.h> #include <sys/cdefs.h>
__BEGIN_DECLS __BEGIN_DECLS
unsigned long inet_addr __P((const char *));
int inet_aton __P((const char *, struct in_addr *));
unsigned long inet_lnaof __P((struct in_addr));
struct in_addr inet_makeaddr __P((u_long, u_long));
unsigned long inet_netof __P((struct in_addr));
unsigned long inet_network __P((const char *));
unsigned long inet_addr __P((const char *));
int inet_aton __P((const char *, struct in_addr *));
unsigned long inet_lnaof __P((struct in_addr));
struct in_addr inet_makeaddr __P((u_long , u_long));
unsigned long inet_netof __P((struct in_addr));
unsigned long inet_network __P((const char *));
char *inet_ntoa __P((struct in_addr)); char *inet_ntoa __P((struct in_addr));
__END_DECLS __END_DECLS


+ 179
- 80
src/include/arpa/nameser.h View File

@ -1,9 +1,9 @@
/* $NetBSD: nameser.h,v 1.7 1994/10/26 00:56:45 cgd Exp $ */
/* /*
* Copyright (c) 1983, 1989 Regents of the University of California.
* All rights reserved.
*
* ++Copyright++ 1983, 1989, 1993
* -
* Copyright (c) 1983, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
* are met: * are met:
@ -14,12 +14,12 @@
* 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. All advertising materials mentioning features or use of this software
* must display the following acknowledgement: * must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 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 * 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.
*
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@ -31,16 +31,60 @@
* 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.
*
* @(#)nameser.h 5.25 (Berkeley) 4/3/91
* -
* 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.
* -
* --Copyright--
*/
/*
* @(#)nameser.h 8.1 (Berkeley) 6/2/93
* $Id: nameser.h,v 8.3 1995/08/21 01:27:12 vixie Exp
*/ */
#ifndef _NAMESER_H_ #ifndef _NAMESER_H_
#define _NAMESER_H_ #define _NAMESER_H_
#include <machine/endian.h>
#include <sys/param.h>
#if (!defined(BSD)) || (BSD < 199306)
# include <sys/bitypes.h>
#else
# include <sys/types.h>
#endif
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifdef _AUX_SOURCE
#include <sys/types.h> /* ech for A/UX */
#define res_send ucb_res_send /* already def'd in libc */
#define _res_close _ucb_res_close /* removing res_send.o from the library */
#endif /* gives an undefined symbol... */
/*
* revision information. this is the release date in YYYYMMDD format.
* it can change every day so the right thing to do with it is use it
* in preprocessor commands such as "#if (__BIND > 19931104)". do not
* compare for equality; rather, use it to determine whether your resolver
* is new enough to contain a certain feature.
*/
#define __BIND 19950621 /* interface version stamp */
/* /*
* Define constants based on rfc883 * Define constants based on rfc883
*/ */
@ -48,10 +92,12 @@
#define MAXDNAME 256 /* maximum domain name */ #define MAXDNAME 256 /* maximum domain name */
#define MAXCDNAME 255 /* maximum compressed domain name */ #define MAXCDNAME 255 /* maximum compressed domain name */
#define MAXLABEL 63 /* maximum length of domain label */ #define MAXLABEL 63 /* maximum length of domain label */
/* Number of bytes of fixed size data in query structure */
#define QFIXEDSZ 4
/* number of bytes of fixed size data in resource record */
#define RRFIXEDSZ 10
#define HFIXEDSZ 12 /* #/bytes of fixed data in header */
#define QFIXEDSZ 4 /* #/bytes of fixed data in query */
#define RRFIXEDSZ 10 /* #/bytes of fixed data in r record */
#define INT32SZ 4 /* for systems without 32-bit ints */
#define INT16SZ 2 /* for systems without 16-bit ints */
#define INADDRSZ 4 /* for sizeof(struct inaddr) != 4 */
/* /*
* Internet nameserver port number * Internet nameserver port number
@ -64,16 +110,18 @@
#define QUERY 0x0 /* standard query */ #define QUERY 0x0 /* standard query */
#define IQUERY 0x1 /* inverse query */ #define IQUERY 0x1 /* inverse query */
#define STATUS 0x2 /* nameserver status query */ #define STATUS 0x2 /* nameserver status query */
/*#define xxx 0x3 /* 0x3 reserved */
/* non standard */
#define UPDATEA 0x9 /* add resource record */
#define UPDATED 0xa /* delete a specific resource record */
#define UPDATEDA 0xb /* delete all named resource record */
#define UPDATEM 0xc /* modify a specific resource record */
#define UPDATEMA 0xd /* modify all named resource record */
#define ZONEINIT 0xe /* initial zone transfer */
#define ZONEREF 0xf /* incremental zone referesh */
/*#define xxx 0x3*/ /* 0x3 reserved */
#define NS_NOTIFY_OP 0x4 /* notify secondary of SOA change */
#ifdef ALLOW_UPDATES
/* non standard - supports ALLOW_UPDATES stuff from Mike Schwartz */
# define UPDATEA 0x9 /* add resource record */
# define UPDATED 0xa /* delete a specific resource record */
# define UPDATEDA 0xb /* delete all named resource record */
# define UPDATEM 0xc /* modify a specific resource record */
# define UPDATEMA 0xd /* modify all named resource record */
# define ZONEINIT 0xe /* initial zone transfer */
# define ZONEREF 0xf /* incremental zone referesh */
#endif
/* /*
* Currently defined response codes * Currently defined response codes
@ -84,8 +132,10 @@
#define NXDOMAIN 3 /* non existent domain */ #define NXDOMAIN 3 /* non existent domain */
#define NOTIMP 4 /* not implemented */ #define NOTIMP 4 /* not implemented */
#define REFUSED 5 /* query refused */ #define REFUSED 5 /* query refused */
#ifdef ALLOW_UPDATES
/* non standard */ /* non standard */
#define NOCHANGE 0xf /* update failed to change db */
# define NOCHANGE 0xf /* update failed to change db */
#endif
/* /*
* Type values for resources and queries * Type values for resources and queries
@ -94,7 +144,7 @@
#define T_NS 2 /* authoritative server */ #define T_NS 2 /* authoritative server */
#define T_MD 3 /* mail destination */ #define T_MD 3 /* mail destination */
#define T_MF 4 /* mail forwarder */ #define T_MF 4 /* mail forwarder */
#define T_CNAME 5 /* connonical name */
#define T_CNAME 5 /* canonical name */
#define T_SOA 6 /* start of authority zone */ #define T_SOA 6 /* start of authority zone */
#define T_MB 7 /* mailbox domain name */ #define T_MB 7 /* mailbox domain name */
#define T_MG 8 /* mail group member */ #define T_MG 8 /* mail group member */
@ -106,16 +156,24 @@
#define T_MINFO 14 /* mailbox information */ #define T_MINFO 14 /* mailbox information */
#define T_MX 15 /* mail routing information */ #define T_MX 15 /* mail routing information */
#define T_TXT 16 /* text strings */ #define T_TXT 16 /* text strings */
#define T_RP 17 /* responsible person */
#define T_RP 17 /* responsible person */
#define T_AFSDB 18 /* AFS cell database */ #define T_AFSDB 18 /* AFS cell database */
#define T_X25 19 /* X_25 calling address */
#define T_ISDN 20 /* ISDN calling address */
#define T_RT 21 /* router */
#define T_NSAP 22 /* NSAP address */ #define T_NSAP 22 /* NSAP address */
#define T_NSAP_PTR 23 /* reverse lookup for NSAP */
#define T_NSAP_PTR 23 /* reverse NSAP lookup (deprecated) */
#define T_SIG 24 /* security signature */
#define T_KEY 25 /* security key */
#define T_PX 26 /* X.400 mail mapping */
#define T_GPOS 27 /* geographical position (withdrawn) */
#define T_AAAA 28 /* IP6 Address */
#define T_LOC 29 /* Location Information */
/* non standard */ /* non standard */
#define T_UINFO 100 /* user (finger) information */ #define T_UINFO 100 /* user (finger) information */
#define T_UID 101 /* user ID */ #define T_UID 101 /* user ID */
#define T_GID 102 /* group ID */ #define T_GID 102 /* group ID */
#define T_UNSPEC 103 /* Unspecified format (binary data) */ #define T_UNSPEC 103 /* Unspecified format (binary data) */
#define T_SA 200 /* shuffle address */
/* Query type values which do not appear in resource records */ /* Query type values which do not appear in resource records */
#define T_AXFR 252 /* transfer zone of authority */ #define T_AXFR 252 /* transfer zone of authority */
#define T_MAILB 253 /* transfer mailbox records */ #define T_MAILB 253 /* transfer mailbox records */
@ -125,60 +183,103 @@
/* /*
* Values for class field * Values for class field
*/ */
#define C_IN 1 /* the arpa internet */ #define C_IN 1 /* the arpa internet */
#define C_CHAOS 3 /* for chaos net at MIT */
#define C_HS 4 /* for Hesiod name server at MIT */
#define C_CHAOS 3 /* for chaos net (MIT) */
#define C_HS 4 /* for Hesiod name server (MIT) (XXX) */
/* Query class values which do not appear in resource records */ /* Query class values which do not appear in resource records */
#define C_ANY 255 /* wildcard match */ #define C_ANY 255 /* wildcard match */
/* /*
* Status return codes for T_UNSPEC conversion routines * Status return codes for T_UNSPEC conversion routines
*/ */
#define CONV_SUCCESS 0
#define CONV_OVERFLOW -1
#define CONV_BADFMT -2
#define CONV_BADCKSUM -3
#define CONV_BADBUFLEN -4
#define CONV_SUCCESS 0
#define CONV_OVERFLOW (-1)
#define CONV_BADFMT (-2)
#define CONV_BADCKSUM (-3)
#define CONV_BADBUFLEN (-4)
#ifndef BYTE_ORDER
#if (BSD >= 199103)
# include <machine/endian.h>
#else
#ifdef linux
# include <endian.h>
#else
#define LITTLE_ENDIAN 1234 /* least-significant byte first (vax, pc) */
#define BIG_ENDIAN 4321 /* most-significant byte first (IBM, net) */
#define PDP_ENDIAN 3412 /* LSB first in word, MSW first in long (pdp)*/
#if defined(vax) || defined(ns32000) || defined(sun386) || defined(i386) || \
defined(MIPSEL) || defined(_MIPSEL) || defined(BIT_ZERO_ON_RIGHT) || \
defined(__alpha__) || defined(__alpha)
#define BYTE_ORDER LITTLE_ENDIAN
#endif
#if defined(sel) || defined(pyr) || defined(mc68000) || defined(sparc) || \
defined(is68k) || defined(tahoe) || defined(ibm032) || defined(ibm370) || \
defined(MIPSEB) || defined(_MIPSEB) || defined(_IBMR2) || defined(DGUX) ||\
defined(apollo) || defined(__convex__) || defined(_CRAY) || \
defined(__hppa) || defined(__hp9000) || \
defined(__hp9000s300) || defined(__hp9000s700) || \
defined (BIT_ZERO_ON_LEFT) || defined(m68k)
#define BYTE_ORDER BIG_ENDIAN
#endif
#endif /* linux */
#endif /* BSD */
#endif /* BYTE_ORDER */
#if !defined(BYTE_ORDER) || \
(BYTE_ORDER != BIG_ENDIAN && BYTE_ORDER != LITTLE_ENDIAN && \
BYTE_ORDER != PDP_ENDIAN)
/* you must determine what the correct bit order is for
* your compiler - the next line is an intentional error
* which will force your compiles to bomb until you fix
* the above macros.
*/
error "Undefined or invalid BYTE_ORDER";
#endif
/* /*
* Structure for query header, the order of the fields is machine and
* compiler dependent, in our case, the bits within a byte are assignd
* least significant first, while the order of transmition is most
* significant first. This requires a somewhat confusing rearrangement.
* Structure for query header. The order of the fields is machine- and
* compiler-dependent, depending on the byte/bit order and the layout
* of bit fields. We use bit fields only in int variables, as this
* is all ANSI requires. This requires a somewhat confusing rearrangement.
*/ */
typedef struct { typedef struct {
u_short id; /* query identification number */
unsigned id :16; /* query identification number */
#if BYTE_ORDER == BIG_ENDIAN #if BYTE_ORDER == BIG_ENDIAN
/* fields in third byte */ /* fields in third byte */
u_char qr:1; /* response flag */
u_char opcode:4; /* purpose of message */
u_char aa:1; /* authoritive answer */
u_char tc:1; /* truncated message */
u_char rd:1; /* recursion desired */
unsigned qr: 1; /* response flag */
unsigned opcode: 4; /* purpose of message */
unsigned aa: 1; /* authoritive answer */
unsigned tc: 1; /* truncated message */
unsigned rd: 1; /* recursion desired */
/* fields in fourth byte */ /* fields in fourth byte */
u_char ra:1; /* recursion available */
u_char pr:1; /* primary server required (non standard) */
u_char unused:2; /* unused bits */
u_char rcode:4; /* response code */
unsigned ra: 1; /* recursion available */
unsigned pr:1; /* primary server required (non standard) */
unsigned unused :2; /* unused bits (MBZ as of 4.9.3a3) */
unsigned rcode :4; /* response code */
#endif #endif
#if BYTE_ORDER == LITTLE_ENDIAN || BYTE_ORDER == PDP_ENDIAN #if BYTE_ORDER == LITTLE_ENDIAN || BYTE_ORDER == PDP_ENDIAN
/* fields in third byte */ /* fields in third byte */
u_char rd:1; /* recursion desired */
u_char tc:1; /* truncated message */
u_char aa:1; /* authoritive answer */
u_char opcode:4; /* purpose of message */
u_char qr:1; /* response flag */
unsigned rd :1; /* recursion desired */
unsigned tc :1; /* truncated message */
unsigned aa :1; /* authoritive answer */
unsigned opcode :4; /* purpose of message */
unsigned qr :1; /* response flag */
/* fields in fourth byte */ /* fields in fourth byte */
u_char rcode:4; /* response code */
u_char unused:2; /* unused bits */
u_char pr:1; /* primary server required (non standard) */
u_char ra:1; /* recursion available */
unsigned rcode :4; /* response code */
unsigned unused :2; /* unused bits (MBZ as of 4.9.3a3) */
unsigned pr:1; /* primary server required (non standard) */
unsigned ra :1; /* recursion available */
#endif #endif
/* remaining bytes */ /* remaining bytes */
u_short qdcount; /* number of question entries */
u_short ancount; /* number of answer entries */
u_short nscount; /* number of authority entries */
u_short arcount; /* number of resource entries */
unsigned qdcount :16; /* number of question entries */
unsigned ancount :16; /* number of answer entries */
unsigned nscount :16; /* number of authority entries */
unsigned arcount :16; /* number of resource entries */
} HEADER; } HEADER;
/* /*
@ -198,20 +299,21 @@ struct rrec {
char *r_data; /* pointer to data */ char *r_data; /* pointer to data */
}; };
extern u_int16_t _getshort();
extern u_int32_t _getlong();
extern u_int16_t _getshort __P((const u_char *));
extern u_int32_t _getlong __P((const u_char *));
/* /*
* Inline versions of get/put short/long.
* Pointer is advanced; we assume that both arguments
* are lvalues and will already be in registers.
* cp MUST be u_char *.
* Inline versions of get/put short/long. Pointer is advanced.
*
* These macros demonstrate the property of C whereby it can be
* portable or it can be elegant but rarely both.
*/ */
#define GETSHORT(s, cp) { \ #define GETSHORT(s, cp) { \
register u_char *t_cp = (u_char *)(cp); \ register u_char *t_cp = (u_char *)(cp); \
(s) = ((u_int16_t)t_cp[0] << 8) \ (s) = ((u_int16_t)t_cp[0] << 8) \
| ((u_int16_t)t_cp[1]) ;\
(cp) += sizeof(u_int16_t); \
| ((u_int16_t)t_cp[1]) \
; \
(cp) += INT16SZ; \
} }
#define GETLONG(l, cp) { \ #define GETLONG(l, cp) { \
@ -219,8 +321,9 @@ extern u_int32_t _getlong();
(l) = ((u_int32_t)t_cp[0] << 24) \ (l) = ((u_int32_t)t_cp[0] << 24) \
| ((u_int32_t)t_cp[1] << 16) \ | ((u_int32_t)t_cp[1] << 16) \
| ((u_int32_t)t_cp[2] << 8) \ | ((u_int32_t)t_cp[2] << 8) \
| ((u_int32_t)t_cp[3]) ;\
(cp) += sizeof(u_int32_t); \
| ((u_int32_t)t_cp[3]) \
; \
(cp) += INT32SZ; \
} }
#define PUTSHORT(s, cp) { \ #define PUTSHORT(s, cp) { \
@ -228,13 +331,9 @@ extern u_int32_t _getlong();
register u_char *t_cp = (u_char *)(cp); \ register u_char *t_cp = (u_char *)(cp); \
*t_cp++ = t_s >> 8; \ *t_cp++ = t_s >> 8; \
*t_cp = t_s; \ *t_cp = t_s; \
(cp) += sizeof(u_int16_t); \
(cp) += INT16SZ; \
} }
/*
* Warning: PUTLONG --no-longer-- destroys its first argument. if you
* were depending on this "feature", you will lose.
*/
#define PUTLONG(l, cp) { \ #define PUTLONG(l, cp) { \
register u_int32_t t_l = (u_int32_t)(l); \ register u_int32_t t_l = (u_int32_t)(l); \
register u_char *t_cp = (u_char *)(cp); \ register u_char *t_cp = (u_char *)(cp); \
@ -242,7 +341,7 @@ extern u_int32_t _getlong();
*t_cp++ = t_l >> 16; \ *t_cp++ = t_l >> 16; \
*t_cp++ = t_l >> 8; \ *t_cp++ = t_l >> 8; \
*t_cp = t_l; \ *t_cp = t_l; \
(cp) += sizeof(u_int32_t); \
(cp) += INT32SZ; \
} }
#endif /* !_NAMESER_H_ */ #endif /* !_NAMESER_H_ */

+ 56
- 12
src/include/netdb.h View File

@ -1,8 +1,8 @@
/* $NetBSD: netdb.h,v 1.5 1995/07/03 22:59:12 jtc Exp $ */
/*-
* Copyright (c) 1980, 1983, 1988 Regents of the University of California.
* All rights reserved.
/*
* ++Copyright++ 1980, 1983, 1988, 1993
* -
* Copyright (c) 1980, 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -31,19 +31,50 @@
* 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.
* *
* @(#)netdb.h 5.15 (Berkeley) 4/3/91
* 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.
* -
* --Copyright--
*/
/*
* @(#)netdb.h 8.1 (Berkeley) 6/2/93
* $Id: netdb.h,v 8.6 1995/12/03 08:31:12 vixie Exp
*/ */
#ifndef _NETDB_H_ #ifndef _NETDB_H_
#define _NETDB_H_ #define _NETDB_H_
#include <sys/param.h>
#if (!defined(BSD)) || (BSD < 199306)
# include <sys/bitypes.h>
#endif
#include <sys/cdefs.h>
#define _PATH_HEQUIV "/etc/hosts.equiv" #define _PATH_HEQUIV "/etc/hosts.equiv"
#define _PATH_HOSTS "/etc/hosts" #define _PATH_HOSTS "/etc/hosts"
#define _PATH_NETWORKS "/etc/networks" #define _PATH_NETWORKS "/etc/networks"
#define _PATH_PROTOCOLS "/etc/protocols" #define _PATH_PROTOCOLS "/etc/protocols"
#define _PATH_SERVICES "/etc/services" #define _PATH_SERVICES "/etc/services"
extern int h_errno;
/* /*
* Structures returned by network data base library. All addresses are * Structures returned by network data base library. All addresses are
* supplied in host order, and returned in network order (suitable for * supplied in host order, and returned in network order (suitable for
@ -60,7 +91,7 @@ struct hostent {
/* /*
* Assumption here is that a network number * Assumption here is that a network number
* fits in 32 bits -- probably a poor one.
* 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 */
@ -87,16 +118,14 @@ struct protoent {
* (left in extern int h_errno). * (left in extern int h_errno).
*/ */
extern int h_errno;
#define NETDB_INTERNAL -1 /* see errno */
#define NETDB_SUCCESS 0 /* no problem */
#define HOST_NOT_FOUND 1 /* Authoritative Answer Host not found */ #define HOST_NOT_FOUND 1 /* Authoritative Answer Host not found */
#define TRY_AGAIN 2 /* Non-Authoritive Host not found, or SERVERFAIL */ #define TRY_AGAIN 2 /* Non-Authoritive Host not found, or SERVERFAIL */
#define NO_RECOVERY 3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */ #define NO_RECOVERY 3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */
#define NO_DATA 4 /* Valid name, no data record of requested type */ #define NO_DATA 4 /* Valid name, no data record of requested type */
#define NO_ADDRESS NO_DATA /* no address, look for MX record */ #define NO_ADDRESS NO_DATA /* no address, look for MX record */
#include <sys/cdefs.h>
__BEGIN_DECLS __BEGIN_DECLS
void endhostent __P((void)); void endhostent __P((void));
void endnetent __P((void)); void endnetent __P((void));
@ -104,6 +133,7 @@ void endprotoent __P((void));
void endservent __P((void)); void endservent __P((void));
struct hostent *gethostbyaddr __P((const char *, int, int)); struct hostent *gethostbyaddr __P((const char *, int, int));
struct hostent *gethostbyname __P((const char *)); struct hostent *gethostbyname __P((const char *));
struct hostent *gethostbyname2 __P((const char *, int));
struct hostent *gethostent __P((void)); struct hostent *gethostent __P((void));
struct netent *getnetbyaddr __P((long, int)); /* u_long? */ struct netent *getnetbyaddr __P((long, int)); /* u_long? */
struct netent *getnetbyname __P((const char *)); struct netent *getnetbyname __P((const char *));
@ -115,7 +145,7 @@ struct servent *getservbyname __P((const char *, const char *));
struct servent *getservbyport __P((int, const char *)); struct servent *getservbyport __P((int, const char *));
struct servent *getservent __P((void)); struct servent *getservent __P((void));
void herror __P((const char *)); void herror __P((const char *));
char *hstrerror __P((int));
const char *hstrerror __P((int));
void sethostent __P((int)); void sethostent __P((int));
/* void sethostfile __P((const char *)); */ /* void sethostfile __P((const char *)); */
void setnetent __P((int)); void setnetent __P((int));
@ -123,4 +153,18 @@ void setprotoent __P((int));
void setservent __P((int)); void setservent __P((int));
__END_DECLS __END_DECLS
/* This is nec'y to make this include file properly replace the sun version. */
#ifdef sun
#ifdef __GNU_LIBRARY__
#include <rpc/netdb.h>
#else
struct rpcent {
char *r_name; /* name of server for this rpc program */
char **r_aliases; /* alias list */
int r_number; /* rpc program number */
};
struct rpcent *getrpcbyname(), *getrpcbynumber(), *getrpcent();
#endif /* __GNU_LIBRARY__ */
#endif /* sun */
#endif /* !_NETDB_H_ */ #endif /* !_NETDB_H_ */

+ 139
- 60
src/include/resolv.h View File

@ -1,9 +1,9 @@
/* $NetBSD: resolv.h,v 1.8 1994/10/26 00:56:16 cgd Exp $ */
/* /*
* Copyright (c) 1983, 1987, 1989 The Regents of the University of California.
* All rights reserved.
*
* ++Copyright++ 1983, 1987, 1989, 1993
* -
* Copyright (c) 1983, 1987, 1989, 1993
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
* are met: * are met:
@ -14,12 +14,12 @@
* 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. All advertising materials mentioning features or use of this software
* must display the following acknowledgement: * must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 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 * 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.
*
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@ -31,13 +31,45 @@
* 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.
*
* @(#)resolv.h 5.15 (Berkeley) 4/3/91
* -
* 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.
* -
* --Copyright--
*/
/*
* @(#)resolv.h 8.1 (Berkeley) 6/2/93
* $Id: resolv.h,v 8.5 1995/12/22 10:20:27 vixie Exp
*/ */
#ifndef _RESOLV_H_ #ifndef _RESOLV_H_
#define _RESOLV_H_ #define _RESOLV_H_
#include <sys/param.h>
#if (!defined(BSD)) || (BSD < 199306)
# include <sys/bitypes.h>
#else
# include <sys/types.h>
#endif
#include <sys/cdefs.h>
#include <stdio.h>
/* /*
* revision information. this is the release date in YYYYMMDD format. * revision information. this is the release date in YYYYMMDD format.
* it can change every day so the right thing to do with it is use it * it can change every day so the right thing to do with it is use it
@ -46,7 +78,7 @@
* is new enough to contain a certain feature. * is new enough to contain a certain feature.
*/ */
#define __RES 19931104
#define __RES 19951031
/* /*
* Resolver configuration file. * Resolver configuration file.
@ -68,99 +100,146 @@
#define MAXDNSLUS 4 /* max # of host lookup types */ #define MAXDNSLUS 4 /* max # of host lookup types */
#define RES_TIMEOUT 5 /* min. seconds between retries */ #define RES_TIMEOUT 5 /* min. seconds between retries */
#define MAXRESOLVSORT 10 /* number of net to sort on */
#define RES_MAXNDOTS 15 /* should reflect bit field size */
#define MAXRESOLVSORT 10 /* number of net to sort on */
#define RES_MAXNDOTS 15 /* should reflect bit field size */
struct __res_state { struct __res_state {
int retrans; /* retransmition time interval */ int retrans; /* retransmition time interval */
int retry; /* number of times to retransmit */ int retry; /* number of times to retransmit */
long options; /* option flags - see below. */
u_long options; /* option flags - see below. */
int nscount; /* number of name servers */ int nscount; /* number of name servers */
struct sockaddr_in nsaddr_list[MAXNS]; /* address of name server */
struct sockaddr_in
nsaddr_list[MAXNS]; /* address of name server */
#define nsaddr nsaddr_list[0] /* for backward compatibility */ #define nsaddr nsaddr_list[0] /* for backward compatibility */
u_short id; /* current packet id */ u_short id; /* current packet id */
char *dnsrch[MAXDNSRCH+1]; /* components of domain to search */ char *dnsrch[MAXDNSRCH+1]; /* components of domain to search */
char defdname[MAXDNAME]; /* default domain */ char defdname[MAXDNAME]; /* default domain */
long pfcode; /* RES_PRF_ flags - see below. */
u_char ndots:4; /* threshold for initial abs. query */
u_char nsort:4; /* number of elements in sort_list[] */
u_long pfcode; /* RES_PRF_ flags - see below. */
unsigned ndots:4; /* threshold for initial abs. query */
unsigned nsort:4; /* number of elements in sort_list[] */
char unused[3]; char unused[3];
struct { struct {
struct in_addr addr;
u_int32_t mask;
struct in_addr addr;
u_int32_t mask;
} sort_list[MAXRESOLVSORT]; } sort_list[MAXRESOLVSORT];
char lookups[MAXDNSLUS]; char lookups[MAXDNSLUS];
}; };
/* /*
* Resolver options
* Resolver options (keep these in synch with res_debug.c, please)
*/ */
#define RES_INIT 0x0001 /* address initialized */
#define RES_DEBUG 0x0002 /* print debug messages */
#define RES_AAONLY 0x0004 /* authoritative answers only */
#define RES_USEVC 0x0008 /* use virtual circuit */
#define RES_PRIMARY 0x0010 /* query primary server only */
#define RES_IGNTC 0x0020 /* ignore trucation errors */
#define RES_RECURSE 0x0040 /* recursion desired */
#define RES_DEFNAMES 0x0080 /* use default domain name */
#define RES_STAYOPEN 0x0100 /* Keep TCP socket open */
#define RES_DNSRCH 0x0200 /* search up local domain tree */
#define RES_INIT 0x00000001 /* address initialized */
#define RES_DEBUG 0x00000002 /* print debug messages */
#define RES_AAONLY 0x00000004 /* authoritative answers only (!IMPL)*/
#define RES_USEVC 0x00000008 /* use virtual circuit */
#define RES_PRIMARY 0x00000010 /* query primary server only (!IMPL) */
#define RES_IGNTC 0x00000020 /* ignore trucation errors */
#define RES_RECURSE 0x00000040 /* recursion desired */
#define RES_DEFNAMES 0x00000080 /* use default domain name */
#define RES_STAYOPEN 0x00000100 /* Keep TCP socket open */
#define RES_DNSRCH 0x00000200 /* search up local domain tree */
#define RES_INSECURE1 0x00000400 /* type 1 security disabled */
#define RES_INSECURE2 0x00000800 /* type 2 security disabled */
#define RES_NOALIASES 0x00001000 /* shuts off HOSTALIASES feature */
#define RES_DEFAULT (RES_RECURSE | RES_DEFNAMES | RES_DNSRCH) #define RES_DEFAULT (RES_RECURSE | RES_DEFNAMES | RES_DNSRCH)
/* /*
* Resolver "pfcode" values. Used by dig. * Resolver "pfcode" values. Used by dig.
*/ */
#define RES_PRF_STATS 0x0001
/* 0x0002 */
#define RES_PRF_CLASS 0x0004
#define RES_PRF_CMD 0x0008
#define RES_PRF_QUES 0x0010
#define RES_PRF_ANS 0x0020
#define RES_PRF_AUTH 0x0040
#define RES_PRF_ADD 0x0080
#define RES_PRF_HEAD1 0x0100
#define RES_PRF_HEAD2 0x0200
#define RES_PRF_TTLID 0x0400
#define RES_PRF_HEADX 0x0800
#define RES_PRF_QUERY 0x1000
#define RES_PRF_REPLY 0x2000
#define RES_PRF_INIT 0x4000
/* 0x8000 */
#define RES_PRF_STATS 0x00000001
/* 0x00000002 */
#define RES_PRF_CLASS 0x00000004
#define RES_PRF_CMD 0x00000008
#define RES_PRF_QUES 0x00000010
#define RES_PRF_ANS 0x00000020
#define RES_PRF_AUTH 0x00000040
#define RES_PRF_ADD 0x00000080
#define RES_PRF_HEAD1 0x00000100
#define RES_PRF_HEAD2 0x00000200
#define RES_PRF_TTLID 0x00000400
#define RES_PRF_HEADX 0x00000800
#define RES_PRF_QUERY 0x00001000
#define RES_PRF_REPLY 0x00002000
#define RES_PRF_INIT 0x00004000
/* 0x00008000 */
/* hooks are still experimental as of 4.9.2 */
typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error }
res_sendhookact;
typedef res_sendhookact (*res_send_qhook)__P((struct sockaddr_in * const *ns,
const u_char **query,
int *querylen,
u_char *ans,
int anssiz,
int *resplen));
typedef res_sendhookact (*res_send_rhook)__P((const struct sockaddr_in *ns,
const u_char *query,
int querylen,
u_char *ans,
int anssiz,
int *resplen));
extern struct __res_state _res; extern struct __res_state _res;
#include <sys/cdefs.h>
#include <stdio.h>
/* Private routines shared between libc/net, named, nslookup and others. */ /* Private routines shared between libc/net, named, nslookup and others. */
#define dn_skipname __dn_skipname #define dn_skipname __dn_skipname
#define fp_query __fp_query #define fp_query __fp_query
#define fp_nquery __fp_nquery
#define hostalias __hostalias #define hostalias __hostalias
#define putlong __putlong #define putlong __putlong
#define putshort __putshort #define putshort __putshort
#define p_class __p_class #define p_class __p_class
#define p_time __p_time #define p_time __p_time
#define p_type __p_type #define p_type __p_type
#define p_cdnname __p_cdnname
#define p_cdname __p_cdname
#define p_fqname __p_fqname
#define p_rr __p_rr
#define p_option __p_option
#define res_randomid __res_randomid
#define res_isourserver __res_isourserver
#define res_nameinquery __res_nameinquery
#define res_queriesmatch __res_queriesmatch
__BEGIN_DECLS __BEGIN_DECLS
int __dn_skipname __P((const u_char *, const u_char *)); int __dn_skipname __P((const u_char *, const u_char *));
void __fp_query __P((char *, FILE *));
void __fp_resstat __P((struct __res_state *, FILE *));
void __fp_query __P((const u_char *, FILE *));
void __fp_nquery __P((const u_char *, int, FILE *));
char *__hostalias __P((const char *)); char *__hostalias __P((const char *));
void __putlong __P((u_int32_t, u_char *)); void __putlong __P((u_int32_t, u_char *));
void __putshort __P((u_int16_t, u_char *)); void __putshort __P((u_int16_t, u_char *));
char *__p_class __P((int));
char *__p_time __P((u_int32_t)); char *__p_time __P((u_int32_t));
char *__p_type __P((int));
int dn_comp __P((const u_char *, u_char *, int, u_char **, u_char **));
void __p_query __P((const u_char *));
const u_char *__p_cdnname __P((const u_char *, const u_char *, int, FILE *));
const u_char *__p_cdname __P((const u_char *, const u_char *, FILE *));
const u_char *__p_fqname __P((const u_char *, const u_char *, FILE *));
const u_char *__p_rr __P((const u_char *, const u_char *, FILE *));
const char *__p_type __P((int));
const char *__p_class __P((int));
const char *__p_option __P((u_long option));
int dn_comp __P((const char *, u_char *, int, u_char **, u_char **));
int dn_expand __P((const u_char *, const u_char *, const u_char *, int dn_expand __P((const u_char *, const u_char *, const u_char *,
u_char *, int));
char *, int));
int res_init __P((void)); int res_init __P((void));
int res_query __P((char *, int, int, u_char *, int));
u_int16_t res_randomid __P((void));
int res_query __P((const char *, int, int, u_char *, int));
int res_search __P((const char *, int, int, u_char *, int)); int res_search __P((const char *, int, int, u_char *, int));
int res_mkquery __P((int, const char *, int, int, const char *, int,
const char *, char *, int));
int res_send __P((const char *, int, char *, int));
int res_querydomain __P((const char *, const char *, int, int,
u_char *, int));
int res_mkquery __P((int, const char *, int, int, const u_char *, int,
const u_char *, u_char *, int));
int res_send __P((const u_char *, int, u_char *, int));
int res_isourserver __P((const struct sockaddr_in *));
int res_nameinquery __P((const char *, int, int,
const u_char *, const u_char *));
int res_queriesmatch __P((const u_char *, const u_char *,
const u_char *, const u_char *));
/* XXX - these last two don't belong in the resolver */
u_int inet_nsap_addr __P((const char *, u_char *, int maxlen));
char *inet_nsap_ntoa __P((int, const u_char *, char *ascii));
__END_DECLS __END_DECLS
#endif /* !_RESOLV_H_ */ #endif /* !_RESOLV_H_ */

Write Preview
Loading…
Cancel
Save