Просмотр исходного кода

Add sniffpmkid submenu to support new options

0xchocolate 2 лет назад
Родитель
Сommit
3168097b69

+ 1 - 0
applications/external/wifi_marauder_companion/scenes/wifi_marauder_scene_config.h

@@ -12,3 +12,4 @@ ADD_SCENE(wifi_marauder, script_confirm_delete, ScriptConfirmDelete)
 ADD_SCENE(wifi_marauder, script_stage_edit, ScriptStageEdit)
 ADD_SCENE(wifi_marauder, script_stage_add, ScriptStageAdd)
 ADD_SCENE(wifi_marauder, script_stage_edit_list, ScriptStageEditList)
+ADD_SCENE(wifi_marauder, sniffpmkid_options, SniffPmkidOptions)

+ 10 - 7
applications/external/wifi_marauder_companion/scenes/wifi_marauder_scene_start.c

@@ -97,13 +97,6 @@ const WifiMarauderItem items[NUM_MENU_ITEMS] = {
      NO_ARGS,
      FOCUS_CONSOLE_END,
      SHOW_STOPSCAN_TIP},
-    {"Sniff PMKID on channel",
-     {""},
-     1,
-     {"sniffpmkid -c"},
-     INPUT_ARGS,
-     FOCUS_CONSOLE_END,
-     SHOW_STOPSCAN_TIP},
     {"Channel",
      {"get", "set"},
      2,
@@ -161,6 +154,12 @@ static void wifi_marauder_scene_start_var_list_enter_callback(void* context, uin
         return;
     }
 
+    if (app->selected_tx_string && strncmp("sniffpmkid", app->selected_tx_string, strlen("sniffpmkid")) == 0) {
+        // sniffpmkid submenu
+        view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventStartSniffPmkidOptions);
+        return;
+    }
+
     // Select automation script
     if(index == NUM_MENU_ITEMS - 2) {
         view_dispatcher_send_custom_event(app->view_dispatcher, WifiMarauderEventStartScriptSelect);
@@ -253,6 +252,10 @@ bool wifi_marauder_scene_start_on_event(void* context, SceneManagerEvent event)
             scene_manager_set_scene_state(
                 app->scene_manager, WifiMarauderSceneStart, app->selected_menu_index);
             scene_manager_next_scene(app->scene_manager, WifiMarauderSceneScriptSelect);
+        } else if(event.event == WifiMarauderEventStartSniffPmkidOptions) {
+            scene_manager_set_scene_state(
+                app->scene_manager, WifiMarauderSceneStart, app->selected_menu_index);
+            scene_manager_next_scene(app->scene_manager, WifiMarauderSceneSniffPmkidOptions);
         }
         consumed = true;
     } else if(event.type == SceneManagerEventTypeTick) {

+ 1 - 1
applications/external/wifi_marauder_companion/wifi_marauder_app.h

@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 
-#define WIFI_MARAUDER_APP_VERSION "v0.3.4"
+#define WIFI_MARAUDER_APP_VERSION "v0.3.5"
 
 typedef struct WifiMarauderApp WifiMarauderApp;
 

+ 1 - 1
applications/external/wifi_marauder_companion/wifi_marauder_app_i.h

@@ -26,7 +26,7 @@
 #include <lib/toolbox/path.h>
 #include <dialogs/dialogs.h>
 
-#define NUM_MENU_ITEMS (18)
+#define NUM_MENU_ITEMS (17)
 
 #define WIFI_MARAUDER_TEXT_BOX_STORE_SIZE (4096)
 #define WIFI_MARAUDER_TEXT_INPUT_STORE_SIZE (512)

+ 2 - 1
applications/external/wifi_marauder_companion/wifi_marauder_custom_event.h

@@ -8,5 +8,6 @@ typedef enum {
     WifiMarauderEventSaveDestinationMac,
     WifiMarauderEventStartSettingsInit,
     WifiMarauderEventStartLogViewer,
-    WifiMarauderEventStartScriptSelect
+    WifiMarauderEventStartScriptSelect,
+    WifiMarauderEventStartSniffPmkidOptions
 } WifiMarauderCustomEvent;