more friendly dumpId for initiator<->responder mode

wifisensing · Apr 22, 2022 · 4e63875 · 4e63875
1 parent 7a3736d
commit 4e63875
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/plugin-echoprobe/EchoProbeInitiator.cxx b/plugin-echoprobe/EchoProbeInitiator.cxx
@@ -35,7 +35,7 @@ void EchoProbeInitiator::unifiedEchoProbeWork() {
         std::this_thread::sleep_for(std::chrono::seconds(tx_delayed_start));
 
     for (const auto &sf_value: sfList) {
-        auto dumperId = fmt::sprintf("EPI_%u_%s_bb%.1fM", sessionId, nic->getReferredInterfaceName(), sf_value / 1e6);
+        auto dumperId = fmt::sprintf("EPI_%s_%u_bb%.1fM", nic->getReferredInterfaceName(), sessionId, sf_value / 1e6);
         if (parameters.outputFileName)
             dumperId = *parameters.outputFileName;
         for (const auto &cf_value: cfList) {

diff --git a/plugin-echoprobe/EchoProbeResponder.cxx b/plugin-echoprobe/EchoProbeResponder.cxx
@@ -29,9 +29,10 @@ void EchoProbeResponder::handle(const ModularPicoScenesRxFrame &rxframe) {
     const auto &epBuffer = rxframe.txUnknownSegmentMap.at("EchoProbeRequest");
     auto epSegment = EchoProbeRequestSegment::createByBuffer(&epBuffer[0], epBuffer.size());
     auto buffer = rxframe.toBuffer();
-    if (!parameters.outputFileName)
-        RXSDumper::getInstance("EPR_" + std::to_string(epSegment.getEchoProbeRequest().sessionId)).dumpRXS(buffer.data(), buffer.size());
-    else
+    if (!parameters.outputFileName) {
+        auto dumpId = fmt::sprintf("EPR_%s_%u", nic->getReferredInterfaceName(), epSegment.getEchoProbeRequest().sessionId);
+        RXSDumper::getInstance(dumpId).dumpRXS(buffer.data(), buffer.size());
+    } else
         RXSDumper::getInstance(*parameters.outputFileName).dumpRXS(buffer.data(), buffer.size());
 
     if (rxframe.PicoScenesHeader->frameType == EchoProbeRequestFrameType) {