Reserve a place for PF_KEY; rename SIP to INET6

sys/sys/socket.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: socket.h,v 1.20 1997/03/15 17:08:28 is Exp $	*/
+/*	$NetBSD: socket.h,v 1.21 1997/03/18 03:47:42 sommerfe Exp $	*/
 
 /*
  * Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994
@@ -120,14 +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		29
+#define	AF_MAX		30
 
 /*
  * Structure used by kernel to store most
@@ -175,7 +176,7 @@ 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
@@ -183,6 +184,7 @@ struct sockproto {
 #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
 
@@ -221,11 +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 }, \
 }
 
 /*