summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoritojun <itojun@NetBSD.org>2000-02-06 11:21:45 +0000
committeritojun <itojun@NetBSD.org>2000-02-06 11:21:45 +0000
commit387cae5e1663cb26b87dba3d31c1db99d3691f1c (patch)
tree7a4ab193426f29cbdd2c8d203804779a5d9f480a
parent23774a37c950c467c7abc147f36de97b173493cd (diff)
fix include file path (IPv6 related).
-rw-r--r--usr.sbin/mtrace6/mtrace6.c5
-rw-r--r--usr.sbin/rtadvd/config.c6
-rw-r--r--usr.sbin/setkey/parse.y4
-rw-r--r--usr.sbin/setkey/setkey.c4
-rw-r--r--usr.sbin/setkey/test-policy.c5
-rw-r--r--usr.sbin/setkey/token.l4
-rw-r--r--usr.sbin/tcpdump/addrtoname.c6
7 files changed, 16 insertions, 18 deletions
diff --git a/usr.sbin/mtrace6/mtrace6.c b/usr.sbin/mtrace6/mtrace6.c
index 6437bc44e80..134b48f296c 100644
--- a/usr.sbin/mtrace6/mtrace6.c
+++ b/usr.sbin/mtrace6/mtrace6.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mtrace6.c,v 1.1 2000/01/28 19:32:54 itojun Exp $ */
+/* $NetBSD: mtrace6.c,v 1.2 2000/02/06 11:21:45 itojun Exp $ */
/*
* Copyright (C) 1999 WIDE Project.
@@ -42,9 +42,8 @@
#include <netinet/in.h>
-#include <netinet6/in6.h>
#include <netinet6/in6_var.h>
-#include <netinet6/icmp6.h>
+#include <netinet/icmp6.h>
#include <string.h>
#include <stdio.h>
diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c
index d490a051319..4749eb04a23 100644
--- a/usr.sbin/rtadvd/config.c
+++ b/usr.sbin/rtadvd/config.c
@@ -1,4 +1,4 @@
-/* $NetBSD: config.c,v 1.4 2000/02/02 04:07:50 itojun Exp $ */
+/* $NetBSD: config.c,v 1.5 2000/02/06 11:21:46 itojun Exp $ */
/*
* Copyright (C) 1998 WIDE Project.
@@ -43,9 +43,9 @@
#include <netinet/in.h>
#include <netinet/in_var.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>
-#include <netinet6/icmp6.h>
+#include <netinet/icmp6.h>
#include <arpa/inet.h>
diff --git a/usr.sbin/setkey/parse.y b/usr.sbin/setkey/parse.y
index bad95b5fc1e..af64ca6a671 100644
--- a/usr.sbin/setkey/parse.y
+++ b/usr.sbin/setkey/parse.y
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.y,v 1.3 2000/01/31 14:22:42 itojun Exp $ */
+/* $NetBSD: parse.y,v 1.4 2000/02/06 11:21:47 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
@@ -37,7 +37,7 @@
#include <net/route.h>
#include <netinet/in.h>
-#include <netkey/keyv2.h>
+#include <net/pfkeyv2.h>
#include <netkey/key_var.h>
#include <netinet6/ipsec.h>
#include <arpa/inet.h>
diff --git a/usr.sbin/setkey/setkey.c b/usr.sbin/setkey/setkey.c
index 226400fb46f..5609a77f353 100644
--- a/usr.sbin/setkey/setkey.c
+++ b/usr.sbin/setkey/setkey.c
@@ -1,4 +1,4 @@
-/* $NetBSD: setkey.c,v 1.3 2000/01/31 14:22:44 itojun Exp $ */
+/* $NetBSD: setkey.c,v 1.4 2000/02/06 11:21:48 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
@@ -37,7 +37,7 @@
#include <err.h>
#include <net/route.h>
#include <netinet/in.h>
-#include <netkey/keyv2.h>
+#include <net/pfkeyv2.h>
#include <netkey/keydb.h>
#include <netkey/key_debug.h>
#include <netinet6/ipsec.h>
diff --git a/usr.sbin/setkey/test-policy.c b/usr.sbin/setkey/test-policy.c
index 9ab363c3089..d5a4e3bf95a 100644
--- a/usr.sbin/setkey/test-policy.c
+++ b/usr.sbin/setkey/test-policy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: test-policy.c,v 1.2 1999/07/06 13:13:03 itojun Exp $ */
+/* $NetBSD: test-policy.c,v 1.3 2000/02/06 11:21:49 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
@@ -33,8 +33,7 @@
#include <sys/param.h>
#include <sys/socket.h>
#include <netinet/in.h>
-#include <netinet6/in6.h>
-#include <netkey/keyv2.h>
+#include <net/pfkeyv2.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr.sbin/setkey/token.l b/usr.sbin/setkey/token.l
index 55d586a9d40..ba20f6677bf 100644
--- a/usr.sbin/setkey/token.l
+++ b/usr.sbin/setkey/token.l
@@ -1,4 +1,4 @@
-/* $NetBSD: token.l,v 1.4 2000/01/31 14:22:45 itojun Exp $ */
+/* $NetBSD: token.l,v 1.5 2000/02/06 11:21:49 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
@@ -34,7 +34,7 @@
#include <sys/param.h>
#include <sys/socket.h>
#include <net/route.h>
-#include <netkey/keyv2.h>
+#include <net/pfkeyv2.h>
#include <netkey/keydb.h>
#include <netkey/key_debug.h>
#include <netinet/in.h>
diff --git a/usr.sbin/tcpdump/addrtoname.c b/usr.sbin/tcpdump/addrtoname.c
index a83a26bfb52..8e8b9dbe30d 100644
--- a/usr.sbin/tcpdump/addrtoname.c
+++ b/usr.sbin/tcpdump/addrtoname.c
@@ -1,4 +1,4 @@
-/* $NetBSD: addrtoname.c,v 1.9 1999/12/10 05:45:07 itojun Exp $ */
+/* $NetBSD: addrtoname.c,v 1.10 2000/02/06 11:21:52 itojun Exp $ */
/*
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -29,7 +29,7 @@
static const char rcsid[] =
"@(#) Header: addrtoname.c,v 1.61 97/06/15 13:20:18 leres Exp (LBL)";
#else
-__RCSID("$NetBSD: addrtoname.c,v 1.9 1999/12/10 05:45:07 itojun Exp $");
+__RCSID("$NetBSD: addrtoname.c,v 1.10 2000/02/06 11:21:52 itojun Exp $");
#endif
#endif
@@ -53,7 +53,7 @@ struct rtentry;
#include <arpa/inet.h>
#ifdef INET6
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
#endif
#include <ctype.h>