summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Sutter <phil@nwl.cc>2020-12-19 02:01:23 +0100
committerPhil Sutter <phil@nwl.cc>2021-03-09 14:23:13 +0100
commit5048736e76e553b54b445dee488a6316468bce73 (patch)
tree9b5247cb736afb5d521dadf3b3a7d467c8015f19
parentd2824247a2bd62a81c7efd41b3a136488a8c6551 (diff)
expr/{masq,nat}: Don't print unused regs
No point in printing the unset register value (which is zero then). Fixes: af0c182670837 ("expr: masq: Add support for port selection") Signed-off-by: Phil Sutter <phil@nwl.cc>
-rw-r--r--src/expr/masq.c10
-rw-r--r--src/expr/nat.c18
2 files changed, 21 insertions, 7 deletions
diff --git a/src/expr/masq.c b/src/expr/masq.c
index 622ba28..ea66fec 100644
--- a/src/expr/masq.c
+++ b/src/expr/masq.c
@@ -138,9 +138,13 @@ static int nftnl_expr_masq_snprintf_default(char *buf, size_t len,
int remain = len, offset = 0, ret = 0;
if (e->flags & (1 << NFTNL_EXPR_MASQ_REG_PROTO_MIN)) {
- ret = snprintf(buf, remain,
- "proto_min reg %u proto_max reg %u ",
- masq->sreg_proto_min, masq->sreg_proto_max);
+ ret = snprintf(buf + offset, remain, "proto_min reg %u ",
+ masq->sreg_proto_min);
+ SNPRINTF_BUFFER_SIZE(ret, remain, offset);
+ }
+ if (e->flags & (1 << NFTNL_EXPR_MASQ_REG_PROTO_MAX)) {
+ ret = snprintf(buf + offset, remain, "proto_max reg %u ",
+ masq->sreg_proto_max);
SNPRINTF_BUFFER_SIZE(ret, remain, offset);
}
if (e->flags & (1 << NFTNL_EXPR_MASQ_FLAGS)) {
diff --git a/src/expr/nat.c b/src/expr/nat.c
index 4085216..91a1ae6 100644
--- a/src/expr/nat.c
+++ b/src/expr/nat.c
@@ -236,15 +236,25 @@ nftnl_expr_nat_snprintf_default(char *buf, size_t size,
if (e->flags & (1 << NFTNL_EXPR_NAT_REG_ADDR_MIN)) {
ret = snprintf(buf + offset, remain,
- "addr_min reg %u addr_max reg %u ",
- nat->sreg_addr_min, nat->sreg_addr_max);
+ "addr_min reg %u ", nat->sreg_addr_min);
+ SNPRINTF_BUFFER_SIZE(ret, remain, offset);
+ }
+
+ if (e->flags & (1 << NFTNL_EXPR_NAT_REG_ADDR_MAX)) {
+ ret = snprintf(buf + offset, remain,
+ "addr_max reg %u ", nat->sreg_addr_max);
SNPRINTF_BUFFER_SIZE(ret, remain, offset);
}
if (e->flags & (1 << NFTNL_EXPR_NAT_REG_PROTO_MIN)) {
ret = snprintf(buf + offset, remain,
- "proto_min reg %u proto_max reg %u ",
- nat->sreg_proto_min, nat->sreg_proto_max);
+ "proto_min reg %u ", nat->sreg_proto_min);
+ SNPRINTF_BUFFER_SIZE(ret, remain, offset);
+ }
+
+ if (e->flags & (1 << NFTNL_EXPR_NAT_REG_PROTO_MAX)) {
+ ret = snprintf(buf + offset, remain,
+ "proto_max reg %u ", nat->sreg_proto_max);
SNPRINTF_BUFFER_SIZE(ret, remain, offset);
}