refactor: clean up unused variables and improve code readability across multiple files

Author: Darcko123

firmware/components/cmd_wifi/cmd_wifi.c

@@ -35,10 +35,6 @@ static const char* TAG = "cmd_wifi";
 // static EventGroupHandle_t wifi_event_group;
 // const int CONNECTED_BIT = BIT0;
 // static app_callback callback_connection;
-static bool disconnect_cb = false;
-static int reconnections = 0;
-static int connect(int argc, char** argv);
-static bool wifi_join(const char* ssid, const char* pass, int timeout_ms);
 static void cmd_wifi_handle_credentials(const char* ssid, const char* pass);
 static int cmd_wifi_show_aps(int argc, char** argv);
 
@@ -169,31 +165,6 @@ static int cmd_wifi_show_aps(int argc, char** argv) {
   return 0;
 }
 
-static int connect(int argc, char** argv) {
-  int nerrors = arg_parse(argc, argv, (void**) &join_args);
-  if (nerrors != 0) {
-    arg_print_errors(stderr, join_args.end, argv[0]);
-    return 1;
-  }
-  ESP_LOGI(__func__, "Connecting to '%s'", join_args.ssid->sval[0]);
-
-  /* set default value*/
-  if (join_args.timeout->count == 0) {
-    join_args.timeout->ival[0] = JOIN_TIMEOUT_MS;
-  }
-  printf("timeout: %d\n", join_args.timeout->ival[0]);
-  printf("ssid: %s\n", join_args.ssid->sval[0]);
-  bool connected =
-      wifi_join(join_args.ssid->sval[0], join_args.password->sval[0],
-                join_args.timeout->ival[0]);
-  if (!connected) {
-    ESP_LOGW(__func__, "Connection timed out");
-    return 1;
-  }
-  ESP_LOGI(__func__, "Connected");
-  return 0;
-}
-
 void register_wifi(void) {
 #if !defined(CONFIG_CMD_WIFI_DEBUG)
   esp_log_level_set(TAG, ESP_LOG_NONE);

firmware/components/wifi_controller/wifi_controller.c

@@ -8,7 +8,6 @@ static volatile bool netif_default_created = false;
 static bool run_once = false;
 static uint8_t default_ap_mac[6];
 static esp_err_t err;
-static wifi_config_t wifi_manager_config;
 
 wifi_config_t wifi_driver_access_point_begin() {
   // #if !defined(CONFIG_WIFI_CONTROLLER_DEBUG)
@@ -129,6 +128,9 @@ void wifi_driver_init_sta(void) {
 }
 
 void wifi_driver_init_null(void) {
+  if (wifi_driver_initialized) {
+    wifi_driver_deinit();
+  }
   esp_err_t err = esp_event_loop_create_default();
   if (err == ESP_ERR_INVALID_STATE) {
     ESP_LOGI(TAG_WIFI_DRIVER, "Event loop already created");

firmware/components/wifi_sniffer/cmd_pcap.c

@@ -7,7 +7,9 @@
 */
 #include <stdlib.h>
 #include <string.h>
+#include <dirent.h>
 #include "argtable3/argtable3.h"
+#include "esp_spiffs.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/queue.h"
 #include "freertos/semphr.h"
@@ -38,6 +40,9 @@ static const char* TAG = "cmd_pcap";
 #define TRACE_TIMER_FLUSH_INT_MS            (1000)
 #define PCAP_FLUSH_INTERVAL_PACKETS \
   (100)  // Flush file every N packets to prevent buffer overflow
+// Minimum free bytes required in internal flash before starting a new capture.
+// Shared logic with cmd_sniffer.c — keep in sync if changed there.
+#define PCAP_FLASH_MIN_FREE_BYTES (51200)
 
 #define ANALIZER_SD_CARD    "/sdcard"
 #define ANALIZER_FLASH_FS   "/internal"
@@ -100,6 +105,56 @@ static void create_pcaps_dir() {
   }
 }
 
+/**
+ * @brief Remove all analizer*.pcap files from the internal SPIFFS partition.
+ *
+ * The analyzer accumulates one .pcap file per session and never deletes old
+ * ones.  On a 512 KB partition this quickly exhausts all available space.
+ * We only ever need the most-recent capture, so we wipe the stale files
+ * before opening a new session.
+ */
+static void cleanup_internal_pcap_files(void) {
+  DIR* dir = opendir(ANALIZER_FLASH_FS);
+  if (!dir) {
+    return;
+  }
+  struct dirent* entry;
+  char filepath[280];
+  while ((entry = readdir(dir)) != NULL) {
+    // Match any file that starts with "analizer" and ends with ".pcap"
+    const char* name = entry->d_name;
+    size_t len = strlen(name);
+    if (len > 5 &&
+        strncmp(name, "analizer", 8) == 0 &&
+        strcmp(name + len - 5, ".pcap") == 0) {
+      snprintf(filepath, sizeof(filepath), "%s/%s", ANALIZER_FLASH_FS, name);
+      ESP_LOGI(TAG, "Removing stale pcap: %s", filepath);
+      remove(filepath);
+    }
+  }
+  closedir(dir);
+}
+
+/**
+ * @brief Return ESP_ERR_NO_MEM if the internal partition has less than the
+ *        minimum free bytes required to start a new capture session.
+ */
+static esp_err_t check_internal_free_space(void) {
+  size_t total = 0, used = 0;
+  esp_err_t ret = esp_spiffs_info("internal", &total, &used);
+  if (ret != ESP_OK) {
+    // Cannot determine free space — optimistically continue
+    return ESP_OK;
+  }
+  size_t free_bytes = (used < total) ? (total - used) : 0;
+  if (free_bytes < PCAP_FLASH_MIN_FREE_BYTES) {
+    ESP_LOGW(TAG, "Not enough internal space: %zu free / %zu total (need %d)",
+             free_bytes, total, PCAP_FLASH_MIN_FREE_BYTES);
+    return ESP_ERR_NO_MEM;
+  }
+  return ESP_OK;
+}
+
 void wifi_sniffer_register_summary_cb(summary_cb_t cb) {
   summary_cb = cb;
 }
@@ -162,8 +217,16 @@ static esp_err_t pcap_open(pcap_cmd_runtime_t* pcap) {
     fp = fopen(pcap->filename, "wb+");
   } else if (wifi_sniffer_is_destination_internal()) {
     flash_fs_mount();
-    files_ops_incremental_name(ANALIZER_FLASH_FS, "analizer", ".pcap",
-                               pcap->filename);
+    // Remove leftover .pcap files from previous sessions to reclaim space,
+    // then verify there is enough room before attempting to create the file.
+    cleanup_internal_pcap_files();
+    esp_err_t space_ret = check_internal_free_space();
+    if (space_ret != ESP_OK) {
+      return space_ret;  // ESP_ERR_NO_MEM → triggers out_of_mem_cb correctly
+    }
+    // Always overwrite the same filename so we never accumulate old captures.
+    snprintf(pcap->filename, PCAP_FILE_NAME_MAX_LEN, "%s/analizer00.pcap",
+             ANALIZER_FLASH_FS);
     fp = fopen(pcap->filename, "wb+");
   } else {
     ESP_LOGE(TAG, "pcap file destination hasn't specified");
@@ -185,6 +248,12 @@ static esp_err_t pcap_open(pcap_cmd_runtime_t* pcap) {
   if (fp) {
     fclose(fp);
   }
+  // If the file could not be opened and we don't already have a specific error
+  // code, promote ESP_FAIL to ESP_ERR_NO_MEM so the caller's out_of_mem_cb
+  // fires correctly (ESP_FAIL would be silently ignored after our earlier fix).
+  if (ret == ESP_FAIL) {
+    ret = ESP_ERR_NO_MEM;
+  }
   return ret;
 }
 

firmware/components/wifi_sniffer/cmd_sniffer.c

@@ -363,7 +363,6 @@ static void sniffer_task(void* parameters) {
 static esp_err_t sniffer_stop(sniffer_runtime_t* sniffer) {
   sniffer->sniffed_packets = 0;
   if (sniffer_animation_stop_cb) {
-    printf("sniffer_animation_stop_cb\n");
     sniffer_animation_stop_cb();
   }
   esp_err_t ret = ESP_OK;
@@ -385,38 +384,30 @@ static esp_err_t sniffer_stop(sniffer_runtime_t* sniffer) {
       break;
   }
   ESP_LOGI(TAG, "stop promiscuous ok");
-  printf("sniffer->packets_to_sniff\n");
 
   /* stop sniffer local task */
   sniffer->is_running = false;
   /* wait for task over */
   if (sniffer->packets_to_sniff != 0) {
-    printf("sniffer->packets_to_sniff: %ld \n", sniffer->packets_to_sniff);
     xSemaphoreTake(sniffer->sem_task_over, portMAX_DELAY);
   }
-  printf("sniffer->xSemaphoreTake\n");
 
   vSemaphoreDelete(sniffer->sem_task_over);
-  printf("sniffer->vSemaphoreDelete\n");
   sniffer->sem_task_over = NULL;
   /* make sure to free all resources in the left items */
   UBaseType_t left_items = uxQueueMessagesWaiting(sniffer->work_queue);
-  printf("sniffer->uxQueueMessagesWaiting\n");
 
   sniffer_packet_info_t packet_info;
   while (left_items--) {
     xQueueReceive(sniffer->work_queue, &packet_info,
                   pdMS_TO_TICKS(SNIFFER_PROCESS_PACKET_TIMEOUT_MS));
     free(packet_info.payload);
   }
-  printf("sniffer->packet_info\n");
   vQueueDelete(sniffer->work_queue);
-  printf("sniffer->vQueueDelete\n");
   sniffer->work_queue = NULL;
 
   /* stop pcap session */
   sniff_packet_stop();
-  printf("sniffer->sniff_packet_stop\n");
 err:
   return ret;
 }
@@ -492,7 +483,12 @@ static esp_err_t sniffer_start(sniffer_runtime_t* sniffer) {
 err_queue:
   sniffer->is_running = false;
 err:
-  out_of_mem_cb();
+  // Only trigger the OOM handler for genuine out-of-memory failures.
+  // Calling it for ESP_ERR_INVALID_STATE or other errors would corrupt
+  // the sniffer state by calling sniffer_stop() on a half-initialized runtime.
+  if (out_of_mem_cb && ret == ESP_ERR_NO_MEM) {
+    out_of_mem_cb();
+  }
   return ret;
 }
 

firmware/main/apps/wifi/captive/captive_cmd.c

@@ -23,7 +23,7 @@ static int captivecmd_change_name(int argc, char** argv) {
     return 1;
   }
 
-  captive_module_change_ap_name(captivecmd_ap_name_args.name->sval[0]);
+  captive_module_change_ap_name((char*) captivecmd_ap_name_args.name->sval[0]);
 
   return 0;
 }

firmware/main/apps/wifi/deauth/deauth_module.c

@@ -48,8 +48,6 @@ static TaskHandle_t scanning_task_handle = NULL;
 
 static void scanning_task();
 static void deauth_run_scan_task();
-static void deauth_increment_item();
-static void deauth_decrement_item();
 static void deauth_handle_attacks();
 
 static void scanning_task() {

firmware/main/apps/wifi/deauth_detector/scenes/detector_scenes.c

@@ -50,7 +50,7 @@ void detector_scenes_show_table(uint16_t* deauth_packets_count_list) {
 }
 
 //////////////////////////   Main Menu   //////////////////////////
-static enum { RUN_OPTION, SETTINGS_OPTION, HELP_OPTION } main_menu_options_e;
+typedef enum { RUN_OPTION, SETTINGS_OPTION, HELP_OPTION } main_menu_options_e;
 static const char* main_menu_options[] = {"Run", "Settings", "Help"};
 static void main_menu_handler(uint8_t selection) {
   switch (selection) {
@@ -83,7 +83,7 @@ void detector_scenes_main_menu() {
 }
 
 //////////////////////////   Settings Menu   //////////////////////////
-static enum { CHANNEL_HOP_OPTION, CHANNEL_OPTION } settings_options_e;
+typedef enum { CHANNEL_HOP_OPTION, CHANNEL_OPTION } settings_options_e;
 static char* settings_options[] = {"Channel hop", "Channel"};
 static void settings_handler(uint8_t scan_mode) {
   switch (scan_mode) {
@@ -155,8 +155,8 @@ static void help_exit() {
 void detector_scenes_help() {
   general_scrolling_text_ctx help;
   memset(&help, 0, sizeof(help));
-  help.banner = "< Back";
-  help.text = help_text;
+  help.banner = (char*) "< Back";
+  help.text = (char*) help_text;
   help.scroll_type = GENERAL_SCROLLING_TEXT_CLAMPED;
   help.window_type = GENERAL_SCROLLING_TEXT_WINDOW;
   help.exit_cb = help_exit;

firmware/main/apps/wifi/modbus_tcp/modbus_dos/cmd/modbus_dos_cmd.c

@@ -41,7 +41,7 @@ static int set_ssid(int argc, char** argv) {
     return 1;
   }
 
-  modbus_dos_prefs_set_ssid(mb_dos_ssid_args.ssid->sval[0]);
+  modbus_dos_prefs_set_ssid((char*) mb_dos_ssid_args.ssid->sval[0]);
   return 0;
 }
 
@@ -52,7 +52,7 @@ static int set_pass(int argc, char** argv) {
     return 1;
   }
 
-  modbus_dos_prefs_set_pass(mb_dos_pass_args.pass->sval[0]);
+  modbus_dos_prefs_set_pass((char*) mb_dos_pass_args.pass->sval[0]);
   return 0;
 }
 
@@ -63,7 +63,7 @@ static int set_ip(int argc, char** argv) {
     return 1;
   }
 
-  modbus_dos_prefs_set_ip(mb_dos_ip_args.ip->sval[0]);
+  modbus_dos_prefs_set_ip((char*) mb_dos_ip_args.ip->sval[0]);
   return 0;
 }
 

firmware/main/apps/wifi/modbus_tcp/modbus_dos/modbus_dos.c

@@ -188,7 +188,7 @@ void reading_task() {
   // while (is_running) {
   skt = modbus_tcp_connect(port, ip);
   if (skt >= 0) {
-    modbus_tcp_request(skt, request, sizeof(request));
+    modbus_tcp_request(skt, (uint8_t*) request, sizeof(request));
     //   vTaskDelay(500);
   }
   close(skt);

firmware/main/apps/wifi/modbus_tcp/modbus_dos/scenes/modbus_dos_scenes.c

@@ -89,8 +89,8 @@ static const char* settings_options[] = {"SSID", "Password", "Server IP",
 
 static void show_cmds_help(const char* head, const char* body) {
   general_notification_ctx_t notification = {0};
-  notification.head = head;
-  notification.body = body;
+  notification.head = (char*) head;
+  notification.body = (char*) body;
   notification.on_exit = modbus_dos_scenes_settings;
 
   general_notification_handler(notification);
@@ -137,7 +137,7 @@ static const char* help_txt[] = {"You must set",   "the server",
 
 void modbus_dos_scenes_help() {
   general_scrolling_text_ctx help = {0};
-  help.banner = "Modbus DOS Help";
+  help.banner = (char*) "Modbus DOS Help";
   help.text_arr = help_txt;
   help.text_len = sizeof(help_txt) / sizeof(char*);
   help.window_type = GENERAL_SCROLLING_TEXT_WINDOW;