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

Commit 287b7f38 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David S. Miller
Browse files

ipv4: Namespacify ip_dynaddr sysctl knob 



Signed-off-by: default avatarNikolay Borisov <kernel@kyup.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dcd87999

include/net/ip.h

+0 −3
Original line number Diff line number Diff line
@@ -248,9 +248,6 @@ extern int inet_peer_maxttl; 
/* From ip_input.c */

extern int sysctl_ip_early_demux;



/* From ip_output.c */

extern int sysctl_ip_dynaddr;



void ipfrag_init(void);



void ip_static_sysctl_init(void);

include/net/netns/ipv4.h

+2 −0
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ struct netns_ipv4 { 
	int sysctl_ip_no_pmtu_disc;

	int sysctl_ip_fwd_use_pmtu;

	int sysctl_ip_nonlocal_bind;

	/* Shall we try to damage output packets if routing dev changes? */

	int sysctl_ip_dynaddr;



	int sysctl_fwmark_reflect;

	int sysctl_tcp_fwmark_accept;

net/ipv4/af_inet.c

+2 −8
Original line number Diff line number Diff line
@@ -1095,12 +1095,6 @@ void inet_unregister_protosw(struct inet_protosw *p) 
}

EXPORT_SYMBOL(inet_unregister_protosw);



/*

 *      Shall we try to damage output packets if routing dev changes?

 */



int sysctl_ip_dynaddr __read_mostly;



static int inet_sk_reselect_saddr(struct sock *sk)

{

	struct inet_sock *inet = inet_sk(sk);
@@ -1131,7 +1125,7 @@ static int inet_sk_reselect_saddr(struct sock *sk) 
	if (new_saddr == old_saddr)

		return 0;



	if (sysctl_ip_dynaddr > 1) {

	if (sock_net(sk)->ipv4.sysctl_ip_dynaddr > 1) {

		pr_info("%s(): shifting inet->saddr from %pI4 to %pI4\n",

			__func__, &old_saddr, &new_saddr);

	}
@@ -1186,7 +1180,7 @@ int inet_sk_rebuild_header(struct sock *sk) 
		 * Other protocols have to map its equivalent state to TCP_SYN_SENT.

		 * DCCP maps its DCCP_REQUESTING state to TCP_SYN_SENT. -acme

		 */

		if (!sysctl_ip_dynaddr ||

		if (!sock_net(sk)->ipv4.sysctl_ip_dynaddr ||

		    sk->sk_state != TCP_SYN_SENT ||

		    (sk->sk_userlocks & SOCK_BINDADDR_LOCK) ||

		    (err = inet_sk_reselect_saddr(sk)) != 0)

net/ipv4/sysctl_net_ipv4.c

+8 −7
Original line number Diff line number Diff line
@@ -303,13 +303,6 @@ static struct ctl_table ipv4_table[] = { 
		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "ip_dynaddr",

		.data		= &sysctl_ip_dynaddr,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "tcp_fastopen",

		.data		= &sysctl_tcp_fastopen,
@@ -743,6 +736,13 @@ static struct ctl_table ipv4_net_table[] = { 
		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "ip_dynaddr",

		.data		= &init_net.ipv4.sysctl_ip_dynaddr,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

	},

	{

		.procname	= "ip_default_ttl",

		.data		= &init_net.ipv4.sysctl_ip_default_ttl,
@@ -989,6 +989,7 @@ static __net_init int ipv4_sysctl_init_net(struct net *net) 
		goto err_ports;



	net->ipv4.sysctl_ip_default_ttl = IPDEFTTL;

	net->ipv4.sysctl_ip_dynaddr = 0;



	return 0;