diff --git a/esp8266_deauther/APScan.cpp b/esp8266_deauther/APScan.cpp index 654c78c..338925d 100644 --- a/esp8266_deauther/APScan.cpp +++ b/esp8266_deauther/APScan.cpp @@ -108,7 +108,7 @@ String APScan::getEncryption(int code) { } String APScan::getAPName(int num) { - if (isHidden(num)) return "* Hidden SSID *"; + //if (isHidden(num)) return "* Hidden SSID *"; return names[num]; } String APScan::getAPEncryption(int num) { @@ -166,7 +166,7 @@ void APScan::sendResults() { _size += 6; // "e": , _size += 6; // "se":0 _size++; // }*/ - _size += 61; + _size += 67; _size += String(i).length(); _size += String(getAPChannel(i)).length(); _size += sanitizeJson(getAPName(i)).length(); @@ -193,7 +193,8 @@ void APScan::sendResults() { json += "\"r\":" + (String)getAPRSSI(i) + ","; json += "\"e\":" + (String)encryption[i] + ","; //json += "\"v\":\""+getAPVendor(i)+"\","; - json += "\"se\":" + (String)isSelected(i); + json += "\"h\":" + (String)hidden[i] + ","; + json += "\"se\":" + (String)isSelected(i); json += "}"; if ((i != results - 1) && (i != maxAPScanResults - 1)) json += ","; @@ -226,6 +227,7 @@ String APScan::getResultsJSON() { json += "\"r\":" + (String)getAPRSSI(i) + ","; json += "\"e\":" + (String)encryption[i] + ","; //json += "\"v\":\""+getAPVendor(i)+"\","; + json += "\"h\":" + (String)hidden[i] + ","; json += "\"se\":" + (String)isSelected(i); json += "}"; if ((i != results - 1) && (i != maxAPScanResults - 1)) json += ","; diff --git a/esp8266_deauther/data/js/apscan.js b/esp8266_deauther/data/js/apscan.js index 4762216..bcfefe5 100644 --- a/esp8266_deauther/data/js/apscan.js +++ b/esp8266_deauther/data/js/apscan.js @@ -17,16 +17,18 @@ function compare(a, b) { return 0; } -function getEncryption(num) { +function getStatus(enc, hid) { /* - if (num == 8) return "WPA*"; - else if (num == 4) return "WPA2"; - else if (num == 2) return "WPA"; - else if (num == 7) return "none"; - else if (num == 5) return "WEP"; + if (enc == 8) return "WPA*"; + else if (enc == 4) return "WPA2"; + else if (enc == 2) return "WPA"; + else if (enc == 7) return "none"; + else if (enc == 5) return "WEP"; */ - if (num == 7) return " "; - else return "🔒"; + var buff = ""; + if (enc != 7) buff += "🔒 "; + if (hid == 1) buff += "👻 "; + return buff; } function getResults() { @@ -59,7 +61,7 @@ function getResults() { else tr += ''; tr += '' + res.aps[i].c + ''; tr += '' + escapeHTML(res.aps[i].ss) + ''; - tr += '' + getEncryption(res.aps[i].e) + ''; + tr += '' + getStatus(res.aps[i].e, res.aps[i].h) + ''; //tr += '' + res.aps[i].r + ' '; var _width = res.aps[i].r + 130; var _color;