ip4 -> ipip

3 files changed, 25 insertions, 25 deletions

diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c
index 7f35c012e56..811af6612a4 100644
--- a/usr.bin/netstat/inet.c
+++ b/usr.bin/netstat/inet.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet.c,v 1.44 2000/01/09 23:44:03 angelos Exp $	*/
+/*	$OpenBSD: inet.c,v 1.45 2000/01/21 03:24:06 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.44 2000/01/09 23:44:03 angelos Exp $";
+static char *rcsid = "$OpenBSD: inet.c,v 1.45 2000/01/21 03:24:06 angelos Exp $";
 #endif
 #endif /* not lint */
 
@@ -71,7 +71,7 @@ static char *rcsid = "$OpenBSD: inet.c,v 1.44 2000/01/09 23:44:03 angelos Exp $"
 #include <netinet/ip_ipsp.h>
 #include <netinet/ip_ah.h>
 #include <netinet/ip_esp.h>
-#include <netinet/ip_ip4.h>
+#include <netinet/ip_ipip.h>
 #include <netinet/ip_ether.h>
 
 #include <arpa/inet.h>
@@ -764,29 +764,29 @@ esp_stats(off, name)
  * Dump ESP statistics structure.
  */
 void
-ip4_stats(off, name)
+ipip_stats(off, name)
         u_long off;
         char *name;
 {
-        struct ip4stat ip4stat;
+        struct ipipstat ipipstat;
 
         if (off == 0)
                 return;
-        kread(off, (char *)&ip4stat, sizeof (ip4stat));
+        kread(off, (char *)&ipipstat, sizeof (ipipstat));
         printf("%s:\n", name);
 
-#define p(f, m) if (ip4stat.f || sflag <= 1) \
-    printf(m, ip4stat.f, plural(ip4stat.f))
-
-        p(ip4s_ipackets, "\t%u total input packet%s\n");
-        p(ip4s_opackets, "\t%u total output packet%s\n");
-        p(ip4s_hdrops, "\t%u packet%s shorter than header shows\n");
-        p(ip4s_pdrops, "\t%u packet%s dropped due to policy\n");
-        p(ip4s_spoof, "\t%u packet%s with possibly spoofed local addresses\n");
-        p(ip4s_qfull, "\t%u packet%s were dropped due to full output queue\n");
-	p(ip4s_ibytes, "\t%qu input byte%s\n");
-	p(ip4s_obytes, "\t%qu output byte%s\n");
-	p(ip4s_family, "\t%u protocol family mismatches\n");
-	p(ip4s_unspec, "\t%u attempts to use tunnel with unspecified endpoint(s)\n");
+#define p(f, m) if (ipipstat.f || sflag <= 1) \
+    printf(m, ipipstat.f, plural(ipipstat.f))
+
+        p(ipips_ipackets, "\t%u total input packet%s\n");
+        p(ipips_opackets, "\t%u total output packet%s\n");
+        p(ipips_hdrops, "\t%u packet%s shorter than header shows\n");
+        p(ipips_pdrops, "\t%u packet%s dropped due to policy\n");
+        p(ipips_spoof, "\t%u packet%s with possibly spoofed local addresses\n");
+        p(ipips_qfull, "\t%u packet%s were dropped due to full output queue\n");
+	p(ipips_ibytes, "\t%qu input byte%s\n");
+	p(ipips_obytes, "\t%qu output byte%s\n");
+	p(ipips_family, "\t%u protocol family mismatches\n");
+	p(ipips_unspec, "\t%u attempts to use tunnel with unspecified endpoint(s)\n");
 #undef p
 }
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index 178b9f63670..ea38e3308d5 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.20 2000/01/11 01:14:26 fgsch Exp $	*/
+/*	$OpenBSD: main.c,v 1.21 2000/01/21 03:24:06 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.20 2000/01/11 01:14:26 fgsch Exp $";
+static char *rcsid = "$OpenBSD: main.c,v 1.21 2000/01/21 03:24:06 angelos Exp $";
 #endif
 #endif /* not lint */
 
@@ -146,7 +146,7 @@ struct nlist nl[] = {
 #define N_ESPSTAT	37
 	{ "_espstat"},
 #define N_IP4STAT	38
-	{ "_ip4stat"},
+	{ "_ipipstat"},
 #define N_DDPSTAT	39
 	{ "_ddpstat"},
 #define N_DDPCB		40
@@ -197,7 +197,7 @@ struct protox {
 	{ -1,		N_ESPSTAT,	1,	0,
 	  esp_stats,	"esp" },
 	{ -1,		N_IP4STAT,	1,	0,
-	  ip4_stats,	"ipencap" },
+	  ipip_stats,	"ipencap" },
 	{ -1,		N_ETHERIPSTAT,	1,	0,
 	  etherip_stats,"etherip" },
 	{ -1,		-1,		0,	0,
diff --git a/usr.bin/netstat/netstat.h b/usr.bin/netstat/netstat.h
index 71797c3c98a..88355fde585 100644
--- a/usr.bin/netstat/netstat.h
+++ b/usr.bin/netstat/netstat.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netstat.h,v 1.13 1999/12/08 12:30:17 itojun Exp $	*/
+/*	$OpenBSD: netstat.h,v 1.14 2000/01/21 03:24:06 angelos Exp $	*/
 /*	$NetBSD: netstat.h,v 1.6 1996/05/07 02:55:05 thorpej Exp $	*/
 
 /*
@@ -76,7 +76,7 @@ void	icmp_stats __P((u_long, char *));
 void	igmp_stats __P((u_long, char *));
 void	ah_stats __P((u_long, char *));
 void	esp_stats __P((u_long, char *));
-void	ip4_stats __P((u_long, char *));
+void	ipip_stats __P((u_long, char *));
 void	etherip_stats __P((u_long, char *));
 void	protopr __P((u_long, char *));