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

Commit b3d54b3e authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Pablo Neira Ayuso
Browse files

netfilter: combine ipt_NETMAP and ip6t_NETMAP 



Combine more modules since the actual code is so small anyway that the
kmod metadata and the module in its loaded state totally outweighs the
combined actual code size.

IP_NF_TARGET_NETMAP becomes a compat option; IP6_NF_TARGET_NETMAP
is completely eliminated since it has not see a release yet.

Signed-off-by: default avatarJan Engelhardt <jengelh@inai.de>
Acked-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 136251d0

net/ipv4/netfilter/Kconfig

+5 −6
Original line number Diff line number Diff line
@@ -172,12 +172,11 @@ config IP_NF_TARGET_MASQUERADE 
config IP_NF_TARGET_NETMAP

	tristate "NETMAP target support"

	depends on NETFILTER_ADVANCED

	help

	  NETMAP is an implementation of static 1:1 NAT mapping of network

	  addresses. It maps the network address part, while keeping the host

	  address part intact.



	  To compile it as a module, choose M here.  If unsure, say N.

	select NETFILTER_XT_TARGET_NETMAP

	---help---

	This is a backwards-compat option for the user's convenience

	(e.g. when running oldconfig). It selects

	CONFIG_NETFILTER_XT_TARGET_NETMAP.



config IP_NF_TARGET_REDIRECT

	tristate "REDIRECT target support"

net/ipv4/netfilter/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ obj-$(CONFIG_IP_NF_MATCH_RPFILTER) += ipt_rpfilter.o 
obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o

obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o

obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o

obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o

obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o

obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o

obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o

net/ipv6/netfilter/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -209,15 +209,6 @@ config IP6_NF_TARGET_MASQUERADE 


	  To compile it as a module, choose M here.  If unsure, say N.



config IP6_NF_TARGET_NETMAP

	tristate "NETMAP target support"

	help

	  NETMAP is an implementation of static 1:1 NAT mapping of network

	  addresses. It maps the network address part, while keeping the host

	  address part intact.



	  To compile it as a module, choose M here.  If unsure, say N.



config IP6_NF_TARGET_REDIRECT

	tristate "REDIRECT target support"

	help

net/ipv6/netfilter/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ obj-$(CONFIG_IP6_NF_MATCH_RT) += ip6t_rt.o 


# targets

obj-$(CONFIG_IP6_NF_TARGET_MASQUERADE) += ip6t_MASQUERADE.o

obj-$(CONFIG_IP6_NF_TARGET_NETMAP) += ip6t_NETMAP.o

obj-$(CONFIG_IP6_NF_TARGET_NPT) += ip6t_NPT.o

obj-$(CONFIG_IP6_NF_TARGET_REDIRECT) += ip6t_REDIRECT.o

obj-$(CONFIG_IP6_NF_TARGET_REJECT) += ip6t_REJECT.o

net/ipv6/netfilter/ip6t_NETMAP.c

deleted100644 → 0
+0 −94
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2011 Patrick McHardy <kaber@trash.net>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * Based on Svenning Soerensen's IPv4 NETMAP target. Development of IPv6

 * NAT funded by Astaro.

 */



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/ipv6.h>

#include <linux/netfilter.h>

#include <linux/netfilter_ipv6.h>

#include <linux/netfilter/x_tables.h>

#include <net/netfilter/nf_nat.h>



static unsigned int

netmap_tg6(struct sk_buff *skb, const struct xt_action_param *par)

{

	const struct nf_nat_range *range = par->targinfo;

	struct nf_nat_range newrange;

	struct nf_conn *ct;

	enum ip_conntrack_info ctinfo;

	union nf_inet_addr new_addr, netmask;

	unsigned int i;



	ct = nf_ct_get(skb, &ctinfo);

	for (i = 0; i < ARRAY_SIZE(range->min_addr.ip6); i++)

		netmask.ip6[i] = ~(range->min_addr.ip6[i] ^

				   range->max_addr.ip6[i]);



	if (par->hooknum == NF_INET_PRE_ROUTING ||

	    par->hooknum == NF_INET_LOCAL_OUT)

		new_addr.in6 = ipv6_hdr(skb)->daddr;

	else

		new_addr.in6 = ipv6_hdr(skb)->saddr;



	for (i = 0; i < ARRAY_SIZE(new_addr.ip6); i++) {

		new_addr.ip6[i] &= ~netmask.ip6[i];

		new_addr.ip6[i] |= range->min_addr.ip6[i] &

				   netmask.ip6[i];

	}



	newrange.flags	= range->flags | NF_NAT_RANGE_MAP_IPS;

	newrange.min_addr	= new_addr;

	newrange.max_addr	= new_addr;

	newrange.min_proto	= range->min_proto;

	newrange.max_proto	= range->max_proto;



	return nf_nat_setup_info(ct, &newrange, HOOK2MANIP(par->hooknum));

}



static int netmap_tg6_checkentry(const struct xt_tgchk_param *par)

{

	const struct nf_nat_range *range = par->targinfo;



	if (!(range->flags & NF_NAT_RANGE_MAP_IPS))

		return -EINVAL;

	return 0;

}



static struct xt_target netmap_tg6_reg __read_mostly = {

	.name		= "NETMAP",

	.family		= NFPROTO_IPV6,

	.target		= netmap_tg6,

	.targetsize	= sizeof(struct nf_nat_range),

	.table		= "nat",

	.hooks		= (1 << NF_INET_PRE_ROUTING) |

			  (1 << NF_INET_POST_ROUTING) |

			  (1 << NF_INET_LOCAL_OUT) |

			  (1 << NF_INET_LOCAL_IN),

	.checkentry	= netmap_tg6_checkentry,

	.me		= THIS_MODULE,

};



static int __init netmap_tg6_init(void)

{

	return xt_register_target(&netmap_tg6_reg);

}



static void netmap_tg6_exit(void)

{

	xt_unregister_target(&netmap_tg6_reg);

}



module_init(netmap_tg6_init);

module_exit(netmap_tg6_exit);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Xtables: 1:1 NAT mapping of IPv6 subnets");

MODULE_AUTHOR("Patrick McHardy <kaber@trash.net>");