Merge pull request #386 from justcallmekoko/develop

Develop
justcallmekoko · Nov 14, 2023 · 7a79860 · 7a79860
2 parents bd17002 + 303c364
commit 7a79860
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/esp32_marauder/CommandLine.cpp b/esp32_marauder/CommandLine.cpp
@@ -251,7 +251,7 @@ void CommandLine::runCommand(String input) {
       Serial.println(HELP_BT_SNIFF_CMD);
       Serial.println(HELP_BT_SOUR_APPLE_CMD);
       Serial.println(HELP_BT_SWIFTPAIR_SPAM_CMD);
-      Serial.println(HELP_BT_KITCHEN_SINK_CMD);
+      Serial.println(HELP_BT_SPAM_ALL_CMD);
       #ifdef HAS_GPS
         Serial.println(HELP_BT_WARDRIVE_CMD);
       #endif
@@ -809,14 +809,14 @@ void CommandLine::runCommand(String input) {
         Serial.println("Bluetooth not supported");
       #endif
     }
-    else if (cmd_args.get(0) == BT_KITCHEN_SINK_CMD) {
+    else if (cmd_args.get(0) == BT_SPAM_ALL_CMD) {
       #ifdef HAS_BT
-        Serial.println("Starting Kitchen Sink Spam attack. Stop with " + (String)STOPSCAN_CMD);
+        Serial.println("Starting BT Spam All attack. Stop with " + (String)STOPSCAN_CMD);
         #ifdef HAS_SCREEN
           display_obj.clearScreen();
           menu_function_obj.drawStatusBar();
         #endif
-        wifi_scan_obj.StartScan(BT_ATTACK_KITCHEN_SINK, TFT_MAGENTA);
+        wifi_scan_obj.StartScan(BT_ATTACK_SPAM_ALL, TFT_MAGENTA);
       #else
         Serial.println("Bluetooth not supported");
       #endif

diff --git a/esp32_marauder/CommandLine.h b/esp32_marauder/CommandLine.h
@@ -79,7 +79,7 @@ const char PROGMEM SSID_CMD[] = "ssid";
 const char PROGMEM BT_SNIFF_CMD[] = "sniffbt";
 const char PROGMEM BT_SOUR_APPLE_CMD[] = "sourapple";
 const char PROGMEM BT_SWIFTPAIR_SPAM_CMD[] = "swiftpair";
-const char PROGMEM BT_KITCHEN_SINK_CMD[] = "kitchensink";
+const char PROGMEM BT_SPAM_ALL_CMD[] = "btspamall";
 const char PROGMEM BT_WARDRIVE_CMD[] = "btwardrive";
 const char PROGMEM BT_SKIM_CMD[] = "sniffskim";
 
@@ -127,7 +127,7 @@ const char PROGMEM HELP_SSID_CMD_B[] = "ssid -r <index>";
 const char PROGMEM HELP_BT_SNIFF_CMD[] = "sniffbt";
 const char PROGMEM HELP_BT_SOUR_APPLE_CMD[] = "sourapple";
 const char PROGMEM HELP_BT_SWIFTPAIR_SPAM_CMD[] = "swiftpair";
-const char PROGMEM HELP_BT_KITCHEN_SINK_CMD[] = "kitchensink";
+const char PROGMEM HELP_BT_SPAM_ALL_CMD[] = "btspamall";
 const char PROGMEM HELP_BT_WARDRIVE_CMD[] = "btwardrive [-c]";
 const char PROGMEM HELP_BT_SKIM_CMD[] = "sniffskim";
 const char PROGMEM HELP_FOOT[] = "==================================";

diff --git a/esp32_marauder/MenuFunctions.cpp b/esp32_marauder/MenuFunctions.cpp
@@ -507,7 +507,7 @@ void MenuFunctions::main(uint32_t currentTime)
           (wifi_scan_obj.currentScanMode == BT_SCAN_ALL) ||
           (wifi_scan_obj.currentScanMode == BT_ATTACK_SOUR_APPLE) ||
           (wifi_scan_obj.currentScanMode == BT_ATTACK_SWIFTPAIR_SPAM) ||
-          (wifi_scan_obj.currentScanMode == BT_ATTACK_KITCHEN_SINK) ||
+          (wifi_scan_obj.currentScanMode == BT_ATTACK_SPAM_ALL) ||
           (wifi_scan_obj.currentScanMode == BT_SCAN_WAR_DRIVE) ||
           (wifi_scan_obj.currentScanMode == BT_SCAN_WAR_DRIVE_CONT) ||
           (wifi_scan_obj.currentScanMode == BT_SCAN_SKIMMERS))
@@ -566,7 +566,7 @@ void MenuFunctions::main(uint32_t currentTime)
           (wifi_scan_obj.currentScanMode == BT_SCAN_ALL) ||
           (wifi_scan_obj.currentScanMode == BT_ATTACK_SOUR_APPLE) ||
           (wifi_scan_obj.currentScanMode == BT_ATTACK_SWIFTPAIR_SPAM) ||
-          (wifi_scan_obj.currentScanMode == BT_ATTACK_KITCHEN_SINK) ||
+          (wifi_scan_obj.currentScanMode == BT_ATTACK_SPAM_ALL) ||
           (wifi_scan_obj.currentScanMode == BT_SCAN_WAR_DRIVE) ||
           (wifi_scan_obj.currentScanMode == BT_SCAN_WAR_DRIVE_CONT) ||
           (wifi_scan_obj.currentScanMode == BT_SCAN_SKIMMERS) ||
@@ -1475,10 +1475,10 @@ void MenuFunctions::RunSetup()
     this->drawStatusBar();
     wifi_scan_obj.StartScan(BT_ATTACK_SWIFTPAIR_SPAM, TFT_CYAN);
   });
