From e37aa33c90e4cbe7586270f490c29d464e07a56b Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Fri, 7 Aug 2020 17:36:22 +0800 Subject: [PATCH] luci-app-ssr-plus: bump to 180-3 --- package/lean/luci-app-ssr-plus/Makefile | 2 +- .../root/etc/config/shadowsocksr | 2 +- .../root/etc/ssr/china_ssr.txt | 13 ++-- .../root/etc/ssr/gfw_list.conf | 70 +++---------------- .../luci-app-ssr-plus/root/usr/bin/ssr-rules | 4 +- 5 files changed, 22 insertions(+), 69 deletions(-) diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile index 32db9ce6e4..1572aa4f4b 100644 --- a/package/lean/luci-app-ssr-plus/Makefile +++ b/package/lean/luci-app-ssr-plus/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ssr-plus PKG_VERSION:=180 -PKG_RELEASE:=2 +PKG_RELEASE:=3 include $(INCLUDE_DIR)/package.mk diff --git a/package/lean/luci-app-ssr-plus/root/etc/config/shadowsocksr b/package/lean/luci-app-ssr-plus/root/etc/config/shadowsocksr index 4329c7839e..e0cfa78f10 100644 --- a/package/lean/luci-app-ssr-plus/root/etc/config/shadowsocksr +++ b/package/lean/luci-app-ssr-plus/root/etc/config/shadowsocksr @@ -13,7 +13,7 @@ config global option gfwlist_url 'https://cdn.jsdelivr.net/gh/Loukky/gfwlist-by-loukky/gfwlist.txt' option chnroute_url 'https://ispip.clang.cn/all_cn.txt' option nfip_url 'https://cdn.jsdelivr.net/gh/QiuSimons/Netflix_IP/getflix.txt' - option adblock_url 'https://gitee.com/privacy-protection-tools/anti-ad/raw/master/anti-ad-for-dnsmasq.conf' + option adblock_url 'https://anti-ad.net/anti-ad-for-dnsmasq.conf' option threads '0' option global_server 'disable' option netflix_server 'nil' diff --git a/package/lean/luci-app-ssr-plus/root/etc/ssr/china_ssr.txt b/package/lean/luci-app-ssr-plus/root/etc/ssr/china_ssr.txt index 5c8eba7e29..e8079c796a 100644 --- a/package/lean/luci-app-ssr-plus/root/etc/ssr/china_ssr.txt +++ b/package/lean/luci-app-ssr-plus/root/etc/ssr/china_ssr.txt @@ -3669,7 +3669,6 @@ 103.110.156.0/22 103.110.188.0/22 103.110.204.0/22 -103.111.38.0/23 103.111.64.0/22 103.111.172.0/22 103.111.252.0/22 @@ -4061,6 +4060,15 @@ 103.152.250.0/23 103.153.4.0/23 103.153.36.0/23 +103.153.98.0/23 +103.153.100.0/23 +103.153.114.0/23 +103.153.122.0/23 +103.153.128.0/23 +103.153.132.0/23 +103.153.138.0/23 +103.153.146.0/23 +103.153.160.0/23 103.192.0.0/22 103.192.4.0/22 103.192.8.0/22 @@ -4461,7 +4469,6 @@ 103.215.116.0/22 103.215.120.0/22 103.215.140.0/22 -103.215.184.0/22 103.215.228.0/22 103.216.4.0/22 103.216.8.0/22 @@ -5424,7 +5431,6 @@ 116.204.216.0/22 116.204.232.0/22 116.204.236.0/22 -116.204.244.0/22 116.205.0.0/16 116.206.92.0/22 116.206.176.0/22 @@ -6119,7 +6125,6 @@ 157.119.12.0/22 157.119.16.0/22 157.119.28.0/22 -157.119.68.0/22 157.119.132.0/22 157.119.136.0/22 157.119.140.0/22 diff --git a/package/lean/luci-app-ssr-plus/root/etc/ssr/gfw_list.conf b/package/lean/luci-app-ssr-plus/root/etc/ssr/gfw_list.conf index 83f93ce5af..7f787ddbaa 100644 --- a/package/lean/luci-app-ssr-plus/root/etc/ssr/gfw_list.conf +++ b/package/lean/luci-app-ssr-plus/root/etc/ssr/gfw_list.conf @@ -326,8 +326,6 @@ server=/airvpn.org/127.0.0.1#5335 ipset=/airvpn.org/gfwlist server=/aisex.com/127.0.0.1#5335 ipset=/aisex.com/gfwlist -server=/aiss.anws.gov.tw/127.0.0.1#5335 -ipset=/aiss.anws.gov.tw/gfwlist server=/ait.org.tw/127.0.0.1#5335 ipset=/ait.org.tw/gfwlist server=/aiweiwei.com/127.0.0.1#5335 @@ -2064,8 +2062,6 @@ server=/data-vocabulary.org/127.0.0.1#5335 ipset=/data-vocabulary.org/gfwlist server=/data.flurry.com/127.0.0.1#5335 ipset=/data.flurry.com/gfwlist -server=/data.gov.tw/127.0.0.1#5335 -ipset=/data.gov.tw/gfwlist server=/daum.net/127.0.0.1#5335 ipset=/daum.net/gfwlist server=/david-kilgour.com/127.0.0.1#5335 @@ -2560,8 +2556,6 @@ server=/entnt.com/127.0.0.1#5335 ipset=/entnt.com/gfwlist server=/environment.google/127.0.0.1#5335 ipset=/environment.google/gfwlist -server=/epa.gov.tw/127.0.0.1#5335 -ipset=/epa.gov.tw/gfwlist server=/epac.to/127.0.0.1#5335 ipset=/epac.to/gfwlist server=/episcopalchurch.org/127.0.0.1#5335 @@ -2670,6 +2664,8 @@ server=/eurekavpt.com/127.0.0.1#5335 ipset=/eurekavpt.com/gfwlist server=/euronews.com/127.0.0.1#5335 ipset=/euronews.com/gfwlist +server=/evchk.wikia.org/127.0.0.1#5335 +ipset=/evchk.wikia.org/gfwlist server=/evschool.net/127.0.0.1#5335 ipset=/evschool.net/gfwlist server=/exblog.jp/127.0.0.1#5335 @@ -2710,8 +2706,6 @@ server=/ezpeer.com/127.0.0.1#5335 ipset=/ezpeer.com/gfwlist server=/ezua.com/127.0.0.1#5335 ipset=/ezua.com/gfwlist -server=/fa.gov.tw/127.0.0.1#5335 -ipset=/fa.gov.tw/gfwlist server=/facebook.br/127.0.0.1#5335 ipset=/facebook.br/gfwlist server=/facebook.com/127.0.0.1#5335 @@ -2876,8 +2870,6 @@ server=/fc2china.com/127.0.0.1#5335 ipset=/fc2china.com/gfwlist server=/fc2cn.com/127.0.0.1#5335 ipset=/fc2cn.com/gfwlist -server=/fda.gov.tw/127.0.0.1#5335 -ipset=/fda.gov.tw/gfwlist server=/fdc64.de/127.0.0.1#5335 ipset=/fdc64.de/gfwlist server=/fdc64.org/127.0.0.1#5335 @@ -4186,6 +4178,8 @@ server=/hotshame.com/127.0.0.1#5335 ipset=/hotshame.com/gfwlist server=/hotspotshield.com/127.0.0.1#5335 ipset=/hotspotshield.com/gfwlist +server=/hottg.com/127.0.0.1#5335 +ipset=/hottg.com/gfwlist server=/hotvpn.com/127.0.0.1#5335 ipset=/hotvpn.com/gfwlist server=/hougaige.com/127.0.0.1#5335 @@ -4194,8 +4188,6 @@ server=/howtoforge.com/127.0.0.1#5335 ipset=/howtoforge.com/gfwlist server=/hoxx.com/127.0.0.1#5335 ipset=/hoxx.com/gfwlist -server=/hpa.gov.tw/127.0.0.1#5335 -ipset=/hpa.gov.tw/gfwlist server=/hqcdp.org/127.0.0.1#5335 ipset=/hqcdp.org/gfwlist server=/hqjapanesesex.com/127.0.0.1#5335 @@ -4464,8 +4456,6 @@ server=/imkev.com/127.0.0.1#5335 ipset=/imkev.com/gfwlist server=/imlive.com/127.0.0.1#5335 ipset=/imlive.com/gfwlist -server=/immigration.gov.tw/127.0.0.1#5335 -ipset=/immigration.gov.tw/gfwlist server=/immoral.jp/127.0.0.1#5335 ipset=/immoral.jp/gfwlist server=/impact.org.au/127.0.0.1#5335 @@ -4610,8 +4600,6 @@ server=/isuntv.com/127.0.0.1#5335 ipset=/isuntv.com/gfwlist server=/itaboo.info/127.0.0.1#5335 ipset=/itaboo.info/gfwlist -server=/itaiwan.gov.tw/127.0.0.1#5335 -ipset=/itaiwan.gov.tw/gfwlist server=/italiatibet.org/127.0.0.1#5335 ipset=/italiatibet.org/gfwlist server=/itasoftware.com/127.0.0.1#5335 @@ -5576,8 +5564,6 @@ server=/mixx.com/127.0.0.1#5335 ipset=/mixx.com/gfwlist server=/mizzmona.com/127.0.0.1#5335 ipset=/mizzmona.com/gfwlist -server=/mjib.gov.tw/127.0.0.1#5335 -ipset=/mjib.gov.tw/gfwlist server=/mk5000.com/127.0.0.1#5335 ipset=/mk5000.com/gfwlist server=/mlcool.com/127.0.0.1#5335 @@ -5604,12 +5590,8 @@ server=/moby.to/127.0.0.1#5335 ipset=/moby.to/gfwlist server=/mobypicture.com/127.0.0.1#5335 ipset=/mobypicture.com/gfwlist -server=/moeaic.gov.tw/127.0.0.1#5335 -ipset=/moeaic.gov.tw/gfwlist server=/moeerolibrary.com/127.0.0.1#5335 ipset=/moeerolibrary.com/gfwlist -server=/mofa.gov.tw/127.0.0.1#5335 -ipset=/mofa.gov.tw/gfwlist server=/mofaxiehui.com/127.0.0.1#5335 ipset=/mofaxiehui.com/gfwlist server=/mofos.com/127.0.0.1#5335 @@ -5622,8 +5604,6 @@ server=/mohu.ml/127.0.0.1#5335 ipset=/mohu.ml/gfwlist server=/mojim.com/127.0.0.1#5335 ipset=/mojim.com/gfwlist -server=/mol.gov.tw/127.0.0.1#5335 -ipset=/mol.gov.tw/gfwlist server=/molihua.org/127.0.0.1#5335 ipset=/molihua.org/gfwlist server=/mondex.org/127.0.0.1#5335 @@ -5718,8 +5698,6 @@ server=/muzi.com/127.0.0.1#5335 ipset=/muzi.com/gfwlist server=/muzi.net/127.0.0.1#5335 ipset=/muzi.net/gfwlist -server=/mvdis.gov.tw/127.0.0.1#5335 -ipset=/mvdis.gov.tw/gfwlist server=/mvg.jp/127.0.0.1#5335 ipset=/mvg.jp/gfwlist server=/mx981.com/127.0.0.1#5335 @@ -5852,8 +5830,6 @@ server=/naol.ca/127.0.0.1#5335 ipset=/naol.ca/gfwlist server=/naol.cc/127.0.0.1#5335 ipset=/naol.cc/gfwlist -server=/nat.gov.tw/127.0.0.1#5335 -ipset=/nat.gov.tw/gfwlist server=/nat.moe/127.0.0.1#5335 ipset=/nat.moe/gfwlist server=/national-lottery.co.uk/127.0.0.1#5335 @@ -5994,8 +5970,6 @@ server=/ngensis.com/127.0.0.1#5335 ipset=/ngensis.com/gfwlist server=/nhentai.net/127.0.0.1#5335 ipset=/nhentai.net/gfwlist -server=/nhi.gov.tw/127.0.0.1#5335 -ipset=/nhi.gov.tw/gfwlist server=/nhk-ondemand.jp/127.0.0.1#5335 ipset=/nhk-ondemand.jp/gfwlist server=/nic.cz.cc/127.0.0.1#5335 @@ -6070,8 +6044,6 @@ server=/noypf.com/127.0.0.1#5335 ipset=/noypf.com/gfwlist server=/npa.go.jp/127.0.0.1#5335 ipset=/npa.go.jp/gfwlist -server=/npa.gov.tw/127.0.0.1#5335 -ipset=/npa.gov.tw/gfwlist server=/npnt.me/127.0.0.1#5335 ipset=/npnt.me/gfwlist server=/nps.gov/127.0.0.1#5335 @@ -6098,14 +6070,6 @@ server=/ns2.name/127.0.0.1#5335 ipset=/ns2.name/gfwlist server=/ns3.name/127.0.0.1#5335 ipset=/ns3.name/gfwlist -server=/nsc.gov.tw/127.0.0.1#5335 -ipset=/nsc.gov.tw/gfwlist -server=/ntbk.gov.tw/127.0.0.1#5335 -ipset=/ntbk.gov.tw/gfwlist -server=/ntbna.gov.tw/127.0.0.1#5335 -ipset=/ntbna.gov.tw/gfwlist -server=/ntbt.gov.tw/127.0.0.1#5335 -ipset=/ntbt.gov.tw/gfwlist server=/ntd.tv/127.0.0.1#5335 ipset=/ntd.tv/gfwlist server=/ntdtv.ca/127.0.0.1#5335 @@ -6122,8 +6086,6 @@ server=/ntdtvla.com/127.0.0.1#5335 ipset=/ntdtvla.com/gfwlist server=/ntrfun.com/127.0.0.1#5335 ipset=/ntrfun.com/gfwlist -server=/ntsna.gov.tw/127.0.0.1#5335 -ipset=/ntsna.gov.tw/gfwlist server=/nubiles.net/127.0.0.1#5335 ipset=/nubiles.net/gfwlist server=/nudezz.com/127.0.0.1#5335 @@ -6434,8 +6396,6 @@ server=/pbxes.org/127.0.0.1#5335 ipset=/pbxes.org/gfwlist server=/pcanywhere.net/127.0.0.1#5335 ipset=/pcanywhere.net/gfwlist -server=/pcc.gov.tw/127.0.0.1#5335 -ipset=/pcc.gov.tw/gfwlist server=/pcdvd.com.tw/127.0.0.1#5335 ipset=/pcdvd.com.tw/gfwlist server=/pchome.com.tw/127.0.0.1#5335 @@ -7744,8 +7704,6 @@ server=/startpage.com/127.0.0.1#5335 ipset=/startpage.com/gfwlist server=/startuplivingchina.com/127.0.0.1#5335 ipset=/startuplivingchina.com/gfwlist -server=/stat.gov.tw/127.0.0.1#5335 -ipset=/stat.gov.tw/gfwlist server=/static-economist.com/127.0.0.1#5335 ipset=/static-economist.com/gfwlist server=/static.shemalez.com/127.0.0.1#5335 @@ -7922,8 +7880,6 @@ server=/taaze.tw/127.0.0.1#5335 ipset=/taaze.tw/gfwlist server=/tabtter.jp/127.0.0.1#5335 ipset=/tabtter.jp/gfwlist -server=/tacc.cwb.gov.tw/127.0.0.1#5335 -ipset=/tacc.cwb.gov.tw/gfwlist server=/tacem.org/127.0.0.1#5335 ipset=/tacem.org/gfwlist server=/taconet.com.tw/127.0.0.1#5335 @@ -7938,8 +7894,6 @@ server=/tagwalk.com/127.0.0.1#5335 ipset=/tagwalk.com/gfwlist server=/tahr.org.tw/127.0.0.1#5335 ipset=/tahr.org.tw/gfwlist -server=/taipei.gov.tw/127.0.0.1#5335 -ipset=/taipei.gov.tw/gfwlist server=/taipeisociety.org/127.0.0.1#5335 ipset=/taipeisociety.org/gfwlist server=/taiwan-sex.com/127.0.0.1#5335 @@ -7952,8 +7906,6 @@ server=/taiwandaily.net/127.0.0.1#5335 ipset=/taiwandaily.net/gfwlist server=/taiwandc.org/127.0.0.1#5335 ipset=/taiwandc.org/gfwlist -server=/taiwanjobs.gov.tw/127.0.0.1#5335 -ipset=/taiwanjobs.gov.tw/gfwlist server=/taiwanjustice.com/127.0.0.1#5335 ipset=/taiwanjustice.com/gfwlist server=/taiwanjustice.net/127.0.0.1#5335 @@ -8064,10 +8016,6 @@ server=/techviz.net/127.0.0.1#5335 ipset=/techviz.net/gfwlist server=/teck.in/127.0.0.1#5335 ipset=/teck.in/gfwlist -server=/teco-hk.org/127.0.0.1#5335 -ipset=/teco-hk.org/gfwlist -server=/teco-mo.org/127.0.0.1#5335 -ipset=/teco-mo.org/gfwlist server=/teddysun.com/127.0.0.1#5335 ipset=/teddysun.com/gfwlist server=/teeniefuck.net/127.0.0.1#5335 @@ -8106,10 +8054,10 @@ server=/textnow.me/127.0.0.1#5335 ipset=/textnow.me/gfwlist server=/tfhub.dev/127.0.0.1#5335 ipset=/tfhub.dev/gfwlist +server=/tgstat.com/127.0.0.1#5335 +ipset=/tgstat.com/gfwlist server=/thaicn.com/127.0.0.1#5335 ipset=/thaicn.com/gfwlist -server=/thb.gov.tw/127.0.0.1#5335 -ipset=/thb.gov.tw/gfwlist server=/theatrum-belli.com/127.0.0.1#5335 ipset=/theatrum-belli.com/gfwlist server=/thebcomplex.com/127.0.0.1#5335 @@ -8410,8 +8358,6 @@ server=/tinychat.com/127.0.0.1#5335 ipset=/tinychat.com/gfwlist server=/tinypaste.com/127.0.0.1#5335 ipset=/tinypaste.com/gfwlist -server=/tipo.gov.tw/127.0.0.1#5335 -ipset=/tipo.gov.tw/gfwlist server=/tistory.com/127.0.0.1#5335 ipset=/tistory.com/gfwlist server=/tkcs-collins.com/127.0.0.1#5335 @@ -8534,6 +8480,8 @@ server=/traffichaus.com/127.0.0.1#5335 ipset=/traffichaus.com/gfwlist server=/transparency.org/127.0.0.1#5335 ipset=/transparency.org/gfwlist +server=/travelinkcard.com/127.0.0.1#5335 +ipset=/travelinkcard.com/gfwlist server=/treemall.com.tw/127.0.0.1#5335 ipset=/treemall.com.tw/gfwlist server=/trendsmap.com/127.0.0.1#5335 @@ -9408,8 +9356,6 @@ server=/waveprotocol.org/127.0.0.1#5335 ipset=/waveprotocol.org/gfwlist server=/waymo.com/127.0.0.1#5335 ipset=/waymo.com/gfwlist -server=/wda.gov.tw/127.0.0.1#5335 -ipset=/wda.gov.tw/gfwlist server=/wdf5.com/127.0.0.1#5335 ipset=/wdf5.com/gfwlist server=/wearehairy.com/127.0.0.1#5335 diff --git a/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules b/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules index 9dcf96803e..3f0aa2d840 100755 --- a/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules +++ b/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules @@ -243,7 +243,9 @@ tp_rule() { $ipt -A SS_SPEC_TPROXY -p udp $PROXY_PORTS -m set --match-set china dst \ -j TPROXY --on-port "$LOCAL_PORT" --tproxy-mark 0x01/0x01 ;; - all) $ipt -A SS_SPEC_TPROXY -p udp $PROXY_PORTS -j TPROXY --on-port "$LOCAL_PORT" --tproxy-mark 0x01/0x01 ;; + all) + $ipt -A SS_SPEC_TPROXY -p udp $PROXY_PORTS -j TPROXY --on-port "$LOCAL_PORT" --tproxy-mark 0x01/0x01 + ;; esac $ipt -I PREROUTING 1 ${IFNAME:+-i $IFNAME} -p udp $EXT_ARGS $MATCH_SET \ -m comment --comment "$TAG" -j SS_SPEC_TPROXY