Added option to use an OLED display

Author: Stefan Kremser

esp8266_deauther/APScan.cpp

@@ -181,7 +181,7 @@ void APScan::sendResults(){
 
 }
 
-String APScan::getResults(){
+String APScan::getResultsJSON(){
   if(debug) Serial.print("getting AP scan result JSON ");
   String json = "{ \"aps\":[ ";
   for(int i=0;i<results && i<maxAPScanResults;i++){
@@ -206,26 +206,42 @@ String APScan::getResults(){
   return json;
 }
 
-String APScan::getResult(int i){
-  if(debug) Serial.print("getting AP scan result JSON for ID " + String(i));
-  String json = "{ \"aps\":[ ";
-  if(debug) Serial.print(".");
-  json += "{";
-  json += "\"i\":"+(String)i+",";
-  json += "\"c\":"+(String)getAPChannel(i)+",";
-  json += "\"m\":\""+getAPMac(i)+"\",";
-  json += "\"ss\":\""+getAPName(i)+"\",";
-  json += "\"r\":"+(String)getAPRSSI(i)+",";
-  json += "\"e\":"+(String)encryption[i]+",";
-  //json += "\"v\":\""+getAPVendor(i)+"\",";
-  json += "\"se\":"+(String)getAPSelected(i);
-  json += "}";
-  json += "] }";
-  if(debug){
-    Serial.println(json);
-    Serial.println("done");
+void APScan::sort(){
+  if(debug) Serial.println("sorting APs ");
+
+  //bubble sort
+  for(int i=0;i<results-1;i++){
+    Serial.println("--------------");
+    for(int h=0;h<results-i-1;h++){
+      
+      if(rssi[h] < rssi[h+1]){
+        Serial.println("switched: "+(String)rssi[h]+" > "+(String)rssi[h+1]);
+        int tmpA = channels[h];
+        channels[h] = channels[h+1];
+        channels[h+1] = tmpA;
+        
+        tmpA = rssi[h];
+        rssi[h] = rssi[h+1];
+        rssi[h+1] = tmpA;
+        
+        tmpA = encryption[h];
+        encryption[h] = encryption[h+1];
+        encryption[h+1] = tmpA;
+        
+        String tmpB = names[h];
+        strncpy(names[h],names[h+1],32);
+        tmpB.toCharArray(names[h+1],32);
+        
+        bool tmpC = hidden[h];
+        hidden[h] = hidden[h+1];
+        hidden[h+1] = tmpC;
+        
+        tmpC = selected[h];
+        selected[h] = selected[h+1];
+        selected[h+1] = tmpC;
+      }else Serial.println((String)rssi[h]+" < "+(String)rssi[h+1]);
+    }
   }
-  return json;
 }
 
 void APScan::select(int num){

esp8266_deauther/APScan.h

@@ -23,8 +23,8 @@ class APScan{
     APScan();
 
     bool start();
-    String getResults();
-    String getResult(int i);
+    void sort();
+    String getResultsJSON();
     void select(int num);
     void sendResults();
 

esp8266_deauther/Attack.cpp

@@ -196,7 +196,7 @@ void Attack::run(){
     if(debug) Serial.println(" done");
     if(settings.attackTimeout > 0){
       attackTimeoutCounter[0]++;
-      if(attackTimeoutCounter[0] > settings.attackTimeout) stop(1);
+      if(attackTimeoutCounter[0] > settings.attackTimeout) stop(0);
     }
   }
 
@@ -316,6 +316,7 @@ void Attack::start(int num){
     attackTimeoutCounter[num] = 0;
     refreshLed();
     if(debug) Serial.println("starting "+(String)attackNames[num]+" attack...");
+    if(num == 0) attackMode = "stop";
     if(num == 1){
       stop(2);
       stop(3);
@@ -332,6 +333,7 @@ void Attack::start(int num){
 void Attack::stop(int num){
   if(isRunning[num]){
     if(debug) Serial.println("stopping "+(String)attackNames[num]+" attack...");
+    if(num == 0) attackMode = "start";
     isRunning[num] = false;
     stati[num] = "ready";
     prevTime[num] = millis();

esp8266_deauther/Attack.h

@@ -24,6 +24,7 @@ extern void PrintHex8(uint8_t *data, uint8_t length);
 extern void getRandomVendorMac(uint8_t *buf);
 extern String data_getVendor(uint8_t first,uint8_t second,uint8_t third);
 extern const bool debug;
+extern String attackMode;
 
 extern APScan apScan;
 extern ClientScan clientScan;

esp8266_deauther/ClientScan.cpp

@@ -5,11 +5,15 @@ ClientScan::ClientScan(){
   zero.set(0x00,0x00,0x00,0x00,0x00,0x00);
 }
 
+void ClientScan::clearList(){
+  clients._clear();
+}
+
 void ClientScan::start(int _time){
   Serial.println();
   Serial.println("starting client scan");
 
-  clients._clear();
+  clearList();
   for(int i=0;i<maxClientScanResults;i++){
     selected[i] = false;
     packets[i] = 0;

esp8266_deauther/ClientScan.h

@@ -26,6 +26,7 @@ class ClientScan{
     ClientScan();
 
     void start(int _time);
+    void clearList();
     bool stop();
     void packetSniffer(uint8_t *buf, uint16_t len);