get* rework and new bind code

2 files changed, 245 insertions, 197 deletions

diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h
index 81e71fb..dfaa3db 100644
--- a/include/arpa/nameser.h
+++ b/include/arpa/nameser.h
@@ -30,7 +30,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      @(#)nameser.h	8.2 (Berkeley) 2/16/94
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
  * 
@@ -51,142 +50,134 @@
  * SOFTWARE.
  * -
  * --Copyright--
+ *
+ *      @(#)nameser.h	8.2 (Berkeley) 2/16/94
+ *	From Id: nameser.h,v 4.9.1.15 1994/07/19 22:51:24 vixie Exp
  */
 
-#ifndef _ARPA_NAMESER_H_
-#define	_ARPA_NAMESER_H_
+#ifndef _NAMESER_H_
+#define	_NAMESER_H_
 
+#include <sys/param.h>
 #include <sys/types.h>
+#include <sys/cdefs.h>
+#include <machine/endian.h>
+
+
+/*
+ * 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		19940417	/* interface version stamp */
 
 /*
  * Define constants based on rfc883
  */
-#define PACKETSZ	512		/* maximum packet size */
-#define MAXDNAME	256		/* maximum domain name */
-#define MAXCDNAME	255		/* maximum compressed domain name */
-#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	PACKETSZ	512		/* maximum packet size */
+#define	MAXDNAME	256		/* maximum domain name */
+#define	MAXCDNAME	255		/* maximum compressed domain name */
+#define	MAXLABEL	63		/* maximum length of domain label */
+#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
  */
-#define NAMESERVER_PORT	53
+#define	NAMESERVER_PORT	53
 
 /*
- * Currently defined opcodes
+ * Currently define	d opcodes
  */
-#define QUERY		0x0		/* standard query */
-#define IQUERY		0x1		/* inverse query */
-#define STATUS		0x2		/* nameserver status query */
-/*#define xxx		0x3		/* 0x3 reserved */
+#define	QUERY		0x0		/* standard query */
+#define	IQUERY		0x1		/* inverse query */
+#define	STATUS		0x2		/* nameserver status query */
+			/* 0x3		   reserved */
 	/* 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	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	ZONEINIT	0xe		/* initial zone transfer */
+#define	ZONEREF		0xf		/* incremental zone referesh */
 
 /*
- * Currently defined response codes
+ * Currently define	d response codes
  */
-#define NOERROR		0		/* no error */
-#define FORMERR		1		/* format error */
-#define SERVFAIL	2		/* server failure */
-#define NXDOMAIN	3		/* non existent domain */
-#define NOTIMP		4		/* not implemented */
-#define REFUSED		5		/* query refused */
+#define	NOERROR		0		/* no error */
+#define	FORMERR		1		/* format error */
+#define	SERVFAIL	2		/* server failure */
+#define	NXDOMAIN	3		/* non existent domain */
+#define	NOTIMP		4		/* not implemented */
+#define	REFUSED		5		/* query refused */
 	/* non standard */
-#define NOCHANGE	0xf		/* update failed to change db */
+#define	NOCHANGE	0xf		/* update failed to change db */
 
 /*
  * Type values for resources and queries
  */
-#define T_A		1		/* host address */
-#define T_NS		2		/* authoritative server */
-#define T_MD		3		/* mail destination */
-#define T_MF		4		/* mail forwarder */
-#define T_CNAME		5		/* connonical name */
-#define T_SOA		6		/* start of authority zone */
-#define T_MB		7		/* mailbox domain name */
-#define T_MG		8		/* mail group member */
-#define T_MR		9		/* mail rename name */
-#define T_NULL		10		/* null resource record */
-#define T_WKS		11		/* well known service */
-#define T_PTR		12		/* domain name pointer */
-#define T_HINFO		13		/* host information */
-#define T_MINFO		14		/* mailbox information */
-#define T_MX		15		/* mail routing information */
-#define T_TXT		16		/* text strings */
+#define	T_A		1		/* host address */
+#define	T_NS		2		/* authoritative server */
+#define	T_MD		3		/* mail destination */
+#define	T_MF		4		/* mail forwarder */
+#define	T_CNAME		5		/* connonical name */
+#define	T_SOA		6		/* start of authority zone */
+#define	T_MB		7		/* mailbox domain name */
+#define	T_MG		8		/* mail group member */
+#define	T_MR		9		/* mail rename name */
+#define	T_NULL		10		/* null resource record */
+#define	T_WKS		11		/* well known service */
+#define	T_PTR		12		/* domain name pointer */
+#define	T_HINFO		13		/* host information */
+#define	T_MINFO		14		/* mailbox information */
+#define	T_MX		15		/* mail routing information */
+#define	T_TXT		16		/* text strings */
 #define	T_RP		17		/* responsible person */
 #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_PTR	23		/* reverse lookup for NSAP */
+#define	T_NSAP_PTR	23		/* reverse NSAP lookup (deprecated) */
 	/* non standard */
-#define T_UINFO		100		/* user (finger) information */
-#define T_UID		101		/* user ID */
-#define T_GID		102		/* group ID */
-#define T_UNSPEC	103		/* Unspecified format (binary data) */
+#define	T_UINFO		100		/* user (finger) information */
+#define	T_UID		101		/* user ID */
+#define	T_GID		102		/* group ID */
+#define	T_UNSPEC	103		/* Unspecified format (binary data) */
+#define	T_SA		200		/* shuffle address */
 	/* Query type values which do not appear in resource records */
-#define T_AXFR		252		/* transfer zone of authority */
-#define T_MAILB		253		/* transfer mailbox records */
-#define T_MAILA		254		/* transfer mail agent records */
-#define T_ANY		255		/* wildcard match */
+#define	T_AXFR		252		/* transfer zone of authority */
+#define	T_MAILB		253		/* transfer mailbox records */
+#define	T_MAILA		254		/* transfer mail agent records */
+#define	T_ANY		255		/* wildcard match */
 
 /*
  * Values for class field
  */
 
-#define C_IN		1		/* the arpa internet */
-#define C_CHAOS		3		/* for chaos net (MIT) */
-#define C_HS		4		/* for Hesiod name server (MIT) (XXX) */
+#define	C_IN		1		/* the arpa internet */
+#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 */
-#define C_ANY		255		/* wildcard match */
+#define	C_ANY		255		/* wildcard match */
 
 /*
  * 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
-
-#ifndef BYTE_ORDER
-#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(apollo) || defined(hp9000) || defined(hp9000s300) || \
-    defined (BIT_ZERO_ON_LEFT)
-#define BYTE_ORDER	BIG_ENDIAN
-#endif
-#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
+#define	CONV_SUCCESS	0
+#define	CONV_OVERFLOW	(-1)
+#define	CONV_BADFMT	(-2)
+#define	CONV_BADCKSUM	(-3)
+#define	CONV_BADBUFLEN	(-4)
 
 /*
  * Structure for query header.  The order of the fields is machine- and
@@ -196,103 +187,100 @@
  */
 
 typedef struct {
-	u_int16_t id;		/* query identification number */
+	unsigned	id :16;		/* query identification number */
 #if BYTE_ORDER == BIG_ENDIAN
 			/* fields in third byte */
-	u_int	qr:1;		/* response flag */
-	u_int	opcode:4;	/* purpose of message */
-	u_int	aa:1;		/* authoritive answer */
-	u_int	tc:1;		/* truncated message */
-	u_int	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 */
-	u_int	ra:1;		/* recursion available */
-	u_int	pr:1;		/* primary server required (non standard) */
-	u_int	unused:2;	/* unused bits */
-	u_int	rcode:4;	/* response code */
+	unsigned	ra: 1;		/* recursion available */
+	unsigned	pr: 1;		/* primary server req'd (!standard) */
+	unsigned	unused :2;	/* unused bits (MBZ as of 4.9.3a3) */
+	unsigned	rcode :4;	/* response code */
 #endif
 #if BYTE_ORDER == LITTLE_ENDIAN || BYTE_ORDER == PDP_ENDIAN
 			/* fields in third byte */
-	u_int	rd:1;		/* recursion desired */
-	u_int	tc:1;		/* truncated message */
-	u_int	aa:1;		/* authoritive answer */
-	u_int	opcode:4;	/* purpose of message */
-	u_int	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 */
-	u_int	rcode:4;	/* response code */
-	u_int	unused:2;	/* unused bits */
-	u_int	pr:1;		/* primary server required (non standard) */
-	u_int	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 req'd (!standard) */
+	unsigned	ra :1;		/* recursion available */
 #endif
 			/* remaining bytes */
-	u_int16_t qdcount;	/* number of question entries */
-	u_int16_t ancount;	/* number of answer entries */
-	u_int16_t nscount;	/* number of authority entries */
-	u_int16_t 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;
 
 /*
  * Defines for handling compressed domain names
  */
-#define INDIR_MASK	0xc0
+#define	INDIR_MASK	0xc0
 
 /*
  * Structure for passing resource records around.
  */
 struct rrec {
-	int16_t	r_zone;			/* zone number */
-	int16_t	r_class;		/* class number */
-	int16_t	r_type;			/* type number */
+	int16_t		r_zone;			/* zone number */
+	int16_t		r_class;		/* class number */
+	int16_t		r_type;			/* type number */
 	u_int32_t	r_ttl;			/* time to live */
-	int	r_size;			/* size of data area */
-	char	*r_data;		/* pointer to data */
+	int		r_size;			/* size of data area */
+	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 also assume that a "u_int16_t" holds 2 "chars"
- * and that a "u_int32_t" holds 4 "chars".
  *
  * These macros demonstrate the property of C whereby it can be
- * portable or it can be elegant but never both.
+ * 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); \
-	(s) = ((u_int16_t)t_cp[0] << 8) | (u_int16_t)t_cp[1]; \
-	(cp) += 2; \
+	(s) = ((u_int16_t)t_cp[0] << 8) \
+	    | ((u_int16_t)t_cp[1]) \
+	    ; \
+	(cp) += INT16SZ; \
 }
 
-#define GETLONG(l, cp) { \
+#define	GETLONG(l, cp) { \
 	register u_char *t_cp = (u_char *)(cp); \
-	(l) = (((u_int32_t)t_cp[0]) << 24) \
-	    | (((u_int32_t)t_cp[1]) << 16) \
-	    | (((u_int32_t)t_cp[2]) << 8) \
-	    | (((u_int32_t)t_cp[3])); \
-	(cp) += 4; \
+	(l) = ((u_int32_t)t_cp[0] << 24) \
+	    | ((u_int32_t)t_cp[1] << 16) \
+	    | ((u_int32_t)t_cp[2] << 8) \
+	    | ((u_int32_t)t_cp[3]) \
+	    ; \
+	(cp) += INT32SZ; \
 }
 
-#define PUTSHORT(s, cp) { \
+#define	PUTSHORT(s, cp) { \
 	register u_int16_t t_s = (u_int16_t)(s); \
 	register u_char *t_cp = (u_char *)(cp); \
 	*t_cp++ = t_s >> 8; \
 	*t_cp   = t_s; \
-	(cp) += 2; \
+	(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_char *t_cp = (u_char *)(cp); \
 	*t_cp++ = t_l >> 24; \
 	*t_cp++ = t_l >> 16; \
 	*t_cp++ = t_l >> 8; \
 	*t_cp   = t_l; \
-	(cp) += 4; \
+	(cp) += INT32SZ; \
 }
 
 #endif /* !_NAMESER_H_ */
diff --git a/include/resolv.h b/include/resolv.h
index cf8fe76..c903a20 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -30,8 +30,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
- *	$Id: resolv.h,v 4.9.1.2 1993/05/17 09:59:01 vixie Exp $
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
  * 
@@ -52,12 +50,30 @@
  * SOFTWARE.
  * -
  * --Copyright--
+ *
+ *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
+ *	From Id: resolv.h,v 4.9.1.2 1993/05/17 09:59:01 vixie Exp
+ *	$Id$
  */
 
 #ifndef _RESOLV_H_
 #define	_RESOLV_H_
 
+#include <sys/param.h>
 #include <sys/types.h>
+#include <sys/cdefs.h>
+#include <stdio.h>
+
+/*
+ * 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 (__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	19940415
+
 /*
  * Resolver configuration file.
  * Normally not present, but may contain the address of the
@@ -65,7 +81,7 @@
  */
 
 #ifndef _PATH_RESCONF
-#define _PATH_RESCONF        "/etc/resolv.conf"
+#define	_PATH_RESCONF        "/etc/resolv.conf"
 #endif
 
 /*
@@ -77,88 +93,132 @@
 #define	LOCALDOMAINPARTS	2	/* min levels in name that is "local" */
 
 #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 */
 
 struct __res_state {
 	int	retrans;	 	/* retransmition time interval */
 	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 */
-	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 */
 	u_short	id;			/* current packet id */
 	char	*dnsrch[MAXDNSRCH+1];	/* components of domain to search */
 	char	defdname[MAXDNAME];	/* default domain */
-	long	pfcode;			/* RES_PRF_ flags - see below. */
+	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];
+	struct {
+		struct in_addr	addr;
+		u_int32_t	mask;
+	} sort_list[MAXRESOLVSORT];
 };
 
 /*
  * 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_DEFAULT	(RES_RECURSE | RES_DEFNAMES | RES_DNSRCH)
+#define	RES_INIT	0x00000001	/* address initialized */
+#define	RES_DEBUG	0x00000002	/* print debug messages */
+#define	RES_AAONLY	0x00000004	/* authoritative answers only */
+#define	RES_USEVC	0x00000008	/* use virtual circuit */
+#define	RES_PRIMARY	0x00000010	/* query primary server only */
+#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_DEFAULT	(RES_RECURSE | RES_DEFNAMES | RES_DNSRCH)
 
 /*
  * 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	*/
 
