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

Commit 8157e6d1 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Patrick McHardy
Browse files

netfilter: netns ebtables: ebtable_broute in netns

parent dbcdf85a
Loading
Loading
Loading
Loading
+3 −0
Original line number Original line Diff line number Diff line
@@ -4,7 +4,10 @@
#include <linux/list.h>
#include <linux/list.h>
#include <linux/netfilter.h>
#include <linux/netfilter.h>


struct ebt_table;

struct netns_xt {
struct netns_xt {
	struct list_head tables[NFPROTO_NUMPROTO];
	struct list_head tables[NFPROTO_NUMPROTO];
	struct ebt_table *broute_table;
};
};
#endif
#endif
+27 −8
Original line number Original line Diff line number Diff line
@@ -41,33 +41,52 @@ static int check(const struct ebt_table_info *info, unsigned int valid_hooks)
	return 0;
	return 0;
}
}


static struct ebt_table __broute_table =
static struct ebt_table broute_table =
{
{
	.name		= "broute",
	.name		= "broute",
	.table		= &initial_table,
	.table		= &initial_table,
	.valid_hooks	= 1 << NF_BR_BROUTING,
	.valid_hooks	= 1 << NF_BR_BROUTING,
	.lock		= __RW_LOCK_UNLOCKED(__broute_table.lock),
	.lock		= __RW_LOCK_UNLOCKED(broute_table.lock),
	.check		= check,
	.check		= check,
	.me		= THIS_MODULE,
	.me		= THIS_MODULE,
};
};
static struct ebt_table *broute_table;


static int ebt_broute(struct sk_buff *skb)
static int ebt_broute(struct sk_buff *skb)
{
{
	int ret;
	int ret;


	ret = ebt_do_table(NF_BR_BROUTING, skb, skb->dev, NULL,
	ret = ebt_do_table(NF_BR_BROUTING, skb, skb->dev, NULL,
	   broute_table);
			   dev_net(skb->dev)->xt.broute_table);
	if (ret == NF_DROP)
	if (ret == NF_DROP)
		return 1; /* route it */
		return 1; /* route it */
	return 0; /* bridge it */
	return 0; /* bridge it */
}
}


static int __net_init broute_net_init(struct net *net)
{
	net->xt.broute_table = ebt_register_table(net, &broute_table);
	if (IS_ERR(net->xt.broute_table))
		return PTR_ERR(net->xt.broute_table);
	return 0;
}

static void __net_exit broute_net_exit(struct net *net)
{
	ebt_unregister_table(net->xt.broute_table);
}

static struct pernet_operations broute_net_ops = {
	.init = broute_net_init,
	.exit = broute_net_exit,
};

static int __init ebtable_broute_init(void)
static int __init ebtable_broute_init(void)
{
{
	broute_table = ebt_register_table(&init_net, &__broute_table);
	int ret;
	if (IS_ERR(broute_table))

		return PTR_ERR(broute_table);
	ret = register_pernet_subsys(&broute_net_ops);
	if (ret < 0)
		return ret;
	/* see br_input.c */
	/* see br_input.c */
	rcu_assign_pointer(br_should_route_hook, ebt_broute);
	rcu_assign_pointer(br_should_route_hook, ebt_broute);
	return 0;
	return 0;
@@ -77,7 +96,7 @@ static void __exit ebtable_broute_fini(void)
{
{
	rcu_assign_pointer(br_should_route_hook, NULL);
	rcu_assign_pointer(br_should_route_hook, NULL);
	synchronize_net();
	synchronize_net();
	ebt_unregister_table(broute_table);
	unregister_pernet_subsys(&broute_net_ops);
}
}


module_init(ebtable_broute_init);
module_init(ebtable_broute_init);