Commit 1ac89d20 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: nat: merge nf_nat_redirect into nf_nat 



Similar to previous patch, this time, merge redirect+nat.
The redirect module is just 2k in size, get rid of it and make
redirect part available from the nat core.

before:
   text    data     bss     dec     hex filename
  19461    1484    4138   25083    61fb net/netfilter/nf_nat.ko
   1236     792       0    2028     7ec net/netfilter/nf_nat_redirect.ko
after:
  20340    1508    4138   25986    6582 net/netfilter/nf_nat.ko

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 0168e8b3

net/netfilter/Kconfig

+1 −5
Original line number Diff line number Diff line
@@ -433,11 +433,7 @@ config NF_NAT_TFTP 
	default NF_NAT && NF_CONNTRACK_TFTP



config NF_NAT_REDIRECT

        tristate "IPv4/IPv6 redirect support"

	depends on NF_NAT

        help

          This is the kernel functionality to redirect packets to local

          machine through NAT.

	bool



config NETFILTER_SYNPROXY

	tristate

net/netfilter/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ obj-$(CONFIG_NF_LOG_COMMON) += nf_log_common.o 
obj-$(CONFIG_NF_LOG_NETDEV) += nf_log_netdev.o



obj-$(CONFIG_NF_NAT) += nf_nat.o

obj-$(CONFIG_NF_NAT_REDIRECT) += nf_nat_redirect.o

nf_nat-$(CONFIG_NF_NAT_REDIRECT) += nf_nat_redirect.o



# NAT helpers

obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_amanda.o

net/netfilter/nf_nat_redirect.c

+0 −4
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/inetdevice.h>

#include <linux/ip.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/netdevice.h>

#include <linux/netfilter.h>

#include <linux/types.h>
@@ -124,6 +123,3 @@ nf_nat_redirect_ipv6(struct sk_buff *skb, const struct nf_nat_range2 *range, 
	return nf_nat_setup_info(ct, &newrange, NF_NAT_MANIP_DST);

}

EXPORT_SYMBOL_GPL(nf_nat_redirect_ipv6);
 


MODULE_LICENSE("GPL");

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE