946bb34b50
- tests: py: add dnat to port without defining destination address - evaluate: fix inet nat with no layer 3 info - include: missing sctp_chunk.h in Makefile.am - exthdr: Implement SCTP Chunk matching - scanner: sctp: Move to own scope - scanner: introduce start condition stack - json: Simplify non-tcpopt exthdr printing a bit Resolves: rhbz#2018023, rhbz#2030314
50 lines
1.4 KiB
Diff
50 lines
1.4 KiB
Diff
From 92f73f85dbd6559905679133cdf61e70004c805d Mon Sep 17 00:00:00 2001
|
|
From: Phil Sutter <phil@nwl.cc>
|
|
Date: Tue, 4 May 2021 13:18:11 +0200
|
|
Subject: [PATCH] json: Simplify non-tcpopt exthdr printing a bit
|
|
|
|
This was just duplicate code apart from the object's name.
|
|
|
|
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
(cherry picked from commit fd81d3ec3ae8b8d1d54a708d63b2dab2c8508c90)
|
|
---
|
|
src/json.c | 18 +++++++-----------
|
|
1 file changed, 7 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/src/json.c b/src/json.c
|
|
index 1fb5015124e16..6607d83f4e8f8 100644
|
|
--- a/src/json.c
|
|
+++ b/src/json.c
|
|
@@ -696,21 +696,17 @@ json_t *exthdr_expr_json(const struct expr *expr, struct output_ctx *octx)
|
|
|
|
return json_pack("{s:o}", "tcp option", root);
|
|
}
|
|
- if (expr->exthdr.op == NFT_EXTHDR_OP_IPV4) {
|
|
- root = json_pack("{s:s}", "name", desc);
|
|
|
|
- if (!is_exists)
|
|
- json_object_set_new(root, "field", json_string(field));
|
|
-
|
|
- return json_pack("{s:o}", "ip option", root);
|
|
- }
|
|
-
|
|
- root = json_pack("{s:s}",
|
|
- "name", desc);
|
|
+ root = json_pack("{s:s}", "name", desc);
|
|
if (!is_exists)
|
|
json_object_set_new(root, "field", json_string(field));
|
|
|
|
- return json_pack("{s:o}", "exthdr", root);
|
|
+ switch (expr->exthdr.op) {
|
|
+ case NFT_EXTHDR_OP_IPV4:
|
|
+ return json_pack("{s:o}", "ip option", root);
|
|
+ default:
|
|
+ return json_pack("{s:o}", "exthdr", root);
|
|
+ }
|
|
}
|
|
|
|
json_t *verdict_expr_json(const struct expr *expr, struct output_ctx *octx)
|
|
--
|
|
2.33.0
|
|
|