-  this->addNodes(&bluetoothAttackMenu, "Kitchen Sink Spam", TFT_MAGENTA, NULL, DEAUTH_SNIFF, [this]() {
+  this->addNodes(&bluetoothAttackMenu, "BLE Spam All", TFT_MAGENTA, NULL, DEAUTH_SNIFF, [this]() {
     display_obj.clearScreen();
     this->drawStatusBar();
-    wifi_scan_obj.StartScan(BT_ATTACK_KITCHEN_SINK, TFT_MAGENTA);
+    wifi_scan_obj.StartScan(BT_ATTACK_SPAM_ALL, TFT_MAGENTA);
   });
 
   // Device menu

diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp
@@ -484,7 +484,7 @@ void WiFiScan::StartScan(uint8_t scan_mode, uint16_t color)
     #endif
   }
   else if ((scan_mode == BT_ATTACK_SWIFTPAIR_SPAM) || 
-           (scan_mode == BT_ATTACK_KITCHEN_SINK)) {
+           (scan_mode == BT_ATTACK_SPAM_ALL)) {
     #ifdef HAS_BT
       RunSwiftpairSpam(scan_mode, color);
     #endif
@@ -662,7 +662,7 @@ void WiFiScan::StopScan(uint8_t scan_mode)
   else if ((currentScanMode == BT_SCAN_ALL) ||
   (currentScanMode == BT_ATTACK_SOUR_APPLE) ||
   (currentScanMode == BT_ATTACK_SWIFTPAIR_SPAM) ||
-  (currentScanMode == BT_ATTACK_KITCHEN_SINK) ||
+  (currentScanMode == BT_ATTACK_SPAM_ALL) ||
   (currentScanMode == BT_SCAN_WAR_DRIVE) ||
   (currentScanMode == BT_SCAN_WAR_DRIVE_CONT) ||
   (currentScanMode == BT_SCAN_SKIMMERS))
@@ -1918,8 +1918,8 @@ void WiFiScan::RunSwiftpairSpam(uint8_t scan_mode, uint16_t color) {
         display_obj.tft.fillRect(0,16,240,16, color);
         if (scan_mode == BT_ATTACK_SWIFTPAIR_SPAM)
           display_obj.tft.drawCentreString("Swiftpair Spam",120,16,2);
-        else if (scan_mode == BT_ATTACK_KITCHEN_SINK)
-          display_obj.tft.drawCentreString("BLE Kitchen Sink Spam",120,16,2);
+        else if (scan_mode == BT_ATTACK_SPAM_ALL)
+          display_obj.tft.drawCentreString("BLE Spam All",120,16,2);
         display_obj.touchToExit();
       #endif
       display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK);
@@ -4267,7 +4267,7 @@ void WiFiScan::main(uint32_t currentTime)
   }
   else if ((currentScanMode == BT_ATTACK_SWIFTPAIR_SPAM) ||
            (currentScanMode == BT_ATTACK_SOUR_APPLE) ||
-           (currentScanMode == BT_ATTACK_KITCHEN_SINK)) {
+           (currentScanMode == BT_ATTACK_SPAM_ALL)) {
     #ifdef HAS_BT
       if (currentTime - initTime >= 1000) {
         initTime = millis();
@@ -4284,11 +4284,11 @@ void WiFiScan::main(uint32_t currentTime)
       }
 
       if ((currentScanMode == BT_ATTACK_SWIFTPAIR_SPAM) ||
-          (currentScanMode == BT_ATTACK_KITCHEN_SINK))
+          (currentScanMode == BT_ATTACK_SPAM_ALL))
         this->executeSwiftpairSpam();
 
       if ((currentScanMode == BT_ATTACK_SOUR_APPLE) ||
-          (currentScanMode == BT_ATTACK_KITCHEN_SINK))
+          (currentScanMode == BT_ATTACK_SPAM_ALL))
         this->executeSourApple();
     #endif
   }

diff --git a/esp32_marauder/WiFiScan.h b/esp32_marauder/WiFiScan.h
@@ -85,7 +85,7 @@
 #define BT_SCAN_WAR_DRIVE_CONT 35
 #define BT_ATTACK_SOUR_APPLE 36
 #define BT_ATTACK_SWIFTPAIR_SPAM 37
-#define BT_ATTACK_KITCHEN_SINK 38
+#define BT_ATTACK_SPAM_ALL 38
 
 #define GRAPH_REFRESH 100