Browse Source

Fixed allocation problem in beaconlist stage

tcpassos 2 years ago
parent
commit
6b7ddbd8ec
14 changed files with 29 additions and 29 deletions
  1. 6 6
      applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu.c
  2. 5 5
      applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_beaconlist.c
  3. 1 1
      applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_deauth.c
  4. 1 1
      applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_delay.c
  5. 1 1
      applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_exec.c
  6. 1 1
      applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_probe.c
  7. 3 3
      applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_scan.c
  8. 3 3
      applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_select.c
  9. 1 1
      applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_sniffbeacon.c
  10. 1 1
      applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_sniffdeauth.c
  11. 1 1
      applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_sniffesp.c
  12. 3 3
      applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_sniffpmkid.c
  13. 1 1
      applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_sniffpwn.c
  14. 1 1
      applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_sniffraw.c

+ 6 - 6
applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu.c

@@ -15,17 +15,17 @@ WifiMarauderScriptStageMenu* wifi_marauder_script_stage_menu_create(WifiMarauder
     return script_stage_menu;
 }
 
-void wifi_marauder_script_stage_menu_free(WifiMarauderScriptStageMenu* list) {
-    if (list == NULL) {
+void wifi_marauder_script_stage_menu_free(WifiMarauderScriptStageMenu* stage_menu) {
+    if (stage_menu == NULL) {
         return;
     }
-    for (uint32_t i = 0; i < list->num_items; i++) {
-        WifiMarauderScriptMenuItem* item = &(list->items[i]);
+    for (uint32_t i = 0; i < stage_menu->num_items; i++) {
+        WifiMarauderScriptMenuItem* item = &(stage_menu->items[i]);
         for (int j = 0; j < item->num_options; j++) {
             free(item->options[j]);
         }
         free(item->name);
     }
-    free(list->items);
-    free(list);
+    free(stage_menu->items);
+    free(stage_menu);
 }

+ 5 - 5
applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_beaconlist.c

@@ -36,24 +36,24 @@ void wifi_marauder_beaconlist_stage_timeout_select_callback(void* context) {
 }
 
 void wifi_marauder_script_stage_menu_beaconlist_load(WifiMarauderScriptStageMenu* stage_menu) {
-    stage_menu->num_items = 1;
-    stage_menu->items = malloc(1 * sizeof(WifiMarauderScriptMenuItem));
+    stage_menu->num_items = 3;
+    stage_menu->items = malloc(3 * sizeof(WifiMarauderScriptMenuItem));
 
     stage_menu->items[0] = (WifiMarauderScriptMenuItem) {
-        .name = "SSIDs",
+        .name = strdup("SSIDs"),
         .type = WifiMarauderScriptMenuItemTypeListString,
         .num_options = 1,
         .select_callback = wifi_marauder_beaconlist_stage_ssids_select_callback
     };
     stage_menu->items[1] = (WifiMarauderScriptMenuItem) {
-        .name = "Generate random",
+        .name = strdup("Generate random"),
         .type = WifiMarauderScriptMenuItemTypeNumber,
         .num_options = 1,
         .setup_callback = wifi_marauder_beaconlist_stage_random_ssids_setup_callback,
         .select_callback = wifi_marauder_beaconlist_stage_random_ssids_select_callback
     };
     stage_menu->items[2] = (WifiMarauderScriptMenuItem) {
-        .name = "Timeout",
+        .name = strdup("Timeout"),
         .type = WifiMarauderScriptMenuItemTypeNumber,
         .num_options = 1,
         .setup_callback = wifi_marauder_beaconlist_stage_timeout_setup_callback,

+ 1 - 1
applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_deauth.c

@@ -19,7 +19,7 @@ void wifi_marauder_script_stage_menu_deauth_load(WifiMarauderScriptStageMenu* st
     stage_menu->items = malloc(1 * sizeof(WifiMarauderScriptMenuItem));
 
     stage_menu->items[0] = (WifiMarauderScriptMenuItem) {
-        .name = "Timeout",
+        .name = strdup("Timeout"),
         .type = WifiMarauderScriptMenuItemTypeNumber,
         .num_options = 1,
         .setup_callback = wifi_marauder_deauth_stage_timeout_setup_callback,

+ 1 - 1
applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_delay.c

@@ -19,7 +19,7 @@ void wifi_marauder_script_stage_menu_delay_load(WifiMarauderScriptStageMenu* sta
     stage_menu->items = malloc(1 * sizeof(WifiMarauderScriptMenuItem));
 
     stage_menu->items[0] = (WifiMarauderScriptMenuItem) {
-        .name = "Timeout",
+        .name = strdup("Timeout"),
         .type = WifiMarauderScriptMenuItemTypeNumber,
         .num_options = 1,
         .setup_callback = wifi_marauder_delay_stage_timeout_setup_callback,

+ 1 - 1
applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_exec.c

@@ -22,7 +22,7 @@ void wifi_marauder_script_stage_menu_exec_load(WifiMarauderScriptStageMenu* stag
     stage_menu->items = malloc(1 * sizeof(WifiMarauderScriptMenuItem));
 
     stage_menu->items[0] = (WifiMarauderScriptMenuItem) {
-        .name = "Command",
+        .name = strdup("Command"),
         .type = WifiMarauderScriptMenuItemTypeString,
         .num_options = 1,
         .setup_callback = wifi_marauder_exec_stage_filter_setup_callback,

+ 1 - 1
applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_probe.c

@@ -19,7 +19,7 @@ void wifi_marauder_script_stage_menu_probe_load(WifiMarauderScriptStageMenu* sta
     stage_menu->items = malloc(1 * sizeof(WifiMarauderScriptMenuItem));
 
     stage_menu->items[0] = (WifiMarauderScriptMenuItem) {
-        .name = "Timeout",
+        .name = strdup("Timeout"),
         .type = WifiMarauderScriptMenuItemTypeNumber,
         .num_options = 1,
         .setup_callback = wifi_marauder_probe_stage_timeout_setup_callback,

+ 3 - 3
applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_scan.c

@@ -67,7 +67,7 @@ void wifi_marauder_script_stage_menu_scan_load(WifiMarauderScriptStageMenu* stag
     stage_menu->items = malloc(3 * sizeof(WifiMarauderScriptMenuItem));
 
     stage_menu->items[0] = (WifiMarauderScriptMenuItem) {
-        .name = "Type",
+        .name = strdup("Type"),
         .type = WifiMarauderScriptMenuItemTypeOptionsString,
         .num_options = 2,
         .options = {"ap", "station"},
@@ -75,7 +75,7 @@ void wifi_marauder_script_stage_menu_scan_load(WifiMarauderScriptStageMenu* stag
         .change_callback = wifi_marauder_scan_stage_type_change_callback,
     };
     stage_menu->items[1] = (WifiMarauderScriptMenuItem) {
-        .name = "Channel",
+        .name = strdup("Channel"),
         .type = WifiMarauderScriptMenuItemTypeOptionsNumber,
         .num_options = 12,
         .options = {"none", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11"},
@@ -83,7 +83,7 @@ void wifi_marauder_script_stage_menu_scan_load(WifiMarauderScriptStageMenu* stag
         .change_callback = wifi_marauder_scan_stage_channel_change_callback,
     };
     stage_menu->items[2] = (WifiMarauderScriptMenuItem) {
-        .name = "Timeout",
+        .name = strdup("Timeout"),
         .type = WifiMarauderScriptMenuItemTypeNumber,
         .num_options = 1,
         .setup_callback = wifi_marauder_scan_stage_timeout_setup_callback,

+ 3 - 3
applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_select.c

@@ -73,7 +73,7 @@ void wifi_marauder_script_stage_menu_select_load(WifiMarauderScriptStageMenu* st
     stage_menu->items = malloc(3 * sizeof(WifiMarauderScriptMenuItem));
 
     stage_menu->items[0] = (WifiMarauderScriptMenuItem) {
-        .name = "Type",
+        .name = strdup("Type"),
         .type = WifiMarauderScriptMenuItemTypeOptionsString,
         .num_options = 2,
         .options = {"ap", "station"},
@@ -81,7 +81,7 @@ void wifi_marauder_script_stage_menu_select_load(WifiMarauderScriptStageMenu* st
         .change_callback = wifi_marauder_select_stage_type_change_callback
     };
     stage_menu->items[1] = (WifiMarauderScriptMenuItem) {
-        .name = "Filter",
+        .name = strdup("Filter"),
         .type = WifiMarauderScriptMenuItemTypeString,
         .num_options = 2,
         .setup_callback = wifi_marauder_select_stage_filter_setup_callback,
@@ -89,7 +89,7 @@ void wifi_marauder_script_stage_menu_select_load(WifiMarauderScriptStageMenu* st
         .select_callback = wifi_marauder_select_stage_filter_select_callback
     };
     stage_menu->items[2] = (WifiMarauderScriptMenuItem) {
-        .name = "Indexes",
+        .name = strdup("Indexes"),
         .type = WifiMarauderScriptMenuItemTypeListNumber,
         .num_options = 1,
         .select_callback = wifi_marauder_select_stage_indexes_select_callback

+ 1 - 1
applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_sniffbeacon.c

@@ -19,7 +19,7 @@ void wifi_marauder_script_stage_menu_sniffbeacon_load(WifiMarauderScriptStageMen
     stage_menu->items = malloc(1 * sizeof(WifiMarauderScriptMenuItem));
 
     stage_menu->items[0] = (WifiMarauderScriptMenuItem) {
-        .name = "Timeout",
+        .name = strdup("Timeout"),
         .type = WifiMarauderScriptMenuItemTypeNumber,
         .num_options = 1,
         .setup_callback = wifi_marauder_sniffbeacon_stage_timeout_setup_callback,

+ 1 - 1
applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_sniffdeauth.c

@@ -19,7 +19,7 @@ void wifi_marauder_script_stage_menu_sniffdeauth_load(WifiMarauderScriptStageMen
     stage_menu->items = malloc(1 * sizeof(WifiMarauderScriptMenuItem));
 
     stage_menu->items[0] = (WifiMarauderScriptMenuItem) {
-        .name = "Timeout",
+        .name = strdup("Timeout"),
         .type = WifiMarauderScriptMenuItemTypeNumber,
         .num_options = 1,
         .setup_callback = wifi_marauder_sniffdeauth_stage_timeout_setup_callback,

+ 1 - 1
applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_sniffesp.c

@@ -19,7 +19,7 @@ void wifi_marauder_script_stage_menu_sniffesp_load(WifiMarauderScriptStageMenu*
     stage_menu->items = malloc(1 * sizeof(WifiMarauderScriptMenuItem));
 
     stage_menu->items[0] = (WifiMarauderScriptMenuItem) {
-        .name = "Timeout",
+        .name = strdup("Timeout"),
         .type = WifiMarauderScriptMenuItemTypeNumber,
         .num_options = 1,
         .setup_callback = wifi_marauder_sniffesp_stage_timeout_setup_callback,

+ 3 - 3
applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_sniffpmkid.c

@@ -67,7 +67,7 @@ void wifi_marauder_script_stage_menu_sniffpmkid_load(WifiMarauderScriptStageMenu
     stage_menu->items = malloc(3 * sizeof(WifiMarauderScriptMenuItem));
 
     stage_menu->items[0] = (WifiMarauderScriptMenuItem) {
-        .name = "Force deauth",
+        .name = strdup("Force deauth"),
         .type = WifiMarauderScriptMenuItemTypeOptionsString,
         .num_options = 2,
         .options = {"no", "yes"},
@@ -75,7 +75,7 @@ void wifi_marauder_script_stage_menu_sniffpmkid_load(WifiMarauderScriptStageMenu
         .change_callback = wifi_marauder_sniffpmkid_stage_force_deauth_change_callback
     };
     stage_menu->items[1] = (WifiMarauderScriptMenuItem) {
-        .name = "Channel",
+        .name = strdup("Channel"),
         .type = WifiMarauderScriptMenuItemTypeOptionsNumber,
         .num_options = 12,
         .options = {"none", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11"},
@@ -83,7 +83,7 @@ void wifi_marauder_script_stage_menu_sniffpmkid_load(WifiMarauderScriptStageMenu
         .change_callback = wifi_marauder_sniffpmkid_stage_channel_change_callback
     };
     stage_menu->items[2] = (WifiMarauderScriptMenuItem) {
-        .name = "Timeout",
+        .name = strdup("Timeout"),
         .type = WifiMarauderScriptMenuItemTypeNumber,
         .num_options = 1,
         .setup_callback = wifi_marauder_sniffpmkid_stage_timeout_setup_callback,

+ 1 - 1
applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_sniffpwn.c

@@ -19,7 +19,7 @@ void wifi_marauder_script_stage_menu_sniffpwn_load(WifiMarauderScriptStageMenu*
     stage_menu->items = malloc(1 * sizeof(WifiMarauderScriptMenuItem));
 
     stage_menu->items[0] = (WifiMarauderScriptMenuItem) {
-        .name = "Timeout",
+        .name = strdup("Timeout"),
         .type = WifiMarauderScriptMenuItemTypeNumber,
         .num_options = 1,
         .setup_callback = wifi_marauder_sniffpwn_stage_timeout_setup_callback,

+ 1 - 1
applications/external/wifi_marauder_companion/script/menu/wifi_marauder_script_stage_menu_sniffraw.c

@@ -19,7 +19,7 @@ void wifi_marauder_script_stage_menu_sniffraw_load(WifiMarauderScriptStageMenu*
     stage_menu->items = malloc(1 * sizeof(WifiMarauderScriptMenuItem));
 
     stage_menu->items[0] = (WifiMarauderScriptMenuItem) {
-        .name = "Timeout",
+        .name = strdup("Timeout"),
         .type = WifiMarauderScriptMenuItemTypeNumber,
         .num_options = 1,
         .setup_callback = wifi_marauder_sniffraw_stage_timeout_setup_callback,