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.24
retrieving revision 1.37
diff -u -p -r1.24 -r1.37
--- src/sys/sys/socket.h	1997/05/02 22:19:13	1.24
+++ src/sys/sys/socket.h	1998/06/26 14:06:35	1.37
@@ -1,4 +1,4 @@
-/*	$NetBSD: socket.h,v 1.24 1997/05/02 22:19:13 thorpej Exp $	*/
+/*	$NetBSD: socket.h,v 1.37 1998/06/26 14:06:35 hannken Exp $	*/
 
 /*
  * Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)socket.h	8.4 (Berkeley) 2/21/94
+ *	@(#)socket.h	8.6 (Berkeley) 5/3/95
  */
 
 #ifndef _SYS_SOCKET_H_
@@ -83,7 +83,7 @@
  */
 struct	linger {
 	int	l_onoff;		/* option on/off */
-	int	l_linger;		/* linger time */
+	int	l_linger;		/* linger time in seconds */
 };
 
 /*
@@ -127,18 +127,20 @@ struct	linger {
 #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	pseudo_AF_HDRCMPLT 30		/* Used by BPF to not rewrite hdrs
+					   in interface output routine */
 
-#define	AF_MAX		30
+#define	AF_MAX		31
 
 /*
- * Structure used by kernel to store most addresses.
- * Force this to have the host's natural alignment.
+ * Structure used by kernel to store most
+ * addresses.
  */
 struct sockaddr {
 	u_char	sa_len;			/* total length */
 	u_char	sa_family;		/* address family */
 	char	sa_data[14];		/* actually longer; address value */
-} __attribute__((aligned(sizeof(long))));
+};
 
 /*
  * Structure used by kernel to pass protocol
@@ -189,6 +191,24 @@ struct sockproto {
 #define	PF_MAX		AF_MAX
 
 /*
+ * Socket credentials.
+ */
+struct sockcred {
+	uid_t	sc_uid;			/* real user id */
+	uid_t	sc_euid;		/* effective user id */
+	gid_t	sc_gid;			/* real group id */
+	gid_t	sc_egid;		/* effective group id */
+	int	sc_ngroups;		/* number of supplemental groups */
+	gid_t	sc_groups[1];		/* variable length */
+};
+
+/*
+ * Compute size of a sockcred structure with groups.
+ */
+#define	SOCKCREDSIZE(ngrps) \
+	(sizeof(struct sockcred) + (sizeof(gid_t) * ((ngrps) - 1)))
+
+/*
  * Definitions for network related sysctl, CTL_NET.
  *
  * Second level is protocol family.
@@ -200,7 +220,7 @@ struct sockproto {
 
 #define CTL_NET_NAMES { \
 	{ 0, 0 }, \
-	{ "unix", CTLTYPE_NODE }, \
+	{ "local", CTLTYPE_NODE }, \
 	{ "inet", CTLTYPE_NODE }, \
 	{ "implink", CTLTYPE_NODE }, \
 	{ "pup", CTLTYPE_NODE }, \
@@ -279,6 +299,8 @@ struct msghdr {
 #define	MSG_CTRUNC	0x20		/* control data lost before delivery */
 #define	MSG_WAITALL	0x40		/* wait for full request or error */
 #define	MSG_DONTWAIT	0x80		/* this message should be nonblocking */
+#define	MSG_BCAST	0x100		/* this message was rcvd using link-level brdcst */
+#define	MSG_MCAST	0x200		/* this message was rcvd using link-level mcast */
 
 /*
  * Header for ancillary data objects in msg_control buffer.
@@ -308,6 +330,14 @@ struct cmsghdr {
 /* "Socket"-level control message types: */
 #define	SCM_RIGHTS	0x01		/* access rights (array of int) */
 #define	SCM_TIMESTAMP	0x02		/* timestamp (struct timeval) */
+#define	SCM_CREDS	0x04		/* credientials (struct sockcred) */
+
+/*
+ * Types of socket shutdown(2).
+ */
+#define	SHUT_RD		0		/* Disallow further receives. */
+#define	SHUT_WR		1		/* Disallow further sends. */
+#define	SHUT_RDWR	2		/* Disallow further sends/receives. */
 
 /*
  * 4.3 compat sockaddr, move to compat file later
@@ -354,6 +384,12 @@ int	socket __P((int, int, int));
 int	socketpair __P((int, int, int, int *));
 __END_DECLS
 #else
+# if !defined(_LKM)
+#  include "opt_compat_freebsd.h"
+#  include "opt_compat_linux.h"
+#  include "opt_compat_sunos.h"
+#  include "opt_compat_hpux.h"
+# endif
 # if defined(COMPAT_43) || defined(COMPAT_SUNOS) || defined(COMPAT_LINUX) || \
      defined(COMPAT_HPUX) || defined(COMPAT_FREEBSD)
 #  define COMPAT_OLDSOCK