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

SimpleList for SSIDs

Browse Source
This commit is contained in:
Stefan Kremser
2018-04-01 12:21:54 +02:00
parent df0a6d50cf
commit 123c19e640
2 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
esp8266_deauther/SSIDs.cpp
View File

@@ -1,7 +1,7 @@
#include "SSIDs.h" #include "SSIDs.h"
SSIDs::SSIDs() { SSIDs::SSIDs() {
list = new LinkedList<SSID>; list = new SimpleList<SSID>;
} }
void SSIDs::load() { void SSIDs::load() {
@@ -49,15 +49,15 @@ void SSIDs::save(bool force) {
buf = String(); // clear buffer buf = String(); // clear buffer
String name; String name;
int size = list->size(); int c = count();
for (int i = 0; i < size; i++) { for (int i = 0; i < c; i++) {
name = escape(getName(i)); name = escape(getName(i));
buf += String(OPEN_BRACKET) + String(DOUBLEQUOTES) + name + String(DOUBLEQUOTES) + String(COMMA); // ["name", buf += String(OPEN_BRACKET) + String(DOUBLEQUOTES) + name + String(DOUBLEQUOTES) + String(COMMA); // ["name",
buf += b2s(getWPA2(i)) + String(COMMA); // false, buf += b2s(getWPA2(i)) + String(COMMA); // false,
buf += String(getLen(i)) + String(CLOSE_BRACKET); // 12] buf += String(getLen(i)) + String(CLOSE_BRACKET); // 12]
if(i<size-1) buf += COMMA; // , if(i < c-1) buf += COMMA; // ,
if(buf.length() >= 1024){ if(buf.length() >= 1024){
if (!appendFile(FILE_PATH, buf)) { if (!appendFile(FILE_PATH, buf)) {
@@ -98,7 +98,8 @@ void SSIDs::update() {
for (int i = 0; i < SSID_LIST_SIZE; i++) { for (int i = 0; i < SSID_LIST_SIZE; i++) {
SSID newSSID; SSID newSSID;
if (check(i)) newSSID = list->get(i); if (check(i))
newSSID = list->get(i);
newSSID.name = String(); newSSID.name = String();
newSSID.len = 32; newSSID.len = 32;
@@ -107,8 +108,10 @@ void SSIDs::update() {
newSSID.wpa2 = random(0, 2); newSSID.wpa2 = random(0, 2);
if (check(i)) list->set(i, newSSID); if (check(i))
else list->add(newSSID); list->replace(i, newSSID);
else
list->add(newSSID);
} }
randomTime = currentTime; randomTime = currentTime;
@@ -132,7 +135,7 @@ int SSIDs::getLen(int num){
void SSIDs::setWPA2(int num, bool wpa2) { void SSIDs::setWPA2(int num, bool wpa2) {
SSID newSSID = list->get(num); SSID newSSID = list->get(num);
newSSID.wpa2 = wpa2; newSSID.wpa2 = wpa2;
list->set(num, newSSID); list->replace(num, newSSID);
} }
String SSIDs::getEncStr(int num) { String SSIDs::getEncStr(int num) {
@@ -215,8 +218,13 @@ void SSIDs::replace(int num, String name, bool wpa2){
if(!check(num)) return; if(!check(num)) return;
int len = name.length(); int len = name.length();
if(len > 32) len = 32; if(len > 32)
list->set(num,SSID{randomize(name),wpa2,(uint8_t)len}); len = 32;
SSID newSSID;
newSSID.name = randomize(name);
newSSID.wpa2 = wpa2;
newSSID.len = (uint8_t)len;
list->replace(num,newSSID);
prnt(SS_REPLACED); prnt(SS_REPLACED);
prntln(name); prntln(name);
@@ -243,11 +251,12 @@ void SSIDs::print(int num, bool header, bool footer) {
void SSIDs::printAll() { void SSIDs::printAll() {
prntln(SS_HEADER); prntln(SS_HEADER);
if (list->size() == 0) int c = count();
if (c == 0)
prntln(SS_ERROR_EMPTY); prntln(SS_ERROR_EMPTY);
else else
for (int i = 0; i < list->size(); i++) for (int i = 0; i < c; i++)
print(i, i == 0, i == list->size() - 1); print(i, i == 0, i == c - 1);
} }
int SSIDs::count() { int SSIDs::count() {
@@ -255,7 +264,7 @@ int SSIDs::count() {
} }
bool SSIDs::check(int num) { bool SSIDs::check(int num) {
return num >= 0 && num < list->size(); return num >= 0 && num < count();
} }
void SSIDs::enableRandom(uint32_t randomInterval) { void SSIDs::enableRandom(uint32_t randomInterval) {

4
esp8266_deauther/SSIDs.h
View File

@@ -4,7 +4,7 @@
#include "Arduino.h" #include "Arduino.h"
#include "FS.h" #include "FS.h"
#include <ArduinoJson.h> #include <ArduinoJson.h>
#include "LinkedList.h" #include "SimpleList.h"
#include "Settings.h" #include "Settings.h"
#include "language.h" #include "language.h"
#include "Accesspoints.h" #include "Accesspoints.h"
@@ -69,7 +69,7 @@ class SSIDs {
String FILE_PATH = "/ssids.json"; String FILE_PATH = "/ssids.json";
LinkedList<SSID>* list; SimpleList<SSID>* list;
bool check(int num); bool check(int num);
String randomize(String name); String randomize(String name);