summaryrefslogtreecommitdiffstats
path: root/sys/netkey
diff options
context:
space:
mode:
authorume <ume@FreeBSD.org>2003-01-08 17:59:24 +0000
committerume <ume@FreeBSD.org>2003-01-08 17:59:24 +0000
commitfa20ded9d15dedf1e52e5f0180135d2e92c9fc5e (patch)
treeea0586d2d518f7c94675bc2fbd31a26fabfcd65a /sys/netkey
parent8c01032b21a8e893c573acbaed57fdf68db4e384 (diff)
downloadFreeBSD-src-fa20ded9d15dedf1e52e5f0180135d2e92c9fc5e.zip
FreeBSD-src-fa20ded9d15dedf1e52e5f0180135d2e92c9fc5e.tar.gz
"struct route" is not sufficient. NetBSD PR 18751
Obtained from: KAME MFC after: 1 days
Diffstat (limited to 'sys/netkey')
-rw-r--r--sys/netkey/keydb.h6
-rw-r--r--sys/netkey/keysock.c1
2 files changed, 6 insertions, 1 deletions
diff --git a/sys/netkey/keydb.h b/sys/netkey/keydb.h
index 8b36e56..0690ec8 100644
--- a/sys/netkey/keydb.h
+++ b/sys/netkey/keydb.h
@@ -63,7 +63,11 @@ struct secashead {
/* SA chain */
/* The first of this list is newer SA */
- struct route sa_route; /* route cache */
+ union {
+ struct route sau_route;
+ struct route_in6 sau_route6;
+ } sa_u;
+#define sa_route sa_u.sau_route
};
/* Security Association */
diff --git a/sys/netkey/keysock.c b/sys/netkey/keysock.c
index 60b43c4..dbc48a8 100644
--- a/sys/netkey/keysock.c
+++ b/sys/netkey/keysock.c
@@ -50,6 +50,7 @@
#include <net/raw_cb.h>
#include <net/route.h>
+#include <netinet/in.h>
#include <net/pfkeyv2.h>
#include <netkey/keydb.h>
OpenPOWER on IntegriCloud