aboutsummaryrefslogtreecommitdiffstats
path: root/include/arpa
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>1996-08-29 20:01:00 +0000
committerPeter Wemm <peter@FreeBSD.org>1996-08-29 20:01:00 +0000
commit74b3fad642cf04affd4b415ee4758edddffc7bb8 (patch)
tree650c9c9c3c1af061e253f92b6d7ce10314f2916d /include/arpa
parent230a383d0dc09f56f6fd9337c3b7e47572cf0ae4 (diff)
downloadsrc-74b3fad642cf04affd4b415ee4758edddffc7bb8.tar.gz
src-74b3fad642cf04affd4b415ee4758edddffc7bb8.zip
Hand merge in the bind-4.9.4-P1 resolver updates.
Notes
Notes: svn path=/head/; revision=17902
Diffstat (limited to 'include/arpa')
-rw-r--r--include/arpa/inet.h7
-rw-r--r--include/arpa/nameser.h6
2 files changed, 10 insertions, 3 deletions
diff --git a/include/arpa/inet.h b/include/arpa/inet.h
index 027f4430aeb5..99c8a4ab895b 100644
--- a/include/arpa/inet.h
+++ b/include/arpa/inet.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)inet.h 8.1 (Berkeley) 6/2/93
- * $Id$
+ * $Id: inet.h,v 1.3 1996/06/13 20:44:50 wollman Exp $
*/
#ifndef _ARPA_INET_H_
@@ -53,6 +53,11 @@ 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));
+int inet_pton __P((int af, const char *src, void *dst));
+const char *inet_ntop __P((int af, const void *src, char *dst, size_t s));
+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
#endif /* !_INET_H_ */
diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h
index f10660d0044f..71ad340021e8 100644
--- a/include/arpa/nameser.h
+++ b/include/arpa/nameser.h
@@ -53,7 +53,7 @@
*
* @(#)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
- * $Id: nameser.h,v 1.6 1996/01/07 05:01:52 peter Exp $
+ * $Id: nameser.h,v 1.7 1996/01/30 23:31:16 mpp Exp $
*/
#ifndef _ARPA_NAMESER_H_
@@ -87,7 +87,9 @@
#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 */
+#define INADDRSZ 4 /* IPv4 T_A */
+#define IN6ADDRSZ 16 /* IPv6 T_AAAA */
+
/*
* Internet nameserver port number