diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-11-13 21:41:28 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 14:53:46 -0800 |
| commit | 227620e295090629fcb2c46ad3828222ab65438d (patch) | |
| tree | 534162a74628fdfa7a8201cb776a45ca07510e5b /net/ipv4/xfrm4_input.c | |
| parent | 36cf9acf93e8561d9faec24849e57688a81eb9c5 (diff) | |
| download | op-kernel-dev-227620e295090629fcb2c46ad3828222ab65438d.zip op-kernel-dev-227620e295090629fcb2c46ad3828222ab65438d.tar.gz | |
[IPSEC]: Separate inner/outer mode processing on input
With inter-family transforms the inner mode differs from the outer
mode. Attempting to handle both sides from the same function means
that it needs to handle both IPv4 and IPv6 which creates duplication
and confusion.
This patch separates the two parts on the input path so that each
function deals with one family only.
In particular, the functions xfrm4_extract_inut/xfrm6_extract_inut
moves the pertinent fields from the IPv4/IPv6 IP headers into a
neutral format stored in skb->cb. This is then used by the inner mode
input functions to modify the inner IP header. In this way the input
function no longer has to know about the outer address family.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/xfrm4_input.c')
| -rw-r--r-- | net/ipv4/xfrm4_input.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/ipv4/xfrm4_input.c b/net/ipv4/xfrm4_input.c index 5e95c8a..c0323d0 100644 --- a/net/ipv4/xfrm4_input.c +++ b/net/ipv4/xfrm4_input.c @@ -16,6 +16,11 @@ #include <net/ip.h> #include <net/xfrm.h> +int xfrm4_extract_input(struct xfrm_state *x, struct sk_buff *skb) +{ + return xfrm4_extract_header(skb); +} + #ifdef CONFIG_NETFILTER static inline int xfrm4_rcv_encap_finish(struct sk_buff *skb) { @@ -91,7 +96,7 @@ int xfrm4_rcv_encap(struct sk_buff *skb, int nexthdr, __be32 spi, xfrm_vec[xfrm_nr++] = x; - if (x->outer_mode->input(x, skb)) + if (x->inner_mode->input(x, skb)) goto drop; if (x->outer_mode->flags & XFRM_MODE_FLAG_TUNNEL) { |
