Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5047992 authored by Daniel Lezcano's avatar Daniel Lezcano Committed by David S. Miller
Browse files

[NETNS][IPV6] tcp6 - handle several network namespace 



We have the right network namespace at the right place now.
So make use of this information to make tcp6 per network namespace

Signed-off-by: default avatarDaniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: default avatarBenjamin Thery <benjamin.thery@bull.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 93ec926b

net/ipv6/tcp_ipv6.c

+8 −6
Original line number Diff line number Diff line
@@ -988,6 +988,8 @@ static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb) 
	struct tcphdr *th = tcp_hdr(skb), *t1;

	struct sk_buff *buff;

	struct flowi fl;

	struct net *net = skb->dst->dev->nd_net;

	struct sock *ctl_sk = net->ipv6.tcp_sk;

	unsigned int tot_len = sizeof(*th);

#ifdef CONFIG_TCP_MD5SIG

	struct tcp_md5sig_key *key;
@@ -1072,11 +1074,10 @@ static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb) 
	 * Underlying function will use this to retrieve the network

	 * namespace

	 */

	if (!ip6_dst_lookup(init_net.ipv6.tcp_sk, &buff->dst, &fl)) {

	if (!ip6_dst_lookup(ctl_sk, &buff->dst, &fl)) {



		if (xfrm_lookup(&buff->dst, &fl, NULL, 0) >= 0) {

			ip6_xmit(init_net.ipv6.tcp_sk,

				 buff, &fl, NULL, 0);

			ip6_xmit(ctl_sk, buff, &fl, NULL, 0);

			TCP_INC_STATS_BH(TCP_MIB_OUTSEGS);

			TCP_INC_STATS_BH(TCP_MIB_OUTRSTS);

			return;
@@ -1092,6 +1093,8 @@ static void tcp_v6_send_ack(struct tcp_timewait_sock *tw, 
	struct tcphdr *th = tcp_hdr(skb), *t1;

	struct sk_buff *buff;

	struct flowi fl;

	struct net *net = skb->dev->nd_net;

	struct sock *ctl_sk = net->ipv6.tcp_sk;

	unsigned int tot_len = sizeof(struct tcphdr);

	__be32 *topt;

#ifdef CONFIG_TCP_MD5SIG
@@ -1173,10 +1176,9 @@ static void tcp_v6_send_ack(struct tcp_timewait_sock *tw, 
	fl.fl_ip_sport = t1->source;

	security_skb_classify_flow(skb, &fl);



	if (!ip6_dst_lookup(init_net.ipv6.tcp_sk, &buff->dst, &fl)) {

	if (!ip6_dst_lookup(ctl_sk, &buff->dst, &fl)) {

		if (xfrm_lookup(&buff->dst, &fl, NULL, 0) >= 0) {

			ip6_xmit(init_net.ipv6.tcp_sk,

				 buff, &fl, NULL, 0);

			ip6_xmit(ctl_sk, buff, &fl, NULL, 0);

			TCP_INC_STATS_BH(TCP_MIB_OUTSEGS);

			return;

		}