From 7ff012d28e689c588dd21b245fffd9f4d05ec36b Mon Sep 17 00:00:00 2001 From: stephb9959 Date: Thu, 24 Mar 2022 10:17:42 -0700 Subject: [PATCH] Adding band to SSIDTP --- src/APStats.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/APStats.cpp b/src/APStats.cpp index 8fd0495..2e04e54 100644 --- a/src/APStats.cpp +++ b/src/APStats.cpp @@ -120,9 +120,10 @@ namespace OpenWifi { } for(const auto &association:associations) { AnalyticsObjects::UETimePoint TP; - std::cout << "ASSOCIATIONDATA: " << association << std::endl; + // std::cout << "ASSOCIATIONDATA: " << association << std::endl; GetJSON("station",association,TP.station, std::string{} ); GetJSON("rssi",association,TP.rssi, (int64_t)0 ); + std::cout << "RSSI:" << TP.rssi << std::endl; GetJSON("tx_bytes",association,TP.tx_bytes, (uint64_t)0 ); GetJSON("rx_bytes",association,TP.rx_bytes, (uint64_t)0 ); GetJSON("tx_duration",association,TP.tx_duration, (uint64_t)0 ); @@ -133,14 +134,14 @@ namespace OpenWifi { GetJSON("connected",association,TP.connected, (uint64_t)0 ); GetJSON("inactive",association,TP.inactive, (uint64_t)0 ); - if(association.contains("msdu") && association["msdu"].is_array()) { - auto msdus = association["msdu"]; - for(const auto &msdu:msdus) { + if(association.contains("tid_stats") && association["tid_stats"].is_array()) { + auto tid_stats = association["tid_stats"]; + for(const auto &tid_stat:tid_stats) { AnalyticsObjects::MSDU_entry E; - GetJSON("rx_msdu",msdu,E.rx_msdu, (uint64_t)0 ); - GetJSON("tx_msdu",msdu,E.tx_msdu, (uint64_t)0 ); - GetJSON("tx_msdu_failed",msdu,E.tx_msdu_failed, (uint64_t)0 ); - GetJSON("tx_msdu_retries",msdu,E.tx_msdu_retries, (uint64_t)0 ); + GetJSON("rx_msdu",tid_stat,E.rx_msdu, (uint64_t)0 ); + GetJSON("tx_msdu",tid_stat,E.tx_msdu, (uint64_t)0 ); + GetJSON("tx_msdu_failed",tid_stat,E.tx_msdu_failed, (uint64_t)0 ); + GetJSON("tx_msdu_retries",tid_stat,E.tx_msdu_retries, (uint64_t)0 ); TP.msdus.push_back(E); } }