Commit 8e1ef0a9 authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki Committed by David S. Miller
Browse files

[IPV6]: Cache source address as well in ipv6_pinfo{}. 



Based on MIPL2 kernel patch.

Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarVille Nuorvala <vnuorval@tcs.hut.fi>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cf6b1982

include/linux/ipv6.h

+3 −0
Original line number Diff line number Diff line
@@ -242,6 +242,9 @@ struct ipv6_pinfo { 
	struct in6_addr 	rcv_saddr;

	struct in6_addr		daddr;

	struct in6_addr		*daddr_cache;

#ifdef CONFIG_IPV6_SUBTREES

	struct in6_addr		*saddr_cache;

#endif



	__u32			flow_label;

	__u32			frag_size;

include/net/ip6_route.h

+6 −3
Original line number Diff line number Diff line
@@ -144,21 +144,24 @@ extern rwlock_t rt6_lock; 
 *	Store a destination cache entry in a socket

 */

static inline void __ip6_dst_store(struct sock *sk, struct dst_entry *dst,

				   struct in6_addr *daddr)

				   struct in6_addr *daddr, struct in6_addr *saddr)

{

	struct ipv6_pinfo *np = inet6_sk(sk);

	struct rt6_info *rt = (struct rt6_info *) dst;



	sk_setup_caps(sk, dst);

	np->daddr_cache = daddr;

#ifdef CONFIG_IPV6_SUBTREES

	np->saddr_cache = saddr;

#endif

	np->dst_cookie = rt->rt6i_node ? rt->rt6i_node->fn_sernum : 0;

}



static inline void ip6_dst_store(struct sock *sk, struct dst_entry *dst,

				 struct in6_addr *daddr)

				 struct in6_addr *daddr, struct in6_addr *saddr)

{

	write_lock(&sk->sk_dst_lock);

	__ip6_dst_store(sk, dst, daddr);

	__ip6_dst_store(sk, dst, daddr, saddr);

	write_unlock(&sk->sk_dst_lock);

}

net/dccp/ipv6.c

+2 −2
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ static int dccp_v6_connect(struct sock *sk, struct sockaddr *uaddr, 
	ipv6_addr_copy(&np->saddr, saddr);

	inet->rcv_saddr = LOOPBACK4_IPV6;



	__ip6_dst_store(sk, dst, NULL);

	__ip6_dst_store(sk, dst, NULL, NULL);



	icsk->icsk_ext_hdr_len = 0;

	if (np->opt != NULL)
@@ -872,7 +872,7 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk, 
	 * comment in that function for the gory details. -acme

	 */



	__ip6_dst_store(newsk, dst, NULL);

	__ip6_dst_store(newsk, dst, NULL, NULL);

	newsk->sk_route_caps = dst->dev->features & ~(NETIF_F_IP_CSUM |

						      NETIF_F_TSO);

	newdp6 = (struct dccp6_sock *)newsk;

net/ipv6/af_inet6.c

+1 −1
Original line number Diff line number Diff line
@@ -659,7 +659,7 @@ int inet6_sk_rebuild_header(struct sock *sk) 
			return err;

		}



		__ip6_dst_store(sk, dst, NULL);

		__ip6_dst_store(sk, dst, NULL, NULL);

	}



	return 0;

net/ipv6/datagram.c

+6 −1
Original line number Diff line number Diff line
@@ -193,7 +193,12 @@ int ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) 


	ip6_dst_store(sk, dst,

		      ipv6_addr_equal(&fl.fl6_dst, &np->daddr) ?

		      &np->daddr : NULL);

		      &np->daddr : NULL,

#ifdef CONFIG_IPV6_SUBTREES

		      ipv6_addr_equal(&fl.fl6_src, &np->saddr) ?

		      &np->saddr :

#endif

		      NULL);



	sk->sk_state = TCP_ESTABLISHED;

out: