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.110.4.2
retrieving revision 1.120.2.1
diff -u -p -r1.110.4.2 -r1.120.2.1
--- src/sys/sys/socket.h	2015/12/27 12:10:18	1.110.4.2
+++ src/sys/sys/socket.h	2017/01/15 20:27:34	1.120.2.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: socket.h,v 1.110.4.2 2015/12/27 12:10:18 skrll Exp $	*/
+/*	$NetBSD: socket.h,v 1.120.2.1 2017/01/15 20:27:34 bouyer Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -221,7 +221,8 @@ struct	accept_filter_arg {
 #define	AF_IEEE80211	32		/* IEEE80211 */
 #define	AF_MPLS		33		/* MultiProtocol Label Switching */
 #define	AF_ROUTE	34		/* Internal Routing Protocol */
-#define	AF_MAX		35
+#define	AF_CAN		35
+#define	AF_MAX		36
 
 /*
  * Structure used by kernel to store most
@@ -330,11 +331,17 @@ struct sockaddr_storage {
 #define PF_BLUETOOTH	AF_BLUETOOTH
 #define	PF_MPLS		AF_MPLS
 #define	PF_ROUTE	AF_ROUTE
+#define	PF_CAN		AF_CAN
 
 #define	PF_MAX		AF_MAX
 
 #if defined(_NETBSD_SOURCE)
 
+#ifndef pid_t
+typedef __pid_t		pid_t;		/* process id */
+#define pid_t		__pid_t
+#endif
+
 #ifndef	gid_t
 typedef	__gid_t		gid_t;		/* group id */
 #define	gid_t		__gid_t
@@ -349,6 +356,7 @@ typedef	__uid_t		uid_t;		/* user id */
  * Socket credentials.
  */
 struct sockcred {
+	pid_t	sc_pid;			/* process id */
 	uid_t	sc_uid;			/* real user id */
 	uid_t	sc_euid;		/* effective user id */
 	gid_t	sc_gid;			/* real group id */
@@ -466,12 +474,13 @@ struct kinfo_pcb {
  *	Fifth: type of info, defined below
  *	Sixth: flag(s) to mask with for NET_RT_FLAGS
  */
-#define NET_RT_DUMP	1		/* dump; may limit to a.f. */
-#define NET_RT_FLAGS	2		/* by flags, e.g. RESOLVING */
-#define NET_RT_OOIFLIST	3		/* old NET_RT_IFLIST (pre 1.5) */
-#define NET_RT_OIFLIST	4		/* survey interface list */
-#define	NET_RT_IFLIST	5
-#define	NET_RT_MAXID	6
+#define	NET_RT_DUMP		1	/* dump; may limit to a.f. */
+#define	NET_RT_FLAGS		2	/* by flags, e.g. RESOLVING */
+#define	NET_RT_OOOIFLIST	3	/* old NET_RT_IFLIST (pre 1.5) */
+#define	NET_RT_OOIFLIST		4	/* old NET_RT_IFLIST (pre-64bit time) */
+#define	NET_RT_OIFLIST		5	/* old NET_RT_IFLIST (pre 8.0) */
+#define	NET_RT_IFLIST		6	/* survey interface list */
+#define	NET_RT_MAXID		7
 
 #define CTL_NET_RT_NAMES { \
 	{ 0, 0 }, \
@@ -595,9 +604,10 @@ struct cmsghdr {
 /* "Socket"-level control message types: */
 #define	SCM_RIGHTS	0x01		/* access rights (array of int) */
 #if defined(_NETBSD_SOURCE)
-/* 			0x02		   timestamp (struct timeval50) */
-#define	SCM_CREDS	0x04		/* credentials (struct sockcred) */
+/*			0x02		   timestamp (struct timeval50) */
+/*			0x04		   credentials (struct sockcred70) */
 #define	SCM_TIMESTAMP	0x08		/* timestamp (struct timeval) */
+#define	SCM_CREDS	0x10		/* credentials (struct sockcred) */
 #endif
 
 /*