From f035be35c749d5c5cbb7ffdbcd1c548b91bd3033 Mon Sep 17 00:00:00 2001 From: "Pablo M. Bermudo Garay" Date: Sat, 9 Jul 2016 12:27:51 +0200 Subject: 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 Signed-off-by: Pablo Neira Ayuso --- extensions/libxt_dccp.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'extensions/libxt_dccp.c') diff --git a/extensions/libxt_dccp.c b/extensions/libxt_dccp.c index d442e37a..179261f9 100644 --- a/extensions/libxt_dccp.c +++ b/extensions/libxt_dccp.c @@ -299,7 +299,7 @@ static int dccp_type_xlate(const struct xt_dccp_info *einfo, if (types & (1 << DCCP_PKT_INVALID)) return 0; - xt_xlate_add(xl, "dccp type%s ", einfo->invflags ? " !=" : ""); + xt_xlate_add(xl, " dccp type%s ", einfo->invflags ? " !=" : ""); if ((types != 0) && !(types == (types & -types))) { xt_xlate_add(xl, "{"); @@ -324,8 +324,6 @@ static int dccp_type_xlate(const struct xt_dccp_info *einfo, if (set_need) xt_xlate_add(xl, "}"); - xt_xlate_add(xl, " "); - return 1; } @@ -335,27 +333,29 @@ static int dccp_xlate(const void *ip, const struct xt_entry_match *match, const struct xt_dccp_info *einfo = (const struct xt_dccp_info *)match->data; int ret = 1; + char *space = ""; xt_xlate_add(xl, "dccp "); if (einfo->flags & XT_DCCP_SRC_PORTS) { if (einfo->spts[0] != einfo->spts[1]) - xt_xlate_add(xl, "sport%s %u-%u ", + xt_xlate_add(xl, "sport%s %u-%u", einfo->invflags & XT_DCCP_SRC_PORTS ? " !=" : "", einfo->spts[0], einfo->spts[1]); else - xt_xlate_add(xl, "sport%s %u ", + xt_xlate_add(xl, "sport%s %u", einfo->invflags & XT_DCCP_SRC_PORTS ? " !=" : "", einfo->spts[0]); + space = " "; } if (einfo->flags & XT_DCCP_DEST_PORTS) { if (einfo->dpts[0] != einfo->dpts[1]) - xt_xlate_add(xl, "dport%s %u-%u ", + xt_xlate_add(xl, "%sdport%s %u-%u", space, einfo->invflags & XT_DCCP_DEST_PORTS ? " !=" : "", einfo->dpts[0], einfo->dpts[1]); else - xt_xlate_add(xl, "dport%s %u ", + xt_xlate_add(xl, "%sdport%s %u", space, einfo->invflags & XT_DCCP_DEST_PORTS ? " !=" : "", einfo->dpts[0]); } -- cgit v1.2.3