552075b562
* Thu Feb 09 2023 Phil Sutter <psutter@redhat.com> [1.0.4-8.el9] - monitor: Sanitize startup race condition (Phil Sutter) [2130721] - evaluate: set eval ctx for add/update statements with integer constants (Phil Sutter) [2094894] - src: allow anon set concatenation with ether and vlan (Phil Sutter) [2094887] - evaluate: search stacked header list for matching payload dep (Phil Sutter) [2094887] - netlink_delinearize: also postprocess OP_AND in set element context (Phil Sutter) [2094887] - tests: add a test case for ether and vlan listing (Phil Sutter) [2094887] - debug: dump the l2 protocol stack (Phil Sutter) [2094887] - proto: track full stack of seen l2 protocols, not just cumulative offset (Phil Sutter) [2094887] - netlink_delinearize: postprocess binary ands in concatenations (Phil Sutter) [2094887] - netlink_delinearize: allow postprocessing on concatenated elements (Phil Sutter) [2094887] - intervals: check for EXPR_F_REMOVE in case of element mismatch (Phil Sutter) [2115627] - intervals: fix crash when trying to remove element in empty set (Phil Sutter) [2115627] - scanner: don't pop active flex scanner scope (Phil Sutter) [2113874] - parser: add missing synproxy scope closure (Phil Sutter) [2113874] - tests/py: Add a test for failing ipsec after counter (Phil Sutter) [2113874] - doc: Document limitations of ipsec expression with xfrm_interface (Phil Sutter) [1806431] Resolves: rhbz#1806431, rhbz#2094887, rhbz#2094894, rhbz#2113874, rhbz#2115627, rhbz#2130721, rhbz#2094890
45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
From ed9b1e973f19f66cf08ea0db8947768f0240fa10 Mon Sep 17 00:00:00 2001
|
|
From: Phil Sutter <psutter@redhat.com>
|
|
Date: Thu, 9 Feb 2023 10:27:57 +0100
|
|
Subject: [PATCH] debug: dump the l2 protocol stack
|
|
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2094887
|
|
Upstream Status: nftables commit dbd5f348c71de
|
|
|
|
commit dbd5f348c71decf0baa8fb592c576f63fa232f50
|
|
Author: Florian Westphal <fw@strlen.de>
|
|
Date: Mon Jul 25 16:42:23 2022 +0200
|
|
|
|
debug: dump the l2 protocol stack
|
|
|
|
Previously we used to print the cumulative size of the headers,
|
|
update this to print the tracked l2 stack.
|
|
|
|
Signed-off-by: Florian Westphal <fw@strlen.de>
|
|
|
|
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
---
|
|
src/proto.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/src/proto.c b/src/proto.c
|
|
index 2663f21..c496482 100644
|
|
--- a/src/proto.c
|
|
+++ b/src/proto.c
|
|
@@ -154,6 +154,12 @@ static void proto_ctx_debug(const struct proto_ctx *ctx, enum proto_bases base,
|
|
if (!(debug_mask & NFT_DEBUG_PROTO_CTX))
|
|
return;
|
|
|
|
+ if (base == PROTO_BASE_LL_HDR && ctx->stacked_ll_count) {
|
|
+ pr_debug(" saved ll headers:");
|
|
+ for (i = 0; i < ctx->stacked_ll_count; i++)
|
|
+ pr_debug(" %s", ctx->stacked_ll[i]->name);
|
|
+ }
|
|
+
|
|
pr_debug("update %s protocol context:\n", proto_base_names[base]);
|
|
for (i = PROTO_BASE_LL_HDR; i <= PROTO_BASE_MAX; i++) {
|
|
pr_debug(" %-20s: %s",
|
|
--
|
|
2.39.1
|
|
|