From: Ulrich Weber <ulrich.weber@sophos.com>
To: <netfilter-devel@vger.kernel.org>
Subject: [PATCH] iptables: allow IPv6 port NAT without address NAT
Date: Wed, 2 Jan 2013 16:52:44 +0100 [thread overview]
Message-ID: <20130102155244.GB5133@uweber-WS> (raw)
correct parsing of IPv6 port NAT without address NAT
and also print brackets for port only IPv6 NAT.
Signed-off-by: Ulrich Weber <ulrich.weber@sophos.com>
---
extensions/libip6t_DNAT.c | 12 +++++-------
extensions/libip6t_SNAT.c | 12 +++++-------
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/extensions/libip6t_DNAT.c b/extensions/libip6t_DNAT.c
index a5969c3..6f11d52 100644
--- a/extensions/libip6t_DNAT.c
+++ b/extensions/libip6t_DNAT.c
@@ -105,8 +105,8 @@ parse_to(const char *orig_arg, int portok, struct nf_nat_range *range)
range->min_proto.tcp.port = htons(port);
range->max_proto.tcp.port = htons(maxport);
}
- /* Starts with a colon? No IP info...*/
- if (colon == arg) {
+ /* Starts with [] colon? No IP info...*/
+ if (colon == arg+2) {
free(arg);
return;
}
@@ -183,18 +183,16 @@ static void DNAT_fcheck(struct xt_fcheck_call *cb)
static void print_range(const struct nf_nat_range *range)
{
+ if (range->flags & NF_NAT_RANGE_PROTO_SPECIFIED)
+ printf("[");
if (range->flags & NF_NAT_RANGE_MAP_IPS) {
- if (range->flags & NF_NAT_RANGE_PROTO_SPECIFIED)
- printf("[");
printf("%s", xtables_ip6addr_to_numeric(&range->min_addr.in6));
if (memcmp(&range->min_addr, &range->max_addr,
sizeof(range->min_addr)))
printf("-%s", xtables_ip6addr_to_numeric(&range->max_addr.in6));
- if (range->flags & NF_NAT_RANGE_PROTO_SPECIFIED)
- printf("]");
}
if (range->flags & NF_NAT_RANGE_PROTO_SPECIFIED) {
- printf(":");
+ printf("]:");
printf("%hu", ntohs(range->min_proto.tcp.port));
if (range->max_proto.tcp.port != range->min_proto.tcp.port)
printf("-%hu", ntohs(range->max_proto.tcp.port));
diff --git a/extensions/libip6t_SNAT.c b/extensions/libip6t_SNAT.c
index 307be70..8d2c87e 100644
--- a/extensions/libip6t_SNAT.c
+++ b/extensions/libip6t_SNAT.c
@@ -105,8 +105,8 @@ parse_to(const char *orig_arg, int portok, struct nf_nat_range *range)
range->min_proto.tcp.port = htons(port);
range->max_proto.tcp.port = htons(maxport);
}
- /* Starts with a colon? No IP info...*/
- if (colon == arg) {
+ /* Starts with [] colon? No IP info...*/
+ if (colon == arg+2) {
free(arg);
return;
}
@@ -183,18 +183,16 @@ static void SNAT_fcheck(struct xt_fcheck_call *cb)
static void print_range(const struct nf_nat_range *range)
{
+ if (range->flags & NF_NAT_RANGE_PROTO_SPECIFIED)
+ printf("[");
if (range->flags & NF_NAT_RANGE_MAP_IPS) {
- if (range->flags & NF_NAT_RANGE_PROTO_SPECIFIED)
- printf("[");
printf("%s", xtables_ip6addr_to_numeric(&range->min_addr.in6));
if (memcmp(&range->min_addr, &range->max_addr,
sizeof(range->min_addr)))
printf("-%s", xtables_ip6addr_to_numeric(&range->max_addr.in6));
- if (range->flags & NF_NAT_RANGE_PROTO_SPECIFIED)
- printf("]");
}
if (range->flags & NF_NAT_RANGE_PROTO_SPECIFIED) {
- printf(":");
+ printf("]:");
printf("%hu", ntohs(range->min_proto.tcp.port));
if (range->max_proto.tcp.port != range->min_proto.tcp.port)
printf("-%hu", ntohs(range->max_proto.tcp.port));
--
1.8.0.2
next reply other threads:[~2013-01-02 15:52 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-02 15:52 Ulrich Weber [this message]
2013-01-03 0:13 ` [PATCH] iptables: allow IPv6 port NAT without address NAT Pablo Neira Ayuso
2013-01-03 10:17 ` Ulrich Weber
2013-01-03 10:39 ` [PATCH v2] " Ulrich Weber
2013-01-04 0:10 ` Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130102155244.GB5133@uweber-WS \
--to=ulrich.weber@sophos.com \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).