-#include <sys/cdefs.h>
-#include <stdio.h>
+/* 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;
 
 /* Private routines shared between libc/net, named, nslookup and others. */
 #define	dn_skipname	__dn_skipname
 #define	fp_query	__fp_query
+#define	fp_nquery	__fp_nquery
 #define	hostalias	__hostalias
 #define	putlong		__putlong
 #define	putshort	__putshort
-#define p_class		__p_class
-#define p_time		__p_time
-#define p_type		__p_type
+#define	p_class		__p_class
+#define	p_time		__p_time
+#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
+
 __BEGIN_DECLS
 int	 __dn_skipname __P((const u_char *, const u_char *));
 void	 __fp_resstat __P((struct __res_state *, FILE *));
-void	 __fp_query __P((char *, FILE *));
+void	 __fp_query __P((const u_char *, FILE *));
+void	 __fp_nquery __P((const u_char *, int, FILE *));
 char	*__hostalias __P((const char *));
 void	 __putlong __P((u_int32_t, u_char *));
-void	 __putshort __P((u_short, u_char *));
-char	*__p_class __P((int));
+void	 __putshort __P((u_int16_t, u_char *));
 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 *,
-			u_char *, int));
+			char *, int));
 int	 res_init __P((void));
-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_query __P((const char *, int, int, u_char *, int));
+int	 res_search __P((const char *, int, int, u_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));
 __END_DECLS
 
 #endif /* !_RESOLV_H_ */