Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[IPV6] XFRM: Fix connected socket to use transformation.

Browse source 
When XFRM policy and state are ready after TCP connection is started,
the traffic should be transformed immediately, however it does not
on IPv6 TCP.

It depends on a dst cache replacement policy with connected socket.
It seems that the replacement is always done for IPv4, however, on
IPv6 case it is done only when routing cookie is changed.

This patch fix that non-transformation dst can be changed to
transformation one.
This behavior is required by MIPv6 and improves IPv6 IPsec.

Fixes by Masahide NAKAMURA.

Signed-off-by: Noriaki TAKAMIYA <takamiya@po.ntts.co.jp>
Signed-off-by: Masahide NAKAMURA <nakam@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Noriaki TAKAMIYA 2007-09-06 03:31:25 -07:00 committed by David S. Miller
parent e773e4faa1
commit a47ed4cd8c
2 changed files with 41 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/net/ip6_fib.h
View file

@ -105,6 +105,10 @@ struct rt6_info
struct rt6key rt6i_src; struct rt6key rt6i_src;
u8 rt6i_protocol; u8 rt6i_protocol;
#ifdef CONFIG_XFRM
u32 rt6i_flow_cache_genid;
#endif
}; };
static inline struct inet6_dev *ip6_dst_idev(struct dst_entry *dst) static inline struct inet6_dev *ip6_dst_idev(struct dst_entry *dst)

39
net/ipv6/inet6_connection_sock.c
View file

@ -139,6 +139,41 @@ void inet6_csk_addr2sockaddr(struct sock *sk, struct sockaddr * uaddr)
EXPORT_SYMBOL_GPL(inet6_csk_addr2sockaddr); EXPORT_SYMBOL_GPL(inet6_csk_addr2sockaddr);
static inline
void __inet6_csk_dst_store(struct sock *sk, struct dst_entry *dst,
struct in6_addr *daddr, struct in6_addr *saddr)
{
__ip6_dst_store(sk, dst, daddr, saddr);
#ifdef CONFIG_XFRM
if (dst) {
struct rt6_info *rt = (struct rt6_info *)dst;
rt->rt6i_flow_cache_genid = atomic_read(&flow_cache_genid);
}
#endif
}
static inline
struct dst_entry *__inet6_csk_dst_check(struct sock *sk, u32 cookie)
{
struct dst_entry *dst;
dst = __sk_dst_check(sk, cookie);
#ifdef CONFIG_XFRM
if (dst) {
struct rt6_info *rt = (struct rt6_info *)dst;
if (rt->rt6i_flow_cache_genid != atomic_read(&flow_cache_genid)) {
sk->sk_dst_cache = NULL;
dst_release(dst);
dst = NULL;
}
}
#endif
return dst;
}
int inet6_csk_xmit(struct sk_buff *skb, int ipfragok) int inet6_csk_xmit(struct sk_buff *skb, int ipfragok)
{ {
struct sock *sk = skb->sk; struct sock *sk = skb->sk;
@ -166,7 +201,7 @@ int inet6_csk_xmit(struct sk_buff *skb, int ipfragok)
final_p = &final; final_p = &final;
} }
dst = __sk_dst_check(sk, np->dst_cookie); dst = __inet6_csk_dst_check(sk, np->dst_cookie);
if (dst == NULL) { if (dst == NULL) {
int err = ip6_dst_lookup(sk, &dst, &fl); int err = ip6_dst_lookup(sk, &dst, &fl);
@ -186,7 +221,7 @@ int inet6_csk_xmit(struct sk_buff *skb, int ipfragok)
return err; return err;
} }
__ip6_dst_store(sk, dst, NULL, NULL); __inet6_csk_dst_store(sk, dst, NULL, NULL);
} }
skb->dst = dst_clone(dst); skb->dst = dst_clone(dst);