netfilter: netns: ip6table_mangle in netns for real (7dd1b8da) · Commits · 戴 / test

net/ipv6/netfilter/ip6table_mangle.c

+22 −9

Original line number	Diff line number	Diff line
		@@ -67,17 +67,29 @@ static struct xt_table packet_mangler = {

		/* The work comes in here from netfilter.c. */
		static unsigned int
		ip6t_route_hook(unsigned int hook,
		ip6t_in_hook(unsigned int hook,
		struct sk_buff *skb,
		const struct net_device *in,
		const struct net_device *out,
		int (okfn)(struct sk_buff ))
		{
		return ip6t_do_table(skb, hook, in, out, init_net.ipv6.ip6table_mangle);
		return ip6t_do_table(skb, hook, in, out,
		dev_net(in)->ipv6.ip6table_mangle);
		}

		static unsigned int
		ip6t_local_hook(unsigned int hook,
		ip6t_post_routing_hook(unsigned int hook,
		struct sk_buff *skb,
		const struct net_device *in,
		const struct net_device *out,
		int (okfn)(struct sk_buff ))
		{
		return ip6t_do_table(skb, hook, in, out,
		dev_net(out)->ipv6.ip6table_mangle);
		}

		static unsigned int
		ip6t_local_out_hook(unsigned int hook,
		struct sk_buff *skb,
		const struct net_device *in,
		const struct net_device *out,
		@@ -108,7 +120,8 @@ ip6t_local_hook(unsigned int hook,
		/* flowlabel and prio (includes version, which shouldn't change either */
		flowlabel = ((u_int32_t )ipv6_hdr(skb));

		ret = ip6t_do_table(skb, hook, in, out, init_net.ipv6.ip6table_mangle);
		ret = ip6t_do_table(skb, hook, in, out,
		dev_net(out)->ipv6.ip6table_mangle);

		if (ret != NF_DROP && ret != NF_STOLEN
		&& (memcmp(&ipv6_hdr(skb)->saddr, &saddr, sizeof(saddr))
		@@ -122,35 +135,35 @@ ip6t_local_hook(unsigned int hook,

		static struct nf_hook_ops ip6t_ops[] __read_mostly = {
		{
		.hook = ip6t_route_hook,
		.hook = ip6t_in_hook,
		.owner = THIS_MODULE,
		.pf = PF_INET6,
		.hooknum = NF_INET_PRE_ROUTING,
		.priority = NF_IP6_PRI_MANGLE,
		},
		{
		.hook = ip6t_route_hook,
		.hook = ip6t_in_hook,
		.owner = THIS_MODULE,
		.pf = PF_INET6,
		.hooknum = NF_INET_LOCAL_IN,
		.priority = NF_IP6_PRI_MANGLE,
		},
		{
		.hook = ip6t_route_hook,
		.hook = ip6t_in_hook,
		.owner = THIS_MODULE,
		.pf = PF_INET6,
		.hooknum = NF_INET_FORWARD,
		.priority = NF_IP6_PRI_MANGLE,
		},
		{
		.hook = ip6t_local_hook,
		.hook = ip6t_local_out_hook,
		.owner = THIS_MODULE,
		.pf = PF_INET6,
		.hooknum = NF_INET_LOCAL_OUT,
		.priority = NF_IP6_PRI_MANGLE,
		},
		{
		.hook = ip6t_route_hook,
		.hook = ip6t_post_routing_hook,
		.owner = THIS_MODULE,
		.pf = PF_INET6,
		.hooknum = NF_INET_POST_ROUTING,

Admin message