From 2085921731d03c3c9854e603051ca272002f4e40 Mon Sep 17 00:00:00 2001 From: Corbin Phipps Date: Fri, 12 Jul 2024 16:11:10 +0000 Subject: [PATCH 1/2] Log AP manager events and WPA events --- src/common/net/wifi/apmanager/AccessPointManager.cxx | 5 +++++ src/common/net/wifi/apmanager/CMakeLists.txt | 1 + src/linux/net/wifi/wpa-controller/CMakeLists.txt | 1 + src/linux/net/wifi/wpa-controller/Hostapd.cxx | 2 ++ 4 files changed, 9 insertions(+) diff --git a/src/common/net/wifi/apmanager/AccessPointManager.cxx b/src/common/net/wifi/apmanager/AccessPointManager.cxx index 882be71f..d8ffc3a7 100644 --- a/src/common/net/wifi/apmanager/AccessPointManager.cxx +++ b/src/common/net/wifi/apmanager/AccessPointManager.cxx @@ -12,6 +12,7 @@ #include #include +#include #include #include #include @@ -40,6 +41,7 @@ AccessPointManager::AddAccessPoint(std::shared_ptr accessPoint) { const auto interfaceName{ accessPoint->GetInterfaceName() }; LOGI << std::format("Attempting to add access point {} to manager", interfaceName); + AUDIT_LOGD << std::format("Attempting to add access point {} to manager", interfaceName); { auto accessPointController = accessPoint->CreateController(); @@ -60,6 +62,7 @@ AccessPointManager::AddAccessPoint(std::shared_ptr accessPoint) } LOGI << std::format("Adding access point {} to manager", interfaceName); + AUDIT_LOGI << std::format("Adding access point {} to manager", interfaceName); m_accessPoints.push_back(std::move(accessPoint)); } @@ -69,6 +72,7 @@ AccessPointManager::RemoveAccessPoint(std::shared_ptr accessPoint) { const auto interfaceName{ accessPoint->GetInterfaceName() }; LOGI << std::format("Attempting to remove access point {} from manager", interfaceName); + AUDIT_LOGD << std::format("Attempting to remove access point {} from manager", interfaceName); const auto accessPointsLock = std::scoped_lock{ m_accessPointGate }; const auto accessPointToRemove = std::ranges::find_if(m_accessPoints, [&](const auto& accessPointExisting) { @@ -81,6 +85,7 @@ AccessPointManager::RemoveAccessPoint(std::shared_ptr accessPoint) } LOGI << std::format("Removing access point {} from manager", interfaceName); + AUDIT_LOGI << std::format("Removing access point {} from manager", interfaceName); m_accessPoints.erase(accessPointToRemove); } diff --git a/src/common/net/wifi/apmanager/CMakeLists.txt b/src/common/net/wifi/apmanager/CMakeLists.txt index 9a3651c6..1712f477 100644 --- a/src/common/net/wifi/apmanager/CMakeLists.txt +++ b/src/common/net/wifi/apmanager/CMakeLists.txt @@ -24,6 +24,7 @@ target_link_libraries(wifi-apmanager plog::plog PUBLIC ${PROJECT_NAME}-protocol + logging-utils wifi-core ) diff --git a/src/linux/net/wifi/wpa-controller/CMakeLists.txt b/src/linux/net/wifi/wpa-controller/CMakeLists.txt index 59056833..99cdee55 100644 --- a/src/linux/net/wifi/wpa-controller/CMakeLists.txt +++ b/src/linux/net/wifi/wpa-controller/CMakeLists.txt @@ -57,6 +57,7 @@ target_sources(wpa-controller target_link_libraries(wpa-controller PUBLIC libwpa-client + logging-utils notstd wifi-core PRIVATE diff --git a/src/linux/net/wifi/wpa-controller/Hostapd.cxx b/src/linux/net/wifi/wpa-controller/Hostapd.cxx index b99d1542..64ac5ccf 100644 --- a/src/linux/net/wifi/wpa-controller/Hostapd.cxx +++ b/src/linux/net/wifi/wpa-controller/Hostapd.cxx @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -553,4 +554,5 @@ Hostapd::OnWpaEvent(WpaEventSender* sender, const WpaEventArgs* eventArgs) { const auto& event{ eventArgs->Event }; LOGD << std::format("> [{}-Event|{}|{}|Sender={:#08x}] {}", magic_enum::enum_name(event.Source), magic_enum::enum_name(event.LogLevel), eventArgs->Timestamp, reinterpret_cast(sender), event.Payload); + AUDIT_LOGI << std::format("> [{}-Event|{}|{}|Sender={:#08x}] {}", magic_enum::enum_name(event.Source), magic_enum::enum_name(event.LogLevel), eventArgs->Timestamp, reinterpret_cast(sender), event.Payload); } From afccfa54e735ec90056d2ae64e8bbf865b72c6e4 Mon Sep 17 00:00:00 2001 From: Corbin Phipps Date: Tue, 16 Jul 2024 16:54:24 +0000 Subject: [PATCH 2/2] Update to use AUDIT* syntax --- src/common/net/wifi/apmanager/AccessPointManager.cxx | 8 ++++---- src/linux/net/wifi/wpa-controller/Hostapd.cxx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/net/wifi/apmanager/AccessPointManager.cxx b/src/common/net/wifi/apmanager/AccessPointManager.cxx index d8ffc3a7..052d0ce2 100644 --- a/src/common/net/wifi/apmanager/AccessPointManager.cxx +++ b/src/common/net/wifi/apmanager/AccessPointManager.cxx @@ -41,7 +41,7 @@ AccessPointManager::AddAccessPoint(std::shared_ptr accessPoint) { const auto interfaceName{ accessPoint->GetInterfaceName() }; LOGI << std::format("Attempting to add access point {} to manager", interfaceName); - AUDIT_LOGD << std::format("Attempting to add access point {} to manager", interfaceName); + AUDITD << std::format("Attempting to add access point {} to manager", interfaceName); { auto accessPointController = accessPoint->CreateController(); @@ -62,7 +62,7 @@ AccessPointManager::AddAccessPoint(std::shared_ptr accessPoint) } LOGI << std::format("Adding access point {} to manager", interfaceName); - AUDIT_LOGI << std::format("Adding access point {} to manager", interfaceName); + AUDITI << std::format("Adding access point {} to manager", interfaceName); m_accessPoints.push_back(std::move(accessPoint)); } @@ -72,7 +72,7 @@ AccessPointManager::RemoveAccessPoint(std::shared_ptr accessPoint) { const auto interfaceName{ accessPoint->GetInterfaceName() }; LOGI << std::format("Attempting to remove access point {} from manager", interfaceName); - AUDIT_LOGD << std::format("Attempting to remove access point {} from manager", interfaceName); + AUDITD << std::format("Attempting to remove access point {} from manager", interfaceName); const auto accessPointsLock = std::scoped_lock{ m_accessPointGate }; const auto accessPointToRemove = std::ranges::find_if(m_accessPoints, [&](const auto& accessPointExisting) { @@ -85,7 +85,7 @@ AccessPointManager::RemoveAccessPoint(std::shared_ptr accessPoint) } LOGI << std::format("Removing access point {} from manager", interfaceName); - AUDIT_LOGI << std::format("Removing access point {} from manager", interfaceName); + AUDITI << std::format("Removing access point {} from manager", interfaceName); m_accessPoints.erase(accessPointToRemove); } diff --git a/src/linux/net/wifi/wpa-controller/Hostapd.cxx b/src/linux/net/wifi/wpa-controller/Hostapd.cxx index 64ac5ccf..724fc434 100644 --- a/src/linux/net/wifi/wpa-controller/Hostapd.cxx +++ b/src/linux/net/wifi/wpa-controller/Hostapd.cxx @@ -554,5 +554,5 @@ Hostapd::OnWpaEvent(WpaEventSender* sender, const WpaEventArgs* eventArgs) { const auto& event{ eventArgs->Event }; LOGD << std::format("> [{}-Event|{}|{}|Sender={:#08x}] {}", magic_enum::enum_name(event.Source), magic_enum::enum_name(event.LogLevel), eventArgs->Timestamp, reinterpret_cast(sender), event.Payload); - AUDIT_LOGI << std::format("> [{}-Event|{}|{}|Sender={:#08x}] {}", magic_enum::enum_name(event.Source), magic_enum::enum_name(event.LogLevel), eventArgs->Timestamp, reinterpret_cast(sender), event.Payload); + AUDITI << std::format("> [{}-Event|{}|{}|Sender={:#08x}] {}", magic_enum::enum_name(event.Source), magic_enum::enum_name(event.LogLevel), eventArgs->Timestamp, reinterpret_cast(sender), event.Payload); }