gitea-mirror/ESP32Marauder
1
0
Fork 0
mirror of https://github.com/justcallmekoko/ESP32Marauder.git synced 2025-12-05 20:40:25 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #244 from tcpassos/develop

Browse Source 
Allowed to enter custom SSIDs with spaces in the name as long as they are enclosed in quotes
This commit is contained in:
Just Call Me Koko
2023-04-09 14:47:20 -04:00
committed by GitHub
parent 785545c185 7a6a880cb9
commit 07d5e8787e
3 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
esp32_marauder/CommandLine.cpp
View File

@@ -36,20 +36,23 @@ void CommandLine::main(uint32_t currentTime) {
LinkedList<String> CommandLine::parseCommand(String input, char* delim) {
LinkedList<String> cmd_args;
if (input != "") {
char fancy[input.length() + 1] = {};
input.toCharArray(fancy, input.length() + 1);
char* ptr = strtok(fancy, delim);
while (ptr != NULL) {
cmd_args.add(String(ptr));
ptr = strtok(NULL, delim);
bool inQuote = false;
String buffer = "";
for (int i = 0; i < input.length(); i++) {
char c = input.charAt(i);
// Do not break parameters that are enclosed in quotes
if (c == '"') {
inQuote = !inQuote;
} else if (!inQuote && strchr(delim, c) != NULL) {
cmd_args.add(buffer);
buffer = "";
} else {
buffer += c;
}
}
cmd_args.add(buffer);
return cmd_args;
}

18
esp32_marauder/WiFiScan.cpp
View File

@@ -176,7 +176,7 @@ int WiFiScan::clearSSIDs() {
}
bool WiFiScan::addSSID(String essid) {
ssid s = {essid, {random(256), random(256), random(256), random(256), random(256), random(256)}, false};
ssid s = {essid, random(1, 12), {random(256), random(256), random(256), random(256), random(256), random(256)}, false};
ssids->add(s);
Serial.println(ssids->get(ssids->size() - 1).essid);
@@ -191,7 +191,7 @@ int WiFiScan::generateSSIDs(int count) {
for (uint8_t i = 0; i < 6; i++)
essid.concat(alfa[random(65)]);
ssid s = {essid, {random(256), random(256), random(256), random(256), random(256), random(256)}, false};
ssid s = {essid, random(1, 12), {random(256), random(256), random(256), random(256), random(256), random(256)}, false};
ssids->add(s);
Serial.println(ssids->get(ssids->size() - 1).essid);
}
@@ -2437,7 +2437,7 @@ void WiFiScan::broadcastCustomBeacon(uint32_t current_time, AccessPoint custom_s
}
void WiFiScan::broadcastCustomBeacon(uint32_t current_time, ssid custom_ssid) {
set_channel = random(1,12);
set_channel = custom_ssid.channel;
esp_wifi_set_channel(set_channel, WIFI_SECOND_CHAN_NONE);
delay(1);
@@ -3623,12 +3623,12 @@ void WiFiScan::main(uint32_t currentTime)
// which makes beacon spam less effective
for (int i = 0; i < access_points->size(); i++) {
if (access_points->get(i).selected)
this->broadcastCustomBeacon(currentTime, ssid{access_points->get(i).essid, {random(256),
random(256),
random(256),
random(256),
random(256),
random(256)}});
this->broadcastCustomBeacon(currentTime, ssid{access_points->get(i).essid, random(1, 12), {random(256),
random(256),
random(256),
random(256),
random(256),
random(256)}});
}

1
esp32_marauder/WiFiScan.h
View File

@@ -88,6 +88,7 @@ esp_err_t esp_wifi_80211_tx(wifi_interface_t ifx, const void *buffer, int len, b
struct ssid {
String essid;
int channel;
int bssid[6];
bool selected;
};