diff options
| author | Patrick McHardy <kaber@trash.net> | 2006-01-06 23:04:54 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-07 12:57:33 -0800 |
| commit | 3e3850e989c5d2eb1aab6f0fd9257759f0f4cbc6 (patch) | |
| tree | fa05d1de4767bc30e77442ffbacfe8bd8dd2213d /include/linux/ipv6.h | |
| parent | 8cdfab8a43bb4b3da686ea503a702cb6f9f6a803 (diff) | |
| download | linux-3e3850e989c5d2eb1aab6f0fd9257759f0f4cbc6.tar.gz linux-3e3850e989c5d2eb1aab6f0fd9257759f0f4cbc6.tar.bz2 linux-3e3850e989c5d2eb1aab6f0fd9257759f0f4cbc6.zip | |
[NETFILTER]: Fix xfrm lookup in ip_route_me_harder/ip6_route_me_harder
ip_route_me_harder doesn't use the port numbers of the xfrm lookup and
uses ip_route_input for non-local addresses which doesn't do a xfrm
lookup, ip6_route_me_harder doesn't do a xfrm lookup at all.
Use xfrm_decode_session and do the lookup manually, make sure both
only do the lookup if the packet hasn't been transformed already.
Makeing sure the lookup only happens once needs a new field in the
IP6CB, which exceeds the size of skb->cb. The size of skb->cb is
increased to 48b. Apparently the IPv6 mobile extensions need some
more room anyway.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/ipv6.h')
| -rw-r--r-- | include/linux/ipv6.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 5cfc71529595..9c8f4c9ed429 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h @@ -192,6 +192,9 @@ struct inet6_skb_parm { __u16 dst1; __u16 lastopt; __u32 nhoff; + __u16 flags; + +#define IP6SKB_XFRM_TRANSFORMED 1 }; #define IP6CB(skb) ((struct inet6_skb_parm*)((skb)->cb)) |