Grok protocol/address family PF_KEY.

4 files changed, 16 insertions, 14 deletions

diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c
index 3e9fd1edfa2..2ce10641a2d 100644
--- a/usr.bin/netstat/inet.c
+++ b/usr.bin/netstat/inet.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet.c,v 1.29 1999/02/18 08:25:51 deraadt Exp $	*/
+/*	$OpenBSD: inet.c,v 1.30 1999/02/24 22:57:34 angelos Exp $	*/
 /*	$NetBSD: inet.c,v 1.14 1995/10/03 21:42:37 thorpej Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from: @(#)inet.c	8.4 (Berkeley) 4/20/94";
 #else
-static char *rcsid = "$OpenBSD: inet.c,v 1.29 1999/02/18 08:25:51 deraadt Exp $";
+static char *rcsid = "$OpenBSD: inet.c,v 1.30 1999/02/24 22:57:34 angelos Exp $";
 #endif
 #endif /* not lint */
 
@@ -68,6 +68,7 @@ static char *rcsid = "$OpenBSD: inet.c,v 1.29 1999/02/18 08:25:51 deraadt Exp $"
 #include <netinet/tcp_debug.h>
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
+#include <netinet/ip_ipsp.h>
 #include <netinet/ip_ah.h>
 #include <netinet/ip_esp.h>
 #include <netinet/ip_ip4.h>
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index 179eae97ab5..3f82ffa9055 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.15 1998/08/01 05:36:18 angelos Exp $	*/
+/*	$OpenBSD: main.c,v 1.16 1999/02/24 22:57:34 angelos Exp $	*/
 /*	$NetBSD: main.c,v 1.9 1996/05/07 02:55:02 thorpej Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ char copyright[] =
 #if 0
 static char sccsid[] = "from: @(#)main.c	8.4 (Berkeley) 3/1/94";
 #else
-static char *rcsid = "$OpenBSD: main.c,v 1.15 1998/08/01 05:36:18 angelos Exp $";
+static char *rcsid = "$OpenBSD: main.c,v 1.16 1999/02/24 22:57:34 angelos Exp $";
 #endif
 #endif /* not lint */
 
@@ -273,7 +273,7 @@ main(argc, argv)
 			else if (strcmp(optarg, "iso") == 0)
 				af = AF_ISO;
 			else if (strcmp(optarg, "encap") == 0)
-				af = AF_ENCAP;
+				af = PF_KEY;
 			else if (strcmp(optarg, "atalk") == 0)
 				af = AF_APPLETALK;
 			else {
diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1
index 5329da119c7..ac14556b57d 100644
--- a/usr.bin/netstat/netstat.1
+++ b/usr.bin/netstat/netstat.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: netstat.1,v 1.12 1998/09/27 16:57:48 aaron Exp $
+.\"	$OpenBSD: netstat.1,v 1.13 1999/02/24 22:57:34 angelos Exp $
 .\"	$NetBSD: netstat.1,v 1.11 1995/10/03 21:42:43 thorpej Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1992, 1993
@@ -118,7 +118,7 @@ for
 .Dv AF_ISO ,
 .Ar encap ,
 for
-.Dv AF_ENCAP ,
+.Dv PF_KEY ,
 .Ar local ,
 for
 .Dv AF_LOCAL ,
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index ced59780a73..12fc9619b1a 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.c,v 1.25 1998/06/23 22:40:40 millert Exp $	*/
+/*	$OpenBSD: route.c,v 1.26 1999/02/24 22:57:35 angelos Exp $	*/
 /*	$NetBSD: route.c,v 1.15 1996/05/07 02:55:06 thorpej Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from: @(#)route.c	8.3 (Berkeley) 3/9/94";
 #else
-static char *rcsid = "$OpenBSD: route.c,v 1.25 1998/06/23 22:40:40 millert Exp $";
+static char *rcsid = "$OpenBSD: route.c,v 1.26 1999/02/24 22:57:35 angelos Exp $";
 #endif
 #endif /* not lint */
 
@@ -75,7 +75,8 @@ static char *rcsid = "$OpenBSD: route.c,v 1.25 1998/06/23 22:40:40 millert Exp $
 #define INET
 #endif
 
-#include <net/encap.h>
+#include <sys/socket.h>
+#include <netinet/ip_ipsp.h>
 #include "netstat.h"
 
 #define kget(p, d) (kread((u_long)(p), (char *)&(d), sizeof (d)))
@@ -159,7 +160,7 @@ routepr(rtree)
 			} else if (af == AF_UNSPEC || af == i) {
 				pr_family(i);
 				do_rtent = 1;
-				if (i != AF_ENCAP)
+				if (i != PF_KEY)
 					pr_rthdr();
 				else
 					pr_encaphdr();
@@ -194,7 +195,7 @@ pr_family(af)
 	case AF_CCITT:
 		afname = "X.25";
 		break;
-	case AF_ENCAP:
+	case PF_KEY:
 		afname = "Encap";
 		break;
 	case AF_APPLETALK:
@@ -230,7 +231,7 @@ pr_rthdr()
 }
 
 /*
- * Print header for AF_ENCAP entries.
+ * Print header for PF_KEY entries.
  */
 void
 pr_encaphdr()
@@ -532,7 +533,7 @@ p_rtentry(rt)
 	
 	bcopy(kgetsa(rt_key(rt)), sa, sizeof(struct sockaddr));
 
-	if (sa->sa_family == AF_ENCAP) {
+	if (sa->sa_family == PF_KEY) {
 		encap_print(rt);
 		return;
 	}