diff options
author | Pablo M. Bermudo Garay <pablombg@gmail.com> | 2016-07-09 12:27:51 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-07-09 13:44:46 +0200 |
commit | f035be35c749d5c5cbb7ffdbcd1c548b91bd3033 (patch) | |
tree | 69f5402722a70645f783d761e2ec60a4e99a85e1 /extensions/libxt_limit.c | |
parent | e8f857a5a1514c3e7d0d8ea0f7d2d571f0e37bd1 (diff) |
xtables-translate: fix multiple spaces issue
This patch fixes a multiple spaces issue. The problem arises when a rule
set loaded through iptables-compat-restore is listed in nft.
Before this commit, two spaces were printed after every match
translation:
$ sudo iptables-save
*filter
:INPUT ACCEPT [0:0]
-A INPUT -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
-A INPUT -p tcp -m multiport --dports 80:85 -m ttl --ttl-gt 5 -j ACCEPT
COMMIT
$ sudo iptables-compat-restore iptables-save
$ sudo nft list ruleset
table ip filter {
chain INPUT {
type filter hook input priority 0; policy accept;
ct state related,established counter packets 0 bytes 0 accept
^^
ip protocol tcp tcp dport 80-85 ip ttl gt 5 counter packets 0 bytes 0 accept
^^ ^^
}
}
Signed-off-by: Pablo M. Bermudo Garay <pablombg@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'extensions/libxt_limit.c')
-rw-r--r-- | extensions/libxt_limit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extensions/libxt_limit.c b/extensions/libxt_limit.c index 6652849a..c82d4df4 100644 --- a/extensions/libxt_limit.c +++ b/extensions/libxt_limit.c @@ -164,7 +164,7 @@ static void print_rate_xlate(uint32_t period, struct xt_xlate *xl) unsigned int i; if (period == 0) { - xt_xlate_add(xl, " %f ", INFINITY); + xt_xlate_add(xl, " %f", INFINITY); return; } @@ -173,7 +173,7 @@ static void print_rate_xlate(uint32_t period, struct xt_xlate *xl) rates_xlate[i].mult / period < rates_xlate[i].mult % period) break; - xt_xlate_add(xl, " %u/%s ", rates_xlate[i - 1].mult / period, + xt_xlate_add(xl, " %u/%s", rates_xlate[i - 1].mult / period, rates_xlate[i - 1].name); } @@ -185,7 +185,7 @@ static int limit_xlate(const void *ip, const struct xt_entry_match *match, xt_xlate_add(xl, "limit rate"); print_rate_xlate(r->avg, xl); if (r->burst != 0) - xt_xlate_add(xl, "burst %u packets ", r->burst); + xt_xlate_add(xl, " burst %u packets", r->burst); return 1; } |