fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-ssr-plus: sync with upstream source

Browse Source
This commit is contained in:
CN_SZTL 2020-07-19 17:34:03 +08:00
parent b5ae8feb35
commit a0c5f9837b
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
7 changed files with 10383 additions and 10371 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package/lean/luci-app-ssr-plus/Makefile
View File

@ -32,6 +32,14 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server
default y if i386||x86_64||arm||aarch64
endef
PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_plugin \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Trojan \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Redsocks2 \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server
LUCI_TITLE:=SS/SSR/V2Ray/Trojan/Socks5/Tun LuCI interface
LUCI_PKGARCH:=all
LUCI_DEPENDS:=+shadowsocksr-libev-alt +ipset +ip-full +iptables-mod-tproxy +dnsmasq-full +coreutils +coreutils-base64 +pdnsd-alt +wget +lua +libuci-lua \

14
package/lean/luci-app-ssr-plus/root/etc/ssr/china_ssr.txt
View File

@ -1065,7 +1065,6 @@
45.114.52.0/22
45.114.96.0/22
45.114.104.0/22
45.114.108.0/22
45.114.124.0/22
45.114.136.0/22
45.114.196.0/22
@ -2855,7 +2854,6 @@
103.61.160.0/22
103.61.172.0/22
103.61.176.0/22
103.61.184.0/22
103.61.188.0/22
103.62.24.0/22
103.62.52.0/22
@ -4056,6 +4054,13 @@
103.152.190.0/23
103.152.192.0/23
103.152.200.0/23
103.152.208.0/23
103.152.224.0/23
103.152.226.0/23
103.152.246.0/23
103.152.250.0/23
103.153.4.0/23
103.153.36.0/23
103.192.0.0/22
103.192.4.0/22
103.192.8.0/22
@ -5654,7 +5659,9 @@
120.31.0.0/16
120.32.0.0/13
120.40.0.0/14
120.44.0.0/14
120.44.0.0/15
120.46.0.0/16
120.47.0.0/16
120.48.0.0/15
120.52.0.0/16
120.53.0.0/16
@ -6113,7 +6120,6 @@
157.119.16.0/22
157.119.28.0/22
157.119.68.0/22
157.119.112.0/22
157.119.132.0/22
157.119.136.0/22
157.119.140.0/22

216
package/lean/luci-app-ssr-plus/root/etc/ssr/gfw_base.conf
View File

