Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66254d2d authored by Benedict Wong's avatar Benedict Wong Committed by android-build-merger
Browse files

Merge "Add xfrm stats to dumpstate" am: 661d91e8 am: c67192a5 

am: 9b0bec97

Change-Id: I1b09fe52d4f58d507814f77ca9cd8932ad704ace
parents b2069eba 9b0bec97

cmds/dumpstate/dumpstate.cpp

+5 −1
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ void add_mountinfo(); 
#define LOGPERSIST_DATA_DIR "/data/misc/logd"

#define PROFILE_DATA_DIR_CUR "/data/misc/profiles/cur"

#define PROFILE_DATA_DIR_REF "/data/misc/profiles/ref"

#define XFRM_STAT_PROC_FILE "/proc/net/xfrm_stat"

#define WLUTIL "/vendor/xbin/wlutil"

#define WMTRACE_DATA_DIR "/data/misc/wmtrace"
@@ -1458,6 +1459,9 @@ static bool DumpstateDefault() { 
    // Capture any IPSec policies in play. No keys are exposed here.

    RunCommand("IP XFRM POLICY", {"ip", "xfrm", "policy"}, CommandOptions::WithTimeout(10).Build());



    // Dump IPsec stats. No keys are exposed here.

    DumpFile("XFRM STATS", XFRM_STAT_PROC_FILE);



    // Run ss as root so we can see socket marks.

    RunCommand("DETAILED SOCKET STATE", {"ss", "-eionptu"}, CommandOptions::WithTimeout(10).Build());