[nft,4/8] monitor: Drop fake XML support

Message ID 20181011154901.20082-5-phil@nwl.cc
State Accepted
Delegated to: Pablo Neira
Headers show
Series
  • monitor: Use libnftables for JSON output
Related show

Commit Message

Phil Sutter Oct. 11, 2018, 3:48 p.m.
Since libnftnl doesn't support XML formatting, pretending to do so in
nft monitor is pointless.

Signed-off-by: Phil Sutter <phil@nwl.cc>
---
 src/monitor.c | 6 ------
 1 file changed, 6 deletions(-)

Patch

diff --git a/src/monitor.c b/src/monitor.c
index 4310c3b8dc434..d75410888e3d0 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -203,7 +203,6 @@  static int netlink_events_table_cb(const struct nlmsghdr *nlh, int type,
 				      nftnl_table_get_u64(nlt, NFTNL_TABLE_HANDLE));
 		nft_mon_print(monh, "\n");
 		break;
-	case NFTNL_OUTPUT_XML:
 	case NFTNL_OUTPUT_JSON:
 		nftnl_table_fprintf(monh->ctx->octx->output_fp, nlt,
 				    monh->format, netlink_msg2nftnl_of(type));
@@ -245,7 +244,6 @@  static int netlink_events_chain_cb(const struct nlmsghdr *nlh, int type,
 			break;
 		}
 		break;
-	case NFTNL_OUTPUT_XML:
 	case NFTNL_OUTPUT_JSON:
 		nftnl_chain_fprintf(monh->ctx->octx->output_fp, nlc,
 				    monh->format, netlink_msg2nftnl_of(type));
@@ -292,7 +290,6 @@  static int netlink_events_set_cb(const struct nlmsghdr *nlh, int type,
 			break;
 		}
 		break;
-	case NFTNL_OUTPUT_XML:
 	case NFTNL_OUTPUT_JSON:
 		nftnl_set_fprintf(monh->ctx->octx->output_fp, nls,
 				  monh->format, netlink_msg2nftnl_of(type));
@@ -441,7 +438,6 @@  static int netlink_events_setelem_cb(const struct nlmsghdr *nlh, int type,
 
 		set_free(dummyset);
 		break;
-	case NFTNL_OUTPUT_XML:
 	case NFTNL_OUTPUT_JSON:
 		nftnl_set_fprintf(monh->ctx->octx->output_fp, nls,
 				  monh->format, netlink_msg2nftnl_of(type));
@@ -486,7 +482,6 @@  static int netlink_events_obj_cb(const struct nlmsghdr *nlh, int type,
 			break;
 		}
 		break;
-	case NFTNL_OUTPUT_XML:
 	case NFTNL_OUTPUT_JSON:
 		nftnl_obj_fprintf(monh->ctx->octx->output_fp, nlo,
 				  monh->format, netlink_msg2nftnl_of(type));
@@ -542,7 +537,6 @@  static int netlink_events_rule_cb(const struct nlmsghdr *nlh, int type,
 			break;
 		}
 		break;
-	case NFTNL_OUTPUT_XML:
 	case NFTNL_OUTPUT_JSON:
 		nftnl_rule_fprintf(monh->ctx->octx->output_fp, nlr,
 				   monh->format, netlink_msg2nftnl_of(type));