diff options
| author | Changli Gao <xiaosuo@gmail.com> | 2010-09-16 19:45:19 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-09-16 19:45:19 +0200 |
| commit | 99ad3c53b36a056a472927de9c79eda231ecc6fe (patch) | |
| tree | 61224a837d3eb7e6504fe49d10613b3717ccd67f /net/ipv4 | |
| parent | 70a851667dbd7aa3f7be9609d6580ca9861230b3 (diff) | |
| download | blackbird-op-linux-99ad3c53b36a056a472927de9c79eda231ecc6fe.tar.gz blackbird-op-linux-99ad3c53b36a056a472927de9c79eda231ecc6fe.zip | |
netfilter: nf_nat_core: don't check if the tuple is used if there is no other choice
Eliminate nf_nat_used_tuple() to save some CPU cycles when there is no
other choice.
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/netfilter/nf_nat_core.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/net/ipv4/netfilter/nf_nat_core.c b/net/ipv4/netfilter/nf_nat_core.c index 8c8632d9b93c..2c084b3a8f0c 100644 --- a/net/ipv4/netfilter/nf_nat_core.c +++ b/net/ipv4/netfilter/nf_nat_core.c @@ -262,11 +262,17 @@ get_unique_tuple(struct nf_conntrack_tuple *tuple, proto = __nf_nat_proto_find(orig_tuple->dst.protonum); /* Only bother mapping if it's not already in range and unique */ - if (!(range->flags & IP_NAT_RANGE_PROTO_RANDOM) && - (!(range->flags & IP_NAT_RANGE_PROTO_SPECIFIED) || - proto->in_range(tuple, maniptype, &range->min, &range->max)) && - !nf_nat_used_tuple(tuple, ct)) - goto out; + if (!(range->flags & IP_NAT_RANGE_PROTO_RANDOM)) { + if (range->flags & IP_NAT_RANGE_PROTO_SPECIFIED) { + if (proto->in_range(tuple, maniptype, &range->min, + &range->max) && + (range->min.all == range->max.all || + !nf_nat_used_tuple(tuple, ct))) + goto out; + } else if (!nf_nat_used_tuple(tuple, ct)) { + goto out; + } + } /* Last change: get protocol to try to obtain unique tuple. */ proto->unique_tuple(tuple, range, maniptype, ct); |
