This commit is contained in:
paldier 2019-01-27 22:50:53 +08:00
parent cb79f7e6a3
commit f4d1a54489
5 changed files with 7 additions and 28 deletions

View File

@ -1,8 +1,8 @@
{ {
"version":"4.1.7", "version":"4.1.7",
"md5":"95b162f6a0bde010a68ff999290cf5a5", "md5":"e385009a9ab5998e14ba6dc8b58a1a20",
"home_url":"Main_Ss_Content.asp", "home_url":"Main_Ss_Content.asp",
"title":"科学上网", "title":"科学上网",
"description":"科学上网", "description":"科学上网",
"build_date":"2019-01-27_21:37:15" "build_date":"2019-01-27_22:50:42"
} }

Binary file not shown.

View File

@ -768,27 +768,6 @@ create_dnsmasq_conf(){
echo "$ss_dnsmasq" | base64_decode | sort -u >> /tmp/custom.conf echo "$ss_dnsmasq" | base64_decode | sort -u >> /tmp/custom.conf
fi fi
# these sites need to go ss inside router
if [ "$ss_basic_mode" != "6" ];then
echo "#for router itself" >> /tmp/wblist.conf
echo "server=/.google.com.tw/127.0.0.1#7913" >> /tmp/wblist.conf
echo "ipset=/.google.com.tw/router" >> /tmp/wblist.conf
echo "server=/dns.google.com/127.0.0.1#7913" >> /tmp/wblist.conf
echo "ipset=/dns.google.com/router" >> /tmp/wblist.conf
echo "server=/.github.com/127.0.0.1#7913" >> /tmp/wblist.conf
echo "ipset=/.github.com/router" >> /tmp/wblist.conf
echo "server=/.github.io/127.0.0.1#7913" >> /tmp/wblist.conf
echo "ipset=/.github.io/router" >> /tmp/wblist.conf
echo "server=/.raw.githubusercontent.com/127.0.0.1#7913" >> /tmp/wblist.conf
echo "ipset=/.raw.githubusercontent.com/router" >> /tmp/wblist.conf
echo "server=/.adblockplus.org/127.0.0.1#7913" >> /tmp/wblist.conf
echo "ipset=/.adblockplus.org/router" >> /tmp/wblist.conf
echo "server=/.entware.net/127.0.0.1#7913" >> /tmp/wblist.conf
echo "ipset=/.entware.net/router" >> /tmp/wblist.conf
echo "server=/.apnic.net/127.0.0.1#7913" >> /tmp/wblist.conf
echo "ipset=/.apnic.net/router" >> /tmp/wblist.conf
fi
# append white domain list, not through ss # append white domain list, not through ss
wanwhitedomain=$(echo $ss_wan_white_domain | base64_decode) wanwhitedomain=$(echo $ss_wan_white_domain | base64_decode)
if [ -n "$ss_wan_white_domain" ];then if [ -n "$ss_wan_white_domain" ];then
@ -1685,7 +1664,7 @@ flush_nat(){
iptables -t mangle -F SHADOWSOCKS >/dev/null 2>&1 && iptables -t mangle -X SHADOWSOCKS >/dev/null 2>&1 iptables -t mangle -F SHADOWSOCKS >/dev/null 2>&1 && iptables -t mangle -X SHADOWSOCKS >/dev/null 2>&1
iptables -t mangle -F SHADOWSOCKS_GAM > /dev/null 2>&1 && iptables -t mangle -X SHADOWSOCKS_GAM > /dev/null 2>&1 iptables -t mangle -F SHADOWSOCKS_GAM > /dev/null 2>&1 && iptables -t mangle -X SHADOWSOCKS_GAM > /dev/null 2>&1
iptables -t nat -D OUTPUT -p tcp -m set --match-set router dst -j REDIRECT --to-ports 3333 >/dev/null 2>&1 iptables -t nat -D OUTPUT -p tcp -m set --match-set gfwlist dst -j REDIRECT --to-ports 3333 >/dev/null 2>&1
iptables -t nat -F OUTPUT > /dev/null 2>&1 iptables -t nat -F OUTPUT > /dev/null 2>&1
iptables -t nat -X SHADOWSOCKS_EXT > /dev/null 2>&1 iptables -t nat -X SHADOWSOCKS_EXT > /dev/null 2>&1
#iptables -t nat -D PREROUTING -p udp -s $(get_lan_cidr) --dport 53 -j DNAT --to $lan_ipaddr >/dev/null 2>&1 #iptables -t nat -D PREROUTING -p udp -s $(get_lan_cidr) --dport 53 -j DNAT --to $lan_ipaddr >/dev/null 2>&1
@ -1942,7 +1921,7 @@ apply_nat_rules(){
lan_acess_control lan_acess_control
#-----------------------FOR ROUTER--------------------- #-----------------------FOR ROUTER---------------------
# router itself # router itself
[ "$ss_basic_mode" != "6" ] && iptables -t nat -A OUTPUT -p tcp -m set --match-set router dst -j REDIRECT --to-ports 3333 [ "$ss_basic_mode" != "6" ] && iptables -t nat -A OUTPUT -p tcp -m set --match-set gfwlist dst -j REDIRECT --to-ports 3333
iptables -t nat -A OUTPUT -p tcp -m mark --mark "$ip_prefix_hex" -j SHADOWSOCKS_EXT iptables -t nat -A OUTPUT -p tcp -m mark --mark "$ip_prefix_hex" -j SHADOWSOCKS_EXT
# 把最后剩余流量重定向到相应模式的nat表中对应的主模式的链 # 把最后剩余流量重定向到相应模式的nat表中对应的主模式的链

View File

@ -1,2 +1,2 @@
4.1.7 4.1.7
95b162f6a0bde010a68ff999290cf5a5 e385009a9ab5998e14ba6dc8b58a1a20

View File

@ -11,10 +11,10 @@
"version": "0.2.3" "version": "0.2.3"
}, },
{ {
"build_date": "2019-01-27_21:37:15", "build_date": "2019-01-27_22:50:42",
"description": "科学上网", "description": "科学上网",
"home_url": "Main_Ss_Content.asp", "home_url": "Main_Ss_Content.asp",
"md5": "95b162f6a0bde010a68ff999290cf5a5", "md5": "e385009a9ab5998e14ba6dc8b58a1a20",
"name": "shadowsocks", "name": "shadowsocks",
"tar_url": "shadowsocks/shadowsocks.tar.gz", "tar_url": "shadowsocks/shadowsocks.tar.gz",
"title": "科学上网", "title": "科学上网",