diff mbox

[v10,07/10] netfilter: print filter info associate with the netdev

Message ID 1441783481-17698-8-git-send-email-yanghy@cn.fujitsu.com
State New
Headers show

Commit Message

Yang Hongyang Sept. 9, 2015, 7:24 a.m. UTC 
From: Yang Hongyang <burnef@gmail.com>

When execute "info network", print filter info also.
add a info_str member to NetFilterState, store specific filters
info.

Signed-off-by: Yang Hongyang <yanghy@cn.fujitsu.com>
---
v10: add a info_str member to NetFilterState
v9: tiny cleanup according to Tomas's comment.
v7: initial patch
---
 include/net/filter.h |  1 +
 net/net.c            | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
diff mbox

Patch

diff --git a/include/net/filter.h b/include/net/filter.h
index ed2bb66..c0b9f0a 100644
--- a/include/net/filter.h
+++ b/include/net/filter.h
@@ -53,6 +53,7 @@  struct NetFilterState {
     char *netdev_id;
     NetClientState *netdev;
     NetFilterChain chain;
+    char info_str[256];
     QTAILQ_ENTRY(NetFilterState) global_list;
     QTAILQ_ENTRY(NetFilterState) next;
 };
diff --git a/net/net.c b/net/net.c
index 112f334..d39ca1c 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1172,10 +1172,27 @@  void qmp_netdev_del(const char *id, Error **errp)
 
 void print_net_client(Monitor *mon, NetClientState *nc)
 {
+    NetFilterState *nf;
+
     monitor_printf(mon, "%s: index=%d,type=%s,%s\n", nc->name,
                    nc->queue_index,
                    NetClientOptionsKind_lookup[nc->info->type],
                    nc->info_str);
+    if (!QTAILQ_EMPTY(&nc->filters)) {
+        monitor_printf(mon, "filters:\n");
+    }
+    QTAILQ_FOREACH(nf, &nc->filters, next) {
+        monitor_printf(mon, "  - %s: type=%s,netdev=%s,chain=%s",
+                       object_get_canonical_path_component(OBJECT(nf)),
+                       object_get_typename(OBJECT(nf)),
+                       nf->netdev->name,
+                       NetFilterChain_lookup[nf->chain]);
+        if (strlen(nf->info_str)) {
+            monitor_printf(mon, ",%s\n", nf->info_str);
+        } else {
+            monitor_printf(mon, "\n");
+        }
+    }
 }
 
 RxFilterInfoList *qmp_query_rx_filter(bool has_name, const char *name,