Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
9a8ce58a
Commit
9a8ce58a
authored
20 years ago
by
Patrick McHardy
Committed by
David S. Miller
20 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[NETFILTER]: Remove CONFIG_IP_NF_NAT_LOCAL config option
Signed-off-by:
Patrick McHardy
<
kaber@trash.net
>
parent
0b79316c
Changes
41
Hide whitespace changes
Inline
Side-by-side
Showing
41 changed files
with
4 additions
and
96 deletions
+4
-96
arch/alpha/defconfig
arch/alpha/defconfig
+0
-1
arch/arm/configs/ebsa110_defconfig
arch/arm/configs/ebsa110_defconfig
+0
-1
arch/arm/configs/ixp4xx_defconfig
arch/arm/configs/ixp4xx_defconfig
+0
-1
arch/i386/defconfig
arch/i386/defconfig
+0
-1
arch/m68k/configs/amiga_defconfig
arch/m68k/configs/amiga_defconfig
+0
-1
arch/m68k/configs/apollo_defconfig
arch/m68k/configs/apollo_defconfig
+0
-1
arch/m68k/configs/atari_defconfig
arch/m68k/configs/atari_defconfig
+0
-1
arch/m68k/configs/bvme6000_defconfig
arch/m68k/configs/bvme6000_defconfig
+0
-1
arch/m68k/configs/hp300_defconfig
arch/m68k/configs/hp300_defconfig
+0
-1
arch/m68k/configs/mac_defconfig
arch/m68k/configs/mac_defconfig
+0
-1
arch/m68k/configs/mvme147_defconfig
arch/m68k/configs/mvme147_defconfig
+0
-1
arch/m68k/configs/mvme16x_defconfig
arch/m68k/configs/mvme16x_defconfig
+0
-1
arch/m68k/configs/q40_defconfig
arch/m68k/configs/q40_defconfig
+0
-1
arch/m68k/configs/sun3_defconfig
arch/m68k/configs/sun3_defconfig
+0
-1
arch/m68k/configs/sun3x_defconfig
arch/m68k/configs/sun3x_defconfig
+0
-1
arch/mips/configs/ip22_defconfig
arch/mips/configs/ip22_defconfig
+0
-1
arch/mips/configs/rm200_defconfig
arch/mips/configs/rm200_defconfig
+0
-1
arch/mips/defconfig
arch/mips/defconfig
+0
-1
arch/parisc/configs/a500_defconfig
arch/parisc/configs/a500_defconfig
+0
-1
arch/parisc/configs/c3000_defconfig
arch/parisc/configs/c3000_defconfig
+0
-1
arch/parisc/configs/n4000_defconfig
arch/parisc/configs/n4000_defconfig
+0
-1
arch/ppc/configs/adir_defconfig
arch/ppc/configs/adir_defconfig
+0
-1
arch/ppc/configs/apus_defconfig
arch/ppc/configs/apus_defconfig
+0
-1
arch/ppc/configs/common_defconfig
arch/ppc/configs/common_defconfig
+0
-1
arch/ppc/configs/ibmchrp_defconfig
arch/ppc/configs/ibmchrp_defconfig
+0
-1
arch/ppc/configs/k2_defconfig
arch/ppc/configs/k2_defconfig
+0
-1
arch/ppc/configs/menf1_defconfig
arch/ppc/configs/menf1_defconfig
+0
-1
arch/ppc/configs/pcore_defconfig
arch/ppc/configs/pcore_defconfig
+0
-1
arch/ppc/configs/pmac_defconfig
arch/ppc/configs/pmac_defconfig
+0
-1
arch/ppc/configs/pplus_defconfig
arch/ppc/configs/pplus_defconfig
+0
-1
arch/ppc/defconfig
arch/ppc/defconfig
+0
-1
arch/ppc64/configs/g5_defconfig
arch/ppc64/configs/g5_defconfig
+0
-1
arch/ppc64/configs/iSeries_defconfig
arch/ppc64/configs/iSeries_defconfig
+0
-1
arch/ppc64/configs/pSeries_defconfig
arch/ppc64/configs/pSeries_defconfig
+0
-1
arch/ppc64/defconfig
arch/ppc64/defconfig
+0
-1
arch/sparc64/defconfig
arch/sparc64/defconfig
+0
-1
include/linux/netfilter_ipv4/ip_nat.h
include/linux/netfilter_ipv4/ip_nat.h
+0
-5
net/ipv4/netfilter/Kconfig
net/ipv4/netfilter/Kconfig
+0
-14
net/ipv4/netfilter/ip_nat_core.c
net/ipv4/netfilter/ip_nat_core.c
+0
-8
net/ipv4/netfilter/ip_nat_rule.c
net/ipv4/netfilter/ip_nat_rule.c
+0
-11
net/ipv4/netfilter/ip_nat_standalone.c
net/ipv4/netfilter/ip_nat_standalone.c
+4
-22
No files found.
arch/alpha/defconfig
View file @
9a8ce58a
...
...
@@ -411,7 +411,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
# CONFIG_IP_NF_TARGET_REDIRECT is not set
# CONFIG_IP_NF_TARGET_NETMAP is not set
# CONFIG_IP_NF_TARGET_SAME is not set
# CONFIG_IP_NF_NAT_LOCAL is not set
# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/arm/configs/ebsa110_defconfig
View file @
9a8ce58a
...
...
@@ -239,7 +239,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=y
CONFIG_IP_NF_TARGET_REDIRECT=y
CONFIG_IP_NF_TARGET_NETMAP=y
CONFIG_IP_NF_TARGET_SAME=y
# CONFIG_IP_NF_NAT_LOCAL is not set
# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
CONFIG_IP_NF_NAT_IRC=y
CONFIG_IP_NF_NAT_FTP=y
...
...
This diff is collapsed.
Click to expand it.
arch/arm/configs/ixp4xx_defconfig
View file @
9a8ce58a
...
...
@@ -399,7 +399,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
# CONFIG_IP_NF_TARGET_NETMAP is not set
# CONFIG_IP_NF_TARGET_SAME is not set
CONFIG_IP_NF_NAT_LOCAL=y
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/i386/defconfig
View file @
9a8ce58a
...
...
@@ -534,7 +534,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=y
CONFIG_IP_NF_TARGET_REDIRECT=y
CONFIG_IP_NF_TARGET_NETMAP=y
CONFIG_IP_NF_TARGET_SAME=y
# CONFIG_IP_NF_NAT_LOCAL is not set
# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
CONFIG_IP_NF_MANGLE=y
CONFIG_IP_NF_TARGET_TOS=y
...
...
This diff is collapsed.
Click to expand it.
arch/m68k/configs/amiga_defconfig
View file @
9a8ce58a
...
...
@@ -356,7 +356,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_SAME=m
CONFIG_IP_NF_NAT_LOCAL=y
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/m68k/configs/apollo_defconfig
View file @
9a8ce58a
...
...
@@ -281,7 +281,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_SAME=m
CONFIG_IP_NF_NAT_LOCAL=y
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/m68k/configs/atari_defconfig
View file @
9a8ce58a
...
...
@@ -311,7 +311,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_SAME=m
CONFIG_IP_NF_NAT_LOCAL=y
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/m68k/configs/bvme6000_defconfig
View file @
9a8ce58a
...
...
@@ -281,7 +281,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_SAME=m
CONFIG_IP_NF_NAT_LOCAL=y
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/m68k/configs/hp300_defconfig
View file @
9a8ce58a
...
...
@@ -282,7 +282,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_SAME=m
CONFIG_IP_NF_NAT_LOCAL=y
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/m68k/configs/mac_defconfig
View file @
9a8ce58a
...
...
@@ -318,7 +318,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_SAME=m
CONFIG_IP_NF_NAT_LOCAL=y
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/m68k/configs/mvme147_defconfig
View file @
9a8ce58a
...
...
@@ -282,7 +282,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_SAME=m
CONFIG_IP_NF_NAT_LOCAL=y
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/m68k/configs/mvme16x_defconfig
View file @
9a8ce58a
...
...
@@ -281,7 +281,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_SAME=m
CONFIG_IP_NF_NAT_LOCAL=y
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/m68k/configs/q40_defconfig
View file @
9a8ce58a
...
...
@@ -336,7 +336,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_SAME=m
CONFIG_IP_NF_NAT_LOCAL=y
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/m68k/configs/sun3_defconfig
View file @
9a8ce58a
...
...
@@ -270,7 +270,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_SAME=m
CONFIG_IP_NF_NAT_LOCAL=y
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/m68k/configs/sun3x_defconfig
View file @
9a8ce58a
...
...
@@ -281,7 +281,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_SAME=m
CONFIG_IP_NF_NAT_LOCAL=y
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/mips/configs/ip22_defconfig
View file @
9a8ce58a
...
...
@@ -342,7 +342,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_SAME=m
CONFIG_IP_NF_NAT_LOCAL=y
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/mips/configs/rm200_defconfig
View file @
9a8ce58a
...
...
@@ -437,7 +437,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_SAME=m
CONFIG_IP_NF_NAT_LOCAL=y
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/mips/defconfig
View file @
9a8ce58a
...
...
@@ -342,7 +342,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_SAME=m
CONFIG_IP_NF_NAT_LOCAL=y
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/parisc/configs/a500_defconfig
View file @
9a8ce58a
...
...
@@ -338,7 +338,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_SAME=m
# CONFIG_IP_NF_NAT_LOCAL is not set
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/parisc/configs/c3000_defconfig
View file @
9a8ce58a
...
...
@@ -396,7 +396,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_SAME=m
# CONFIG_IP_NF_NAT_LOCAL is not set
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/parisc/configs/n4000_defconfig
View file @
9a8ce58a
...
...
@@ -331,7 +331,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_SAME=m
# CONFIG_IP_NF_NAT_LOCAL is not set
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/ppc/configs/adir_defconfig
View file @
9a8ce58a
...
...
@@ -302,7 +302,6 @@ CONFIG_IP_NF_NAT=m
CONFIG_IP_NF_NAT_NEEDED=y
CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
# CONFIG_IP_NF_NAT_LOCAL is not set
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/ppc/configs/apus_defconfig
View file @
9a8ce58a
...
...
@@ -354,7 +354,6 @@ CONFIG_IP_NF_NAT=m
CONFIG_IP_NF_NAT_NEEDED=y
CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
# CONFIG_IP_NF_NAT_LOCAL is not set
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/ppc/configs/common_defconfig
View file @
9a8ce58a
...
...
@@ -457,7 +457,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_SAME=m
# CONFIG_IP_NF_NAT_LOCAL is not set
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/ppc/configs/ibmchrp_defconfig
View file @
9a8ce58a
...
...
@@ -367,7 +367,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_SAME=m
# CONFIG_IP_NF_NAT_LOCAL is not set
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/ppc/configs/k2_defconfig
View file @
9a8ce58a
...
...
@@ -319,7 +319,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
# CONFIG_IP_NF_TARGET_NETMAP is not set
# CONFIG_IP_NF_TARGET_SAME is not set
# CONFIG_IP_NF_NAT_LOCAL is not set
# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
CONFIG_IP_NF_NAT_FTP=m
# CONFIG_IP_NF_MANGLE is not set
...
...
This diff is collapsed.
Click to expand it.
arch/ppc/configs/menf1_defconfig
View file @
9a8ce58a
...
...
@@ -249,7 +249,6 @@ CONFIG_IP_NF_NAT=m
CONFIG_IP_NF_NAT_NEEDED=y
CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
# CONFIG_IP_NF_NAT_LOCAL is not set
# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/ppc/configs/pcore_defconfig
View file @
9a8ce58a
...
...
@@ -332,7 +332,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
# CONFIG_IP_NF_TARGET_NETMAP is not set
# CONFIG_IP_NF_TARGET_SAME is not set
# CONFIG_IP_NF_NAT_LOCAL is not set
# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/ppc/configs/pmac_defconfig
View file @
9a8ce58a
...
...
@@ -479,7 +479,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_SAME=m
# CONFIG_IP_NF_NAT_LOCAL is not set
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/ppc/configs/pplus_defconfig
View file @
9a8ce58a
...
...
@@ -343,7 +343,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
# CONFIG_IP_NF_TARGET_NETMAP is not set
# CONFIG_IP_NF_TARGET_SAME is not set
# CONFIG_IP_NF_NAT_LOCAL is not set
# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
CONFIG_IP_NF_NAT_FTP=m
# CONFIG_IP_NF_MANGLE is not set
...
...
This diff is collapsed.
Click to expand it.
arch/ppc/defconfig
View file @
9a8ce58a
...
...
@@ -464,7 +464,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_SAME=m
# CONFIG_IP_NF_NAT_LOCAL is not set
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/ppc64/configs/g5_defconfig
View file @
9a8ce58a
...
...
@@ -440,7 +440,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=y
CONFIG_IP_NF_TARGET_REDIRECT=y
CONFIG_IP_NF_TARGET_NETMAP=y
CONFIG_IP_NF_TARGET_SAME=y
# CONFIG_IP_NF_NAT_LOCAL is not set
# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
CONFIG_IP_NF_MANGLE=y
CONFIG_IP_NF_TARGET_TOS=y
...
...
This diff is collapsed.
Click to expand it.
arch/ppc64/configs/iSeries_defconfig
View file @
9a8ce58a
...
...
@@ -316,7 +316,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_SAME=m
# CONFIG_IP_NF_NAT_LOCAL is not set
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/ppc64/configs/pSeries_defconfig
View file @
9a8ce58a
...
...
@@ -408,7 +408,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_SAME=m
# CONFIG_IP_NF_NAT_LOCAL is not set
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/ppc64/defconfig
View file @
9a8ce58a
...
...
@@ -374,7 +374,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_SAME=m
# CONFIG_IP_NF_NAT_LOCAL is not set
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
arch/sparc64/defconfig
View file @
9a8ce58a
...
...
@@ -601,7 +601,6 @@ CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_SAME=m
CONFIG_IP_NF_NAT_LOCAL=y
CONFIG_IP_NF_NAT_SNMP_BASIC=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
...
...
This diff is collapsed.
Click to expand it.
include/linux/netfilter_ipv4/ip_nat.h
View file @
9a8ce58a
...
...
@@ -11,13 +11,8 @@ enum ip_nat_manip_type
IP_NAT_MANIP_DST
};
#ifndef CONFIG_IP_NF_NAT_LOCAL
/* SRC manip occurs only on POST_ROUTING */
#define HOOK2MANIP(hooknum) ((hooknum) != NF_IP_POST_ROUTING)
#else
/* SRC manip occurs POST_ROUTING or LOCAL_IN */
#define HOOK2MANIP(hooknum) ((hooknum) != NF_IP_POST_ROUTING && (hooknum) != NF_IP_LOCAL_IN)
#endif
#define IP_NAT_RANGE_MAP_IPS 1
#define IP_NAT_RANGE_PROTO_SPECIFIED 2
...
...
This diff is collapsed.
Click to expand it.
net/ipv4/netfilter/Kconfig
View file @
9a8ce58a
...
...
@@ -504,20 +504,6 @@ config IP_NF_TARGET_SAME
To compile it as a module, choose M here. If unsure, say N.
config IP_NF_NAT_LOCAL
bool "NAT of local connections (READ HELP)"
depends on IP_NF_NAT
help
This option enables support for NAT of locally originated connections.
Enable this if you need to use destination NAT on connections
originating from local processes on the nat box itself.
Please note that you will need a recent version (>= 1.2.6a)
of the iptables userspace program in order to use this feature.
See <http://www.iptables.org/> for download instructions.
If unsure, say 'N'.
config IP_NF_NAT_SNMP_BASIC
tristate "Basic SNMP-ALG support (EXPERIMENTAL)"
depends on EXPERIMENTAL && IP_NF_NAT
...
...
This diff is collapsed.
Click to expand it.
net/ipv4/netfilter/ip_nat_core.c
View file @
9a8ce58a
...
...
@@ -182,7 +182,6 @@ find_appropriate_src(const struct ip_conntrack_tuple *tuple,
return
0
;
}
#ifdef CONFIG_IP_NF_NAT_LOCAL
/* If it's really a local destination manip, it may need to do a
source manip too. */
static
int
...
...
@@ -202,7 +201,6 @@ do_extra_mangle(u_int32_t var_ip, u_int32_t *other_ipp)
ip_rt_put
(
rt
);
return
1
;
}
#endif
/* Simple way to iterate through all. */
static
inline
int
fake_cmp
(
const
struct
ip_conntrack
*
ct
,
...
...
@@ -301,7 +299,6 @@ find_best_ips_proto(struct ip_conntrack_tuple *tuple,
* do_extra_mangle last time. */
*
other_ipp
=
saved_ip
;
#ifdef CONFIG_IP_NF_NAT_LOCAL
if
(
hooknum
==
NF_IP_LOCAL_OUT
&&
*
var_ipp
!=
orig_dstip
&&
!
do_extra_mangle
(
*
var_ipp
,
other_ipp
))
{
...
...
@@ -312,7 +309,6 @@ find_best_ips_proto(struct ip_conntrack_tuple *tuple,
* anyway. */
continue
;
}
#endif
/* Count how many others map onto this. */
score
=
count_maps
(
tuple
->
src
.
ip
,
tuple
->
dst
.
ip
,
...
...
@@ -356,13 +352,11 @@ find_best_ips_proto_fast(struct ip_conntrack_tuple *tuple,
else
{
/* Only do extra mangle when required (breaks
socket binding) */
#ifdef CONFIG_IP_NF_NAT_LOCAL
if
(
tuple
->
dst
.
ip
!=
mr
->
range
[
0
].
min_ip
&&
hooknum
==
NF_IP_LOCAL_OUT
&&
!
do_extra_mangle
(
mr
->
range
[
0
].
min_ip
,
&
tuple
->
src
.
ip
))
return
NULL
;
#endif
tuple
->
dst
.
ip
=
mr
->
range
[
0
].
min_ip
;
}
}
...
...
@@ -473,10 +467,8 @@ get_unique_tuple(struct ip_conntrack_tuple *tuple,
static
unsigned
int
opposite_hook
[
NF_IP_NUMHOOKS
]
=
{
[
NF_IP_PRE_ROUTING
]
=
NF_IP_POST_ROUTING
,
[
NF_IP_POST_ROUTING
]
=
NF_IP_PRE_ROUTING
,
#ifdef CONFIG_IP_NF_NAT_LOCAL
[
NF_IP_LOCAL_OUT
]
=
NF_IP_LOCAL_IN
,
[
NF_IP_LOCAL_IN
]
=
NF_IP_LOCAL_OUT
,
#endif
};
unsigned
int
...
...
This diff is collapsed.
Click to expand it.
net/ipv4/netfilter/ip_nat_rule.c
View file @
9a8ce58a
...
...
@@ -149,12 +149,8 @@ static unsigned int ipt_dnat_target(struct sk_buff **pskb,
struct
ip_conntrack
*
ct
;
enum
ip_conntrack_info
ctinfo
;
#ifdef CONFIG_IP_NF_NAT_LOCAL
IP_NF_ASSERT
(
hooknum
==
NF_IP_PRE_ROUTING
||
hooknum
==
NF_IP_LOCAL_OUT
);
#else
IP_NF_ASSERT
(
hooknum
==
NF_IP_PRE_ROUTING
);
#endif
ct
=
ip_conntrack_get
(
*
pskb
,
&
ctinfo
);
...
...
@@ -232,13 +228,6 @@ static int ipt_dnat_checkentry(const char *tablename,
return
0
;
}
#ifndef CONFIG_IP_NF_NAT_LOCAL
if
(
hook_mask
&
(
1
<<
NF_IP_LOCAL_OUT
))
{
DEBUGP
(
"DNAT: CONFIG_IP_NF_NAT_LOCAL not enabled
\n
"
);
return
0
;
}
#endif
return
1
;
}
...
...
This diff is collapsed.
Click to expand it.
net/ipv4/netfilter/ip_nat_standalone.c
View file @
9a8ce58a
...
...
@@ -128,16 +128,7 @@ ip_nat_fn(unsigned int hooknum,
WRITE_LOCK
(
&
ip_nat_lock
);
/* Seen it before? This can happen for loopback, retrans,
or local packets.. */
if
(
!
(
info
->
initialized
&
(
1
<<
maniptype
))
#ifndef CONFIG_IP_NF_NAT_LOCAL
/* If this session has already been confirmed we must not
* touch it again even if there is no mapping set up.
* Can only happen on local->local traffic with
* CONFIG_IP_NF_NAT_LOCAL disabled.
*/
&&
!
(
ct
->
status
&
IPS_CONFIRMED
)
#endif
)
{
if
(
!
(
info
->
initialized
&
(
1
<<
maniptype
)))
{
unsigned
int
ret
;
if
(
ct
->
master
...
...
@@ -146,15 +137,14 @@ ip_nat_fn(unsigned int hooknum,
ret
=
call_expect
(
master_ct
(
ct
),
pskb
,
hooknum
,
ct
,
info
);
}
else
{
#ifdef CONFIG_IP_NF_NAT_LOCAL
/* LOCAL_IN hook doesn't have a chain! */
if
(
hooknum
==
NF_IP_LOCAL_IN
)
ret
=
alloc_null_binding
(
ct
,
info
,
hooknum
);
else
#endif
ret
=
ip_nat_rule_find
(
pskb
,
hooknum
,
in
,
ou
t
,
ct
,
info
);
ret
=
ip_nat_rule_find
(
pskb
,
hooknum
,
in
,
out
,
c
t
,
info
);
}
if
(
ret
!=
NF_ACCEPT
)
{
...
...
@@ -234,7 +224,6 @@ ip_nat_out(unsigned int hooknum,
return
ip_nat_fn
(
hooknum
,
pskb
,
in
,
out
,
okfn
);
}
#ifdef CONFIG_IP_NF_NAT_LOCAL
static
unsigned
int
ip_nat_local_fn
(
unsigned
int
hooknum
,
struct
sk_buff
**
pskb
,
...
...
@@ -260,7 +249,6 @@ ip_nat_local_fn(unsigned int hooknum,
return
ip_route_me_harder
(
pskb
)
==
0
?
ret
:
NF_DROP
;
return
ret
;
}
#endif
/* We must be after connection tracking and before packet filtering. */
...
...
@@ -282,7 +270,6 @@ static struct nf_hook_ops ip_nat_out_ops = {
.
priority
=
NF_IP_PRI_NAT_SRC
,
};
#ifdef CONFIG_IP_NF_NAT_LOCAL
/* Before packet filtering, change destination */
static
struct
nf_hook_ops
ip_nat_local_out_ops
=
{
.
hook
=
ip_nat_local_fn
,
...
...
@@ -300,7 +287,6 @@ static struct nf_hook_ops ip_nat_local_in_ops = {
.
hooknum
=
NF_IP_LOCAL_IN
,
.
priority
=
NF_IP_PRI_NAT_SRC
,
};
#endif
/* Protocol registration. */
int
ip_nat_protocol_register
(
struct
ip_nat_protocol
*
proto
)
...
...
@@ -357,7 +343,6 @@ static int init_or_cleanup(int init)
printk
(
"ip_nat_init: can't register out hook.
\n
"
);
goto
cleanup_inops
;
}
#ifdef CONFIG_IP_NF_NAT_LOCAL
ret
=
nf_register_hook
(
&
ip_nat_local_out_ops
);
if
(
ret
<
0
)
{
printk
(
"ip_nat_init: can't register local out hook.
\n
"
);
...
...
@@ -368,16 +353,13 @@ static int init_or_cleanup(int init)
printk
(
"ip_nat_init: can't register local in hook.
\n
"
);
goto
cleanup_localoutops
;
}
#endif
return
ret
;
cleanup:
#ifdef CONFIG_IP_NF_NAT_LOCAL
nf_unregister_hook
(
&
ip_nat_local_in_ops
);
cleanup_localoutops:
nf_unregister_hook
(
&
ip_nat_local_out_ops
);
cleanup_outops:
#endif
nf_unregister_hook
(
&
ip_nat_out_ops
);
cleanup_inops:
nf_unregister_hook
(
&
ip_nat_in_ops
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment