69c15a0028
* Tue Feb 24 2026 Phil Sutter <psutter@redhat.com> [1.3.0-3.el10]
- src: Do not include userdata content in debug output (Phil Sutter) [RHEL-119650]
- Revert "udata: Store u32 udata values in Big Endian" (Phil Sutter) [RHEL-119650]
- udata: Store u32 udata values in Big Endian (Phil Sutter) [RHEL-119650]
- data_reg: Support concatenated data (Phil Sutter) [RHEL-119650]
- data_reg: Respect data byteorder when printing (Phil Sutter) [RHEL-119650]
- Introduce nftnl_{expr,set_elem}_set_imm() (Phil Sutter) [RHEL-119650]
- data_reg: Introduce struct nftnl_data_reg::sizes array (Phil Sutter) [RHEL-119650]
- data_reg: Introduce struct nftnl_data_reg::byteorder field (Phil Sutter) [RHEL-119650]
- expr: Pass byteorder to struct expr_ops::set callback (Phil Sutter) [RHEL-119650]
- expr: data_reg: Avoid extra whitespace (Phil Sutter) [RHEL-119650]
- set_elem: Review debug output (Phil Sutter) [RHEL-119650]
Resolves: RHEL-119650
103 lines
3.0 KiB
Diff
103 lines
3.0 KiB
Diff
From f5309200e4fd545a6375d6f8d20a9f8e5a1985ce Mon Sep 17 00:00:00 2001
|
|
From: Phil Sutter <psutter@redhat.com>
|
|
Date: Tue, 24 Feb 2026 15:06:55 +0100
|
|
Subject: [PATCH] data_reg: Support concatenated data
|
|
|
|
JIRA: https://issues.redhat.com/browse/RHEL-119650
|
|
Upstream Status: libnftnl commit 4562e2418575d58df36d214c242f5d04613f52dd
|
|
|
|
commit 4562e2418575d58df36d214c242f5d04613f52dd
|
|
Author: Phil Sutter <phil@nwl.cc>
|
|
Date: Tue Oct 14 15:56:26 2025 +0200
|
|
|
|
data_reg: Support concatenated data
|
|
|
|
If sizes array has non-zero field values, interpret byteorder field as
|
|
bitfield indicating each compontent's byteorder and print the components
|
|
separated by a dot.
|
|
|
|
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
|
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
---
|
|
src/expr/data_reg.c | 48 +++++++++++++++++++++++++++++++++++----------
|
|
1 file changed, 38 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c
|
|
index de5d235..d01e0f7 100644
|
|
--- a/src/expr/data_reg.c
|
|
+++ b/src/expr/data_reg.c
|
|
@@ -27,34 +27,62 @@ static bool big_endian_host(void)
|
|
return v == htons(v);
|
|
}
|
|
|
|
-static int
|
|
-nftnl_data_reg_value_snprintf_default(char *buf, size_t remain,
|
|
- const union nftnl_data_reg *reg,
|
|
- uint32_t flags)
|
|
+static int __reg_value_snprintf(char *buf, size_t remain,
|
|
+ uint8_t *data, size_t datalen,
|
|
+ bool reverse, const char *pfx)
|
|
{
|
|
- const char *pfx = flags & DATA_F_NOPFX ? "" : "0x", *sep = "";
|
|
- bool reverse = reg->byteorder && !big_endian_host();
|
|
int offset = 0, ret, i, idx;
|
|
+ const char *sep = "";
|
|
|
|
- for (i = 0; i < reg->len; i++) {
|
|
+ for (i = 0; i < datalen; i++) {
|
|
if ((i % 4) == 0) {
|
|
ret = snprintf(buf + offset, remain, "%s%s", sep, pfx);
|
|
SNPRINTF_BUFFER_SIZE(ret, remain, offset);
|
|
sep = " ";
|
|
}
|
|
if (reverse)
|
|
- idx = reg->len - i - 1;
|
|
+ idx = datalen - i - 1;
|
|
else
|
|
idx = i;
|
|
|
|
- ret = snprintf(buf + offset, remain, "%.2x",
|
|
- ((uint8_t *)reg->val)[idx]);
|
|
+ ret = snprintf(buf + offset, remain, "%.2x", data[idx]);
|
|
SNPRINTF_BUFFER_SIZE(ret, remain, offset);
|
|
}
|
|
|
|
return offset;
|
|
}
|
|
|
|
+static int
|
|
+nftnl_data_reg_value_snprintf_default(char *buf, size_t remain,
|
|
+ const union nftnl_data_reg *reg,
|
|
+ uint32_t flags)
|
|
+{
|
|
+ uint32_t byteorder = big_endian_host() ? 0 : reg->byteorder;
|
|
+ const char *pfx = flags & DATA_F_NOPFX ? "" : "0x";
|
|
+ int offset = 0, ret, i, pos = 0;
|
|
+
|
|
+ for (i = 0; i < array_size(reg->sizes); i++) {
|
|
+ int curlen = reg->sizes[i] ?: reg->len;
|
|
+ bool reverse = byteorder & (1 << i);
|
|
+
|
|
+ if (i > 0) {
|
|
+ ret = snprintf(buf + offset, remain, " . ");
|
|
+ SNPRINTF_BUFFER_SIZE(ret, remain, offset);
|
|
+ }
|
|
+
|
|
+ ret = __reg_value_snprintf(buf + offset, remain,
|
|
+ (void *)®->val[pos],
|
|
+ curlen, reverse, pfx);
|
|
+ SNPRINTF_BUFFER_SIZE(ret, remain, offset);
|
|
+
|
|
+ pos += div_round_up(curlen, sizeof(uint32_t));
|
|
+ if (pos >= reg->len / sizeof(uint32_t))
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ return offset;
|
|
+}
|
|
+
|
|
static int
|
|
nftnl_data_reg_verdict_snprintf_def(char *buf, size_t size,
|
|
const union nftnl_data_reg *reg,
|