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

Commit 5e6b2997 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Patrick McHardy
Browse files

netfilter: netns nf_conntrack: per-netns /proc/net/ip_conntrack,... 


netfilter: netns nf_conntrack: per-netns /proc/net/ip_conntrack, /proc/net/stat/ip_conntrack, /proc/net/ip_conntrack_expect

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent dc5129f8

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c

+38 −19
Original line number Diff line number Diff line
@@ -21,18 +21,20 @@ 
#include <net/netfilter/nf_conntrack_acct.h>



struct ct_iter_state {

	struct seq_net_private p;

	unsigned int bucket;

};



static struct hlist_node *ct_get_first(struct seq_file *seq)

{

	struct net *net = seq_file_net(seq);

	struct ct_iter_state *st = seq->private;

	struct hlist_node *n;



	for (st->bucket = 0;

	     st->bucket < nf_conntrack_htable_size;

	     st->bucket++) {

		n = rcu_dereference(init_net.ct.hash[st->bucket].first);

		n = rcu_dereference(net->ct.hash[st->bucket].first);

		if (n)

			return n;

	}
@@ -42,13 +44,14 @@ static struct hlist_node *ct_get_first(struct seq_file *seq) 
static struct hlist_node *ct_get_next(struct seq_file *seq,

				      struct hlist_node *head)

{

	struct net *net = seq_file_net(seq);

	struct ct_iter_state *st = seq->private;



	head = rcu_dereference(head->next);

	while (head == NULL) {

		if (++st->bucket >= nf_conntrack_htable_size)

			return NULL;

		head = rcu_dereference(init_net.ct.hash[st->bucket].first);

		head = rcu_dereference(net->ct.hash[st->bucket].first);

	}

	return head;

}
@@ -158,7 +161,7 @@ static const struct seq_operations ct_seq_ops = { 


static int ct_open(struct inode *inode, struct file *file)

{

	return seq_open_private(file, &ct_seq_ops,

	return seq_open_net(inode, file, &ct_seq_ops,

			    sizeof(struct ct_iter_state));

}
@@ -167,17 +170,18 @@ static const struct file_operations ct_file_ops = { 
	.open    = ct_open,

	.read    = seq_read,

	.llseek  = seq_lseek,

	.release = seq_release_private,

	.release = seq_release_net,

};



/* expects */

struct ct_expect_iter_state {

	struct seq_net_private p;

	unsigned int bucket;

};



static struct hlist_node *ct_expect_get_first(struct seq_file *seq)

{

	struct net *net = &init_net;

	struct net *net = seq_file_net(seq);

	struct ct_expect_iter_state *st = seq->private;

	struct hlist_node *n;
@@ -192,7 +196,7 @@ static struct hlist_node *ct_expect_get_first(struct seq_file *seq) 
static struct hlist_node *ct_expect_get_next(struct seq_file *seq,

					     struct hlist_node *head)

{

	struct net *net = &init_net;

	struct net *net = seq_file_net(seq);

	struct ct_expect_iter_state *st = seq->private;



	head = rcu_dereference(head->next);
@@ -267,7 +271,7 @@ static const struct seq_operations exp_seq_ops = { 


static int exp_open(struct inode *inode, struct file *file)

{

	return seq_open_private(file, &exp_seq_ops,

	return seq_open_net(inode, file, &exp_seq_ops,

			    sizeof(struct ct_expect_iter_state));

}
@@ -276,7 +280,7 @@ static const struct file_operations ip_exp_file_ops = { 
	.open    = exp_open,

	.read    = seq_read,

	.llseek  = seq_lseek,

	.release = seq_release_private,

	.release = seq_release_net,

};



static void *ct_cpu_seq_start(struct seq_file *seq, loff_t *pos)
@@ -367,36 +371,51 @@ static const struct file_operations ct_cpu_seq_fops = { 
	.release = seq_release,

};



int __init nf_conntrack_ipv4_compat_init(void)

static int __net_init ip_conntrack_net_init(struct net *net)

{

	struct proc_dir_entry *proc, *proc_exp, *proc_stat;



	proc = proc_net_fops_create(&init_net, "ip_conntrack", 0440, &ct_file_ops);

	proc = proc_net_fops_create(net, "ip_conntrack", 0440, &ct_file_ops);

	if (!proc)

		goto err1;



	proc_exp = proc_net_fops_create(&init_net, "ip_conntrack_expect", 0440,

	proc_exp = proc_net_fops_create(net, "ip_conntrack_expect", 0440,

					&ip_exp_file_ops);

	if (!proc_exp)

		goto err2;



	proc_stat = proc_create("ip_conntrack", S_IRUGO,

				init_net.proc_net_stat, &ct_cpu_seq_fops);

				net->proc_net_stat, &ct_cpu_seq_fops);

	if (!proc_stat)

		goto err3;

	return 0;



err3:

	proc_net_remove(&init_net, "ip_conntrack_expect");

	proc_net_remove(net, "ip_conntrack_expect");

err2:

	proc_net_remove(&init_net, "ip_conntrack");

	proc_net_remove(net, "ip_conntrack");

err1:

	return -ENOMEM;

}



static void __net_exit ip_conntrack_net_exit(struct net *net)

{

	remove_proc_entry("ip_conntrack", net->proc_net_stat);

	proc_net_remove(net, "ip_conntrack_expect");

	proc_net_remove(net, "ip_conntrack");

}



static struct pernet_operations ip_conntrack_net_ops = {

	.init = ip_conntrack_net_init,

	.exit = ip_conntrack_net_exit,

};



int __init nf_conntrack_ipv4_compat_init(void)

{

	return register_pernet_subsys(&ip_conntrack_net_ops);

}



void __exit nf_conntrack_ipv4_compat_fini(void)

{

	remove_proc_entry("ip_conntrack", init_net.proc_net_stat);

	proc_net_remove(&init_net, "ip_conntrack_expect");

	proc_net_remove(&init_net, "ip_conntrack");

	unregister_pernet_subsys(&ip_conntrack_net_ops);

}