|
 |
9ff721 |
From 7a2546c151233aceb7cb8628b234e2a7d2d7620f Mon Sep 17 00:00:00 2001
|
|
|
9ff721 |
From: Phil Sutter <phil@nwl.cc>
|
|
|
9ff721 |
Date: Thu, 11 Oct 2018 17:48:57 +0200
|
|
|
9ff721 |
Subject: [PATCH] monitor: Drop fake XML support
|
|
|
9ff721 |
|
|
|
9ff721 |
Since libnftnl doesn't support XML formatting, pretending to do so in
|
|
|
9ff721 |
nft monitor is pointless.
|
|
|
9ff721 |
|
|
|
9ff721 |
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
9ff721 |
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
9ff721 |
(cherry picked from commit 2194a76ed46a2f097c5ca5955e44544418866cc2)
|
|
|
9ff721 |
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
|
9ff721 |
---
|
|
|
9ff721 |
src/monitor.c | 6 ------
|
|
|
9ff721 |
1 file changed, 6 deletions(-)
|
|
|
9ff721 |
|
|
|
9ff721 |
diff --git a/src/monitor.c b/src/monitor.c
|
|
|
9ff721 |
index 4310c3b8dc434..d75410888e3d0 100644
|
|
|
9ff721 |
--- a/src/monitor.c
|
|
|
9ff721 |
+++ b/src/monitor.c
|
|
|
9ff721 |
@@ -203,7 +203,6 @@ static int netlink_events_table_cb(const struct nlmsghdr *nlh, int type,
|
|
|
9ff721 |
nftnl_table_get_u64(nlt, NFTNL_TABLE_HANDLE));
|
|
|
9ff721 |
nft_mon_print(monh, "\n");
|
|
|
9ff721 |
break;
|
|
|
9ff721 |
- case NFTNL_OUTPUT_XML:
|
|
|
9ff721 |
case NFTNL_OUTPUT_JSON:
|
|
|
9ff721 |
nftnl_table_fprintf(monh->ctx->octx->output_fp, nlt,
|
|
|
9ff721 |
monh->format, netlink_msg2nftnl_of(type));
|
|
|
9ff721 |
@@ -245,7 +244,6 @@ static int netlink_events_chain_cb(const struct nlmsghdr *nlh, int type,
|
|
|
9ff721 |
break;
|
|
|
9ff721 |
}
|
|
|
9ff721 |
break;
|
|
|
9ff721 |
- case NFTNL_OUTPUT_XML:
|
|
|
9ff721 |
case NFTNL_OUTPUT_JSON:
|
|
|
9ff721 |
nftnl_chain_fprintf(monh->ctx->octx->output_fp, nlc,
|
|
|
9ff721 |
monh->format, netlink_msg2nftnl_of(type));
|
|
|
9ff721 |
@@ -292,7 +290,6 @@ static int netlink_events_set_cb(const struct nlmsghdr *nlh, int type,
|
|
|
9ff721 |
break;
|
|
|
9ff721 |
}
|
|
|
9ff721 |
break;
|
|
|
9ff721 |
- case NFTNL_OUTPUT_XML:
|
|
|
9ff721 |
case NFTNL_OUTPUT_JSON:
|
|
|
9ff721 |
nftnl_set_fprintf(monh->ctx->octx->output_fp, nls,
|
|
|
9ff721 |
monh->format, netlink_msg2nftnl_of(type));
|
|
|
9ff721 |
@@ -441,7 +438,6 @@ static int netlink_events_setelem_cb(const struct nlmsghdr *nlh, int type,
|
|
|
9ff721 |
|
|
|
9ff721 |
set_free(dummyset);
|
|
|
9ff721 |
break;
|
|
|
9ff721 |
- case NFTNL_OUTPUT_XML:
|
|
|
9ff721 |
case NFTNL_OUTPUT_JSON:
|
|
|
9ff721 |
nftnl_set_fprintf(monh->ctx->octx->output_fp, nls,
|
|
|
9ff721 |
monh->format, netlink_msg2nftnl_of(type));
|
|
|
9ff721 |
@@ -486,7 +482,6 @@ static int netlink_events_obj_cb(const struct nlmsghdr *nlh, int type,
|
|
|
9ff721 |
break;
|
|
|
9ff721 |
}
|
|
|
9ff721 |
break;
|
|
|
9ff721 |
- case NFTNL_OUTPUT_XML:
|
|
|
9ff721 |
case NFTNL_OUTPUT_JSON:
|
|
|
9ff721 |
nftnl_obj_fprintf(monh->ctx->octx->output_fp, nlo,
|
|
|
9ff721 |
monh->format, netlink_msg2nftnl_of(type));
|
|
|
9ff721 |
@@ -542,7 +537,6 @@ static int netlink_events_rule_cb(const struct nlmsghdr *nlh, int type,
|
|
|
9ff721 |
break;
|
|
|
9ff721 |
}
|
|
|
9ff721 |
break;
|
|
|
9ff721 |
- case NFTNL_OUTPUT_XML:
|
|
|
9ff721 |
case NFTNL_OUTPUT_JSON:
|
|
|
9ff721 |
nftnl_rule_fprintf(monh->ctx->octx->output_fp, nlr,
|
|
|
9ff721 |
monh->format, netlink_msg2nftnl_of(type));
|
|
|
9ff721 |
--
|
|
|
bacbc8 |
2.21.0
|
|
|
9ff721 |
|