Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys fix include pathname for better rfc2292 compliance.
details: https://anonhg.NetBSD.org/src/rev/ef2df29cb7b8
branches: trunk
changeset: 481802:ef2df29cb7b8
user: itojun <itojun%NetBSD.org@localhost>
date: Sun Feb 06 12:49:37 2000 +0000
description:
fix include pathname for better rfc2292 compliance.
diffstat:
sys/kern/uipc_mbuf2.c | 4 ++--
sys/net/if_faith.c | 4 ++--
sys/net/if_loop.c | 4 ++--
sys/netinet6/ah_core.c | 10 +++++-----
sys/netinet6/ah_input.c | 6 +++---
sys/netinet6/ah_output.c | 6 +++---
sys/netinet6/dest6.c | 6 +++---
sys/netinet6/frag6.c | 6 +++---
sys/netinet6/icmp6.c | 6 +++---
sys/netinet6/in6.c | 4 ++--
sys/netinet6/in6_cksum.c | 4 ++--
sys/netinet6/in6_gif.c | 7 +++----
sys/netinet6/in6_ifattach.c | 6 +++---
sys/netinet6/in6_pcb.c | 4 ++--
sys/netinet6/in6_prefix.c | 4 ++--
sys/netinet6/in6_proto.c | 6 +++---
sys/netinet6/ip6_forward.c | 6 +++---
sys/netinet6/ip6_input.c | 6 +++---
sys/netinet6/ip6_mroute.c | 4 ++--
sys/netinet6/ip6_output.c | 6 +++---
sys/netinet6/ipcomp_input.c | 4 ++--
sys/netinet6/ipcomp_output.c | 4 ++--
sys/netinet6/ipsec.c | 6 +++---
sys/netinet6/ipsec.h | 4 ++--
sys/netinet6/mld6.c | 6 +++---
sys/netinet6/nd6.c | 6 +++---
sys/netinet6/nd6_nbr.c | 6 +++---
sys/netinet6/nd6_rtr.c | 6 +++---
sys/netinet6/raw_ip6.c | 6 +++---
sys/netinet6/route6.c | 4 ++--
sys/netinet6/udp6_usrreq.c | 6 +++---
sys/netkey/key.c | 7 +++----
sys/netkey/key_debug.c | 3 +--
sys/netkey/keydb.c | 4 ++--
sys/netkey/keysock.c | 4 ++--
35 files changed, 91 insertions(+), 94 deletions(-)
diffs (truncated from 737 to 300 lines):
diff -r 069c2cd24f67 -r ef2df29cb7b8 sys/kern/uipc_mbuf2.c
--- a/sys/kern/uipc_mbuf2.c Sun Feb 06 11:59:29 2000 +0000
+++ b/sys/kern/uipc_mbuf2.c Sun Feb 06 12:49:37 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_mbuf2.c,v 1.2 1999/12/13 15:17:18 itojun Exp $ */
+/* $NetBSD: uipc_mbuf2.c,v 1.3 2000/02/06 12:49:51 itojun Exp $ */
/*
* Copyright (C) 1999 WIDE Project.
@@ -80,7 +80,7 @@
#include <sys/mbuf.h>
#if defined(PULLDOWN_STAT) && defined(INET6)
#include <netinet/in.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>
#endif
diff -r 069c2cd24f67 -r ef2df29cb7b8 sys/net/if_faith.c
--- a/sys/net/if_faith.c Sun Feb 06 11:59:29 2000 +0000
+++ b/sys/net/if_faith.c Sun Feb 06 12:49:37 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_faith.c,v 1.9 2000/01/06 15:46:07 itojun Exp $ */
+/* $NetBSD: if_faith.c,v 1.10 2000/02/06 12:49:37 itojun Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -74,7 +74,7 @@
#include <netinet/in.h>
#endif
#include <netinet6/in6_var.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
#endif
#include "bpfilter.h"
diff -r 069c2cd24f67 -r ef2df29cb7b8 sys/net/if_loop.c
--- a/sys/net/if_loop.c Sun Feb 06 11:59:29 2000 +0000
+++ b/sys/net/if_loop.c Sun Feb 06 12:49:37 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_loop.c,v 1.28 1999/12/15 06:16:05 itojun Exp $ */
+/* $NetBSD: if_loop.c,v 1.29 2000/02/06 12:49:37 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -104,7 +104,7 @@
#include <netinet/in.h>
#endif
#include <netinet6/in6_var.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
#endif
#ifdef NS
diff -r 069c2cd24f67 -r ef2df29cb7b8 sys/netinet6/ah_core.c
--- a/sys/netinet6/ah_core.c Sun Feb 06 11:59:29 2000 +0000
+++ b/sys/netinet6/ah_core.c Sun Feb 06 12:49:37 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ah_core.c,v 1.15 2000/01/31 14:19:01 itojun Exp $ */
+/* $NetBSD: ah_core.c,v 1.16 2000/02/06 12:49:40 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -64,9 +64,9 @@
#include <netinet/in_var.h>
#ifdef INET6
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>
-#include <netinet6/icmp6.h>
+#include <netinet/icmp6.h>
#endif
#include <netinet6/ipsec.h>
@@ -74,7 +74,7 @@
#ifdef IPSEC_ESP
#include <netinet6/esp.h>
#endif
-#include <netkey/keyv2.h>
+#include <net/pfkeyv2.h>
#include <netkey/keydb.h>
#ifdef HAVE_MD5
#include <sys/md5.h>
@@ -130,7 +130,7 @@
static void ah_hmac_sha1_result __P((struct ah_algorithm_state *, caddr_t));
/* checksum algorithms */
-/* NOTE: The order depends on SADB_AALG_x in netkey/keyv2.h */
+/* NOTE: The order depends on SADB_AALG_x in net/pfkeyv2.h.h */
struct ah_algorithm ah_algorithms[] = {
{ 0, 0, 0, 0, 0, 0, },
{ ah_sumsiz_1216, ah_hmac_md5_mature, 128, 128,
diff -r 069c2cd24f67 -r ef2df29cb7b8 sys/netinet6/ah_input.c
--- a/sys/netinet6/ah_input.c Sun Feb 06 11:59:29 2000 +0000
+++ b/sys/netinet6/ah_input.c Sun Feb 06 12:49:37 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ah_input.c,v 1.7 2000/01/31 14:19:01 itojun Exp $ */
+/* $NetBSD: ah_input.c,v 1.8 2000/02/06 12:49:42 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -60,9 +60,9 @@
#include <netinet/ip_ecn.h>
#ifdef INET6
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>
-#include <netinet6/icmp6.h>
+#include <netinet/icmp6.h>
#endif
#include <netinet6/ipsec.h>
diff -r 069c2cd24f67 -r ef2df29cb7b8 sys/netinet6/ah_output.c
--- a/sys/netinet6/ah_output.c Sun Feb 06 11:59:29 2000 +0000
+++ b/sys/netinet6/ah_output.c Sun Feb 06 12:49:37 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ah_output.c,v 1.6 2000/01/31 14:19:02 itojun Exp $ */
+/* $NetBSD: ah_output.c,v 1.7 2000/02/06 12:49:42 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -58,9 +58,9 @@
#include <netinet/in_var.h>
#ifdef INET6
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>
-#include <netinet6/icmp6.h>
+#include <netinet/icmp6.h>
#endif
#include <netinet6/ipsec.h>
diff -r 069c2cd24f67 -r ef2df29cb7b8 sys/netinet6/dest6.c
--- a/sys/netinet6/dest6.c Sun Feb 06 11:59:29 2000 +0000
+++ b/sys/netinet6/dest6.c Sun Feb 06 12:49:37 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dest6.c,v 1.6 2000/01/06 07:31:11 itojun Exp $ */
+/* $NetBSD: dest6.c,v 1.7 2000/02/06 12:49:42 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -45,10 +45,10 @@
#include <netinet/in.h>
#include <netinet/in_var.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
#include <netinet6/in6_pcb.h>
#include <netinet6/ip6_var.h>
-#include <netinet6/icmp6.h>
+#include <netinet/icmp6.h>
/*
* Destination options header processing.
diff -r 069c2cd24f67 -r ef2df29cb7b8 sys/netinet6/frag6.c
--- a/sys/netinet6/frag6.c Sun Feb 06 11:59:29 2000 +0000
+++ b/sys/netinet6/frag6.c Sun Feb 06 12:49:37 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: frag6.c,v 1.9 2000/02/03 18:13:01 itojun Exp $ */
+/* $NetBSD: frag6.c,v 1.10 2000/02/06 12:49:42 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -46,10 +46,10 @@
#include <netinet/in.h>
#include <netinet/in_var.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
#include <netinet6/in6_pcb.h>
#include <netinet6/ip6_var.h>
-#include <netinet6/icmp6.h>
+#include <netinet/icmp6.h>
#include <net/net_osdep.h>
diff -r 069c2cd24f67 -r ef2df29cb7b8 sys/netinet6/icmp6.c
--- a/sys/netinet6/icmp6.c Sun Feb 06 11:59:29 2000 +0000
+++ b/sys/netinet6/icmp6.c Sun Feb 06 12:49:37 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.c,v 1.18 2000/01/16 18:06:03 itojun Exp $ */
+/* $NetBSD: icmp6.c,v 1.19 2000/02/06 12:49:42 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -86,9 +86,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 <netinet6/mld6_var.h>
#include <netinet6/in6_pcb.h>
#include <netinet6/nd6.h>
diff -r 069c2cd24f67 -r ef2df29cb7b8 sys/netinet6/in6.c
--- a/sys/netinet6/in6.c Sun Feb 06 11:59:29 2000 +0000
+++ b/sys/netinet6/in6.c Sun Feb 06 12:49:37 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: in6.c,v 1.15 2000/02/04 08:54:04 itojun Exp $ */
+/* $NetBSD: in6.c,v 1.16 2000/02/06 12:49:43 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -93,7 +93,7 @@
#include <net/if_ether.h>
#include <netinet6/nd6.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>
#include <netinet6/mld6_var.h>
#include <netinet6/ip6_mroute.h>
diff -r 069c2cd24f67 -r ef2df29cb7b8 sys/netinet6/in6_cksum.c
--- a/sys/netinet6/in6_cksum.c Sun Feb 06 11:59:29 2000 +0000
+++ b/sys/netinet6/in6_cksum.c Sun Feb 06 12:49:37 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_cksum.c,v 1.6 1999/12/13 15:17:22 itojun Exp $ */
+/* $NetBSD: in6_cksum.c,v 1.7 2000/02/06 12:49:43 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -68,7 +68,7 @@
#include <sys/mbuf.h>
#include <sys/systm.h>
#include <netinet/in.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
#include <net/net_osdep.h>
diff -r 069c2cd24f67 -r ef2df29cb7b8 sys/netinet6/in6_gif.c
--- a/sys/netinet6/in6_gif.c Sun Feb 06 11:59:29 2000 +0000
+++ b/sys/netinet6/in6_gif.c Sun Feb 06 12:49:37 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_gif.c,v 1.10 2000/01/06 15:46:09 itojun Exp $ */
+/* $NetBSD: in6_gif.c,v 1.11 2000/02/06 12:49:44 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -53,11 +53,10 @@
#ifdef INET
#include <netinet/ip.h>
#endif
-#include <netinet6/ip6.h>
+#ifdef INET6
+#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>
#include <netinet6/in6_gif.h>
-#ifdef INET6
-#include <netinet6/ip6.h>
#endif
#include <netinet/ip_ecn.h>
diff -r 069c2cd24f67 -r ef2df29cb7b8 sys/netinet6/in6_ifattach.c
--- a/sys/netinet6/in6_ifattach.c Sun Feb 06 11:59:29 2000 +0000
+++ b/sys/netinet6/in6_ifattach.c Sun Feb 06 12:49:37 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_ifattach.c,v 1.18 2000/02/04 14:34:25 itojun Exp $ */
+/* $NetBSD: in6_ifattach.c,v 1.19 2000/02/06 12:49:44 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -45,10 +45,10 @@
#include <netinet/in.h>
#include <netinet/in_var.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>
#include <netinet6/in6_ifattach.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>
#include <netinet6/nd6.h>
diff -r 069c2cd24f67 -r ef2df29cb7b8 sys/netinet6/in6_pcb.c
--- a/sys/netinet6/in6_pcb.c Sun Feb 06 11:59:29 2000 +0000
+++ b/sys/netinet6/in6_pcb.c Sun Feb 06 12:49:37 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_pcb.c,v 1.18 2000/02/03 13:17:39 itojun Exp $ */
+/* $NetBSD: in6_pcb.c,v 1.19 2000/02/06 12:49:44 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -86,7 +86,7 @@
#include <netinet/in_systm.h>
#include <netinet/ip.h>
#include <netinet/in_pcb.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>
#include <netinet6/in6_pcb.h>
#include <netinet6/nd6.h>
diff -r 069c2cd24f67 -r ef2df29cb7b8 sys/netinet6/in6_prefix.c
Home |
Main Index |
Thread Index |
Old Index