Skip to content

Commit

Permalink
fs
Browse files Browse the repository at this point in the history
  • Loading branch information
Adamm00 committed Oct 26, 2018
1 parent 1f9d93d commit 037b0dd
Showing 1 changed file with 23 additions and 23 deletions.
46 changes: 23 additions & 23 deletions firewall.sh
Expand Up @@ -159,7 +159,7 @@ Check_Settings () {
extendedstats="disabled"
fi

if [ -z "$wifemode" ]; then wifemode="disabled"; fi
if [ -z "$fastswap" ]; then fastswap="disabled"; fi
}

Check_Files () {
Expand Down Expand Up @@ -692,7 +692,7 @@ Write_Config () {
echo "banaiprotect=\"$banaiprotect\""
echo "securemode=\"$securemode\""
echo "extendedstats=\"$extendedstats\""
echo "wifemode=\"$wifemode\""
echo "fastswap=\"$fastswap\""
echo
echo "################################################"; } > "$skynetcfg"
}
Expand Down Expand Up @@ -726,7 +726,7 @@ Load_Menu () {
if ! ipset -L -n Skynet-BlockedRanges >/dev/null 2>&1; then printf "Checking BlockedRanges IPSet... "; $red "[Failed]"; nolog="1"; fi
if ! ipset -L -n Skynet-Blacklist >/dev/null 2>&1; then printf "Checking Blacklist IPSet... "; $red "[Failed]"; nolog="1"; fi
if ! ipset -L -n Skynet-Master >/dev/null 2>&1; then printf "Checking Skynet IPSet... "; $red "[Failed]"; nolog="1"; fi
if [ "$wifemode" = "enabled" ]; then $ylow "Wife Mode Is Enabled!"; fi
if [ "$fastswap" = "enabled" ]; then $ylow "Fast Swap Is Enabled!"; fi
if [ "$nolog" != "1" ]; then Print_Log "minimal"; fi
unset "nolog"
unset "option1" "option2" "option3" "option4" "option5"
Expand Down Expand Up @@ -1286,7 +1286,7 @@ Load_Menu () {
echo "[6] --> Log Invalid Packets - $(if [ "$loginvalid" = "enabled" ]; then $grn "[Enabled]";else $ylow "[Disabled]"; fi)"
echo "[7] --> Ban AiProtect - $(if [ "$banaiprotect" = "enabled" ]; then $grn "[Enabled]"; else $red "[Disabled]"; fi)"
echo "[8] --> Secure Mode - $(if [ "$securemode" = "enabled" ]; then $grn "[Enabled]"; else $red "[Disabled]"; fi)"
echo "[9] --> Wife Mode - $(if [ "$wifemode" = "enabled" ]; then $grn "[Enabled]"; else $ylow "[Disabled]"; fi)"
echo "[9] --> Fast Swap - $(if [ "$fastswap" = "enabled" ]; then $grn "[Enabled]"; else $ylow "[Disabled]"; fi)"
echo
printf "[1-9]: "
read -r "menu2"
Expand Down Expand Up @@ -1576,9 +1576,9 @@ Load_Menu () {
;;
9)
if ! Check_Status; then echo "[*] Skynet Not Running - Exiting"; echo; exit 0; fi
option1="wm"
option1="fs"
while true; do
echo "Select Wife Mode Option:"
echo "Select Fast Swap Option:"
echo "[1] --> Enable"
echo "[2] --> Disable"
echo
Expand Down Expand Up @@ -1627,8 +1627,8 @@ Load_Menu () {
done
break
;;
wm)
option1="wm"
fs)
option1="fs"
break
;;
12)
Expand Down Expand Up @@ -2225,22 +2225,22 @@ case "$1" in
echo
;;

