Evolution-X-Tensor/device_google_gs101
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Dump tcpdump into bugreport

Browse source 
Bug: 183467815
Test: 1. Enable tcpdump_logger always-on function
      2. Dump bugreport
      3. Pull dumpstate_board.bin and chagne it to zip
      4. Unzip dumpstate_board.zip and check if tcpdump files
         are there.
Change-Id: If5fc2fe8ff4bfc0beb91ff973cc3d8137fd7cc47
This commit is contained in:
lucaslin 2021-03-31 20:55:27 +08:00 • committed by TreeHugger Robot
parent 8201411a5b
commit 725f060835
1 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
dumpstate/DumpstateDevice.cpp
View file

@ -45,6 +45,10 @@
#define UFS_BOOTDEVICE "ro.boot.bootdevice" #define UFS_BOOTDEVICE "ro.boot.bootdevice"
#define TCPDUMP_LOG_DIRECTORY "/data/vendor/tcpdump_logger/logs"
#define TCPDUMP_NUMBER_BUGREPORT "persist.vendor.tcpdump.log.br_num"
#define TCPDUMP_PERSIST_PROPERTY "persist.vendor.tcpdump.log.alwayson"
using android::os::dumpstate::CommandOptions; using android::os::dumpstate::CommandOptions;
using android::os::dumpstate::DumpFileToFd; using android::os::dumpstate::DumpFileToFd;
using android::os::dumpstate::PropertiesHelper; using android::os::dumpstate::PropertiesHelper;
@ -61,6 +65,7 @@ namespace implementation {
#define EXTENDED_LOG_PREFIX "extended_log_" #define EXTENDED_LOG_PREFIX "extended_log_"
#define RIL_LOG_PREFIX "rild.log." #define RIL_LOG_PREFIX "rild.log."
#define BUFSIZE 65536 #define BUFSIZE 65536
#define TCPDUMP_LOG_PREFIX "tcpdump"
typedef std::chrono::time_point<std::chrono::steady_clock> timepoint_t; typedef std::chrono::time_point<std::chrono::steady_clock> timepoint_t;
@ -793,6 +798,7 @@ void DumpstateDevice::dumpModem(int fd, int fdModem)
{ {
std::string modemLogDir = MODEM_LOG_DIRECTORY; std::string modemLogDir = MODEM_LOG_DIRECTORY;
std::string extendedLogDir = MODEM_EXTENDED_LOG_DIRECTORY; std::string extendedLogDir = MODEM_EXTENDED_LOG_DIRECTORY;
std::string tcpdumpLogDir = TCPDUMP_LOG_DIRECTORY;
static const std::string sectionName = "modem"; static const std::string sectionName = "modem";
auto startTime = startSection(fd, sectionName); auto startTime = startSection(fd, sectionName);
@ -813,8 +819,13 @@ void DumpstateDevice::dumpModem(int fd, int fdModem)
if (!PropertiesHelper::IsUserBuild()) { if (!PropertiesHelper::IsUserBuild()) {
bool modemLogEnabled = android::base::GetBoolProperty(MODEM_LOGGING_PERSIST_PROPERTY, false); bool modemLogEnabled = android::base::GetBoolProperty(MODEM_LOGGING_PERSIST_PROPERTY, false);
bool gpsLogEnabled = android::base::GetBoolProperty(GPS_LOGGING_STATUS_PROPERTY, false); bool gpsLogEnabled = android::base::GetBoolProperty(GPS_LOGGING_STATUS_PROPERTY, false);
bool tcpdumpEnabled = android::base::GetBoolProperty(TCPDUMP_PERSIST_PROPERTY, false);
int maxFileNum = android::base::GetIntProperty(MODEM_LOGGING_NUMBER_BUGREPORT_PROPERTY, 100); int maxFileNum = android::base::GetIntProperty(MODEM_LOGGING_NUMBER_BUGREPORT_PROPERTY, 100);
if (tcpdumpEnabled) {
dumpLogs(fd, tcpdumpLogDir, modemLogAllDir, android::base::GetIntProperty(TCPDUMP_NUMBER_BUGREPORT, 5), TCPDUMP_LOG_PREFIX);
}
if (modemLogEnabled) { if (modemLogEnabled) {
bool modemLogStarted = android::base::GetBoolProperty(MODEM_LOGGING_STATUS_PROPERTY, false); bool modemLogStarted = android::base::GetBoolProperty(MODEM_LOGGING_STATUS_PROPERTY, false);