aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2009-04-16 18:33:01 +0200
committerPatrick McHardy <kaber@trash.net>2009-04-16 18:33:01 +0200
commit98d500d66cb7940747b424b245fc6a51ecfbf005 (patch)
tree0c5d745901be7aab151071829a8dc6fac193fb30 /net/ipv4
parent38fb0afcd8761f8858e27135ed89a65117e2019c (diff)
downloadkernel_samsung_espresso10-98d500d66cb7940747b424b245fc6a51ecfbf005.zip
kernel_samsung_espresso10-98d500d66cb7940747b424b245fc6a51ecfbf005.tar.gz
kernel_samsung_espresso10-98d500d66cb7940747b424b245fc6a51ecfbf005.tar.bz2
netfilter: nf_nat: add support for persistent mappings
The removal of the SAME target accidentally removed one feature that is not available from the normal NAT targets so far, having multi-range mappings that use the same mapping for each connection from a single client. The current behaviour is to choose the address from the range based on source and destination IP, which breaks when communicating with sites having multiple addresses that require all connections to originate from the same IP address. Introduce a IP_NAT_RANGE_PERSISTENT option that controls whether the destination address is taken into account for selecting addresses. http://bugzilla.kernel.org/show_bug.cgi?id=12954 Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/netfilter/nf_nat_core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/nf_nat_core.c b/net/ipv4/netfilter/nf_nat_core.c
index fe65187..3229e0a 100644
--- a/net/ipv4/netfilter/nf_nat_core.c
+++ b/net/ipv4/netfilter/nf_nat_core.c
@@ -211,7 +211,8 @@ find_best_ips_proto(struct nf_conntrack_tuple *tuple,
minip = ntohl(range->min_ip);
maxip = ntohl(range->max_ip);
j = jhash_2words((__force u32)tuple->src.u3.ip,
- (__force u32)tuple->dst.u3.ip, 0);
+ range->flags & IP_NAT_RANGE_PERSISTENT ?
+ (__force u32)tuple->dst.u3.ip : 0, 0);
j = ((u64)j * (maxip - minip + 1)) >> 32;
*var_ipp = htonl(minip + j);
}