From 012c2ea5651a56218a4359c78db26dd700d9930b Mon Sep 17 00:00:00 2001 From: JP Abgrall Date: Wed, 16 May 2012 20:49:29 -0700 Subject: [PATCH] dumpstate: collect xtables based iface stats, update iptables info. The newer kernels now have /proc/net/xt_qtaguid/iface_stat_fmt. Add the extra iptables output and remove ip6tables for nat which doesn't exist. Change-Id: I819c707b337a707ca0acd87d9ab38cd68ca0f36c --- cmds/dumpstate/dumpstate.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmds/dumpstate/dumpstate.c b/cmds/dumpstate/dumpstate.c index 880f81fef..2bcda11a5 100644 --- a/cmds/dumpstate/dumpstate.c +++ b/cmds/dumpstate/dumpstate.c @@ -144,6 +144,7 @@ static void dumpstate() { dump_file("NETWORK DEV INFO", "/proc/net/dev"); dump_file("QTAGUID NETWORK INTERFACES INFO", "/proc/net/xt_qtaguid/iface_stat_all"); + dump_file("QTAGUID NETWORK INTERFACES INFO (xt)", "/proc/net/xt_qtaguid/iface_stat_fmt"); dump_file("QTAGUID CTRL INFO", "/proc/net/xt_qtaguid/ctrl"); dump_file("QTAGUID STATS INFO", "/proc/net/xt_qtaguid/stats"); @@ -176,8 +177,10 @@ static void dumpstate() { dump_file("ARP CACHE", "/proc/net/arp"); run_command("IPTABLES", 10, SU_PATH, "root", "iptables", "-L", "-nvx", NULL); run_command("IP6TABLES", 10, SU_PATH, "root", "ip6tables", "-L", "-nvx", NULL); - run_command("IPTABLE NAT", 10, SU_PATH, "root", "iptables", "-t", "nat", "-L", "-n", NULL); - run_command("IPT6ABLE NAT", 10, SU_PATH, "root", "ip6tables", "-t", "nat", "-L", "-n", NULL); + run_command("IPTABLE NAT", 10, SU_PATH, "root", "iptables", "-t", "nat", "-L", "-nvx", NULL); + /* no ip6 nat */ + run_command("IPTABLE RAW", 10, SU_PATH, "root", "iptables", "-t", "raw", "-L", "-nvx", NULL); + run_command("IP6TABLE RAW", 10, SU_PATH, "root", "ip6tables", "-t", "raw", "-L", "-nvx", NULL); run_command("WIFI NETWORKS", 20, SU_PATH, "root", "wpa_cli", "list_networks", NULL);