Refactored wifi.h into module

Author: Spacehuhn

esp8266_deauther/CLI.cpp

@@ -2,6 +2,7 @@
 
 #include <LittleFS.h>
 #include "settings.h"
+#include "wifi.h"
 
 /*
    Shitty code used less resources so I will keep this clusterfuck as it is,
@@ -869,7 +870,7 @@ void CLI::runCommand(String input) {
             prnt(int(f.size()));
             prntln(str(CLI_BYTES));
         }
-        printWifiStatus();
+        wifi::printStatus();
         prntln(CLI_SYSTEM_FOOTER);
     }
 
@@ -1093,7 +1094,7 @@ void CLI::runCommand(String input) {
             // ------- loop function ----- //
             currentTime = millis();
 
-            wifiUpdate();    // manage access point
+            wifi::update();    // manage access point
             scan.update();   // run scan
             attack.update(); // run attacks
             ssids.update();  // run random mode, if enabled
@@ -1217,12 +1218,12 @@ void CLI::runCommand(String input) {
             }
         }
 
-        startAP(path, ssid, password, ch, hidden, captivePortal);
+        wifi::startNewAP(path, ssid, password, ch, hidden, captivePortal);
     }
 
     // stopap
     else if (eqlsCMD(0, CLI_STOPAP)) {
-        stopAP();
+        wifi::stopAP();
     }
 
     // ===== SCREEN ===== //

esp8266_deauther/CLI.h

@@ -41,9 +41,6 @@ extern bool appendFile(String path, String& buf);
 extern bool removeLines(String path, int lineFrom, int lineTo);
 extern bool replaceLine(String path, int line, String& buf);
 extern bool equalsKeyword(const char* str, const char* keyword);
-extern void printWifiStatus();
-extern void startAP(String path, String ssid, String password, uint8_t ch, bool hidden, bool captivePortal);
-extern void wifiUpdate();
 
 class CLI {
     public:

esp8266_deauther/Scan.cpp

@@ -1,6 +1,7 @@
 #include "Scan.h"
 
 #include "settings.h"
+#include "wifi.h"
 
 Scan::Scan() {
     list = new SimpleList<uint16_t>;
@@ -104,7 +105,7 @@ void Scan::start(uint8_t mode, uint32_t time, uint8_t nextmode, uint32_t continu
         prntln();
 
         // enable sniffer
-        stopAP();
+        wifi::stopAP();
         wifi_promiscuous_enable(true);
     }
 
@@ -120,15 +121,15 @@ void Scan::start(uint8_t mode, uint32_t time, uint8_t nextmode, uint32_t continu
         prntln(channelHop ? str(SC_ONE_TO) + (String)14 : (String)wifi_channel);
 
         // enable sniffer
-        stopAP();
+        wifi::stopAP();
         wifi_promiscuous_enable(true);
     }
 
     /* Stop scan */
     else if (mode == SCAN_MODE_OFF) {
         wifi_promiscuous_enable(false);
 
-        if (settings::getWebSettings().enabled) resumeAP();
+        if (settings::getWebSettings().enabled) wifi::resumeAP();
         prntln(SC_STOPPED);
         save(true);
 

esp8266_deauther/Scan.h

@@ -29,8 +29,6 @@ extern void setWifiChannel(uint8_t ch);
 extern bool appendFile(String path, String& buf);
 extern bool writeFile(String path, String& buf);
 extern void readFileToSerial(const String path);
-extern void resumeAP();
-extern void stopAP();
 extern String escape(String str);
 
 class Scan {

esp8266_deauther/esp8266_deauther.ino

@@ -33,7 +33,6 @@ extern "C" {
 #include "CLI.h"
 #include "DisplayUI.h"
 #include "A_config.h"
-#include "webfiles.h"
 
 #include "LED.h"
 
@@ -108,13 +107,7 @@ void setup() {
     settings::save();
     #endif // ifndef RESET_SETTINGS
 
-    // set mac address
-    wifi_set_macaddr(STATION_IF, (uint8_t*)settings::getWifiSettings().mac_st);
-    wifi_set_macaddr(SOFTAP_IF, (uint8_t*)settings::getWifiSettings().mac_ap);
-
-    // start WiFi
-    WiFi.mode(WIFI_OFF);
-    wifi_set_opmode(STATION_MODE);
+    wifi::begin();
     wifi_set_promiscuous_rx_cb([](uint8_t* buf, uint16_t len) {
         scan.sniffer(buf, len);
     });
@@ -126,7 +119,7 @@ void setup() {
     }
 
     // copy web files to SPIFFS
-    copyWebFiles(false);
+    //copyWebFiles(false);
 
     // load everything else
     names.load();
@@ -139,9 +132,6 @@ void setup() {
     // set channel
     setWifiChannel(settings::getWifiSettings().channel);
 
-    // load Wifi settings: SSID, password,...
-    loadWifiConfigDefaults();
-
     // dis/enable serial command interface
     if (settings::getCLISettings().enabled) {
         cli.enable();
@@ -152,7 +142,7 @@ void setup() {
     }
 
     // start access point/web interface
-    if (settings::getWebSettings().enabled) startAP();
+    if (settings::getWebSettings().enabled) wifi::startAP();
 
     // STARTED
     prntln(SETUP_STARTED);
@@ -168,7 +158,7 @@ void loop() {
     currentTime = millis();
 
     led.update();    // update LED color
-    wifiUpdate();    // manage access point
+    wifi::update();    // manage access point
     attack.update(); // run attacks
     displayUI.update();
     cli.update();    // read and run serial input

esp8266_deauther/language.h

@@ -541,6 +541,36 @@ const char W_BAD_ARGS[] PROGMEM = "BAD ARGS";
 const char W_BAD_PATH[] PROGMEM = "BAD PATH";
 const char W_FILE_NOT_FOUND[] PROGMEM = "ERROR 404 File Not Found";
 const char W_STARTED_AP[] PROGMEM = "Started AP";
+const char W_WEBINTERFACE[] PROGMEM = "/web";  // default folder containing the web files
+const char W_DEFAULT_LANG[] PROGMEM = "/lang/default.lang";
+
+const char W_HTML[] PROGMEM = "text/html";
+const char W_CSS[] PROGMEM = "text/css";
+const char W_JS[] PROGMEM = "application/javascript";
+const char W_PNG[] PROGMEM = "image/png";
+const char W_GIF[] PROGMEM = "image/gif";
+const char W_JPG[] PROGMEM = "image/jpeg";
+const char W_ICON[] PROGMEM = "image/x-icon";
+const char W_XML[] PROGMEM = "text/xml";
+const char W_XPDF[] PROGMEM = "application/x-pdf";
+const char W_XZIP[] PROGMEM = "application/x-zip";
+const char W_GZIP[] PROGMEM = "application/x-gzip";
+const char W_JSON[] PROGMEM = "application/json";
+const char W_TXT[] PROGMEM = "text/plain";
+
+const char W_DOT_HTM[] PROGMEM = ".htm";
+const char W_DOT_HTML[] PROGMEM = ".html";
+const char W_DOT_CSS[] PROGMEM = ".css";
+const char W_DOT_JS[] PROGMEM = ".js";
+const char W_DOT_PNG[] PROGMEM = ".png";
+const char W_DOT_GIF[] PROGMEM = ".gif";
+const char W_DOT_JPG[] PROGMEM = ".jpg";
+const char W_DOT_ICON[] PROGMEM = ".ico";
+const char W_DOT_XML[] PROGMEM = ".xml";
+const char W_DOT_PDF[] PROGMEM = ".pdf";
+const char W_DOT_ZIP[] PROGMEM = ".zip";
+const char W_DOT_GZIP[] PROGMEM = ".gz";
+const char W_DOT_JSON[] PROGMEM = ".json";
 
 // ===== SETTINGS ====== //
 // Version