gitea-mirror/esp8266_deauther
1
0
Fork 0
mirror of https://github.com/SpacehuhnTech/esp8266_deauther.git synced 2025-12-20 22:34:23 -08:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes for settings json

Browse Source
This commit is contained in:
Stefan Kremser
2019-05-28 21:44:24 +02:00
parent fba18d7c66
commit 2f4836b3c8
3 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
esp8266_deauther/CLI.cpp
View File

@@ -625,10 +625,10 @@ void CLI::runCommand(String input) {
// else if (eqlsCMD(1, CLI_SETTING)) load ? settings.load(list->get(2)) : settings.save(true, list->get(2)); // else if (eqlsCMD(1, CLI_SETTING)) load ? settings.load(list->get(2)) : settings.save(true, list->get(2));
else parameterError(list->get(1)); else parameterError(list->get(1));
} else { } else {
if (eqlsCMD(1, CLI_SSID)) load ? ssids.load() : ssids.save(false); if (eqlsCMD(1, CLI_SSID)) load ? ssids.load() : ssids.save(true);
else if (eqlsCMD(1, CLI_NAME)) load ? names.load() : names.save(false); else if (eqlsCMD(1, CLI_NAME)) load ? names.load() : names.save(true);
else if (eqlsCMD(1, CLI_SETTING)) load ? settings.load() : settings.save(false); else if (eqlsCMD(1, CLI_SETTING)) load ? settings.load() : settings.save(true);
else if ((eqlsCMD(1, CLI_SCAN) || eqlsCMD(1, CLI_AP) || eqlsCMD(1, CLI_STATION)) && !load) scan.save(false); else if ((eqlsCMD(1, CLI_SCAN) || eqlsCMD(1, CLI_AP) || eqlsCMD(1, CLI_STATION)) && !load) scan.save(true);
else parameterError(list->get(1)); else parameterError(list->get(1));
} }
} }
@@ -727,7 +727,7 @@ void CLI::runCommand(String input) {
else { else {
prnt(_tmp); prnt(_tmp);
prntln(" settings not found"); prntln(" setting not found");
} }
} }

38
esp8266_deauther/Settings.cpp
View File

