General clean-up of socket.h and associated sources to synchronise up

with NetBSD and the Single Unix Specification v2.

This updates some structures with other, almost equivalent types and
effort is under way to get the whole more consistent.

Also removes a double definition of INET6 and some other clean-ups.

Reviewed by: green, bde, phk
Some part obtained from: NetBSD, SUSv2 specification

9 files changed, 48 insertions, 21 deletions

diff --git a/lib/libc/sys/accept.2 b/lib/libc/sys/accept.2
index 211904e..384823e 100644
--- a/lib/libc/sys/accept.2
+++ b/lib/libc/sys/accept.2
@@ -42,7 +42,7 @@
 .Fd #include <sys/types.h>
 .Fd #include <sys/socket.h>
 .Ft int
-.Fn accept "int s" "struct sockaddr *addr" "int *addrlen"
+.Fn accept "int s" "struct sockaddr *addr" "socklen_t *addrlen"
 .Sh DESCRIPTION
 The argument
 .Fa s
diff --git a/lib/libc/sys/bind.2 b/lib/libc/sys/bind.2
index 53f1874..316ed18 100644
--- a/lib/libc/sys/bind.2
+++ b/lib/libc/sys/bind.2
@@ -42,7 +42,7 @@
 .Fd #include <sys/types.h>
 .Fd #include <sys/socket.h>
 .Ft int
-.Fn bind "int s" "const struct sockaddr *addr" "int addrlen"
+.Fn bind "int s" "const struct sockaddr *addr" "socklen_t addrlen"
 .Sh DESCRIPTION
 .Fn Bind
 assigns the local protocol address to a socket.
diff --git a/lib/libc/sys/connect.2 b/lib/libc/sys/connect.2
index bd42550..aef52f1 100644
--- a/lib/libc/sys/connect.2
+++ b/lib/libc/sys/connect.2
@@ -42,7 +42,7 @@
 .Fd #include <sys/types.h>
 .Fd #include <sys/socket.h>
 .Ft int
-.Fn connect "int s" "const struct sockaddr *name" "int namelen"
+.Fn connect "int s" "const struct sockaddr *name" "socklen_t namelen"
 .Sh DESCRIPTION
 The parameter
 .Fa s
diff --git a/lib/libc/sys/getpeername.2 b/lib/libc/sys/getpeername.2
index cdf69f1..109d195 100644
--- a/lib/libc/sys/getpeername.2
+++ b/lib/libc/sys/getpeername.2
@@ -42,7 +42,7 @@
 .Fd #include <sys/types.h>
 .Fd #include <sys/socket.h>
 .Ft int
-.Fn getpeername "int s" "struct sockaddr *name" "int *namelen"
+.Fn getpeername "int s" "struct sockaddr *name" "socklen_t *namelen"
 .Sh DESCRIPTION
 .Fn Getpeername
 returns the name of the peer connected to
diff --git a/lib/libc/sys/getsockname.2 b/lib/libc/sys/getsockname.2
index 9330a3e..9355596 100644
--- a/lib/libc/sys/getsockname.2
+++ b/lib/libc/sys/getsockname.2
@@ -42,7 +42,7 @@
 .Fd #include <sys/types.h>
 .Fd #include <sys/socket.h>
 .Ft int
-.Fn getsockname "int s" "struct sockaddr *name" "int *namelen"
+.Fn getsockname "int s" "struct sockaddr *name" "socklen_t *namelen"
 .Sh DESCRIPTION
 .Fn Getsockname
 returns the current 
diff --git a/lib/libc/sys/getsockopt.2 b/lib/libc/sys/getsockopt.2
index 6cc8e49..db1f834 100644
--- a/lib/libc/sys/getsockopt.2
+++ b/lib/libc/sys/getsockopt.2
@@ -43,9 +43,9 @@
 .Fd #include <sys/types.h>
 .Fd #include <sys/socket.h>
 .Ft int
-.Fn getsockopt "int s" "int level" "int optname" "void *optval" "int *optlen"
+.Fn getsockopt "int s" "int level" "int optname" "void *optval" "socklen_t *optlen"
 .Ft int
-.Fn setsockopt "int s" "int level" "int optname" "const void *optval" "int optlen"
+.Fn setsockopt "int s" "int level" "int optname" "const void *optval" "socklen_t optlen"
 .Sh DESCRIPTION
 .Fn Getsockopt
 and
diff --git a/lib/libc/sys/recv.2 b/lib/libc/sys/recv.2
index bcaf9b9..bf73dd5 100644
--- a/lib/libc/sys/recv.2
+++ b/lib/libc/sys/recv.2
@@ -46,7 +46,7 @@
 .Ft ssize_t
 .Fn recv "int s" "void *buf" "size_t len" "int flags"
 .Ft ssize_t
