Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Multiple inclusion protection, as suggested by christos@...
details: https://anonhg.NetBSD.org/src/rev/b57ae1c80aa0
branches: trunk
changeset: 586235:b57ae1c80aa0
user: elad <elad%NetBSD.org@localhost>
date: Sat Dec 10 23:44:08 2005 +0000
description:
Multiple inclusion protection, as suggested by christos@ on tech-kern@
few days ago.
diffstat:
sys/netipsec/ah.h | 4 ++--
sys/netipsec/ah_var.h | 4 ++--
sys/netipsec/esp.h | 4 ++--
sys/netipsec/esp_var.h | 4 ++--
sys/netipsec/ipcomp.h | 4 ++--
sys/netipsec/ipcomp_var.h | 4 ++--
sys/netipsec/ipip_var.h | 4 ++--
sys/netipsec/ipsec.h | 4 ++--
sys/netipsec/ipsec6.h | 4 ++--
sys/netipsec/ipsec_osdep.h | 8 ++++----
sys/netipsec/ipsec_var.h | 4 ++--
sys/netipsec/key.h | 4 ++--
sys/netipsec/key_debug.h | 4 ++--
sys/netipsec/key_var.h | 4 ++--
sys/netipsec/keydb.h | 4 ++--
sys/netipsec/keysock.h | 4 ++--
sys/netipsec/xform.h | 4 ++--
sys/netisdn/i4b_capi.h | 8 ++++----
sys/netisdn/i4b_capi_msgs.h | 8 ++++----
sys/netisdn/i4b_cause.h | 8 ++++----
sys/netisdn/i4b_debug.h | 8 ++++----
sys/netisdn/i4b_global.h | 8 ++++----
sys/netisdn/i4b_ioctl.h | 8 ++++----
sys/netisdn/i4b_isdnq931.h | 7 ++++++-
sys/netisdn/i4b_isppp.h | 8 ++++----
sys/netisdn/i4b_l1l2.h | 9 ++++-----
sys/netisdn/i4b_l2.h | 10 +++++-----
sys/netisdn/i4b_l2fsm.h | 9 ++++-----
sys/netisdn/i4b_l3.h | 8 ++++----
sys/netisdn/i4b_l3fsm.h | 8 ++++----
sys/netisdn/i4b_l3l4.h | 10 +++++-----
sys/netisdn/i4b_l4.h | 8 ++++----
sys/netisdn/i4b_mbuf.h | 8 ++++----
sys/netisdn/i4b_q931.h | 8 ++++----
sys/netisdn/i4b_q932fac.h | 6 +++++-
sys/netisdn/i4b_rbch_ioctl.h | 8 ++++----
sys/netisdn/i4b_tel_ioctl.h | 8 ++++----
sys/netisdn/i4b_trace.h | 8 ++++----
38 files changed, 125 insertions(+), 118 deletions(-)
diffs (truncated from 877 to 300 lines):
diff -r 31577734719b -r b57ae1c80aa0 sys/netipsec/ah.h
--- a/sys/netipsec/ah.h Sat Dec 10 23:31:41 2005 +0000
+++ b/sys/netipsec/ah.h Sat Dec 10 23:44:08 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ah.h,v 1.1 2003/08/13 20:06:49 jonathan Exp $ */
+/* $NetBSD: ah.h,v 1.2 2005/12/10 23:44:08 elad Exp $ */
/* $FreeBSD: src/sys/netipsec/ah.h,v 1.1.4.1 2003/01/24 05:11:35 sam Exp $ */
/* $KAME: ah.h,v 1.13 2000/10/18 21:28:00 itojun Exp $ */
@@ -54,4 +54,4 @@
u_int32_t ah_seq; /* Sequence number field */
/* variable size, 32bit bound*/ /* Authentication data */
};
-#endif /*_NETIPSEC_AH_H_*/
+#endif /* !_NETIPSEC_AH_H_ */
diff -r 31577734719b -r b57ae1c80aa0 sys/netipsec/ah_var.h
--- a/sys/netipsec/ah_var.h Sat Dec 10 23:31:41 2005 +0000
+++ b/sys/netipsec/ah_var.h Sat Dec 10 23:44:08 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ah_var.h,v 1.2 2004/05/07 00:55:14 jonathan Exp $ */
+/* $NetBSD: ah_var.h,v 1.3 2005/12/10 23:44:08 elad Exp $ */
/* $FreeBSD: src/sys/netipsec/ah_var.h,v 1.1.4.1 2003/01/24 05:11:35 sam Exp $ */
/* $OpenBSD: ip_ah.h,v 1.29 2002/06/09 16:26:10 itojun Exp $ */
/*
@@ -76,4 +76,4 @@
extern int ah_cleartos;
extern struct ahstat ahstat;
#endif /* _KERNEL */
-#endif /*_NETIPSEC_AH_VAR_H_*/
+#endif /* !_NETIPSEC_AH_VAR_H_ */
diff -r 31577734719b -r b57ae1c80aa0 sys/netipsec/esp.h
--- a/sys/netipsec/esp.h Sat Dec 10 23:31:41 2005 +0000
+++ b/sys/netipsec/esp.h Sat Dec 10 23:44:08 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: esp.h,v 1.2 2005/02/26 22:45:13 perry Exp $ */
+/* $NetBSD: esp.h,v 1.3 2005/12/10 23:44:08 elad Exp $ */
/* $FreeBSD: src/sys/netipsec/esp.h,v 1.1.4.1 2003/01/24 05:11:35 sam Exp $ */
/* $KAME: esp.h,v 1.16 2000/10/18 21:28:00 itojun Exp $ */
@@ -67,4 +67,4 @@
};
#define ESP_ALEN 12 /* 96-bit authenticator */
-#endif /*_NETIPSEC_ESP_H_*/
+#endif /* !_NETIPSEC_ESP_H_ */
diff -r 31577734719b -r b57ae1c80aa0 sys/netipsec/esp_var.h
--- a/sys/netipsec/esp_var.h Sat Dec 10 23:31:41 2005 +0000
+++ b/sys/netipsec/esp_var.h Sat Dec 10 23:44:08 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_var.h,v 1.2 2004/05/07 00:55:14 jonathan Exp $ */
+/* $NetBSD: esp_var.h,v 1.3 2005/12/10 23:44:08 elad Exp $ */
/* $FreeBSD: src/sys/netipsec/esp_var.h,v 1.1.4.1 2003/01/24 05:11:35 sam Exp $ */
/* $OpenBSD: ip_esp.h,v 1.37 2002/06/09 16:26:10 itojun Exp $ */
/*
@@ -76,4 +76,4 @@
extern int esp_enable;
extern struct espstat espstat;
#endif /* _KERNEL */
-#endif /*_NETIPSEC_ESP_VAR_H_*/
+#endif /* !_NETIPSEC_ESP_VAR_H_ */
diff -r 31577734719b -r b57ae1c80aa0 sys/netipsec/ipcomp.h
--- a/sys/netipsec/ipcomp.h Sat Dec 10 23:31:41 2005 +0000
+++ b/sys/netipsec/ipcomp.h Sat Dec 10 23:44:08 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ipcomp.h,v 1.1 2003/08/13 20:06:50 jonathan Exp $ */
+/* $NetBSD: ipcomp.h,v 1.2 2005/12/10 23:44:08 elad Exp $ */
/* $FreeBSD: src/sys/netipsec/ipcomp.h,v 1.1.4.1 2003/01/24 05:11:35 sam Exp $ */
/* $KAME: ipcomp.h,v 1.8 2000/09/26 07:55:14 itojun Exp $ */
@@ -53,4 +53,4 @@
#define IPCOMP_MAX 4
#define IPCOMP_CPI_NEGOTIATE_MIN 256
-#endif /*_NETIPSEC_IPCOMP_H_*/
+#endif /* !_NETIPSEC_IPCOMP_H_ */
diff -r 31577734719b -r b57ae1c80aa0 sys/netipsec/ipcomp_var.h
--- a/sys/netipsec/ipcomp_var.h Sat Dec 10 23:31:41 2005 +0000
+++ b/sys/netipsec/ipcomp_var.h Sat Dec 10 23:44:08 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ipcomp_var.h,v 1.2 2004/05/07 00:55:14 jonathan Exp $ */
+/* $NetBSD: ipcomp_var.h,v 1.3 2005/12/10 23:44:08 elad Exp $ */
/* $FreeBSD: src/sys/netipsec/ipcomp_var.h,v 1.1.4.1 2003/01/24 05:11:35 sam Exp $ */
/* $KAME: ipcomp.h,v 1.8 2000/09/26 07:55:14 itojun Exp $ */
@@ -65,4 +65,4 @@
extern int ipcomp_enable;
extern struct ipcompstat ipcompstat;
#endif /* _KERNEL */
-#endif /*_NETIPSEC_IPCOMP_VAR_H_*/
+#endif /* !_NETIPSEC_IPCOMP_VAR_H_ */
diff -r 31577734719b -r b57ae1c80aa0 sys/netipsec/ipip_var.h
--- a/sys/netipsec/ipip_var.h Sat Dec 10 23:31:41 2005 +0000
+++ b/sys/netipsec/ipip_var.h Sat Dec 10 23:44:08 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ipip_var.h,v 1.2 2004/05/07 00:55:14 jonathan Exp $ */
+/* $NetBSD: ipip_var.h,v 1.3 2005/12/10 23:44:08 elad Exp $ */
/* $FreeBSD: src/sys/netipsec/ipip_var.h,v 1.1.4.1 2003/01/24 05:11:35 sam Exp $ */
/* $OpenBSD: ip_ipip.h,v 1.5 2002/06/09 16:26:10 itojun Exp $ */
/*
@@ -63,4 +63,4 @@
extern int ipip_allow;
extern struct ipipstat ipipstat;
#endif /* _KERNEL */
-#endif /* _NETINET_IPIP_H_ */
+#endif /* !_NETINET_IPIP_H_ */
diff -r 31577734719b -r b57ae1c80aa0 sys/netipsec/ipsec.h
--- a/sys/netipsec/ipsec.h Sat Dec 10 23:31:41 2005 +0000
+++ b/sys/netipsec/ipsec.h Sat Dec 10 23:44:08 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.h,v 1.11 2005/06/10 13:22:42 christos Exp $ */
+/* $NetBSD: ipsec.h,v 1.12 2005/12/10 23:44:08 elad Exp $ */
/* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.h,v 1.2.4.2 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: ipsec.h,v 1.53 2001/11/20 08:32:38 itojun Exp $ */
@@ -358,4 +358,4 @@
INITFN void ipsec_attach(void);
#endif /* _KERNEL */
-#endif /* _NETIPSEC_IPSEC_H_ */
+#endif /* !_NETIPSEC_IPSEC_H_ */
diff -r 31577734719b -r b57ae1c80aa0 sys/netipsec/ipsec6.h
--- a/sys/netipsec/ipsec6.h Sat Dec 10 23:31:41 2005 +0000
+++ b/sys/netipsec/ipsec6.h Sat Dec 10 23:44:08 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec6.h,v 1.3 2003/12/04 19:38:24 atatat Exp $ */
+/* $NetBSD: ipsec6.h,v 1.4 2005/12/10 23:44:08 elad Exp $ */
/* $FreeBSD: src/sys/netipsec/ipsec6.h,v 1.1.4.1 2003/01/24 05:11:35 sam Exp $ */
/* $KAME: ipsec.h,v 1.44 2001/03/23 08:08:47 itojun Exp $ */
@@ -104,4 +104,4 @@
struct secpolicy *, int));
#endif /*_KERNEL*/
-#endif /*_NETIPSEC_IPSEC6_H_*/
+#endif /* !_NETIPSEC_IPSEC6_H_ */
diff -r 31577734719b -r b57ae1c80aa0 sys/netipsec/ipsec_osdep.h
--- a/sys/netipsec/ipsec_osdep.h Sat Dec 10 23:31:41 2005 +0000
+++ b/sys/netipsec/ipsec_osdep.h Sat Dec 10 23:44:08 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec_osdep.h,v 1.14 2005/12/04 19:15:21 christos Exp $ */
+/* $NetBSD: ipsec_osdep.h,v 1.15 2005/12/10 23:44:08 elad Exp $ */
/* $FreeBSD: /repoman/r/ncvs/src/sys/netipsec/ipsec_osdep.h,v 1.1 2003/09/29 22:47:45 sam Exp $ */
/*
@@ -26,8 +26,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef NETIPSEC_OSDEP_H
-#define NETIPSEC_OSDEP_H
+#ifndef _NETIPSEC_OSDEP_H_
+#define _NETIPSEC_OSDEP_H_
#ifdef _KERNEL
/*
@@ -341,4 +341,4 @@
* FreeBSD uses splimp() where (for networking) NetBSD would use splnet().
*/
#endif /* _KERNEL */
-#endif /* NETIPSEC_OSDEP_H */
+#endif /* !_NETIPSEC_OSDEP_H_ */
diff -r 31577734719b -r b57ae1c80aa0 sys/netipsec/ipsec_var.h
--- a/sys/netipsec/ipsec_var.h Sat Dec 10 23:31:41 2005 +0000
+++ b/sys/netipsec/ipsec_var.h Sat Dec 10 23:44:08 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec_var.h,v 1.3 2005/02/26 22:45:13 perry Exp $ */
+/* $NetBSD: ipsec_var.h,v 1.4 2005/12/10 23:44:08 elad Exp $ */
/* $FreeBSD: src/sys/netipsec/ipsec.h,v 1.2.4.2 2004/02/14 22:23:23 bms Exp $ */
/*-
@@ -128,4 +128,4 @@
{ "esp_randpad", CTLTYPE_INT }, \
}
-#endif /*_NETIPSEC_IPSEC_VAR_H_*/
+#endif /* !_NETIPSEC_IPSEC_VAR_H_ */
diff -r 31577734719b -r b57ae1c80aa0 sys/netipsec/key.h
--- a/sys/netipsec/key.h Sat Dec 10 23:31:41 2005 +0000
+++ b/sys/netipsec/key.h Sat Dec 10 23:44:08 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: key.h,v 1.3 2005/02/26 22:45:13 perry Exp $ */
+/* $NetBSD: key.h,v 1.4 2005/12/10 23:44:08 elad Exp $ */
/* $FreeBSD: src/sys/netipsec/key.h,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
/* $KAME: key.h,v 1.21 2001/07/27 03:51:30 itojun Exp $ */
@@ -116,4 +116,4 @@
#endif /* MALLOC_DECLARE */
#endif /* defined(_KERNEL) */
-#endif /* _NETIPSEC_KEY_H_ */
+#endif /* !_NETIPSEC_KEY_H_ */
diff -r 31577734719b -r b57ae1c80aa0 sys/netipsec/key_debug.h
--- a/sys/netipsec/key_debug.h Sat Dec 10 23:31:41 2005 +0000
+++ b/sys/netipsec/key_debug.h Sat Dec 10 23:44:08 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: key_debug.h,v 1.1 2003/08/13 20:06:51 jonathan Exp $ */
+/* $NetBSD: key_debug.h,v 1.2 2005/12/10 23:44:08 elad Exp $ */
/* $FreeBSD: src/sys/netipsec/key_debug.h,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
/* $KAME: key_debug.h,v 1.10 2001/08/05 08:37:52 itojun Exp $ */
@@ -86,4 +86,4 @@
extern void ipsec_hexdump __P((caddr_t, int));
extern void ipsec_bindump __P((caddr_t, int));
-#endif /* _NETIPSEC_KEY_DEBUG_H_ */
+#endif /* !_NETIPSEC_KEY_DEBUG_H_ */
diff -r 31577734719b -r b57ae1c80aa0 sys/netipsec/key_var.h
--- a/sys/netipsec/key_var.h Sat Dec 10 23:31:41 2005 +0000
+++ b/sys/netipsec/key_var.h Sat Dec 10 23:44:08 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: key_var.h,v 1.2 2003/12/12 21:04:04 scw Exp $ */
+/* $NetBSD: key_var.h,v 1.3 2005/12/10 23:44:08 elad Exp $ */
/* $FreeBSD: src/sys/netipsec/key_var.h,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
/* $KAME: key_var.h,v 1.11 2001/09/12 23:05:07 sakane Exp $ */
@@ -90,4 +90,4 @@
#define _KEYBUF(key) ((u_int8_t *)((u_int8_t*)(key) + sizeof(struct sadb_key)))
#endif /*_KERNEL*/
-#endif /* _NETIPSEC_KEY_VAR_H_ */
+#endif /* !_NETIPSEC_KEY_VAR_H_ */
diff -r 31577734719b -r b57ae1c80aa0 sys/netipsec/keydb.h
--- a/sys/netipsec/keydb.h Sat Dec 10 23:31:41 2005 +0000
+++ b/sys/netipsec/keydb.h Sat Dec 10 23:44:08 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: keydb.h,v 1.1 2003/08/13 20:06:51 jonathan Exp $ */
+/* $NetBSD: keydb.h,v 1.2 2005/12/10 23:44:08 elad Exp $ */
/* $FreeBSD: src/sys/netipsec/keydb.h,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
/* $KAME: keydb.h,v 1.14 2000/08/02 17:58:26 sakane Exp $ */
@@ -181,4 +181,4 @@
#endif /* _KERNEL */
-#endif /* _NETIPSEC_KEYDB_H_ */
+#endif /* !_NETIPSEC_KEYDB_H_ */
diff -r 31577734719b -r b57ae1c80aa0 sys/netipsec/keysock.h
--- a/sys/netipsec/keysock.h Sat Dec 10 23:31:41 2005 +0000
+++ b/sys/netipsec/keysock.h Sat Dec 10 23:44:08 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: keysock.h,v 1.2 2003/12/04 19:38:25 atatat Exp $ */
+/* $NetBSD: keysock.h,v 1.3 2005/12/10 23:44:08 elad Exp $ */
/* $FreeBSD: src/sys/netipsec/keysock.h,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
/* $KAME: keysock.h,v 1.8 2000/03/27 05:11:06 sumikawa Exp $ */
@@ -85,4 +85,4 @@
extern int key_sendup_mbuf __P((struct socket *, struct mbuf *, int));
#endif /* _KERNEL */
-#endif /*_NETIPSEC_KEYSOCK_H_*/
+#endif /* !_NETIPSEC_KEYSOCK_H_ */
diff -r 31577734719b -r b57ae1c80aa0 sys/netipsec/xform.h
--- a/sys/netipsec/xform.h Sat Dec 10 23:31:41 2005 +0000
+++ b/sys/netipsec/xform.h Sat Dec 10 23:44:08 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: xform.h,v 1.2 2005/06/10 13:22:42 christos Exp $ */
+/* $NetBSD: xform.h,v 1.3 2005/12/10 23:44:08 elad Exp $ */
/* $FreeBSD: src/sys/netipsec/xform.h,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_ipsp.h,v 1.119 2002/03/14 01:27:11 millert Exp $ */
/*
@@ -124,4 +124,4 @@
extern struct comp_algo *ipcomp_algorithm_lookup(int alg);
#endif /* _KERNEL */
-#endif /* _NETIPSEC_XFORM_H_ */
+#endif /* !_NETIPSEC_XFORM_H_ */
diff -r 31577734719b -r b57ae1c80aa0 sys/netisdn/i4b_capi.h
--- a/sys/netisdn/i4b_capi.h Sat Dec 10 23:31:41 2005 +0000
+++ b/sys/netisdn/i4b_capi.h Sat Dec 10 23:44:08 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: i4b_capi.h,v 1.3 2005/02/26 22:39:49 perry Exp $ */
+/* $NetBSD: i4b_capi.h,v 1.4 2005/12/10 23:51:50 elad Exp $ */
/*
* Copyright (c) 2001-2003 Cubical Solutions Ltd. All rights reserved.
@@ -29,8 +29,8 @@
* $FreeBSD: src/sys/i4b/capi/capi.h,v 1.1 2001/05/25 08:39:31 hm Exp $
*/
-#ifndef _I4B_CAPI_H_
-#define _I4B_CAPI_H_
+#ifndef _NETISDN_I4B_CAPI_H_
+#define _NETISDN_I4B_CAPI_H_
/*
// CAPI driver context: B channels and controller softcs.
@@ -133,4 +133,4 @@
extern int capi_start_tx(void *, int bchan);
-#endif /* _I4B_CAPI_H_ */
+#endif /* !_NETISDN_I4B_CAPI_H_ */
diff -r 31577734719b -r b57ae1c80aa0 sys/netisdn/i4b_capi_msgs.h
--- a/sys/netisdn/i4b_capi_msgs.h Sat Dec 10 23:31:41 2005 +0000
+++ b/sys/netisdn/i4b_capi_msgs.h Sat Dec 10 23:44:08 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: i4b_capi_msgs.h,v 1.1 2003/09/25 15:34:38 pooka Exp $ */
+/* $NetBSD: i4b_capi_msgs.h,v 1.2 2005/12/10 23:51:50 elad Exp $ */
/*
Home |
Main Index |
Thread Index |
Old Index