@ -1,108 +1,108 @@
ipset=/.91smartyun.pt/gfwlist
ipset=/.adobe.com/gfwlist
ipset=/.amazonaws.com/gfwlist
ipset=/.ampproject.org/gfwlist
ipset=/.apple.news/gfwlist
ipset=/.aws.amazon.com/gfwlist
ipset=/.azureedge.net/gfwlist
ipset=/.backpackers.com.tw/gfwlist
ipset=/.bitfinex.com/gfwlist
ipset=/.buzzfeed.com/gfwlist
ipset=/.clockwise.ee/gfwlist
ipset=/.cloudfront.net/gfwlist
ipset=/.coindesk.com/gfwlist
ipset=/.coinsquare.io/gfwlist
ipset=/.cryptocompare.com/gfwlist
ipset=/.dropboxstatic.com/gfwlist
ipset=/.eurecom.fr/gfwlist
ipset=/.gdax.com/gfwlist
ipset=/.github.com/gfwlist
ipset=/.kknews.cc/gfwlist
ipset=/.nutaq.com/gfwlist
ipset=/.openairinterface.org/gfwlist
ipset=/.skype.com/gfwlist
ipset=/.sublimetext.com/gfwlist
ipset=/.textnow.com/gfwlist
ipset=/.textnow.me/gfwlist
ipset=/.trouter.io/gfwlist
ipset=/.t66y.com/gfwlist
ipset=/.uploaded.net/gfwlist
ipset=/.whatsapp.com/gfwlist
ipset=/.whatsapp.net/gfwlist
ipset=/.wsj.net/gfwlist
ipset=/.google.com/gfwlist
ipset=/.google.com.hk/gfwlist
ipset=/.gstatic.com/gfwlist
ipset=/.googleusercontent.com/gfwlist
ipset=/.googlepages.com/gfwlist
ipset=/.googlevideo.com/gfwlist
ipset=/.googlecode.com/gfwlist
ipset=/.googleapis.com/gfwlist
ipset=/.googlesource.com/gfwlist
ipset=/.googledrive.com/gfwlist
ipset=/.ggpht.com/gfwlist
ipset=/.youtube.com/gfwlist
ipset=/.youtu.be/gfwlist
ipset=/.ytimg.com/gfwlist
ipset=/.twitter.com/gfwlist
ipset=/.facebook.com/gfwlist
ipset=/.fastly.net/gfwlist
ipset=/.akamai.net/gfwlist
ipset=/.akamaiedge.net/gfwlist
ipset=/.akamaihd.net/gfwlist
ipset=/.edgesuite.net/gfwlist
ipset=/.edgekey.net/gfwlist
server=/.91smartyun.pt/127.0.0.1#5335
server=/.adobe.com/127.0.0.1#5335
server=/.amazonaws.com/127.0.0.1#5335
server=/.ampproject.org/127.0.0.1#5335
server=/.apple.news/127.0.0.1#5335
server=/.aws.amazon.com/127.0.0.1#5335
server=/.azureedge.net/127.0.0.1#5335
server=/.backpackers.com.tw/127.0.0.1#5335
server=/.bitfinex.com/127.0.0.1#5335
server=/.buzzfeed.com/127.0.0.1#5335
server=/.clockwise.ee/127.0.0.1#5335
server=/.cloudfront.net/127.0.0.1#5335
server=/.coindesk.com/127.0.0.1#5335
server=/.coinsquare.io/127.0.0.1#5335
server=/.cryptocompare.com/127.0.0.1#5335
server=/.dropboxstatic.com/127.0.0.1#5335
server=/.eurecom.fr/127.0.0.1#5335
server=/.gdax.com/127.0.0.1#5335
server=/.github.com/127.0.0.1#5335
server=/.kknews.cc/127.0.0.1#5335
server=/.nutaq.com/127.0.0.1#5335
server=/.openairinterface.org/127.0.0.1#5335
server=/.skype.com/127.0.0.1#5335
server=/.sublimetext.com/127.0.0.1#5335
server=/.textnow.com/127.0.0.1#5335
server=/.textnow.me/127.0.0.1#5335
server=/.trouter.io/127.0.0.1#5335
server=/.t66y.com/127.0.0.1#5335
server=/.uploaded.net/127.0.0.1#5335
server=/.whatsapp.com/127.0.0.1#5335
server=/.whatsapp.net/127.0.0.1#5335
server=/.wsj.net/127.0.0.1#5335
server=/.google.com/127.0.0.1#5335
server=/.google.com.hk/127.0.0.1#5335
server=/.gstatic.com/127.0.0.1#5335
server=/.googleusercontent.com/127.0.0.1#5335
server=/.googlepages.com/127.0.0.1#5335
server=/.googlevideo.com/127.0.0.1#5335
server=/.googlecode.com/127.0.0.1#5335
server=/.googleapis.com/127.0.0.1#5335
server=/.googlesource.com/127.0.0.1#5335
server=/.googledrive.com/127.0.0.1#5335
server=/.ggpht.com/127.0.0.1#5335
server=/.youtube.com/127.0.0.1#5335
server=/.youtu.be/127.0.0.1#5335
server=/.ytimg.com/127.0.0.1#5335
server=/.twitter.com/127.0.0.1#5335
server=/.facebook.com/127.0.0.1#5335
server=/.fastly.net/127.0.0.1#5335
server=/.akamai.net/127.0.0.1#5335
server=/.akamaiedge.net/127.0.0.1#5335
server=/.akamaihd.net/127.0.0.1#5335
server=/.edgesuite.net/127.0.0.1#5335
server=/.edgekey.net/127.0.0.1#5335
ipset=/91smartyun.pt/gfwlist
ipset=/adobe.com/gfwlist
ipset=/amazonaws.com/gfwlist
ipset=/ampproject.org/gfwlist
ipset=/apple.news/gfwlist
ipset=/aws.amazon.com/gfwlist
ipset=/azureedge.net/gfwlist
ipset=/backpackers.com.tw/gfwlist
ipset=/bitfinex.com/gfwlist
ipset=/buzzfeed.com/gfwlist
ipset=/clockwise.ee/gfwlist
ipset=/cloudfront.net/gfwlist
ipset=/coindesk.com/gfwlist
ipset=/coinsquare.io/gfwlist
ipset=/cryptocompare.com/gfwlist
ipset=/dropboxstatic.com/gfwlist
ipset=/eurecom.fr/gfwlist
ipset=/gdax.com/gfwlist
ipset=/github.com/gfwlist
ipset=/kknews.cc/gfwlist
ipset=/nutaq.com/gfwlist
ipset=/openairinterface.org/gfwlist
ipset=/skype.com/gfwlist
ipset=/sublimetext.com/gfwlist
ipset=/textnow.com/gfwlist
ipset=/textnow.me/gfwlist
ipset=/trouter.io/gfwlist
ipset=/t66y.com/gfwlist
ipset=/uploaded.net/gfwlist
ipset=/whatsapp.com/gfwlist
ipset=/whatsapp.net/gfwlist
ipset=/wsj.net/gfwlist
ipset=/google.com/gfwlist
ipset=/google.com.hk/gfwlist
ipset=/gstatic.com/gfwlist
ipset=/googleusercontent.com/gfwlist
ipset=/googlepages.com/gfwlist
ipset=/googlevideo.com/gfwlist
ipset=/googlecode.com/gfwlist
ipset=/googleapis.com/gfwlist
ipset=/googlesource.com/gfwlist
ipset=/googledrive.com/gfwlist
ipset=/ggpht.com/gfwlist
ipset=/youtube.com/gfwlist
ipset=/youtu.be/gfwlist
ipset=/ytimg.com/gfwlist
ipset=/twitter.com/gfwlist
ipset=/facebook.com/gfwlist
ipset=/fastly.net/gfwlist
ipset=/akamai.net/gfwlist
ipset=/akamaiedge.net/gfwlist
ipset=/akamaihd.net/gfwlist
ipset=/edgesuite.net/gfwlist
ipset=/edgekey.net/gfwlist
server=/91smartyun.pt/127.0.0.1#5335
server=/adobe.com/127.0.0.1#5335
server=/amazonaws.com/127.0.0.1#5335
server=/ampproject.org/127.0.0.1#5335
server=/apple.news/127.0.0.1#5335
server=/aws.amazon.com/127.0.0.1#5335
server=/azureedge.net/127.0.0.1#5335
server=/backpackers.com.tw/127.0.0.1#5335
server=/bitfinex.com/127.0.0.1#5335
server=/buzzfeed.com/127.0.0.1#5335
server=/clockwise.ee/127.0.0.1#5335
server=/cloudfront.net/127.0.0.1#5335
server=/coindesk.com/127.0.0.1#5335
server=/coinsquare.io/127.0.0.1#5335
server=/cryptocompare.com/127.0.0.1#5335
server=/dropboxstatic.com/127.0.0.1#5335
server=/eurecom.fr/127.0.0.1#5335
server=/gdax.com/127.0.0.1#5335
server=/github.com/127.0.0.1#5335
server=/kknews.cc/127.0.0.1#5335
server=/nutaq.com/127.0.0.1#5335
server=/openairinterface.org/127.0.0.1#5335
server=/skype.com/127.0.0.1#5335
server=/sublimetext.com/127.0.0.1#5335
server=/textnow.com/127.0.0.1#5335
server=/textnow.me/127.0.0.1#5335
server=/trouter.io/127.0.0.1#5335
server=/t66y.com/127.0.0.1#5335
server=/uploaded.net/127.0.0.1#5335
server=/whatsapp.com/127.0.0.1#5335
server=/whatsapp.net/127.0.0.1#5335
server=/wsj.net/127.0.0.1#5335
server=/google.com/127.0.0.1#5335
server=/google.com.hk/127.0.0.1#5335
server=/gstatic.com/127.0.0.1#5335
server=/googleusercontent.com/127.0.0.1#5335
server=/googlepages.com/127.0.0.1#5335
server=/googlevideo.com/127.0.0.1#5335
server=/googlecode.com/127.0.0.1#5335
server=/googleapis.com/127.0.0.1#5335
server=/googlesource.com/127.0.0.1#5335
server=/googledrive.com/127.0.0.1#5335
server=/ggpht.com/127.0.0.1#5335
server=/youtube.com/127.0.0.1#5335
server=/youtu.be/127.0.0.1#5335
server=/ytimg.com/127.0.0.1#5335
server=/twitter.com/127.0.0.1#5335
server=/facebook.com/127.0.0.1#5335
server=/fastly.net/127.0.0.1#5335
server=/akamai.net/127.0.0.1#5335
server=/akamaiedge.net/127.0.0.1#5335
server=/akamaihd.net/127.0.0.1#5335
server=/edgesuite.net/127.0.0.1#5335
server=/edgekey.net/127.0.0.1#5335

