Merged branch testing into testing

Author: Stefan Kremser

README.md

@@ -100,12 +100,20 @@ It doesn’t matter which board you use, as long as it has an ESP8266 on it.
 
 **don't forget to save!**
 
-**12** Download and open `esp8266_deauther` > `esp8266_deauther.ino` in Arduino
+**12** Download the project
 
-**13** Select your ESP8266 board at `Tools` > `Board` and the right port at `Tools` > `Port`  
+**13** Go to the SDK_fix folder of this project
+
+**14** Copy ESP8266WiFi.cpp and ESP8266WiFi.h
+
+**15** Past these files here `packages` > `esp8266` > `hardware` > `esp8266` > `2.0.0` > `libraries` > `ESP8266WiFi` > `src`
+
+**16** Open `esp8266_deauther` > `esp8266_deauther.ino` in Arduino
+
+**17** Select your ESP8266 board at `Tools` > `Board` and the right port at `Tools` > `Port`  
 If no port shows up you may have to reinstall the drivers.
 
-**14** Upload!
+**18** Upload!
 
 **Your ESP8266 Deauther is now ready!**
 

esp8266_deauther/APScan.cpp

@@ -7,11 +7,11 @@ APScan::APScan(){
 bool APScan::start(){
     if(debug){
       Serial.println("starting AP scan...");
-      Serial.println("MAC - Ch - RSSI - Encrypt. - SSID");// - Vendor");
+      Serial.println("MAC - Ch - RSSI - Encrypt. - SSID - Hidden");// - Vendor");
     }
     aps._clear();
     for(int i=0;i<maxAPScanResults;i++) selected[i] = false;
-    results = WiFi.scanNetworks();
+    results = WiFi.scanNetworks(false, true); // lets scanNetworks return hidden APs. (async = false & show_hidden = true)
 
     for(int i=0;i<results && i<maxAPScanResults;i++){
       Mac _ap;
@@ -20,6 +20,7 @@ bool APScan::start(){
       channels[i] = WiFi.channel(i);
       rssi[i] = WiFi.RSSI(i);
       encryption[i] = WiFi.encryptionType(i);
+      hidden[i] = WiFi.isHidden(i);
       String _ssid = WiFi.SSID(i);
       _ssid.replace("\"","\\\"");
       _ssid.toCharArray(names[i],33);
@@ -34,6 +35,8 @@ bool APScan::start(){
         Serial.print(getEncryption(encryption[i]));
         Serial.print(" - ");
         Serial.print(names[i]);
+        Serial.print(" - ");
+        Serial.print(hidden[i]);
         //Serial.print(" - ");
         //Serial.print(vendors[i]);
         Serial.println();
@@ -93,11 +96,15 @@ String APScan::getEncryption(int code){
   return "?";
 }
 
-String APScan::getAPName(int num){ return names[num]; }
+String APScan::getAPName(int num){ 
+    if(isHidden(num)) return "* Hidden SSID *";
+    return names[num]; 
+}
 String APScan::getAPEncryption(int num){ return getEncryption(encryption[num]); }
 //String APScan::getAPVendor(int num){ return vendors[num]; }
 String APScan::getAPMac(int num){ return aps._get(num).toString(); }
 bool APScan::getAPSelected(int num){ return selected[num]; }
+bool APScan::isHidden(int num){ return hidden[num]; }
 int APScan::getAPRSSI(int num){ return rssi[num]; }
 int APScan::getAPChannel(int num){ return channels[num]; }
 

esp8266_deauther/APScan.h

@@ -23,6 +23,7 @@ class APScan{
     //String getAPVendor(int num);
     String getAPMac(int num);
     bool getAPSelected(int num);
+    bool isHidden(int num);
     int getAPRSSI(int num);
     int getAPChannel(int num);
 
@@ -37,7 +38,8 @@ class APScan{
     int rssi[maxAPScanResults];
     char names[maxAPScanResults][33];
     int encryption[maxAPScanResults];
-
+    bool hidden[maxAPScanResults];
+    
     String getEncryption(int code);
 
     bool selected[maxAPScanResults];

esp8266_deauther/Attack.cpp

@@ -154,7 +154,7 @@ void Attack::run(){
     prevTime[1] = millis();
 
     for(int a=0;a<apScan.results;a++){
-      if(apScan.isSelected(a)){
+      if(apScan.isSelected(a) && !apScan.isHidden(a)){
         String _ssid = apScan.getAPName(a);
         int _ssidLen = _ssid.length();
         int _restSSIDLen = 32 - _ssidLen;