]> git.ipfire.org Git - thirdparty/iptables.git/commit
xtables-translate: fix multiple spaces issue
authorPablo M. Bermudo Garay <pablombg@gmail.com>
Sat, 9 Jul 2016 10:27:51 +0000 (12:27 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Sat, 9 Jul 2016 11:44:46 +0000 (13:44 +0200)
commitf035be35c749d5c5cbb7ffdbcd1c548b91bd3033
tree69f5402722a70645f783d761e2ec60a4e99a85e1
parente8f857a5a1514c3e7d0d8ea0f7d2d571f0e37bd1
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>
33 files changed:
extensions/libip6t_ah.c
extensions/libip6t_frag.c
extensions/libip6t_hbh.c
extensions/libip6t_hl.c
extensions/libip6t_mh.c
extensions/libip6t_rt.c
extensions/libipt_ah.c
extensions/libipt_icmp.c
extensions/libipt_realm.c
extensions/libipt_ttl.c
extensions/libxt_cgroup.c
extensions/libxt_connmark.c
extensions/libxt_conntrack.c
extensions/libxt_cpu.c
extensions/libxt_dccp.c
extensions/libxt_devgroup.c
extensions/libxt_dscp.c
extensions/libxt_ecn.c
extensions/libxt_esp.c
extensions/libxt_helper.c
extensions/libxt_ipcomp.c
extensions/libxt_iprange.c
extensions/libxt_length.c
extensions/libxt_limit.c
extensions/libxt_mac.c
extensions/libxt_mark.c
extensions/libxt_multiport.c
extensions/libxt_owner.c
extensions/libxt_pkttype.c
extensions/libxt_sctp.c
extensions/libxt_tcp.c
extensions/libxt_udp.c
iptables/xtables-translate.c