From f53795edb6f646997be0d138d8003c852f4486b3 Mon Sep 17 00:00:00 2001
From: N0vaPixel <aurelien.hernandez27@gmail.com>
Date: Fri, 3 Mar 2017 00:38:09 +0100
Subject: [PATCH] Implement hidden APs

Now APscan is compatible with the new scanNetworks method

+ added bool hidden[] and bool getAPName(int num) to save and retrieve
the "visibility" status of a network.

+ If the ssid of a given network is hidden, getAPName() will return "*
Hidden SSID *"
hidden[] will stay empty.

+ Added debug infos
---
 esp8266_deauther/APScan.cpp | 13 ++++++++++---
 esp8266_deauther/APScan.h   |  4 +++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/esp8266_deauther/APScan.cpp b/esp8266_deauther/APScan.cpp
index 3475c3c..73684f5 100644
--- a/esp8266_deauther/APScan.cpp
+++ b/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]; }
 
diff --git a/esp8266_deauther/APScan.h b/esp8266_deauther/APScan.h
index 168e55e..1b052fe 100644
--- a/esp8266_deauther/APScan.h
+++ b/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];