@@ -25,15 +25,15 @@ void jsonStr(String& str, const char* name, const char* value) {
str += ','; str += ',';
} }
/* void jsonFlag(String& str, const char* name, bool value) {
void jsonFlag(String& str, const char* name, bool value) {
str += '"'; str += '"';
str += String(name); str += String(name);
str += '"'; str += '"';
str += ':'; str += ':';
str += String(value ? S_JSON_TRUE : S_JSON_FALSE); str += value ? String(S_JSON_TRUE) : String(S_JSON_FALSE);
str += ','; str += ',';
}*/ }
void jsonValue(String& str, const char* name, int value) { void jsonValue(String& str, const char* name, int value) {
str += '"'; str += '"';
str += String(name); str += String(name);
@@ -49,12 +49,15 @@ void jsonHex(String& str, const char* name, uint8_t* byteArr, int len) {
str += '"'; str += '"';
str += ':'; str += ':';
str += '"';
for (int i = 0; i<len; i++) { for (int i = 0; i<len; i++) {
if (i > 0) str += ':'; if (i > 0) str += ':';
if (byteArr[i] < 0x10) str += '0'; if (byteArr[i] < 0x10) str += '0';
str += String(byteArr[i], HEX); str += String(byteArr[i], HEX);
} }
str += '"';
str += ','; str += ',';
} }
@@ -64,11 +67,14 @@ void jsonDec(String& str, const char* name, uint8_t* byteArr, int len) {
str += '"'; str += '"';
str += ':'; str += ':';
str += '"';
for (int i = 0; i<len; i++) { for (int i = 0; i<len; i++) {
if (i > 0) str += '.'; if (i > 0) str += '.';
str += String(byteArr[i]); str += String(byteArr[i]);
} }
str += '"';
str += ','; str += ',';
} }
@@ -91,16 +97,16 @@ String Settings::getJsonStr() {
jsonStr(str, S_JSON_VERSION, DEAUTHER_VERSION); jsonStr(str, S_JSON_VERSION, DEAUTHER_VERSION);
// Autosave // Autosave
/*jsonFlag*/ jsonValue(str, S_JSON_AUTOSAVE, data.autosave.enabled); jsonFlag(str, S_JSON_AUTOSAVE, data.autosave.enabled);
jsonValue(str, S_JSON_AUTOSAVETIME, data.autosave.time); jsonValue(str, S_JSON_AUTOSAVETIME, data.autosave.time);
// Attack // Attack
/*jsonFlag*/ jsonValue(str, S_JSON_BEACONCHANNEL, data.attack.attack_all_ch); jsonFlag(str, S_JSON_BEACONCHANNEL, data.attack.attack_all_ch);
/*jsonFlag*/ jsonValue(str, S_JSON_RANDOMTX, data.attack.random_tx); jsonFlag(str, S_JSON_RANDOMTX, data.attack.random_tx);
jsonValue(str, S_JSON_ATTACKTIMEOUT, data.attack.timeout); jsonValue(str, S_JSON_ATTACKTIMEOUT, data.attack.timeout);
jsonValue(str, S_JSON_DEAUTHSPERTARGET, data.attack.deauths_per_target); jsonValue(str, S_JSON_DEAUTHSPERTARGET, data.attack.deauths_per_target);
jsonValue(str, S_JSON_DEAUTHREASON, data.attack.deauth_reason); jsonValue(str, S_JSON_DEAUTHREASON, data.attack.deauth_reason);
/*jsonFlag*/ jsonValue(str, S_JSON_BEACONINTERVAL, data.attack.beacon_interval == INTERVAL_1S); jsonFlag(str, S_JSON_BEACONINTERVAL, data.attack.beacon_interval == INTERVAL_1S);
jsonValue(str, S_JSON_PROBESPERSSID, data.attack.probe_frames_per_ssid); jsonValue(str, S_JSON_PROBESPERSSID, data.attack.probe_frames_per_ssid);
// WiFi // WiFi
@@ -115,24 +121,24 @@ String Settings::getJsonStr() {
// Access Point // Access Point
jsonStr(str, S_JSON_SSID, data.ap.ssid); jsonStr(str, S_JSON_SSID, data.ap.ssid);
jsonStr(str, S_JSON_PASSWORD, data.ap.password); jsonStr(str, S_JSON_PASSWORD, data.ap.password);
/*jsonFlag*/ jsonValue(str, S_JSON_HIDDEN, data.ap.hidden); jsonFlag(str, S_JSON_HIDDEN, data.ap.hidden);
jsonDec(str, S_JSON_IP, data.ap.ip, 4); jsonDec(str, S_JSON_IP, data.ap.ip, 4);
// Web Interface // Web Interface
/*jsonFlag*/ jsonValue(str, S_JSON_WEBINTERFACE, data.web.enabled); jsonFlag(str, S_JSON_WEBINTERFACE, data.web.enabled);
/*jsonFlag*/ jsonValue(str, S_JSON_CAPTIVEPORTAL, data.web.captive_portal); jsonFlag(str, S_JSON_CAPTIVEPORTAL, data.web.captive_portal);
/*jsonFlag*/ jsonValue(str, S_JSON_WEB_SPIFFS, data.web.use_spiffs); jsonFlag(str, S_JSON_WEB_SPIFFS, data.web.use_spiffs);
jsonStr(str, S_JSON_LANG, data.web.lang); jsonStr(str, S_JSON_LANG, data.web.lang);
// CLI // CLI
/*jsonFlag*/ jsonValue(str, S_JSON_SERIALINTERFACE, data.cli.enabled); jsonFlag(str, S_JSON_SERIALINTERFACE, data.cli.enabled);
/*jsonFlag*/ jsonValue(str, S_JSON_SERIAL_ECHO, data.cli.serial_echo); jsonFlag(str, S_JSON_SERIAL_ECHO, data.cli.serial_echo);
// LED // LED
/*jsonFlag*/ jsonValue(str, S_JSON_LEDENABLED, data.led.enabled); jsonFlag(str, S_JSON_LEDENABLED, data.led.enabled);
// Display // Display
/*jsonFlag*/ jsonValue(str, S_JSON_DISPLAYINTERFACE, data.display.enabled); jsonFlag(str, S_JSON_DISPLAYINTERFACE, data.display.enabled);
jsonValue(str, S_JSON_DISPLAY_TIMEOUT, data.display.timeout); jsonValue(str, S_JSON_DISPLAY_TIMEOUT, data.display.timeout);
str[str.length()-1] = '}'; str[str.length()-1] = '}';

2
esp8266_deauther/Settings.h
View File

@@ -31,7 +31,7 @@ const char S_CHANGED_SETTING[] PROGMEM = "Changed setting ";
// ===== JSON Strings ====== // // ===== JSON Strings ====== //
// General // General
const char S_JSON_TRUE[] PROGMEM = "true"; const char S_JSON_TRUE[] PROGMEM = "true";
const char S_JSON_FALSE[] PROGMEM = "true"; const char S_JSON_FALSE[] PROGMEM = "false";
// Version // Version
const char S_JSON_VERSION[] PROGMEM = "version"; const char S_JSON_VERSION[] PROGMEM = "version";