20506
package/lean/luci-app-ssr-plus/root/etc/ssr/gfw_list.conf
View File

File diff suppressed because it is too large Load Diff

6
package/lean/luci-app-ssr-plus/root/etc/ssr/netflixip.list
View File

@ -1,15 +1,15 @@
8.41.4.0/24
23.246.0.0/18
37.77.184.0/21
38.72.126.0/24
45.57.0.0/17
64.120.128.0/17
66.197.128.0/17
69.53.224.0/19
103.87.204.0/22
108.175.32.0/20
185.2.220.0/22
185.9.188.0/22
192.173.64.0/18
198.38.96.0/19
198.45.48.0/20
207.45.72.0/22
208.75.76.0/22
208.75.76.0/22

2
package/lean/luci-app-ssr-plus/root/usr/bin/ssr-gfw
View File

@ -19,5 +19,5 @@ prev = cur;
}
generate_china_banned /tmp/ssr-update.$1 >/tmp/gfw.txt
rm -f /tmp/gfwlist.txt
sed '/.*/s/.*/server=\/\.&\/127.0.0.1#5335\nipset=\/\.&\/gfwlist/' /tmp/gfw.txt >/tmp/ssr-update.$1
sed '/.*/s/.*/server=\/&\/127.0.0.1#5335\nipset=\/&\/gfwlist/' /tmp/gfw.txt >/tmp/ssr-update.$1
rm -f /tmp/gfw.txt

2
package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gfw2ipset.sh
View File

@ -9,7 +9,7 @@ NETFLIX_SERVER=$(uci_get_by_type global netflix_server nil)
[ "$NETFLIX_SERVER" == "same" ] && NETFLIX_SERVER=$GLOBAL_SERVER
if [ "$NETFLIX_SERVER" != "nil" ]; then
netflix() {
if [ -f "tmp/dnsmasq.ssr/gfw_list.conf" ]; then
if [ -f "/tmp/dnsmasq.ssr/gfw_list.conf" ]; then
for line in $(cat /etc/ssr/netflix.list); do sed -i "/$line/d" /tmp/dnsmasq.ssr/gfw_list.conf; done
fi
awk '!/^$/&&!/^#/{printf("ipset=/.%s/'"netflix"'\n",$0)}' /etc/ssr/netflix.list >/tmp/dnsmasq.ssr/netflix_forward.conf