diff options
| -rw-r--r-- | include/arpa/inet.h | 7 | ||||
| -rw-r--r-- | include/arpa/nameser.h | 6 | ||||
| -rw-r--r-- | include/netdb.h | 32 | ||||
| -rw-r--r-- | include/resolv.h | 17 |
4 files changed, 56 insertions, 6 deletions
diff --git a/include/arpa/inet.h b/include/arpa/inet.h index 027f443..99c8a4a 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 f10660d..71ad340 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 diff --git a/include/netdb.h b/include/netdb.h index 4835703..8b86ea1 100644 --- a/include/netdb.h +++ b/include/netdb.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)netdb.h 8.1 (Berkeley) 6/2/93 - * $Id: netdb.h,v 1.3 1995/08/20 19:59:12 peter Exp $ + * $Id: netdb.h,v 1.4 1996/01/30 23:30:30 mpp Exp $ * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. * @@ -125,6 +125,7 @@ void endprotoent __P((void)); void endservent __P((void)); struct hostent *gethostbyaddr __P((const char *, int, int)); struct hostent *gethostbyname __P((const char *)); +struct hostent *gethostbyname2 __P((const char *, int)); struct hostent *gethostent __P((void)); struct netent *getnetbyaddr __P((long, int)); /* u_long? */ struct netent *getnetbyname __P((const char *)); @@ -142,6 +143,35 @@ void sethostent __P((int)); void setnetent __P((int)); void setprotoent __P((int)); void setservent __P((int)); + +/* + * PRIVATE functions specific to the FreeBSD implementation + */ + +/* DO NOT USE THESE, THEY ARE SUBJECT TO CHANGE AND ARE NOT PORTABLE!!! */ +void _sethosthtent __P((int)); +void _endhosthtent __P((void)); +void _sethostdnsent __P((int)); +void _endhostdnsent __P((void)); +void _setnethtent __P((int)); +void _endnethtent __P((void)); +void _setnetdnsent __P((int)); +void _endnetdnsent __P((void)); +struct hostent * _gethostbyhtname __P((const char *, int)); +struct hostent * _gethostbydnsname __P((const char *, int)); +struct hostent * _gethostbynisname __P((const char *, int)); +struct hostent * _gethostbyhtaddr __P((const char *, int, int)); +struct hostent * _gethostbydnsaddr __P((const char *, int, int)); +struct hostent * _gethostbynisaddr __P((const char *, int, int)); +struct netent * _getnetbyhtname __P((const char *)); +struct netent * _getnetbydnsname __P((const char *)); +struct netent * _getnetbynisname __P((const char *)); +struct netent * _getnetbyhtaddr __P((unsigned long, int)); +struct netent * _getnetbydnsaddr __P((unsigned long, int)); +struct netent * _getnetbynisaddr __P((unsigned long, int)); +void _map_v4v6_address __P((const char *src, char *dst)); +void _map_v4v6_hostent __P((struct hostent *hp, char **bp, int *len)); + __END_DECLS #endif /* !_NETDB_H_ */ diff --git a/include/resolv.h b/include/resolv.h index 6c97364..a6c4f4a 100644 --- a/include/resolv.h +++ b/include/resolv.h @@ -53,7 +53,7 @@ * * @(#)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: resolv.h,v 1.5 1996/01/07 05:01:50 peter Exp $ + * $Id: resolv.h,v 1.6 1996/01/30 23:30:34 mpp Exp $ */ #ifndef _RESOLV_H_ @@ -72,7 +72,7 @@ * is new enough to contain a certain feature. */ -#define __RES 19951031 +#define __RES 19960229 /* * Resolver configuration file. @@ -134,6 +134,7 @@ struct __res_state { #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_USE_INET6 0x00002000 /* use/map IPv6 in gethostbyname() */ #define RES_DEFAULT (RES_RECURSE | RES_DEFNAMES | RES_DNSRCH) @@ -178,6 +179,12 @@ typedef res_sendhookact (*res_send_rhook)__P((const struct sockaddr_in *ns, extern struct __res_state _res; /* Private routines shared between libc/net, named, nslookup and others. */ +#define res_hnok __res_hnok +#define res_ownok __res_ownok +#define res_mailok __res_mailok +#define res_dnok __res_dnok +#define loc_ntoa __loc_ntoa +#define loc_aton __loc_aton #define dn_skipname __dn_skipname #define fp_query __fp_query #define fp_nquery __fp_nquery @@ -198,6 +205,12 @@ extern struct __res_state _res; #define res_queriesmatch __res_queriesmatch __BEGIN_DECLS +int __res_hnok __P((const char *)); +int __res_ownok __P((const char *)); +int __res_mailok __P((const char *)); +int __res_dnok __P((const char *)); +int __loc_aton __P((const char *ascii, u_char *binary)); +char * __loc_ntoa __P((const u_char *binary, char *ascii)); int __dn_skipname __P((const u_char *, const u_char *)); void __fp_resstat __P((struct __res_state *, FILE *)); void __fp_query __P((const u_char *, FILE *)); |
