Skip to contentSkip to conversation

libxt_iprange: remove extra space in translation

PATCH Applied Pablo M. Bermudo Garay 2 participants 2 messages Jun 20, 2016 – Jun 22, 2016 netfilter

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libxt_iprange: remove extra space in translation

Extra space was printed by iprange_xlate:

  # iptables-translate -A INPUT -m iprange --src-range \
    192.168.25.149-192.168.25.151 -j ACCEPT

nft add rule ip filter INPUT ip saddr 192.168.25.149-192.168.25...

                              ^^
---
 extensions/libxt_iprange.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)
extensions/libxt_iprange.c +12 -12
index c2d51e9..8da7de1 100644
@@ -322,14 +322,14 @@ static int iprange_xlate(const void *ip, const struct xt_entry_match *match,
 
 	if (info->flags & IPRANGE_SRC) {
 		if (info->flags & IPRANGE_SRC_INV)
-			xt_xlate_add(xl, " !=");
-		xt_xlate_add(xl, " ip saddr");
+			xt_xlate_add(xl, "!= ");
+		xt_xlate_add(xl, "ip saddr");
 		print_iprange_xlate(&info->src, xl);
 	}
 	if (info->flags & IPRANGE_DST) {
 		if (info->flags & IPRANGE_DST_INV)
-			xt_xlate_add(xl, " !=");
-		xt_xlate_add(xl, " ip daddr");
+			xt_xlate_add(xl, "!= ");
+		xt_xlate_add(xl, "ip daddr");
 		print_iprange_xlate(&info->dst, xl);
 	}
 
@@ -343,16 +343,16 @@ static int iprange_mt4_xlate(const void *ip, const struct xt_entry_match *match,
 
 	if (info->flags & IPRANGE_SRC) {
 		if (info->flags & IPRANGE_SRC_INV)
-			xt_xlate_add(xl, " !=");
-		xt_xlate_add(xl, " ip saddr %s",
+			xt_xlate_add(xl, "!= ");
+		xt_xlate_add(xl, "ip saddr %s",
 			   xtables_ipaddr_to_numeric(&info->src_min.in));
 		xt_xlate_add(xl, "-%s ",
 			   xtables_ipaddr_to_numeric(&info->src_max.in));
 	}
 	if (info->flags & IPRANGE_DST) {
 		if (info->flags & IPRANGE_DST_INV)
-			xt_xlate_add(xl, " !=");
-		xt_xlate_add(xl, " ip daddr %s",
+			xt_xlate_add(xl, "!= ");
+		xt_xlate_add(xl, "ip daddr %s",
 			   xtables_ipaddr_to_numeric(&info->dst_min.in));
 		xt_xlate_add(xl, "-%s ",
 			   xtables_ipaddr_to_numeric(&info->dst_max.in));
@@ -368,16 +368,16 @@ static int iprange_mt6_xlate(const void *ip, const struct xt_entry_match *match,
 
 	if (info->flags & IPRANGE_SRC) {
 		if (info->flags & IPRANGE_SRC_INV)
-			xt_xlate_add(xl, " !=");
-		xt_xlate_add(xl, " ip saddr %s",
+			xt_xlate_add(xl, "!= ");
+		xt_xlate_add(xl, "ip saddr %s",
 			   xtables_ip6addr_to_numeric(&info->src_min.in6));
 		xt_xlate_add(xl, "-%s ",
 			   xtables_ip6addr_to_numeric(&info->src_max.in6));
 	}
 	if (info->flags & IPRANGE_DST) {
 		if (info->flags & IPRANGE_DST_INV)
-			xt_xlate_add(xl, " !=");
-		xt_xlate_add(xl, " ip daddr %s",
+			xt_xlate_add(xl, "!= ");
+		xt_xlate_add(xl, "ip daddr %s",
 			   xtables_ip6addr_to_numeric(&info->dst_min.in6));
 		xt_xlate_add(xl, "-%s ",
 			   xtables_ip6addr_to_numeric(&info->dst_max.in6));
Signature · 1 line
2.8.3
maintainer Applied
#1 lore raw
Quoted 7 lines · Pablo M. Bermudo Garay

Extra space was printed by iprange_xlate:

  # iptables-translate -A INPUT -m iprange --src-range \
    192.168.25.149-192.168.25.151 -j ACCEPT

nft add rule ip filter INPUT ip saddr 192.168.25.149-192.168.25...

                              ^^

Applied, thanks.