diff options
| author | ume <ume@FreeBSD.org> | 2003-01-08 17:59:24 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2003-01-08 17:59:24 +0000 |
| commit | fa20ded9d15dedf1e52e5f0180135d2e92c9fc5e (patch) | |
| tree | ea0586d2d518f7c94675bc2fbd31a26fabfcd65a | |
| parent | 8c01032b21a8e893c573acbaed57fdf68db4e384 (diff) | |
| download | FreeBSD-src-fa20ded9d15dedf1e52e5f0180135d2e92c9fc5e.zip FreeBSD-src-fa20ded9d15dedf1e52e5f0180135d2e92c9fc5e.tar.gz | |
"struct route" is not sufficient. NetBSD PR 18751
Obtained from: KAME
MFC after: 1 days
| -rw-r--r-- | sys/netinet6/esp_rijndael.c | 1 | ||||
| -rw-r--r-- | sys/netinet6/ipcomp_core.c | 1 | ||||
| -rw-r--r-- | sys/netkey/keydb.h | 6 | ||||
| -rw-r--r-- | sys/netkey/keysock.c | 1 |
4 files changed, 8 insertions, 1 deletions
diff --git a/sys/netinet6/esp_rijndael.c b/sys/netinet6/esp_rijndael.c index 5b0e5fa..950bbe8 100644 --- a/sys/netinet6/esp_rijndael.c +++ b/sys/netinet6/esp_rijndael.c @@ -40,6 +40,7 @@ #include <net/if.h> #include <net/route.h> +#include <netinet/in.h> #include <netinet6/ipsec.h> #include <netinet6/esp.h> diff --git a/sys/netinet6/ipcomp_core.c b/sys/netinet6/ipcomp_core.c index 62af1bc..a6cdea5 100644 --- a/sys/netinet6/ipcomp_core.c +++ b/sys/netinet6/ipcomp_core.c @@ -51,6 +51,7 @@ #include <net/if.h> #include <net/route.h> +#include <netinet/in.h> #include <net/netisr.h> #include <net/zlib.h> #include <machine/cpu.h> 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> |
