gitea-mirror/ESP32Marauder
1
0
Fork 0
mirror of https://github.com/justcallmekoko/ESP32Marauder.git synced 2025-12-22 07:10:47 -08:00
Code Issues Packages Projects Releases Wiki Activity

Add packet count command

Browse Source
This commit is contained in:
Just Call Me Koko
2025-03-29 20:23:38 -04:00
parent e3f32106d9
commit f4634638a9
4 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
esp32_marauder/CommandLine.cpp
View File

@@ -220,6 +220,7 @@ void CommandLine::runCommand(String input) {
// WiFi sniff/scan // WiFi sniff/scan
Serial.println(HELP_EVIL_PORTAL_CMD); Serial.println(HELP_EVIL_PORTAL_CMD);
Serial.println(HELP_PACKET_COUNT_CMD);
Serial.println(HELP_SIGSTREN_CMD); Serial.println(HELP_SIGSTREN_CMD);
Serial.println(HELP_SCANAP_CMD); Serial.println(HELP_SCANAP_CMD);
Serial.println(HELP_SCANSTA_CMD); Serial.println(HELP_SCANSTA_CMD);
@@ -520,6 +521,16 @@ void CommandLine::runCommand(String input) {
menu_function_obj.drawStatusBar(); menu_function_obj.drawStatusBar();
#endif #endif
wifi_scan_obj.StartScan(WIFI_SCAN_SIG_STREN, TFT_MAGENTA); wifi_scan_obj.StartScan(WIFI_SCAN_SIG_STREN, TFT_MAGENTA);
wifi_scan_obj.renderPacketRate();
}
// Packet count
else if (cmd_args.get(0) == PACKET_COUNT_CMD) {
Serial.println("Starting Packet Count Scan. Stop with " + (String)STOPSCAN_CMD);
#ifdef HAS_SCREEN
display_obj.clearScreen();
menu_function_obj.drawStatusBar();
#endif
wifi_scan_obj.StartScan(WIFI_SCAN_PACKET_RATE, TFT_ORANGE);
} }
// Wardrive // Wardrive
else if (cmd_args.get(0) == WARDRIVE_CMD) { else if (cmd_args.get(0) == WARDRIVE_CMD) {

2
esp32_marauder/CommandLine.h
View File

@@ -54,6 +54,7 @@ const char PROGMEM NMEA_CMD[] = "nmea";
// WiFi sniff/scan // WiFi sniff/scan
const char PROGMEM EVIL_PORTAL_CMD[] = "evilportal"; const char PROGMEM EVIL_PORTAL_CMD[] = "evilportal";
const char PROGMEM PACKET_COUNT_CMD[] = "packetcount";
const char PROGMEM SIGSTREN_CMD[] = "sigmon"; const char PROGMEM SIGSTREN_CMD[] = "sigmon";
const char PROGMEM SCANAP_CMD[] = "scanap"; const char PROGMEM SCANAP_CMD[] = "scanap";
const char PROGMEM SCANSTA_CMD[] = "scansta"; const char PROGMEM SCANSTA_CMD[] = "scansta";
@@ -109,6 +110,7 @@ const char PROGMEM HELP_NMEA_CMD[] = "nmea";
// WiFi sniff/scan // WiFi sniff/scan
const char PROGMEM HELP_EVIL_PORTAL_CMD[] = "evilportal [-c start [-w html.html]/sethtml <html.html>]"; const char PROGMEM HELP_EVIL_PORTAL_CMD[] = "evilportal [-c start [-w html.html]/sethtml <html.html>]";
const char PROGMEM HELP_PACKET_COUNT_CMD[] = "packetcount";
const char PROGMEM HELP_SIGSTREN_CMD[] = "sigmon"; const char PROGMEM HELP_SIGSTREN_CMD[] = "sigmon";
const char PROGMEM HELP_SCANAP_CMD[] = "scanap"; const char PROGMEM HELP_SCANAP_CMD[] = "scanap";
const char PROGMEM HELP_SCANSTA_CMD[] = "scansta"; const char PROGMEM HELP_SCANSTA_CMD[] = "scansta";

2
esp32_marauder/MenuFunctions.cpp
View File

@@ -1614,7 +1614,7 @@ void MenuFunctions::RunSetup()
this->renderGraphUI(WIFI_SCAN_CHAN_ANALYZER); this->renderGraphUI(WIFI_SCAN_CHAN_ANALYZER);
wifi_scan_obj.StartScan(WIFI_SCAN_CHAN_ANALYZER, TFT_CYAN); wifi_scan_obj.StartScan(WIFI_SCAN_CHAN_ANALYZER, TFT_CYAN);
}); });
this->addNodes(&wifiSnifferMenu, "Packet Rate", TFTORANGE, NULL, PACKET_MONITOR, [this]() { this->addNodes(&wifiSnifferMenu, "Packet Count", TFTORANGE, NULL, PACKET_MONITOR, [this]() {
display_obj.clearScreen(); display_obj.clearScreen();
this->drawStatusBar(); this->drawStatusBar();
wifi_scan_obj.StartScan(WIFI_SCAN_PACKET_RATE, TFT_ORANGE); wifi_scan_obj.StartScan(WIFI_SCAN_PACKET_RATE, TFT_ORANGE);

40
esp32_marauder/WiFiScan.cpp
View File

@@ -5525,27 +5525,29 @@ void WiFiScan::displayAnalyzerString(String str) {
} }
void WiFiScan::renderPacketRate() { void WiFiScan::renderPacketRate() {
uint8_t line_count = 0; #ifdef HAS_SCREEN
display_obj.tft.fillRect(0, uint8_t line_count = 0;
(STATUS_BAR_WIDTH * 2) + 1, display_obj.tft.fillRect(0,
TFT_WIDTH, (STATUS_BAR_WIDTH * 2) + 1,
TFT_HEIGHT - STATUS_BAR_WIDTH + 1, TFT_WIDTH,
TFT_BLACK); TFT_HEIGHT - STATUS_BAR_WIDTH + 1,
display_obj.tft.setCursor(0, (STATUS_BAR_WIDTH * 2) + CHAR_WIDTH); TFT_BLACK);
display_obj.tft.setTextSize(1); display_obj.tft.setCursor(0, (STATUS_BAR_WIDTH * 2) + CHAR_WIDTH);
display_obj.tft.setTextColor(TFT_WHITE, TFT_BLACK); display_obj.tft.setTextSize(1);
for (int i = 0; i < access_points->size(); i++) { display_obj.tft.setTextColor(TFT_WHITE, TFT_BLACK);
if (access_points->get(i).selected) { for (int i = 0; i < access_points->size(); i++) {
display_obj.tft.println(access_points->get(i).essid + ": " + (String)access_points->get(i).packets); if (access_points->get(i).selected) {
Serial.println(access_points->get(i).essid + ": " + (String)access_points->get(i).packets); display_obj.tft.println(access_points->get(i).essid + ": " + (String)access_points->get(i).packets);
Serial.println(access_points->get(i).essid + ": " + (String)access_points->get(i).packets);
}
} }
} for (int i = 0; i < stations->size(); i++) {
for (int i = 0; i < stations->size(); i++) { if (stations->get(i).selected) {
if (stations->get(i).selected) { display_obj.tft.println(macToString(stations->get(i).mac) + ": " + (String)stations->get(i).packets);
display_obj.tft.println(macToString(stations->get(i).mac) + ": " + (String)stations->get(i).packets); Serial.println(macToString(stations->get(i).mac) + ": " + (String)stations->get(i).packets);
Serial.println(macToString(stations->get(i).mac) + ": " + (String)stations->get(i).packets); }
} }
} #endif
} }
void WiFiScan::packetRateLoop(uint32_t tick) { void WiFiScan::packetRateLoop(uint32_t tick) {