lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[IPSEC]: Rename mode to outer_mode and add inner_mode

Browse Source 
This patch adds a new field to xfrm states called inner_mode.  The existing
mode object is renamed to outer_mode.

This is the first part of an attempt to fix inter-family transforms.  As it
is we always use the outer family when determining which mode to use.  As a
result we may end up shoving IPv4 packets into netfilter6 and vice versa.

What we really want is to use the inner family for the first part of outbound
processing and the outer family for the second part.  For inbound processing
we'd use the opposite pairing.

I've also added a check to prevent silly combinations such as transport mode
with inter-family transforms.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Herbert Xu
2007-10-17 21:35:51 -07:00
committed by David S. Miller
parent ca68145f16
commit 13996378e6
11 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/ipv4/xfrm4_input.c
View File

@@ -91,10 +91,10 @@ int xfrm4_rcv_encap(struct sk_buff *skb, int nexthdr, __be32 spi,
xfrm_vec[xfrm_nr++] = x;
if (x->mode->input(x, skb))
if (x->outer_mode->input(x, skb))
goto drop;
if (x->mode->flags & XFRM_MODE_FLAG_TUNNEL) {
if (x->outer_mode->flags & XFRM_MODE_FLAG_TUNNEL) {
decaps = 1;
break;
}