gitea-mirror/ESP32Marauder
1
0
Fork 0
mirror of https://github.com/justcallmekoko/ESP32Marauder.git synced 2026-04-28 03:53:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1243 from justcallmekoko/develop

Browse Source 
Host AP info display now shows connection events
This commit is contained in:
Just Call Me Koko
2026-04-27 00:28:26 -04:00
committed by GitHub
parent 47fa870d5a 47de07867d
commit a1c14c2580
3 changed files with 100 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
esp32_marauder/MenuFunctions.cpp
View File

@@ -2435,7 +2435,7 @@ void MenuFunctions::RunSetup()
this->changeMenu(&ssidsMenu, true);
});
this->addNodes(&wifiGeneralMenu, "View AP Stats", TFTGREEN, NULL, BEACON_SNIFF, [this]() {
this->addNodes(&wifiGeneralMenu, "Host AP Info", TFTGREEN, NULL, BEACON_SNIFF, [this]() {
display_obj.clearScreen();
this->drawStatusBar();
wifi_scan_obj.StartScan(WIFI_SCAN_DISPLAY_AP_INFO, TFT_GREEN);

102
esp32_marauder/WiFiScan.cpp
View File

@@ -11,6 +11,9 @@ uint8_t *current_act = nullptr;
MacEntry WiFiScan::mac_entries[mac_history_len_half];
uint8_t WiFiScan::mac_entry_state[mac_history_len_half];
WiFiEventId_t WiFiScan::eventId;
String WiFiScan::lastClientMAC = "N/A";
String WiFiScan::lastClientIP = "N/A";
int num_beacon = 0;
int num_deauth = 0;
@@ -1883,6 +1886,8 @@ bool WiFiScan::startWiFi(String ssid, String password, bool gui) {
this->setMac();
eventId = WiFi.onEvent(WiFiScan::onWiFiEvent);
if (password != "")
WiFi.softAP(ssid.c_str(), password.c_str());
else
@@ -2371,6 +2376,9 @@ void WiFiScan::StopScan(uint8_t scan_mode) {
this->max_rssi = -128;
this->send_deauth = false;
this->complete_eapol = 0;
this->connected_devices = 0;
WiFi.removeEvent(eventId);
evil_portal_obj.cleanup();
#endif
@@ -4905,12 +4913,84 @@ void WiFiScan::tagPOI(const char* label) {
#endif
}
void WiFiScan::onWiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info) {
#ifdef HAS_SCREEN
extern WiFiScan wifi_scan_obj;
switch (event) {
case ARDUINO_EVENT_WIFI_AP_STACONNECTED: {
char macStr[18];
snprintf(macStr,
sizeof(macStr),
"%02X:%02X:%02X:%02X:%02X:%02X",
info.wifi_ap_staconnected.mac[0],
info.wifi_ap_staconnected.mac[1],
info.wifi_ap_staconnected.mac[2],
info.wifi_ap_staconnected.mac[3],
info.wifi_ap_staconnected.mac[4],
info.wifi_ap_staconnected.mac[5]);
lastClientMAC = String(macStr);
break;
}
case ARDUINO_EVENT_WIFI_AP_STAIPASSIGNED: {
IPAddress ip(info.wifi_ap_staipassigned.ip.addr);
lastClientIP = ip.toString();
Serial.println("Client IP assigned");
Serial.println("IP: " + lastClientIP);
display_obj.tft.setTextSize(1);
if (wifi_scan_obj.currentScanMode == WIFI_SCAN_DISPLAY_AP_INFO) {
display_obj.tft.fillRect(0,
((SCREEN_HEIGHT / 3) * 2),
TFT_WIDTH,
SCREEN_HEIGHT,
TFT_BLACK);
display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK);
display_obj.tft.setCursor(0, ((SCREEN_HEIGHT / 3) * 2));
display_obj.tft.println(lastClientMAC + "\n" + lastClientIP + "\nconnected");
}
break;
}
case ARDUINO_EVENT_WIFI_AP_STADISCONNECTED: {
char macStr[18];
snprintf(macStr,
sizeof(macStr),
"%02X:%02X:%02X:%02X:%02X:%02X",
info.wifi_ap_staconnected.mac[0],
info.wifi_ap_staconnected.mac[1],
info.wifi_ap_staconnected.mac[2],
info.wifi_ap_staconnected.mac[3],
info.wifi_ap_staconnected.mac[4],
info.wifi_ap_staconnected.mac[5]);
display_obj.tft.fillRect(0,
((SCREEN_HEIGHT / 3) * 2),
TFT_WIDTH,
SCREEN_HEIGHT,
TFT_BLACK);
display_obj.tft.setTextColor(TFT_RED, TFT_BLACK);
display_obj.tft.setCursor(0, ((SCREEN_HEIGHT / 3) * 2));
display_obj.tft.println(String(macStr) + "\nClient disconnected");
break;
}
default:
break;
}
#endif
}
void WiFiScan::displayAPStats() {
#ifdef HAS_SCREEN
display_obj.tft.fillRect(0,
(STATUS_BAR_WIDTH * 2) + 1 + EXT_BUTTON_WIDTH,
(STATUS_BAR_WIDTH * 2),
TFT_WIDTH,
TFT_HEIGHT - STATUS_BAR_WIDTH + 1,
((SCREEN_HEIGHT / 3) * 2) - 1 - (STATUS_BAR_WIDTH * 2),
TFT_BLACK);
#ifndef HAS_MINI_SCREEN
@@ -4921,12 +5001,6 @@ void WiFiScan::displayAPStats() {
display_obj.tft.setTextSize(1);
#endif
display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK);
display_obj.tft.println("Access Point");
display_obj.tft.setTextColor(TFT_WHITE, TFT_BLACK);
display_obj.tft.println("");
display_obj.tft.setTextColor(TFT_CYAN, TFT_BLACK);
display_obj.tft.println("SSID:");
display_obj.tft.setTextColor(TFT_WHITE, TFT_BLACK);
@@ -4941,10 +5015,20 @@ void WiFiScan::displayAPStats() {
display_obj.tft.println("");
uint8_t num_clients = WiFi.softAPgetStationNum();
if (num_clients != this->connected_devices) {
// New device connected
if (num_clients > this->connected_devices) {
}
this->connected_devices = num_clients;
}
display_obj.tft.setTextColor(TFT_CYAN, TFT_BLACK);
display_obj.tft.print("Clients: ");
display_obj.tft.setTextColor(TFT_WHITE, TFT_BLACK);
display_obj.tft.println((String)WiFi.softAPgetStationNum());
display_obj.tft.println((String)num_clients);
uint8_t primaryChannel;
wifi_second_chan_t secondChannel;

6
esp32_marauder/WiFiScan.h
View File

@@ -683,6 +683,7 @@ class WiFiScan
bool send_deauth = false;
bool channel_hop = false;
uint8_t connected_devices = 0;
static MacEntry mac_entries[mac_history_len_half];
@@ -904,6 +905,11 @@ class WiFiScan
void startGPX(String file_name);
//String macToString(const Station& station);
static WiFiEventId_t eventId;
static String lastClientMAC;
static String lastClientIP;
static void onWiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info);
static bool initMbedtls();
static int mbedtls_entropy_source(void *data, unsigned char *output, size_t len);
static bool getSAEACT(const uint8_t *frame, size_t frame_len, uint16_t &group_out, size_t &act_len_out);