mirror of
https://github.com/SpacehuhnTech/esp8266_deauther.git
synced 2025-12-22 23:26:49 -08:00
Better OLED-Display-Menu and spelling error fix
Capital letter in menu for difference between menu and APs
Fix spelling error in APScan.cpp ("seect" -> "select")
Format files with Strg+T in Arduino-IDE - looks better ;-)
This commit is contained in:
@@ -1,30 +1,30 @@
|
||||
#include "Settings.h"
|
||||
|
||||
Settings::Settings(){
|
||||
Settings::Settings() {
|
||||
|
||||
}
|
||||
|
||||
void Settings::load(){
|
||||
void Settings::load() {
|
||||
ssidLen = EEPROM.read(ssidLenAdr);
|
||||
passwordLen = EEPROM.read(passwordLenAdr);
|
||||
|
||||
if(ssidLen < 1 || ssidLen > 32 || passwordLen < 8 && passwordLen != 0 || passwordLen > 32) reset();
|
||||
else{
|
||||
|
||||
if (ssidLen < 1 || ssidLen > 32 || passwordLen < 8 && passwordLen != 0 || passwordLen > 32) reset();
|
||||
else {
|
||||
ssid = "";
|
||||
password = "";
|
||||
for(int i=0;i<ssidLen;i++) ssid += (char)EEPROM.read(ssidAdr+i);
|
||||
for(int i=0;i<passwordLen;i++) password += (char)EEPROM.read(passwordAdr+i);
|
||||
|
||||
for (int i = 0; i < ssidLen; i++) ssid += (char)EEPROM.read(ssidAdr + i);
|
||||
for (int i = 0; i < passwordLen; i++) password += (char)EEPROM.read(passwordAdr + i);
|
||||
|
||||
ssidHidden = (bool)EEPROM.read(ssidHiddenAdr);
|
||||
|
||||
if((int)EEPROM.read(apChannelAdr) >= 1 && (int)EEPROM.read(apChannelAdr) <= 14){
|
||||
if ((int)EEPROM.read(apChannelAdr) >= 1 && (int)EEPROM.read(apChannelAdr) <= 14) {
|
||||
apChannel = (int)EEPROM.read(apChannelAdr);
|
||||
} else {
|
||||
apChannel = 1;
|
||||
}
|
||||
|
||||
|
||||
apScanHidden = (bool)EEPROM.read(apScanHiddenAdr);
|
||||
|
||||
|
||||
deauthReason = EEPROM.read(deauthReasonAdr);
|
||||
attackTimeout = eepromReadInt(attackTimeoutAdr);
|
||||
attackPacketRate = EEPROM.read(attackPacketRateAdr);
|
||||
@@ -35,9 +35,9 @@ void Settings::load(){
|
||||
}
|
||||
}
|
||||
|
||||
void Settings::reset(){
|
||||
if(debug) Serial.print("reset settings...");
|
||||
|
||||
void Settings::reset() {
|
||||
if (debug) Serial.print("reset settings...");
|
||||
|
||||
ssid = "pwned";
|
||||
password = "deauther"; //must have at least 8 characters
|
||||
ssidHidden = false;
|
||||
@@ -45,36 +45,36 @@ void Settings::reset(){
|
||||
|
||||
ssidLen = ssid.length();
|
||||
passwordLen = password.length();
|
||||
|
||||
|
||||
apScanHidden = true;
|
||||
|
||||
|
||||
deauthReason = 0x01;
|
||||
attackTimeout = 5*60;
|
||||
attackTimeout = 5 * 60;
|
||||
attackPacketRate = 10;
|
||||
clientScanTime = 15;
|
||||
attackEncrypted = false;
|
||||
useLed = false;
|
||||
channelHop = false;
|
||||
|
||||
if(debug) Serial.println("done");
|
||||
|
||||
|
||||
if (debug) Serial.println("done");
|
||||
|
||||
save();
|
||||
}
|
||||
|
||||
void Settings::save(){
|
||||
void Settings::save() {
|
||||
ssidLen = ssid.length();
|
||||
passwordLen = password.length();
|
||||
|
||||
|
||||
EEPROM.write(ssidLenAdr, ssidLen);
|
||||
EEPROM.write(passwordLenAdr, passwordLen);
|
||||
for(int i=0;i<ssidLen;i++) EEPROM.write(ssidAdr+i,ssid[i]);
|
||||
for(int i=0;i<passwordLen;i++) EEPROM.write(passwordAdr+i,password[i]);
|
||||
for (int i = 0; i < ssidLen; i++) EEPROM.write(ssidAdr + i, ssid[i]);
|
||||
for (int i = 0; i < passwordLen; i++) EEPROM.write(passwordAdr + i, password[i]);
|
||||
|
||||
EEPROM.write(ssidHiddenAdr, ssidHidden);
|
||||
EEPROM.write(apChannelAdr, apChannel);
|
||||
|
||||
EEPROM.write(apScanHiddenAdr, apScanHidden);
|
||||
|
||||
|
||||
EEPROM.write(deauthReasonAdr, deauthReason);
|
||||
|
||||
eepromWriteInt(attackTimeoutAdr, attackTimeout);
|
||||
@@ -85,85 +85,85 @@ void Settings::save(){
|
||||
EEPROM.write(useLedAdr, useLed);
|
||||
EEPROM.write(channelHopAdr, channelHop);
|
||||
EEPROM.commit();
|
||||
|
||||
if(debug){
|
||||
|
||||
if (debug) {
|
||||
info();
|
||||
Serial.println("settings saved");
|
||||
}
|
||||
}
|
||||
|
||||
void Settings::info(){
|
||||
void Settings::info() {
|
||||
Serial.println("settings:");
|
||||
Serial.println("SSID: "+ssid);
|
||||
Serial.println("SSID length: "+(String)ssidLen);
|
||||
Serial.println("SSID hidden: "+(String)ssidHidden);
|
||||
Serial.println("password: "+password);
|
||||
Serial.println("password length: "+(String)passwordLen);
|
||||
Serial.println("channel: "+(String)apChannel);
|
||||
Serial.println("Scan hidden APs: "+(String)apScanHidden);
|
||||
Serial.println("deauth reson: "+(String)(int)deauthReason);
|
||||
Serial.println("attack timeout: "+(String)attackTimeout);
|
||||
Serial.println("attack packet rate: "+(String)attackPacketRate);
|
||||
Serial.println("client scan time: "+(String)clientScanTime);
|
||||
Serial.println("attack SSID encrypted: "+(String)attackEncrypted);
|
||||
Serial.println("use built-in LED: "+(String)useLed);
|
||||
Serial.println("channel hopping: "+(String)channelHop);
|
||||
Serial.println("SSID: " + ssid);
|
||||
Serial.println("SSID length: " + (String)ssidLen);
|
||||
Serial.println("SSID hidden: " + (String)ssidHidden);
|
||||
Serial.println("password: " + password);
|
||||
Serial.println("password length: " + (String)passwordLen);
|
||||
Serial.println("channel: " + (String)apChannel);
|
||||
Serial.println("Scan hidden APs: " + (String)apScanHidden);
|
||||
Serial.println("deauth reson: " + (String)(int)deauthReason);
|
||||
Serial.println("attack timeout: " + (String)attackTimeout);
|
||||
Serial.println("attack packet rate: " + (String)attackPacketRate);
|
||||
Serial.println("client scan time: " + (String)clientScanTime);
|
||||
Serial.println("attack SSID encrypted: " + (String)attackEncrypted);
|
||||
Serial.println("use built-in LED: " + (String)useLed);
|
||||
Serial.println("channel hopping: " + (String)channelHop);
|
||||
}
|
||||
|
||||
void Settings::send(){
|
||||
if(debug) Serial.println("getting settings json");
|
||||
void Settings::send() {
|
||||
if (debug) Serial.println("getting settings json");
|
||||
String json = "{";
|
||||
size_t jsonSize = 0;
|
||||
|
||||
json += "\"ssid\":\""+ssid+"\",";
|
||||
json += "\"ssidHidden\":"+(String)ssidHidden+",";
|
||||
json += "\"password\":\""+password+"\",";
|
||||
json += "\"apChannel\":"+(String)apChannel+",";
|
||||
json += "\"apScanHidden\":"+(String)apScanHidden+",";
|
||||
json += "\"deauthReason\":"+(String)(int)deauthReason+",";
|
||||
json += "\"attackTimeout\":"+(String)attackTimeout+",";
|
||||
json += "\"attackPacketRate\":"+(String)attackPacketRate+",";
|
||||
json += "\"clientScanTime\":"+(String)clientScanTime+",";
|
||||
json += "\"attackEncrypted\":"+(String)attackEncrypted+",";
|
||||
json += "\"useLed\":"+(String)useLed+",";
|
||||
json += "\"channelHop\":"+(String)channelHop+",";
|
||||
|
||||
|
||||
json += "\"ssid\":\"" + ssid + "\",";
|
||||
json += "\"ssidHidden\":" + (String)ssidHidden + ",";
|
||||
json += "\"password\":\"" + password + "\",";
|
||||
json += "\"apChannel\":" + (String)apChannel + ",";
|
||||
json += "\"apScanHidden\":" + (String)apScanHidden + ",";
|
||||
json += "\"deauthReason\":" + (String)(int)deauthReason + ",";
|
||||
json += "\"attackTimeout\":" + (String)attackTimeout + ",";
|
||||
json += "\"attackPacketRate\":" + (String)attackPacketRate + ",";
|
||||
json += "\"clientScanTime\":" + (String)clientScanTime + ",";
|
||||
json += "\"attackEncrypted\":" + (String)attackEncrypted + ",";
|
||||
json += "\"useLed\":" + (String)useLed + ",";
|
||||
json += "\"channelHop\":" + (String)channelHop + ",";
|
||||
|
||||
json += "\"nameList\":[";
|
||||
|
||||
|
||||
jsonSize += json.length();
|
||||
|
||||
for(int i=0;i<nameList.len;i++){
|
||||
|
||||
for (int i = 0; i < nameList.len; i++) {
|
||||
json = "";
|
||||
json += "{";
|
||||
json += "\"n\":\""+nameList.getName(i)+"\",";
|
||||
json += "\"m\":\""+nameList.getMac(i).toString()+"\",";
|
||||
json += "\"v\":\""+data_getVendor(nameList.getMac(i)._get(0), nameList.getMac(i)._get(1), nameList.getMac(i)._get(2))+"\"";
|
||||
json += "\"n\":\"" + nameList.getName(i) + "\",";
|
||||
json += "\"m\":\"" + nameList.getMac(i).toString() + "\",";
|
||||
json += "\"v\":\"" + data_getVendor(nameList.getMac(i)._get(0), nameList.getMac(i)._get(1), nameList.getMac(i)._get(2)) + "\"";
|
||||
json += "}";
|
||||
if(i!=nameList.len-1) json += ",";
|
||||
if (i != nameList.len - 1) json += ",";
|
||||
jsonSize += json.length();
|
||||
}
|
||||
jsonSize += 2; //]}
|
||||
|
||||
|
||||
sendHeader(200, "text/json", jsonSize);
|
||||
sendToBuffer(json);
|
||||
|
||||
for(int i=0;i<nameList.len;i++){
|
||||
|
||||
for (int i = 0; i < nameList.len; i++) {
|
||||
json = "";
|
||||
json += "{";
|
||||
json += "\"n\":\""+nameList.getName(i)+"\",";
|
||||
json += "\"m\":\""+nameList.getMac(i).toString()+"\",";
|
||||
json += "\"v\":\""+data_getVendor(nameList.getMac(i)._get(0), nameList.getMac(i)._get(1), nameList.getMac(i)._get(2))+"\"";
|
||||
json += "\"n\":\"" + nameList.getName(i) + "\",";
|
||||
json += "\"m\":\"" + nameList.getMac(i).toString() + "\",";
|
||||
json += "\"v\":\"" + data_getVendor(nameList.getMac(i)._get(0), nameList.getMac(i)._get(1), nameList.getMac(i)._get(2)) + "\"";
|
||||
json += "}";
|
||||
if(i!=nameList.len-1) json += ",";
|
||||
if (i != nameList.len - 1) json += ",";
|
||||
sendToBuffer(json);
|
||||
}
|
||||
sendToBuffer("]}");
|
||||
|
||||
|
||||
sendBuffer();
|
||||
|
||||
if(debug){
|
||||
|
||||
if (debug) {
|
||||
Serial.println(json);
|
||||
Serial.println("done");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user