diff --git a/package/lean/luci-app-shadowsocksr-pro/root/etc/init.d/ssrpro b/package/lean/luci-app-shadowsocksr-pro/root/etc/init.d/ssrpro index e44591b5d..8d0691a4f 100755 --- a/package/lean/luci-app-shadowsocksr-pro/root/etc/init.d/ssrpro +++ b/package/lean/luci-app-shadowsocksr-pro/root/etc/init.d/ssrpro @@ -329,6 +329,7 @@ add_rule() G) : ;; S) iptables -t nat -A shadowsocksr_pre -m set --match-set $vt_np_ipset dst -j RETURN + iptables -t nat -I OUTPUT -p tcp -m multiport --dports 80,443 -m set ! --match-set $vt_np_ipset dst -j REDIRECT --to $SS_REDIR_PORT ;; M) ipset -! create $vt_gfwlist hash:ip maxelem 65536 2>/dev/null @@ -337,6 +338,7 @@ add_rule() ipset -! restore < /tmp/addinip.ipset iptables -t nat -A shadowsocksr_pre -m set ! --match-set $vt_gfwlist dst -j RETURN iptables -t nat -A shadowsocksr_pre -m set --match-set $vt_np_ipset dst -j RETURN + iptables -t nat -I OUTPUT -p tcp -m multiport --dports 80,443 -m set --match-set $vt_gfwlist dst -j REDIRECT --to $SS_REDIR_PORT ;; V) vt_np_ipset="" @@ -358,6 +360,9 @@ del_rule() iptables -t nat -X shadowsocksr_pre 2>/dev/null fi + iptables -t nat -D OUTPUT -p tcp -m multiport --dports 80,443 -m set --match-set china-banned dst -j REDIRECT --to $SS_REDIR_PORT 2>/dev/null + iptables -t nat -D OUTPUT -p tcp -m multiport --dports 80,443 -m set ! --match-set $vt_np_ipset dst -j REDIRECT --to $SS_REDIR_PORT 2>/dev/null + /usr/bin/ip rule del fwmark 0x01/0x01 table 100 /usr/bin/ip route del local 0.0.0.0/0 dev lo table 100 if iptables -t mangle -F gameboost 2>/dev/null; then diff --git a/package/lean/luci-app-shadowsocksr-pro/root/etc/shadowsocksr/ssr-watchdog b/package/lean/luci-app-shadowsocksr-pro/root/etc/shadowsocksr/ssr-watchdog index 66f82b4f7..9f370073d 100755 --- a/package/lean/luci-app-shadowsocksr-pro/root/etc/shadowsocksr/ssr-watchdog +++ b/package/lean/luci-app-shadowsocksr-pro/root/etc/shadowsocksr/ssr-watchdog @@ -1,11 +1,11 @@ #!/bin/sh LOGTIME=$(date "+%Y-%m-%d %H:%M:%S") -GOOGLE=$(ping -4 www.gstatic.com -c 1 -w 5| sed '1{s/[^(]*(//;s/).*//;q}') +#GOOGLE=$(ping -4 www.gstatic.com -c 1 -w 5| sed '1{s/[^(]*(//;s/).*//;q}') -iptables -t nat -I OUTPUT -p tcp -d $GOOGLE -j REDIRECT --to-port 7070 +#iptables -t nat -I OUTPUT -p tcp -d $GOOGLE -j REDIRECT --to-port 7070 -sleep 3 +#sleep 3 /usr/bin/wget --spider --quiet --tries=1 --timeout=3 www.gstatic.com/generate_204 @@ -21,9 +21,9 @@ else fi fi -sleep 3 +#sleep 3 -iptables -t nat -D OUTPUT -p tcp -d $GOOGLE -j REDIRECT --to-port 7070 +#iptables -t nat -D OUTPUT -p tcp -d $GOOGLE -j REDIRECT --to-port 7070