298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

luci-app-ssr-plus: fix commit bug (....

Browse Source
This commit is contained in:
lean 2020-03-18 21:31:40 +08:00
parent 830d3f946c
commit 75d6fe83b8
9 changed files with 18912 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-ssr-plus
PKG_VERSION:=170
PKG_RELEASE:=4
PKG_RELEASE:=6
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
@ -77,6 +77,9 @@ define Package/$(PKG_NAME)/conffiles
endef
define Package/$(PKG_NAME)/install
$(INSTALL_DIR) $(1)/etc
$(INSTALL_DATA) ./root/etc/china_ssr.txt $(1)/etc/china_ssr.txt
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_CONF) ./root/etc/config/shadowsocksr $(1)/etc/config/shadowsocksr
$(INSTALL_DATA) ./root/etc/config/*.list $(1)/etc/config/

2
package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua
View File

@ -80,7 +80,7 @@ function refresh_data()
luci.sys.call("/usr/bin/ssr-gfw")
icount = luci.sys.exec("cat /tmp/gfwnew.txt | wc -l")
if tonumber(icount) > 1000 then
oldcount= l uci.sys.exec("cat /etc/dnsmasq.ssr/gfw_list.conf | wc -l")
oldcount= luci.sys.exec("cat /etc/dnsmasq.ssr/gfw_list.conf | wc -l")
if tonumber(icount) ~= tonumber(oldcount) then
luci.sys.exec("cp -f /tmp/gfwnew.txt /etc/dnsmasq.ssr/gfw_list.conf")
luci.sys.exec("cp -f /tmp/gfwnew.txt /tmp/dnsmasq.ssr/gfw_list.conf")

8481
package/lean/luci-app-ssr-plus/root/etc/china_ssr.txt Normal file
View File

File diff suppressed because it is too large Load Diff

0
package/lean/luci-app-ssr-plus/root/etc/config/black.list Normal file
View File

6
package/lean/luci-app-ssr-plus/root/etc/config/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

0
package/lean/luci-app-ssr-plus/root/etc/config/white.list Normal file
View File

10414
package/lean/luci-app-ssr-plus/root/etc/dnsmasq.ssr/gfw_list.conf Normal file
View File

File diff suppressed because it is too large Load Diff

19
package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
View File

@ -629,6 +629,8 @@ start() {
/usr/share/shadowsocksr/gfw2ipset.sh
if [ "$NETFLIX_SERVER" != "$GLOBAL_SERVER" ]; then
ipset -N netflix hash:net 2>/dev/null
cat /etc/config/netflix.list | while read line || [ -n "$line" ];
do
sed -i "/$line/d" /tmp/dnsmasq.ssr/gfw_list.conf
@ -637,18 +639,15 @@ start() {
awk '!/^$/&&!/^#/{printf("server=/.%s/'"127.0.0.1#5555"'\n",$0)}' /etc/config/netflix.list >> /tmp/dnsmasq.ssr/netflix_forward.conf
ipset add ss_spec_wan_ac $(check_host $(uci_get_by_name $NETFLIX_SERVER server)) 2>/dev/null
else
awk '!/^$/&&!/^#/{printf("ipset=/.%s/'"netflix"'\n",$0)}' /etc/config/netflix.list > /tmp/dnsmasq.ssr/netflix_forward.conf
awk '!/^$/&&!/^#/{printf("server=/.%s/'"127.0.0.1#5335"'\n",$0)}' /etc/config/netflix.list >> /tmp/dnsmasq.ssr/netflix_forward.conf
cat /etc/config/netflixip.list | while read nip || [ -n "$nip" ];
do
ipset add netflix $nip 2>/dev/null
done
else
rm -f /tmp/dnsmasq.ssr/netflix_forward.conf
fi
ipset -N netflix hash:net 2>/dev/null
cat /etc/config/netflixip.list | while read nip || [ -n "$nip" ];
do
ipset add netflix $nip 2>/dev/null
done
/etc/init.d/dnsmasq restart >/dev/null 2>&1
fi
start_server

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

@ -122,8 +122,6 @@ ipset_r() {
if [ "$NETFLIX" == "1" ]; then
$IPT -I SS_SPEC_WAN_AC -p tcp -m set --match-set netflix dst -j REDIRECT --to-ports 4321
else
$IPT -I SS_SPEC_WAN_AC -p tcp -m set --match-set netflix dst -j REDIRECT --to-ports $local_port
fi
return $?
}