Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/sys/socket.h,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/sys/socket.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.8
retrieving revision 1.23
diff -u -p -r1.8 -r1.23
--- src/sys/sys/socket.h	1994/05/13 06:12:10	1.8
+++ src/sys/sys/socket.h	1997/05/02 19:02:02	1.23
@@ -1,3 +1,5 @@
+/*	$NetBSD: socket.h,v 1.23 1997/05/02 19:02:02 thorpej Exp $	*/
+
 /*
  * Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)socket.h	8.4 (Berkeley) 2/21/94
- *	$Id: socket.h,v 1.8 1994/05/13 06:12:10 mycroft Exp $
+ *	@(#)socket.h	8.4 (Berkeley) 2/21/94
  */
 
 #ifndef _SYS_SOCKET_H_
@@ -63,6 +64,7 @@
 #define	SO_LINGER	0x0080		/* linger on close if data present */
 #define	SO_OOBINLINE	0x0100		/* leave received OOB data in line */
 #define	SO_REUSEPORT	0x0200		/* allow local address & port reuse */
+#define	SO_TIMESTAMP	0x0400		/* timestamp received dgram traffic */
 
 /*
  * Additional options, not kept in so_options.
@@ -118,10 +120,15 @@ struct	linger {
 #define	AF_CNT		21		/* Computer Network Technology */
 #define pseudo_AF_RTIP	22		/* Help Identify RTIP packets */
 #define	AF_IPX		23		/* Novell Internet Protocol */
-#define	AF_SIP		24		/* Simple Internet Protocol */
+#define	AF_INET6	24		/* IP version 6 */
 #define pseudo_AF_PIP	25		/* Help Identify PIP packets */
+#define AF_ISDN		26		/* Integrated Services Digital Network*/
+#define AF_E164		AF_ISDN		/* CCITT E.164 recommendation */
+#define AF_NATM		27		/* native ATM access */
+#define AF_ARP		28		/* (rev.) addr. res. prot. (RFC 826) */
+#define pseudo_AF_KEY	29		/* Internal key management protocol  */
 
-#define	AF_MAX		26
+#define	AF_MAX		30
 
 /*
  * Structure used by kernel to store most
@@ -169,10 +176,15 @@ struct sockproto {
 #define	PF_XTP		pseudo_AF_XTP	/* really just proto family, no AF */
 #define	PF_COIP		AF_COIP
 #define	PF_CNT		AF_CNT
-#define	PF_SIP		AF_SIP
+#define	PF_INET6	AF_INET6
 #define	PF_IPX		AF_IPX		/* same format as AF_NS */
 #define PF_RTIP		pseudo_AF_FTIP	/* same format as AF_INET */
 #define PF_PIP		pseudo_AF_PIP
+#define PF_ISDN		AF_ISDN		/* same as E164 */
+#define PF_E164		AF_E164
+#define PF_NATM		AF_NATM
+#define PF_ARP		AF_ARP
+#define PF_KEY 		pseudo_AF_KEY	/* like PF_ROUTE, only for key mgmt */
 
 #define	PF_MAX		AF_MAX
 
@@ -211,8 +223,12 @@ struct sockproto {
 	{ "cnt", CTLTYPE_NODE }, \
 	{ "rtip", CTLTYPE_NODE }, \
 	{ "ipx", CTLTYPE_NODE }, \
-	{ "sip", CTLTYPE_NODE }, \
+	{ "inet6", CTLTYPE_NODE }, \
 	{ "pip", CTLTYPE_NODE }, \
+	{ "isdn", CTLTYPE_NODE }, \
+	{ "natm", CTLTYPE_NODE }, \
+	{ "arp", CTLTYPE_NODE }, \
+	{ "key", CTLTYPE_NODE }, \
 }
 
 /*
@@ -236,9 +252,10 @@ struct sockproto {
 }
 
 /*
- * Maximum queue length specifiable by listen.
+ * Maximum queue length specifiable by listen(2).
  */
-#define	SOMAXCONN	5
+
+#define	SOMAXCONN	128
 
 /*
  * Message header for recvmsg and sendmsg calls.
@@ -290,6 +307,7 @@ struct cmsghdr {
 
 /* "Socket"-level control message types: */
 #define	SCM_RIGHTS	0x01		/* access rights (array of int) */
+#define	SCM_TIMESTAMP	0x02		/* timestamp (struct timeval) */
 
 /*
  * 4.3 compat sockaddr, move to compat file later
@@ -311,7 +329,7 @@ struct omsghdr {
 	int	msg_accrightslen;
 };
 
-#ifndef	KERNEL
+#ifndef	_KERNEL
 
 #include <sys/cdefs.h>
 
@@ -335,6 +353,12 @@ int	shutdown __P((int, int));
 int	socket __P((int, int, int));
 int	socketpair __P((int, int, int, int *));
 __END_DECLS
+#else
+# if defined(COMPAT_43) || defined(COMPAT_SUNOS) || defined(COMPAT_LINUX) || \
+     defined(COMPAT_HPUX) || defined(COMPAT_FREEBSD)
+#  define COMPAT_OLDSOCK
+#  define MSG_COMPAT	0x8000
+# endif
+#endif /* !_KERNEL */
 
-#endif /* !KERNEL */
 #endif /* !_SYS_SOCKET_H_ */