Merge 3524284b30
into eb35a3be13
This commit is contained in:
commit
440ad869da
|
@ -83,8 +83,10 @@ stop_service() {
|
||||||
table="$($IPT -S)"
|
table="$($IPT -S)"
|
||||||
{
|
{
|
||||||
echo "*mangle";
|
echo "*mangle";
|
||||||
|
[ -z "${table##*PREROUTING -j mwan3_pre*}" ] && echo "-D PREROUTING -j mwan3_pre"
|
||||||
[ -z "${table##*PREROUTING -j mwan3_hook*}" ] && echo "-D PREROUTING -j mwan3_hook"
|
[ -z "${table##*PREROUTING -j mwan3_hook*}" ] && echo "-D PREROUTING -j mwan3_hook"
|
||||||
[ -z "${table##*OUTPUT -j mwan3_hook*}" ] && echo "-D OUTPUT -j mwan3_hook"
|
[ -z "${table##*OUTPUT -j mwan3_hook*}" ] && echo "-D OUTPUT -j mwan3_hook"
|
||||||
|
[ -z "${table##*POSTROUTING -j mwan3_post*}" ] && echo "-D POSTROUTING -j mwan3_post"
|
||||||
echo "$table" | awk '{print "-F "$2}' | grep mwan3 | sort -u
|
echo "$table" | awk '{print "-F "$2}' | grep mwan3 | sort -u
|
||||||
echo "$table" | awk '{print "-X "$2}' | grep mwan3 | sort -u
|
echo "$table" | awk '{print "-X "$2}' | grep mwan3 | sort -u
|
||||||
echo "COMMIT"
|
echo "COMMIT"
|
||||||
|
|
|
@ -338,12 +338,30 @@ mwan3_set_general_iptables()
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ -n "${current##*-N mwan3_pre*}" ]; then
|
||||||
|
mwan3_push_update -N mwan3_pre
|
||||||
|
mwan3_push_update -A mwan3_pre \
|
||||||
|
-j MARK --set-xmark "0x0/$MMX_MASK"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -n "${current##*-N mwan3_post*}" ]; then
|
||||||
|
mwan3_push_update -N mwan3_post
|
||||||
|
mwan3_push_update -A mwan3_post \
|
||||||
|
-j MARK --set-xmark "0x0/$MMX_MASK"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -n "${current##*-A PREROUTING -j mwan3_pre*}" ]; then
|
||||||
|
mwan3_push_update -A PREROUTING -j mwan3_pre
|
||||||
|
fi
|
||||||
if [ -n "${current##*-A PREROUTING -j mwan3_hook*}" ]; then
|
if [ -n "${current##*-A PREROUTING -j mwan3_hook*}" ]; then
|
||||||
mwan3_push_update -A PREROUTING -j mwan3_hook
|
mwan3_push_update -A PREROUTING -j mwan3_hook
|
||||||
fi
|
fi
|
||||||
if [ -n "${current##*-A OUTPUT -j mwan3_hook*}" ]; then
|
if [ -n "${current##*-A OUTPUT -j mwan3_hook*}" ]; then
|
||||||
mwan3_push_update -A OUTPUT -j mwan3_hook
|
mwan3_push_update -A OUTPUT -j mwan3_hook
|
||||||
fi
|
fi
|
||||||
|
if [ -n "${current##*-A POSTROUTING -j mwan3_post*}" ]; then
|
||||||
|
mwan3_push_update -A POSTROUTING -j mwan3_post
|
||||||
|
fi
|
||||||
mwan3_push_update COMMIT
|
mwan3_push_update COMMIT
|
||||||
mwan3_push_update ""
|
mwan3_push_update ""
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue