Module Name: src
Committed By: drochner
Date: Wed Jan 11 14:37:45 UTC 2012
Modified Files:
src/sys/dist/pf/net: pfvar.h
src/sys/netipsec: keydb.h
Log Message:
protect "union sockaddr_union" from being defined twice by a CPP symbol
(copied from FreeBSD), allows coexistence of (FAST_)IPSEC and pf
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dist/pf/net/pfvar.h
cvs rdiff -u -r1.10 -r1.11 src/sys/netipsec/keydb.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dist/pf/net/pfvar.h
diff -u src/sys/dist/pf/net/pfvar.h:1.19 src/sys/dist/pf/net/pfvar.h:1.20
--- src/sys/dist/pf/net/pfvar.h:1.19 Fri May 7 17:41:57 2010
+++ src/sys/dist/pf/net/pfvar.h Wed Jan 11 14:37:45 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pfvar.h,v 1.19 2010/05/07 17:41:57 degroote Exp $ */
+/* $NetBSD: pfvar.h,v 1.20 2012/01/11 14:37:45 drochner Exp $ */
/* $OpenBSD: pfvar.h,v 1.254 2007/07/13 09:17:48 markus Exp $ */
/*
@@ -55,14 +55,6 @@
#include <net/pf_mtag.h>
#endif /* __NetBSD__ && _KERNEL */
-#ifdef __NetBSD__
-union sockaddr_union {
- struct sockaddr sa;
- struct sockaddr_in sin;
- struct sockaddr_in6 sin6;
-};
-#endif /* __NetBSD__ */
-
struct ip;
struct ip6_hdr;
@@ -984,6 +976,15 @@ struct pfr_tstats {
#define pfrts_name pfrts_t.pfrt_name
#define pfrts_flags pfrts_t.pfrt_flags
+#ifndef _SOCKADDR_UNION_DEFINED
+#define _SOCKADDR_UNION_DEFINED
+union sockaddr_union {
+ struct sockaddr sa;
+ struct sockaddr_in sin;
+ struct sockaddr_in6 sin6;
+};
+#endif /* _SOCKADDR_UNION_DEFINED */
+
SLIST_HEAD(pfr_kentryworkq, pfr_kentry);
struct pfr_kentry {
struct radix_node pfrke_node[2];
Index: src/sys/netipsec/keydb.h
diff -u src/sys/netipsec/keydb.h:1.10 src/sys/netipsec/keydb.h:1.11
--- src/sys/netipsec/keydb.h:1.10 Mon May 23 15:17:25 2011
+++ src/sys/netipsec/keydb.h Wed Jan 11 14:37:45 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: keydb.h,v 1.10 2011/05/23 15:17:25 drochner Exp $ */
+/* $NetBSD: keydb.h,v 1.11 2012/01/11 14:37:45 drochner 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 $ */
@@ -42,6 +42,8 @@
#include <net/route.h>
#include <netinet/in.h>
+#ifndef _SOCKADDR_UNION_DEFINED
+#define _SOCKADDR_UNION_DEFINED
/*
* The union of all possible address formats we handle.
*/
@@ -50,6 +52,7 @@ union sockaddr_union {
struct sockaddr_in sin;
struct sockaddr_in6 sin6;
};
+#endif /* _SOCKADDR_UNION_DEFINED */
/* Security Assocciation Index */
/* NOTE: Ensure to be same address family */