banmalware|wm)
banmalware|fs)
if ! Check_Status; then echo "[*] Skynet Not Running - Exiting"; echo; exit 0; fi
trap '' 2
Check_Lock "$@"
Purge_Logs
if [ "$2" = "disable" ] && [ "$wifemode" = "disabled" ] && [ "$1" = "wm" ]; then
echo "[*] Wife Mode Already Disabled - Stopping Banmalware"
if [ "$2" = "disable" ] && [ "$fastswap" = "disabled" ] && [ "$1" = "fs" ]; then
echo "[*] Fast Swap Already Disabled - Stopping Banmalware"
echo; exit 1
fi
if [ "$wifemode" = "enabled" ] && [ "$1" = "wm" ] && [ -z "$2" ]; then
echo "[i] Wife Mode Disabled"
wifemode="disabled"
if [ "$fastswap" = "enabled" ] && [ "$1" = "fs" ] && [ -z "$2" ]; then
echo "[i] Fast Swap Disabled"
fastswap="disabled"
set "banmalware"
fi
if [ "$wifemode" = "enabled" ] && [ "$1" = "banmalware" ]; then
set "wm"
if [ "$fastswap" = "enabled" ] && [ "$1" = "banmalware" ]; then
set "fs"
fi
if [ "$2" = "exclude" ]; then
if [ "$3" = "reset" ] || [ -z "$3" ]; then
Expand All @@ -2256,17 +2256,17 @@ case "$1" in
echo "[i] Filter URL Reset"
unset "customlisturl"
fi
if [ -n "$2" ] && [ "$2" != "reset" ] && [ "$1" != "wm" ]; then
if [ -n "$2" ] && [ "$2" != "reset" ] && [ "$1" != "fs" ]; then
customlisturl="$2"
listurl="$customlisturl"
echo "[i] Custom Filter Detected: $customlisturl"
elif [ "$1" = "wm" ]; then
elif [ "$1" = "fs" ]; then
if [ -z "$2" ] && [ -z "$customlist2url" ]; then
logger -st Skynet "[*] Wife-Mode URL Not Detected - Stopping Banmalware"
echo; exit 1
else
wifemode="enabled"
echo "[i] Wife Mode Enabled"
fastswap="enabled"
echo "[i] Fast Swap Enabled"
if [ -z "$customlist2url" ] || [ -n "$2" ]; then
customlist2url="$2"
listurl="$customlist2url"
Expand Down Expand Up @@ -3100,8 +3100,8 @@ case "$1" in
if [ "$banaiprotect" = "enabled" ]; then $grn "[Enabled]"; else $red "[Disabled]"; fi
printf "[i] Checking Secure Mode Setting... "
if [ "$securemode" = "enabled" ]; then $grn "[Enabled]"; else $red "[Disabled]"; fi
printf "[i] Checking Wife Mode Setting... "
if [ "$wifemode" = "enabled" ]; then $grn "[Enabled]"; else $ylow "[Disabled]"; fi
printf "[i] Checking Fast Swap Setting... "
if [ "$fastswap" = "enabled" ]; then $grn "[Enabled]"; else $ylow "[Disabled]"; fi
echo
echo "${passedtests}/${totaltests} Tests Sucessful."
if [ "$3" = "extended" ]; then echo; echo; cat "$skynetcfg"; echo; fi
Expand Down Expand Up @@ -3743,7 +3743,7 @@ case "$1" in
if [ -z "$unbanprivateip" ]; then unbanprivateip="enabled"; fi
if [ -z "$banaiprotect" ] && [ -f /opt/bin/opkg ]; then banaiprotect="enabled"; fi
if [ -z "$securemode" ]; then securemode="enabled"; fi
if [ -z "$wifemode" ]; then wifemode="disabled"; fi
if [ -z "$fastswap" ]; then fastswap="disabled"; fi
Write_Config
cmdline="sh /jffs/scripts/firewall start skynetloc=${device}/skynet # Skynet Firewall Addition"
if grep -E "sh /jffs/scripts/firewall .* # Skynet" /jffs/scripts/firewall-start 2>/dev/null | grep -qvE "^#"; then
Expand Down

0 comments on commit 037b0dd

Please sign in to comment.