From a71946d09abecee3e98cf63d9dcd8356e9414b11 Mon Sep 17 00:00:00 2001 From: Stefan Kremser Date: Thu, 16 Mar 2017 22:36:34 +0100 Subject: [PATCH] added buffer functions and fixed APScan issue --- esp8266_deauther/APScan.cpp | 74 +++++++++++++++++++++++++-- esp8266_deauther/APScan.h | 12 ++++- esp8266_deauther/data.h | 30 ++++++++++- esp8266_deauther/esp8266_deauther.ino | 8 +-- 4 files changed, 114 insertions(+), 10 deletions(-) diff --git a/esp8266_deauther/APScan.cpp b/esp8266_deauther/APScan.cpp index 77039b0..c3c8f45 100644 --- a/esp8266_deauther/APScan.cpp +++ b/esp8266_deauther/APScan.cpp @@ -26,6 +26,8 @@ bool APScan::start(){ _ssid.toCharArray(names[i],33); //data_getVendor(WiFi.BSSID(i)[0],WiFi.BSSID(i)[1],WiFi.BSSID(i)[2]).toCharArray(vendors[i],9); if(debug){ + Serial.print((String)i); + Serial.print(" - "); _ap._print(); Serial.print(" - "); Serial.print(channels[i]); @@ -44,7 +46,8 @@ bool APScan::start(){ } //for debugging the APScan crash bug - /*if(debug){ + /* + if(debug){ for(int i=results;i #include "Mac.h" #include "MacList.h" #include "Settings.h" +#include extern String data_getVendor(uint8_t first,uint8_t second,uint8_t third); +extern ESP8266WebServer server; +extern void sendBuffer(); +extern void sendToBuffer(String str); +extern void sendHeader(int code, String type, size_t _size); extern const bool debug; extern Settings settings; @@ -21,6 +26,7 @@ class APScan{ String getResults(); String getResult(int i); void select(int num); + void sendResults(); String getAPName(int num); String getAPEncryption(int num); @@ -38,6 +44,7 @@ class APScan{ int selectedSum; MacList aps; private: + int channels[maxAPScanResults]; int rssi[maxAPScanResults]; char names[maxAPScanResults][33]; @@ -47,6 +54,7 @@ class APScan{ String getEncryption(int code); bool selected[maxAPScanResults]; + }; -#endif +#endif diff --git a/esp8266_deauther/data.h b/esp8266_deauther/data.h index 298da51..c4c99be 100644 --- a/esp8266_deauther/data.h +++ b/esp8266_deauther/data.h @@ -5,7 +5,10 @@ static uint8_t data_macBuffer; static char data_vendorBuffer; static String data_vendorStrBuffer = ""; -static char data_websiteBuffer[5000]; +const int bufSize = 5000; +int bufc = 0; //buffer counter; +char data_websiteBuffer[bufSize]; + /* I used the program memory (https://www.arduino.cc/en/Reference/PROGMEM) so I don't need an external SD card reader to hold the HTML files and the very ling vendor list. @@ -31,6 +34,31 @@ const static uint8_t data_settingsJS[] PROGMEM = {0x76,0x61,0x72,0x20,0x6e,0x61, const static uint8_t data_styleCSS[] PROGMEM = {0x2f,0x2a,0x20,0x47,0x6c,0x6f,0x62,0x61,0x6c,0x20,0x2a,0x2f,0x20,0x2a,0x2c,0x20,0x62,0x6f,0x64,0x79,0x20,0x7b,0x20,0x6d,0x61,0x72,0x67,0x69,0x6e,0x3a,0x20,0x30,0x3b,0x20,0x70,0x61,0x64,0x64,0x69,0x6e,0x67,0x3a,0x20,0x30,0x3b,0x20,0x66,0x6f,0x6e,0x74,0x2d,0x66,0x61,0x6d,0x69,0x6c,0x79,0x3a,0x20,0x61,0x72,0x69,0x61,0x6c,0x3b,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x20,0x23,0x34,0x33,0x32,0x39,0x32,0x39,0x3b,0x20,0x7d,0x20,0x68,0x31,0x20,0x7b,0x20,0x66,0x6f,0x6e,0x74,0x2d,0x73,0x69,0x7a,0x65,0x3a,0x20,0x32,0x32,0x70,0x78,0x3b,0x20,0x6d,0x61,0x72,0x67,0x69,0x6e,0x2d,0x62,0x6f,0x74,0x74,0x6f,0x6d,0x3a,0x20,0x30,0x2e,0x36,0x65,0x6d,0x3b,0x20,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,0x75,0x6e,0x64,0x3a,0x20,0x23,0x30,0x30,0x42,0x30,0x46,0x46,0x3b,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x20,0x23,0x66,0x66,0x66,0x3b,0x20,0x70,0x61,0x64,0x64,0x69,0x6e,0x67,0x3a,0x20,0x30,0x2e,0x32,0x65,0x6d,0x3b,0x20,0x62,0x6f,0x72,0x64,0x65,0x72,0x2d,0x72,0x61,0x64,0x69,0x75,0x73,0x3a,0x20,0x34,0x70,0x78,0x3b,0x20,0x7d,0x20,0x62,0x75,0x74,0x74,0x6f,0x6e,0x20,0x7b,0x20,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,0x75,0x6e,0x64,0x3a,0x20,0x23,0x30,0x30,0x42,0x30,0x46,0x46,0x3b,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x20,0x23,0x66,0x66,0x66,0x3b,0x20,0x62,0x6f,0x72,0x64,0x65,0x72,0x3a,0x20,0x31,0x70,0x78,0x20,0x73,0x6f,0x6c,0x69,0x64,0x20,0x23,0x38,0x46,0x38,0x46,0x38,0x46,0x3b,0x20,0x62,0x6f,0x72,0x64,0x65,0x72,0x2d,0x72,0x61,0x64,0x69,0x75,0x73,0x3a,0x20,0x31,0x34,0x70,0x78,0x3b,0x20,0x70,0x61,0x64,0x64,0x69,0x6e,0x67,0x3a,0x20,0x30,0x2e,0x33,0x34,0x65,0x6d,0x20,0x30,0x2e,0x33,0x65,0x6d,0x3b,0x20,0x6d,0x61,0x72,0x67,0x69,0x6e,0x2d,0x62,0x6f,0x74,0x74,0x6f,0x6d,0x3a,0x20,0x30,0x2e,0x36,0x65,0x6d,0x3b,0x20,0x7d,0x20,0x62,0x75,0x74,0x74,0x6f,0x6e,0x3a,0x68,0x6f,0x76,0x65,0x72,0x20,0x7b,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x20,0x23,0x30,0x30,0x30,0x3b,0x20,0x7d,0x20,0x6c,0x61,0x62,0x65,0x6c,0x20,0x7b,0x20,0x64,0x69,0x73,0x70,0x6c,0x61,0x79,0x3a,0x20,0x69,0x6e,0x6c,0x69,0x6e,0x65,0x2d,0x62,0x6c,0x6f,0x63,0x6b,0x3b,0x20,0x77,0x69,0x64,0x74,0x68,0x3a,0x20,0x31,0x33,0x35,0x70,0x78,0x3b,0x20,0x7d,0x20,0x69,0x6e,0x70,0x75,0x74,0x20,0x7b,0x20,0x68,0x65,0x69,0x67,0x68,0x74,0x3a,0x20,0x32,0x32,0x70,0x78,0x3b,0x20,0x77,0x69,0x64,0x74,0x68,0x3a,0x20,0x31,0x32,0x30,0x70,0x78,0x3b,0x20,0x62,0x6f,0x72,0x64,0x65,0x72,0x3a,0x20,0x31,0x70,0x78,0x20,0x73,0x6f,0x6c,0x69,0x64,0x20,0x23,0x41,0x39,0x39,0x44,0x39,0x44,0x3b,0x20,0x62,0x6f,0x72,0x64,0x65,0x72,0x2d,0x72,0x61,0x64,0x69,0x75,0x73,0x3a,0x20,0x35,0x70,0x78,0x3b,0x20,0x70,0x61,0x64,0x64,0x69,0x6e,0x67,0x3a,0x20,0x30,0x2e,0x32,0x65,0x6d,0x3b,0x20,0x6d,0x61,0x72,0x67,0x69,0x6e,0x3a,0x20,0x32,0x70,0x78,0x3b,0x20,0x7d,0x20,0x69,0x6e,0x70,0x75,0x74,0x5b,0x74,0x79,0x70,0x65,0x3d,0x22,0x63,0x68,0x65,0x63,0x6b,0x62,0x6f,0x78,0x22,0x5d,0x20,0x7b,0x20,0x68,0x65,0x69,0x67,0x68,0x74,0x3a,0x20,0x31,0x35,0x70,0x78,0x3b,0x20,0x77,0x69,0x64,0x74,0x68,0x3a,0x20,0x61,0x75,0x74,0x6f,0x3b,0x20,0x7d,0x20,0x2e,0x77,0x61,0x72,0x6e,0x20,0x7b,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x20,0x23,0x63,0x32,0x30,0x30,0x30,0x30,0x3b,0x20,0x7d,0x20,0x2e,0x77,0x61,0x72,0x6e,0x42,0x74,0x6e,0x20,0x7b,0x20,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,0x75,0x6e,0x64,0x3a,0x20,0x23,0x63,0x32,0x30,0x30,0x30,0x30,0x3b,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x20,0x23,0x66,0x66,0x66,0x3b,0x20,0x7d,0x20,0x2e,0x77,0x61,0x72,0x6e,0x42,0x74,0x6e,0x3a,0x68,0x6f,0x76,0x65,0x72,0x20,0x7b,0x20,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,0x75,0x6e,0x64,0x3a,0x20,0x23,0x66,0x30,0x30,0x3b,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x20,0x23,0x30,0x30,0x30,0x3b,0x20,0x7d,0x20,0x2e,0x73,0x65,0x6c,0x65,0x63,0x74,0x65,0x64,0x42,0x74,0x6e,0x20,0x7b,0x20,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,0x75,0x6e,0x64,0x3a,0x20,0x23,0x66,0x66,0x66,0x3b,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x20,0x23,0x30,0x30,0x30,0x3b,0x20,0x7d,0x20,0x2e,0x73,0x65,0x6c,0x65,0x63,0x74,0x65,0x64,0x42,0x74,0x6e,0x3a,0x68,0x6f,0x76,0x65,0x72,0x20,0x7b,0x20,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,0x75,0x6e,0x64,0x3a,0x20,0x23,0x30,0x30,0x42,0x30,0x46,0x46,0x3b,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x20,0x23,0x66,0x66,0x66,0x3b,0x20,0x7d,0x20,0x2e,0x72,0x69,0x67,0x68,0x74,0x20,0x7b,0x20,0x66,0x6c,0x6f,0x61,0x74,0x3a,0x20,0x72,0x69,0x67,0x68,0x74,0x3b,0x20,0x7d,0x20,0x2e,0x62,0x6f,0x6c,0x64,0x20,0x7b,0x20,0x66,0x6f,0x6e,0x74,0x2d,0x77,0x65,0x69,0x67,0x68,0x74,0x3a,0x20,0x62,0x6f,0x6c,0x64,0x3b,0x20,0x7d,0x20,0x2e,0x62,0x6c,0x6f,0x63,0x6b,0x20,0x7b,0x20,0x64,0x69,0x73,0x70,0x6c,0x61,0x79,0x3a,0x20,0x62,0x6c,0x6f,0x63,0x6b,0x3b,0x20,0x7d,0x20,0x2e,0x6d,0x61,0x72,0x67,0x69,0x6e,0x4e,0x75,0x6c,0x6c,0x20,0x7b,0x20,0x6d,0x61,0x72,0x67,0x69,0x6e,0x3a,0x20,0x30,0x20,0x7d,0x20,0x2e,0x62,0x6c,0x75,0x65,0x20,0x7b,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x20,0x23,0x30,0x30,0x42,0x30,0x46,0x46,0x20,0x7d,0x20,0x2e,0x73,0x6d,0x61,0x6c,0x6c,0x20,0x7b,0x20,0x66,0x6f,0x6e,0x74,0x2d,0x73,0x69,0x7a,0x65,0x3a,0x20,0x31,0x34,0x70,0x78,0x3b,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x20,0x23,0x37,0x32,0x37,0x32,0x37,0x32,0x20,0x7d,0x20,0x2f,0x2a,0x20,0x4e,0x61,0x76,0x69,0x67,0x61,0x74,0x69,0x6f,0x6e,0x20,0x2a,0x2f,0x20,0x6e,0x61,0x76,0x20,0x7b,0x20,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,0x75,0x6e,0x64,0x3a,0x20,0x23,0x32,0x32,0x32,0x3b,0x20,0x7d,0x20,0x6e,0x61,0x76,0x20,0x61,0x20,0x7b,0x20,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,0x75,0x6e,0x64,0x3a,0x20,0x23,0x32,0x32,0x32,0x3b,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x20,0x23,0x39,0x39,0x39,0x3b,0x20,0x70,0x61,0x64,0x64,0x69,0x6e,0x67,0x3a,0x20,0x30,0x2e,0x35,0x65,0x6d,0x3b,0x20,0x64,0x69,0x73,0x70,0x6c,0x61,0x79,0x3a,0x20,0x69,0x6e,0x6c,0x69,0x6e,0x65,0x2d,0x62,0x6c,0x6f,0x63,0x6b,0x3b,0x20,0x74,0x65,0x78,0x74,0x2d,0x64,0x65,0x63,0x6f,0x72,0x61,0x74,0x69,0x6f,0x6e,0x3a,0x20,0x6e,0x6f,0x6e,0x65,0x3b,0x20,0x7d,0x20,0x6e,0x61,0x76,0x20,0x61,0x3a,0x68,0x6f,0x76,0x65,0x72,0x20,0x7b,0x20,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,0x75,0x6e,0x64,0x3a,0x20,0x23,0x30,0x30,0x30,0x3b,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x20,0x23,0x66,0x30,0x66,0x30,0x66,0x30,0x3b,0x20,0x7d,0x20,0x2f,0x2a,0x20,0x43,0x6f,0x6e,0x74,0x65,0x6e,0x74,0x20,0x2a,0x2f,0x20,0x23,0x63,0x6f,0x6e,0x74,0x65,0x6e,0x74,0x20,0x7b,0x20,0x70,0x61,0x64,0x64,0x69,0x6e,0x67,0x3a,0x20,0x30,0x2e,0x33,0x34,0x65,0x6d,0x3b,0x20,0x7d,0x20,0x74,0x61,0x62,0x6c,0x65,0x20,0x7b,0x20,0x70,0x61,0x64,0x64,0x69,0x6e,0x67,0x3a,0x20,0x30,0x3b,0x20,0x77,0x69,0x64,0x74,0x68,0x3a,0x20,0x31,0x30,0x30,0x25,0x3b,0x20,0x6d,0x61,0x78,0x2d,0x77,0x69,0x64,0x74,0x68,0x3a,0x20,0x39,0x36,0x30,0x70,0x78,0x3b,0x20,0x6d,0x61,0x72,0x67,0x69,0x6e,0x3a,0x20,0x30,0x20,0x61,0x75,0x74,0x6f,0x3b,0x20,0x62,0x6f,0x72,0x64,0x65,0x72,0x2d,0x73,0x70,0x61,0x63,0x69,0x6e,0x67,0x3a,0x20,0x30,0x3b,0x20,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,0x75,0x6e,0x64,0x3a,0x20,0x23,0x32,0x32,0x32,0x32,0x32,0x32,0x3b,0x20,0x7d,0x20,0x74,0x61,0x62,0x6c,0x65,0x20,0x74,0x68,0x20,0x7b,0x20,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,0x75,0x6e,0x64,0x3a,0x20,0x23,0x32,0x32,0x32,0x32,0x32,0x32,0x3b,0x20,0x63,0x6f,0x6c,0x6f,0x72,0x3a,0x20,0x23,0x66,0x30,0x66,0x30,0x66,0x30,0x3b,0x20,0x7d,0x20,0x74,0x61,0x62,0x6c,0x65,0x20,0x74,0x64,0x20,0x7b,0x20,0x66,0x6f,0x6e,0x74,0x2d,0x73,0x69,0x7a,0x65,0x3a,0x20,0x31,0x34,0x70,0x78,0x3b,0x20,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,0x75,0x6e,0x64,0x3a,0x20,0x23,0x66,0x30,0x66,0x30,0x66,0x30,0x3b,0x20,0x7d,0x20,0x74,0x61,0x62,0x6c,0x65,0x20,0x74,0x68,0x2c,0x20,0x74,0x61,0x62,0x6c,0x65,0x20,0x74,0x64,0x20,0x7b,0x20,0x74,0x65,0x78,0x74,0x2d,0x61,0x6c,0x69,0x67,0x6e,0x3a,0x20,0x63,0x65,0x6e,0x74,0x65,0x72,0x3b,0x20,0x70,0x61,0x64,0x64,0x69,0x6e,0x67,0x3a,0x20,0x30,0x2e,0x31,0x65,0x6d,0x20,0x30,0x3b,0x20,0x7d,0x20,0x74,0x61,0x62,0x6c,0x65,0x20,0x2e,0x73,0x65,0x6c,0x65,0x63,0x74,0x65,0x64,0x20,0x74,0x64,0x20,0x7b,0x20,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,0x75,0x6e,0x64,0x3a,0x20,0x23,0x31,0x31,0x61,0x34,0x63,0x63,0x3b,0x20,0x7d,0x20,0x2f,0x2a,0x20,0x53,0x70,0x65,0x63,0x69,0x66,0x69,0x63,0x20,0x2a,0x2f,0x20,0x23,0x73,0x61,0x76,0x65,0x64,0x20,0x7b,0x20,0x64,0x69,0x73,0x70,0x6c,0x61,0x79,0x3a,0x20,0x69,0x6e,0x6c,0x69,0x6e,0x65,0x3b,0x20,0x7d,0x20,0x23,0x63,0x6c,0x69,0x65,0x6e,0x74,0x53,0x63,0x61,0x6e,0x53,0x74,0x61,0x74,0x75,0x73,0x20,0x7b,0x20,0x6d,0x61,0x72,0x67,0x69,0x6e,0x2d,0x6c,0x65,0x66,0x74,0x3a,0x20,0x31,0x65,0x6d,0x3b,0x20,0x7d,0x20,0x23,0x63,0x6c,0x69,0x65,0x6e,0x74,0x53,0x63,0x61,0x6e,0x53,0x74,0x61,0x72,0x74,0x20,0x7b,0x20,0x6d,0x61,0x72,0x67,0x69,0x6e,0x2d,0x6c,0x65,0x66,0x74,0x3a,0x20,0x33,0x30,0x70,0x78,0x3b,0x20,0x7d,0x20,0x23,0x73,0x63,0x61,0x6e,0x54,0x69,0x6d,0x65,0x20,0x7b,0x20,0x77,0x69,0x64,0x74,0x68,0x3a,0x20,0x36,0x30,0x70,0x78,0x3b,0x20,0x7d,0x20,0x23,0x61,0x70,0x53,0x63,0x61,0x6e,0x53,0x74,0x61,0x74,0x75,0x73,0x20,0x7b,0x20,0x6d,0x61,0x72,0x67,0x69,0x6e,0x2d,0x6c,0x65,0x66,0x74,0x3a,0x20,0x31,0x65,0x6d,0x3b,0x20,0x7d,0x20,0x23,0x72,0x73,0x73,0x69,0x42,0x61,0x72,0x20,0x7b,0x20,0x77,0x69,0x64,0x74,0x68,0x3a,0x20,0x31,0x30,0x30,0x70,0x78,0x3b,0x20,0x68,0x65,0x69,0x67,0x68,0x74,0x3a,0x20,0x31,0x35,0x70,0x78,0x3b,0x20,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,0x75,0x6e,0x64,0x3a,0x20,0x23,0x66,0x66,0x66,0x3b,0x20,0x7d,0x20,0x23,0x72,0x73,0x73,0x69,0x42,0x61,0x72,0x20,0x3e,0x20,0x64,0x69,0x76,0x20,0x7b,0x20,0x77,0x69,0x64,0x74,0x68,0x3a,0x20,0x35,0x32,0x70,0x78,0x3b,0x20,0x68,0x65,0x69,0x67,0x68,0x74,0x3a,0x20,0x31,0x35,0x70,0x78,0x3b,0x20,0x62,0x61,0x63,0x6b,0x67,0x72,0x6f,0x75,0x6e,0x64,0x3a,0x20,0x23,0x63,0x32,0x30,0x30,0x30,0x30,0x3b,0x20,0x7d,0x20,0x23,0x77,0x70,0x61,0x5f,0x69,0x6e,0x66,0x6f,0x20,0x7b,0x20,0x70,0x61,0x64,0x64,0x69,0x6e,0x67,0x2d,0x6c,0x65,0x66,0x74,0x3a,0x20,0x30,0x2e,0x33,0x34,0x65,0x6d,0x3b,0x20,0x7d,0x20,0x23,0x73,0x61,0x76,0x65,0x64,0x20,0x7b,0x20,0x64,0x69,0x73,0x70,0x6c,0x61,0x79,0x3a,0x20,0x69,0x6e,0x6c,0x69,0x6e,0x65,0x3b,0x20,0x6d,0x61,0x72,0x67,0x69,0x6e,0x2d,0x6c,0x65,0x66,0x74,0x3a,0x20,0x32,0x30,0x70,0x78,0x3b,0x20,0x7d}; const static uint8_t data_manifest[] PROGMEM = {0x7b,0x20,0x22,0x73,0x69,0x74,0x65,0x73,0x22,0x3a,0x5b,0x20,0x22,0x65,0x72,0x72,0x6f,0x72,0x34,0x30,0x34,0x2e,0x68,0x74,0x6d,0x6c,0x22,0x2c,0x20,0x22,0x73,0x74,0x79,0x6c,0x65,0x2e,0x63,0x73,0x73,0x22,0x2c,0x20,0x22,0x66,0x75,0x6e,0x63,0x74,0x69,0x6f,0x6e,0x73,0x2e,0x6a,0x73,0x22,0x2c,0x20,0x22,0x69,0x6e,0x64,0x65,0x78,0x2e,0x68,0x74,0x6d,0x6c,0x22,0x2c,0x20,0x22,0x63,0x6c,0x69,0x65,0x6e,0x74,0x73,0x2e,0x68,0x74,0x6d,0x6c,0x22,0x2c,0x20,0x22,0x61,0x74,0x74,0x61,0x63,0x6b,0x2e,0x68,0x74,0x6d,0x6c,0x22,0x2c,0x20,0x22,0x73,0x65,0x74,0x74,0x69,0x6e,0x67,0x73,0x2e,0x68,0x74,0x6d,0x6c,0x22,0x20,0x5d,0x2c,0x20,0x22,0x6a,0x73,0x6f,0x6e,0x22,0x3a,0x5b,0x20,0x22,0x41,0x50,0x53,0x63,0x61,0x6e,0x52,0x65,0x73,0x75,0x6c,0x74,0x73,0x2e,0x6a,0x73,0x6f,0x6e,0x22,0x2c,0x20,0x22,0x43,0x6c,0x69,0x65,0x6e,0x74,0x53,0x63,0x61,0x6e,0x52,0x65,0x73,0x75,0x6c,0x74,0x73,0x2e,0x6a,0x73,0x6f,0x6e,0x22,0x2c,0x20,0x22,0x73,0x65,0x74,0x74,0x69,0x6e,0x67,0x73,0x2e,0x6a,0x73,0x6f,0x6e,0x22,0x2c,0x20,0x22,0x61,0x74,0x74,0x61,0x63,0x6b,0x49,0x6e,0x66,0x6f,0x2e,0x6a,0x73,0x6f,0x6e,0x22,0x20,0x5d,0x2c,0x20,0x22,0x63,0x6f,0x6d,0x6d,0x61,0x6e,0x64,0x73,0x22,0x3a,0x5b,0x20,0x22,0x41,0x50,0x53,0x63,0x61,0x6e,0x2e,0x6a,0x73,0x6f,0x6e,0x22,0x2c,0x20,0x22,0x41,0x50,0x53,0x65,0x6c,0x65,0x63,0x74,0x2e,0x6a,0x73,0x6f,0x6e,0x22,0x2c,0x20,0x22,0x43,0x6c,0x69,0x65,0x6e,0x74,0x53,0x63,0x61,0x6e,0x2e,0x6a,0x73,0x6f,0x6e,0x22,0x2c,0x20,0x22,0x43,0x6c,0x69,0x65,0x6e,0x74,0x53,0x63,0x61,0x6e,0x54,0x69,0x6d,0x65,0x2e,0x6a,0x73,0x6f,0x6e,0x22,0x2c,0x20,0x22,0x63,0x6c,0x69,0x65,0x6e,0x74,0x53,0x65,0x6c,0x65,0x63,0x74,0x2e,0x6a,0x73,0x6f,0x6e,0x22,0x2c,0x20,0x22,0x73,0x65,0x74,0x4e,0x61,0x6d,0x65,0x2e,0x6a,0x73,0x6f,0x6e,0x22,0x2c,0x20,0x22,0x61,0x74,0x74,0x61,0x63,0x6b,0x53,0x74,0x61,0x72,0x74,0x2e,0x6a,0x73,0x6f,0x6e,0x22,0x2c,0x20,0x22,0x73,0x65,0x74,0x74,0x69,0x6e,0x67,0x73,0x53,0x61,0x76,0x65,0x2e,0x6a,0x73,0x6f,0x6e,0x22,0x2c,0x20,0x22,0x73,0x65,0x74,0x74,0x69,0x6e,0x67,0x73,0x52,0x65,0x73,0x65,0x74,0x2e,0x6a,0x73,0x6f,0x6e,0x22,0x2c,0x20,0x22,0x64,0x65,0x6c,0x65,0x74,0x65,0x4e,0x61,0x6d,0x65,0x2e,0x6a,0x73,0x6f,0x6e,0x22,0x2c,0x20,0x22,0x63,0x6c,0x65,0x61,0x72,0x4e,0x61,0x6d,0x65,0x4c,0x69,0x73,0x74,0x2e,0x6a,0x73,0x6f,0x6e,0x22,0x2c,0x20,0x22,0x65,0x64,0x69,0x74,0x4e,0x61,0x6d,0x65,0x4c,0x69,0x73,0x74,0x2e,0x6a,0x73,0x6f,0x6e,0x22,0x2c,0x20,0x22,0x61,0x64,0x64,0x53,0x53,0x49,0x44,0x2e,0x6a,0x73,0x6f,0x6e,0x22,0x2c,0x20,0x22,0x63,0x6c,0x6f,0x6e,0x65,0x53,0x53,0x49,0x44,0x2e,0x6a,0x73,0x6f,0x6e,0x22,0x2c,0x20,0x22,0x64,0x65,0x6c,0x65,0x74,0x65,0x53,0x53,0x49,0x44,0x2e,0x6a,0x73,0x6f,0x6e,0x22,0x2c,0x20,0x22,0x72,0x61,0x6e,0x64,0x6f,0x6d,0x53,0x53,0x49,0x44,0x2e,0x6a,0x73,0x6f,0x6e,0x22,0x2c,0x20,0x22,0x63,0x6c,0x65,0x61,0x72,0x53,0x53,0x49,0x44,0x2e,0x6a,0x73,0x6f,0x6e,0x22,0x2c,0x20,0x22,0x72,0x65,0x73,0x65,0x74,0x53,0x53,0x49,0x44,0x2e,0x6a,0x73,0x6f,0x6e,0x22,0x2c,0x20,0x22,0x73,0x61,0x76,0x65,0x53,0x53,0x49,0x44,0x2e,0x6a,0x73,0x6f,0x6e,0x22,0x20,0x5d,0x20,0x7d}; + +void sendBuffer(){ + if(bufc > 0){ + server.sendContent_P(data_websiteBuffer, bufc); + bufc = 0; + } +} + +void sendToBuffer(String str){ + int len = str.length(); + int _counter = bufc + len; + if(_counter >= 5000){ + server.sendContent_P(data_websiteBuffer, bufc); + bufc = 0; + } + memcpy(data_websiteBuffer + bufc, str.c_str(), len); + bufc += len; +} + + +void sendHeader(int code, String type, size_t _size){ + server.sendHeader("Content-Length", (String)_size); + server.send(code, type, ""); +} + /* Based on Wireshark manufacturer database source: https://www.wireshark.org/tools/oui-lookup.html diff --git a/esp8266_deauther/esp8266_deauther.ino b/esp8266_deauther/esp8266_deauther.ino index 8cd16e7..ab32a72 100644 --- a/esp8266_deauther/esp8266_deauther.ino +++ b/esp8266_deauther/esp8266_deauther.ino @@ -8,6 +8,8 @@ extern "C" { #include "user_interface.h" } +ESP8266WebServer server(80); + #include #include "data.h" #include "NameList.h" @@ -21,8 +23,6 @@ extern "C" { const bool debug = true; /* ========== DEBUG ========== */ -ESP8266WebServer server(80); - NameList nameList; APScan apScan; @@ -71,12 +71,14 @@ void startAPScan() { } void sendAPResults() { + apScan.sendResults(); + /* if (server.hasArg("apid")) { int apid = server.arg("apid").toInt(); server.send ( 200, "text/json", apScan.getResult(apid)); } else { server.send ( 200, "text/json", apScan.getResults()); - } + }*/ } void selectAP() {