Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make iv_mitm encounter like mon_mitm #1187

Open
wants to merge 3 commits into
base: legacy
Choose a base branch
from
Open

make iv_mitm encounter like mon_mitm #1187

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96694b0
make iv_mitm encounter like mon_mitm
crhbetz Aug 1, 2021
8dd6bfd
Merge remote-tracking branch 'upstream/master' into iv-mitm-scanmode
crhbetz Sep 6, 2021
8f080cb
2022-02-21 'upstream/master' into iv-mitm-scanmode
crhbetz Feb 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions mapadroid/worker/WorkerMITM.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def __update_injection_settings(self):
# worker has to sleep, just empty out the settings...
ids_iv = []
scanmode = "nothing"
elif routemanager_mode == "mon_mitm":
elif routemanager_mode == "mon_mitm" or routemanager_mode == "iv_mitm":
scanmode = "mons"
routemanager_settings = self._mapping_manager.routemanager_get_settings(self._routemanager_name)
if routemanager_settings is not None:
Expand All @@ -124,9 +124,6 @@ def __update_injection_settings(self):
routemanager_settings = self._mapping_manager.routemanager_get_settings(self._routemanager_name)
if routemanager_settings is not None:
ids_iv = self._mapping_manager.get_monlist(self._routemanager_name)
elif routemanager_mode == "iv_mitm":
scanmode = "ivs"
ids_iv = self._mapping_manager.routemanager_get_encounter_ids_left(self._routemanager_name)
else:
# TODO: should we throw an exception here?
ids_iv = []
Expand Down