diff options
author | mike <mike@FreeBSD.org> | 2002-03-10 06:42:27 +0000 |
---|---|---|
committer | mike <mike@FreeBSD.org> | 2002-03-10 06:42:27 +0000 |
commit | b9910027dd0cf95c5e683b596045e215cb76ba18 (patch) | |
tree | 4d519d265a17a89110120a04e0ed090d2c1c1a95 | |
parent | d16edb37a4a17619e92bf8c60ccc2a81cfad0b96 (diff) | |
download | FreeBSD-src-b9910027dd0cf95c5e683b596045e215cb76ba18.zip FreeBSD-src-b9910027dd0cf95c5e683b596045e215cb76ba18.tar.gz |
o Add INET_ADDRSTRLEN and INET6_ADDRSTRLEN defines to <arpa/inet.h>
for POSIX.1-2001 conformance.
o Add magic to <netinet/in.h> and <netinet6/in6.h> to prevent
redefining INET_ADDRSTRLEN and INET6_ADDRSTRLEN.
o Add a note about missing typedefs in <arpa/inet.h>.
-rw-r--r-- | include/arpa/inet.h | 16 | ||||
-rw-r--r-- | sys/netinet/in.h | 2 | ||||
-rw-r--r-- | sys/netinet6/in6.h | 2 |
3 files changed, 18 insertions, 2 deletions
diff --git a/include/arpa/inet.h b/include/arpa/inet.h index 9c9554e..42daebf 100644 --- a/include/arpa/inet.h +++ b/include/arpa/inet.h @@ -64,6 +64,14 @@ /* Required for byteorder(3) functions. */ #include <machine/endian.h> +#ifndef INET_ADDRSTRLEN +#define INET_ADDRSTRLEN 16 +#endif + +#ifndef INET6_ADDRSTRLEN +#define INET6_ADDRSTRLEN 46 +#endif + #ifndef _IN_ADDR_T_DECLARED_ typedef __uint32_t in_addr_t; #define _IN_ADDR_T_DECLARED_ @@ -82,8 +90,8 @@ typedef _BSD_SIZE_T_ size_t; #endif /* !_POSIX_SOURCE */ /* - * XXX socklen_t is used by a POSIX.1-200x interface, but not required by - * POSIX.1-200x. + * XXX socklen_t is used by a POSIX.1-2001 interface, but not required by + * POSIX.1-2001. */ #ifdef _BSD_SOCKLEN_T_ typedef _BSD_SOCKLEN_T_ socklen_t; @@ -97,6 +105,10 @@ struct in_addr { #define _STRUCT_IN_ADDR_DECLARED #endif +/* + * XXX missing typedefs for uint16_t and uint32_t. + */ + /* XXX all new diversions!! argh!! */ #ifndef _POSIX_SOURCE #define inet_addr __inet_addr diff --git a/sys/netinet/in.h b/sys/netinet/in.h index 819a827..973d0af 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -306,7 +306,9 @@ struct sockaddr_in { char sin_zero[8]; }; +#ifndef INET_ADDRSTRLEN #define INET_ADDRSTRLEN 16 +#endif /* * Options for use with [gs]etsockopt at the IP level. diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h index b16af5f..39cda5d 100644 --- a/sys/netinet6/in6.h +++ b/sys/netinet6/in6.h @@ -132,7 +132,9 @@ struct in6_addr { #define s6_addr32 __u6_addr.__u6_addr32 #endif +#ifndef INET6_ADDRSTRLEN #define INET6_ADDRSTRLEN 46 +#endif /* * Socket address for IPv6 |