-.Fn recvfrom "int s" "void *buf" "size_t len" "int flags" "struct sockaddr *from" "int *fromlen"
+.Fn recvfrom "int s" "void *buf" "size_t len" "int flags" "struct sockaddr *from" "socklen_t *fromlen"
 .Ft ssize_t
 .Fn recvmsg "int s" "struct msghdr *msg" "int flags"
 .Sh DESCRIPTION
diff --git a/lib/libc/sys/send.2 b/lib/libc/sys/send.2
index 8f74a9f..327307c 100644
--- a/lib/libc/sys/send.2
+++ b/lib/libc/sys/send.2
@@ -46,7 +46,7 @@
 .Ft ssize_t
 .Fn send "int s" "const void *msg" "size_t len" "int flags"
 .Ft ssize_t
-.Fn sendto "int s" "const void *msg" "size_t len" "int flags" "const struct sockaddr *to" "int tolen"
+.Fn sendto "int s" "const void *msg" "size_t len" "int flags" "const struct sockaddr *to" "socklen_t tolen"
 .Ft ssize_t
 .Fn sendmsg "int s" "const struct msghdr *msg" "int flags"
 .Sh DESCRIPTION
diff --git a/lib/libc/sys/socket.2 b/lib/libc/sys/socket.2
index df988ff..f86d693 100644
--- a/lib/libc/sys/socket.2
+++ b/lib/libc/sys/socket.2
@@ -54,15 +54,42 @@ communication will take place; this selects the protocol family
 which should be used.
 These families are defined in the include file
 .Ao Pa sys/socket.h Ac .
-The currently understood formats are
+The currently understood formats are:
 .Pp
 .Bd -literal -offset indent -compact
-PF_LOCAL	(Host-internal protocols, formerly called PF_UNIX),
-PF_INET		(ARPA Internet protocols),
-PF_ISO		(ISO protocols),
-PF_CCITT	(ITU-T protocols, like X.25),
-PF_NS		(Xerox Network Systems protocols), and
-.\"PF_IMPLINK	(IMP \*(lqhost at IMP\*(rq link layer).
+PF_LOCAL	Host-internal protocols, formerly called PF_UNIX,
+PF_UNIX		Host-internal protocols, depreciated, use PF_LOCAL,
+PF_INET		Internet version 4 protocols,
+PF_IMPLINK	ARPAnet IMP addresses,
+PF_PUP		PUP protocols, like BSP,
+PF_CHAOS	MIT CHAOS protocols,
+PF_NS		Xerox Network Systems protocols,
+PF_ISO		ISO protocols,
+PF_OSI		Open Systems Interconnection protocols,
+PF_ECMA		European Computer Manufacturers,
+PF_DATAKIT	Datakit protocols,
+PF_CCITT	ITU-T protocols, like X.25,
+PF_SNA		IBM SNA,
+PF_DECnet	DECnet,
+PF_DLI		DEC Direct Data Link Interface protocol,
+PF_LAT		LAT protocol,
+PF_HYLINK	NSC Hyperchannel,
+PF_APPLETALK	AppleTalk protocols,
+PF_ROUTE	Internal Routing protocol,
+PF_LINK		Link layer interface,
+PF_XTP		eXpress Transfer Protocol,
+PF_COIP		Connection-Oriented IP, aka ST II,
+PF_CNT		Computer Network Technology,
+PF_SIP		Simple Internet Protocol,
+PF_IPX		Novell Intenet Packet eXchange protocol,
+PF_RTIP		Help Identify RTIP packets,
+PF_PIP		Help Identify PIP packets,
+PF_ISDN		Integrated Services Digital Network,
+PF_KEY		Internal key-management function,
+PF_INET6	Internet version 6 protocols,
+PF_NATM		Native ATM access,
+PF_ATM		ATM,
+PF_NETGRAPH	Netgraph sockets
 .Ed
 .Pp
 The socket has the indicated
@@ -71,11 +98,11 @@ which specifies the semantics of communication.  Currently
 defined types are:
 .Pp
 .Bd -literal -offset indent -compact
-SOCK_STREAM
-SOCK_DGRAM
-SOCK_RAW
-SOCK_SEQPACKET
-SOCK_RDM
+SOCK_STREAM	Stream socket,
+SOCK_DGRAM	Datagram socket,
+SOCK_RAW	Raw-protocol interface,
+SOCK_RDM	Sequenced packet stream,
+SOCK_SEQPACKET	Reliably-delivered packet
 .Ed
 .Pp
 A