diff options
| author |   Patrick McHardy <kaber@trash.net> | 2011-12-23 13:59:49 +0100 |
|---|---|---|
| committer |   Pablo Neira Ayuso <pablo@netfilter.org> | 2011-12-23 14:36:43 +0100 |
| commit | cbc9f2f4fcd70d5a627558ca9a881fa9391abf69 (patch) | |
| tree | 37bc0efbcc8fda2250bca77bbd681167c96a2598 /net/ipv4/netfilter/nf_nat_proto_icmp.c | |
| parent | netfilter: rework user-space expectation helper support (diff) | |
| download | linux-dev-cbc9f2f4fcd70d5a627558ca9a881fa9391abf69.tar.xz linux-dev-cbc9f2f4fcd70d5a627558ca9a881fa9391abf69.zip | |
netfilter: nf_nat: export NAT definitions to userspace
Export the NAT definitions to userspace. So far userspace (specifically,
iptables) has been copying the headers files from include/net. Also
rename some structures and definitions in preparation for IPv6 NAT.
Since these have never been officially exported, this doesn't affect
existing userspace code.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/ipv4/netfilter/nf_nat_proto_icmp.c')
| -rw-r--r-- | net/ipv4/netfilter/nf_nat_proto_icmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/netfilter/nf_nat_proto_icmp.c b/net/ipv4/netfilter/nf_nat_proto_icmp.c index 9f4dc1235dc7..8f87b4bebf2b 100644 --- a/net/ipv4/netfilter/nf_nat_proto_icmp.c +++ b/net/ipv4/netfilter/nf_nat_proto_icmp.c @@ -30,7 +30,7 @@ icmp_in_range(const struct nf_conntrack_tuple *tuple, static void icmp_unique_tuple(struct nf_conntrack_tuple *tuple, - const struct nf_nat_range *range, + const struct nf_nat_ipv4_range *range, enum nf_nat_manip_type maniptype, const struct nf_conn *ct) { @@ -40,7 +40,7 @@ icmp_unique_tuple(struct nf_conntrack_tuple *tuple, range_size = ntohs(range->max.icmp.id) - ntohs(range->min.icmp.id) + 1; /* If no range specified... */ - if (!(range->flags & IP_NAT_RANGE_PROTO_SPECIFIED)) + if (!(range->flags & NF_NAT_RANGE_PROTO_SPECIFIED)) range_size = 0xFFFF; for (i = 0; ; ++id) { |