OpenClash: bump to v0.37.4-beta

This commit is contained in:
CN_SZTL 2020-04-23 03:09:15 +08:00
parent 39d4c7314d
commit 4b4948f75b
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
21 changed files with 1167 additions and 270 deletions

View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-openclash
PKG_VERSION:=0.37.3
PKG_VERSION:=0.37.4
PKG_RELEASE:=beta
PKG_MAINTAINER:=vernesong <https://github.com/vernesong/OpenClash>

View File

@ -110,49 +110,11 @@ yml_check()
sed -i "s/- \{2,\}/- /g" "$3" 2>/dev/null
#检查关键字避免后续操作出错
#proxy-providers
[ -z "$(grep "^proxy-provider:" "$3")" ] && {
sed -i "/^ \{1,\}proxy-provider:/c\proxy-provider:" "$3" 2>/dev/null
}
[ -z "$(grep "^proxy-provider:" "$3")" ] && {
sed -i "/^ \{0,\}proxy-providers:/c\proxy-provider:" "$3" 2>/dev/null
}
#proxy-groups
[ -z "$(grep "^Proxy Group:" "$3")" ] && {
sed -i "/^ \{0,\}\'Proxy Group\':/c\Proxy Group:" "$3" 2>/dev/null
sed -i '/^ \{0,\}\"Proxy Group\":/c\Proxy Group:' "$3" 2>/dev/null
sed -i "/^ \{1,\}Proxy Group:/c\Proxy Group:" "$3" 2>/dev/null
}
[ -z "$(grep "^Proxy Group:" "$3")" ] && {
sed -i "/^ \{0,\}proxy-groups:/c\Proxy Group:" "$3" 2>/dev/null
}
#proxies
[ -z "$(grep "^Proxy:" "$3")" ] && {
sed -i "/^ \{1,\}Proxy:/c\Proxy:" "$3" 2>/dev/null
}
[ -z "$(grep "^Proxy:" "$3")" ] && {
sed -i "/^proxies:/c\Proxy:" "$3" 2>/dev/null
}
[ -z "$(grep "^Proxy:" "$3")" ] && {
group_len=$(sed -n '/^Proxy Group:/=' "$3" 2>/dev/null)
proxies_len=$(sed -n '/proxies:/=' "$3" 2>/dev/null |sed -n 1p)
if [ "$proxies_len" -lt "$group_len" ]; then
sed -i "${proxies_len}c\Proxy:" "$3" 2>/dev/null
fi 2>/dev/null
}
#rules
[ -z "$(grep "^Rule:" "$3")" ] && {
sed -i "/^ \{1,\}Rule:/c\Rule:" "$3" 2>/dev/null
}
[ -z "$(grep "^Rule:" "$3")" ] && {
sed -i "/^ \{0,\}rules:/c\Rule:" "$3" 2>/dev/null
}
/usr/share/openclash/yml_field_name_ch.sh "$3"
#dns
[ -z "$(grep "^dns:" "$3")" ] && {
sed -i "/^ \{1,\}dns:/c\dns:" "$3" 2>/dev/null
sed -i "s/^ \{1,\}dns:/dns:/g" "$3" 2>/dev/null
}
#创建启动备份
@ -166,6 +128,7 @@ yml_check()
#位置检查
proxy_len=$(sed -n '/^Proxy:/=' "$3" 2>/dev/null)
provider_len=$(sed -n '/^proxy-provider:/=' "$3" 2>/dev/null)
group_len=$(sed -n '/^Proxy Group:/=' "$3" 2>/dev/null)
dns_len=$(sed -n '/^dns:/=' "$3" 2>/dev/null)
rule_len=$(sed -n '/^Rule:/=' "$3" 2>/dev/null)
@ -197,10 +160,11 @@ yml_check()
sed -i '/^Proxy Group:/i\proxy-provider-tag' "$3" 2>/dev/null
sed -i '/^proxy-provider:/,/proxy-provider-tag/d' "$3" 2>/dev/null
sed -i '/^Proxy:/i\proxy-provider:' "$3" 2>/dev/null
sed -i '/^proxy-provider:/d' /tmp/backprovider.yaml 2>/dev/null
sed -i 's/^proxy-provider://g' /tmp/backprovider.yaml 2>/dev/null
sed -i '/^ *$/d' /tmp/backprovider.yaml 2>/dev/null
sed -i '/proxy-provider:/r/tmp/backprovider.yaml' "$3" 2>/dev/null
rm -rf /tmp/backprovider.yaml 2>/dev/null
elif [ "$provider_len" -ge "$group_len" ]; then
elif [ "$provider_len" -ge "$group_len" ] && [ "$provider_len" -le "$rule_len" ]; then; then
awk '/^proxy-provider:/,/^Rule:/{print}' "$3" | sed '/^Rule:/d' >/tmp/backprovider.yaml 2>/dev/null
sed -i '/^Rule:/i\proxy-provider-tag' "$3" 2>/dev/null
sed -i '/^proxy-provider:/,/proxy-provider-tag/d' "$3" 2>/dev/null
@ -209,7 +173,20 @@ yml_check()
else
sed -i '/^Proxy Group:/i\proxy-provider:' "$3" 2>/dev/null
fi
sed -i '/^proxy-provider:/d' /tmp/backprovider.yaml 2>/dev/null
sed -i 's/^proxy-provider://g' /tmp/backprovider.yaml 2>/dev/null
sed -i '/^ *$/d' /tmp/backprovider.yaml 2>/dev/null
sed -i '/proxy-provider:/r/tmp/backprovider.yaml' "$3" 2>/dev/null
rm -rf /tmp/backprovider.yaml 2>/dev/null
elif [ "$provider_len" -ge "$rule_len" ]; then
sed -n '/^ \{0,\}proxy-provider:/,$p' "$3" >/tmp/backprovider.yaml 2>/dev/null
sed -i '/^ \{0,\}proxy-provider:/,$d' "$3" 2>/dev/null
if [ ! -z "$proxy_len" ]; then
sed -i '/^Proxy:/i\proxy-provider:' "$3" 2>/dev/null
else
sed -i '/^Proxy Group:/i\proxy-provider:' "$3" 2>/dev/null
fi
sed -i 's/^proxy-provider://g' /tmp/backprovider.yaml 2>/dev/null
sed -i '/^ *$/d' /tmp/backprovider.yaml 2>/dev/null
sed -i '/proxy-provider:/r/tmp/backprovider.yaml' "$3" 2>/dev/null
rm -rf /tmp/backprovider.yaml 2>/dev/null
fi 2>/dev/null
@ -298,42 +275,60 @@ yml_dns_check()
}
#修改代理集路径
yml_provider_path()
{
sed -i "s/\'//g" "$1" 2>/dev/null
sed -i 's/\"//g' "$1" 2>/dev/null
proxy_provider_path_line=$(sed -n '/^ \{0,\}path:/=' "$1" 2>/dev/null)
if [ ! -z "$proxy_provider_path_line" ]; then
for n in $proxy_provider_path_line
do
provider_path=$(sed -n "${n}p" "$1" |awk -F 'path:' '{print $2}' 2>/dev/null |sed 's/,.*//' 2>/dev/null |sed 's/^ \{0,\}//g' 2>/dev/null |sed 's/ \{0,\}$//g' 2>/dev/null |sed 's/ \{0,\}\}\{0,\}$//g' 2>/dev/null)
if [ -z "$(echo "$provider_path" |grep "proxy_provider")" ]; then
provider_name=$(echo "$provider_path" |awk -F '/' '{print $NF}')
sed -i "s#${provider_path}#./proxy_provider/${provider_name}#" "$1" 2>/dev/null
fi
done
fi
}
#检查代理集文件防止启动失败
yml_proxy_provider_check()
{
while ( [ ! -z "$(pidof clash)" ] && [ "$proxy_provider_path_exist" != 1 ] )
do
if [ "$proxy_provider_mode" = 1 ]; then
proxy_provider_path_line=$(sed -n '/^ \{0,\}path:/=' "$1" 2>/dev/null)
proxy_provider_path_exist=1
for n in $proxy_provider_path_line
do
provider_path=$(sed -n "${n}p" $1 |awk -F 'path:' '{print $2}' 2>/dev/null |sed 's/,.*//' 2>/dev/null |sed 's/^ \{0,\}//g' 2>/dev/null |sed 's/ \{0,\}$//g' 2>/dev/null |sed 's/ \{0,\}\}\{0,\}$//g' 2>/dev/null)
if [ "$(echo ${provider_path:0:1})" = "." ]; then
provider_path_check="/etc/openclash/$(echo ${provider_path:2})"
if [ -f "$provider_path_check" ]; then
if [ -z "$(grep "'proxies:':" "$provider_path_check")" ] && [ -z "$(grep '"proxies:":' "$provider_path_check")" ] && [ -z "$(grep 'proxies:' "$provider_path_check")" ]; then
if [ ! -z "$proxy_provider_path_line" ]; then
while ( [ ! -z "$(pidof clash)" ] && [ "$proxy_provider_path_exist" != 1 ] )
do
if [ "$proxy_provider_mode" = 1 ]; then
proxy_provider_path_exist=1
for n in $proxy_provider_path_line
do
provider_path=$(sed -n "${n}p" "$1" |awk -F 'path:' '{print $2}' 2>/dev/null |sed 's/,.*//' 2>/dev/null |sed 's/^ \{0,\}//g' 2>/dev/null |sed 's/ \{0,\}$//g' 2>/dev/null |sed 's/ \{0,\}\}\{0,\}$//g' 2>/dev/null)
if [ "$(echo ${provider_path:0:1})" = "." ]; then
provider_path_check="/etc/openclash/$(echo ${provider_path:2})"
if [ -f "$provider_path_check" ]; then
if [ -z "$(grep "'proxies:':" "$provider_path_check")" ] && [ -z "$(grep '"proxies:":' "$provider_path_check")" ] && [ -z "$(grep 'proxies:' "$provider_path_check")" ]; then
proxy_provider_path_exist=0
fi
else
proxy_provider_path_exist=0
fi
else
proxy_provider_path_exist=0
fi
else
provider_path_check="$provider_path"
if [ -f "$provider_path_check" ]; then
if [ -z "$(grep "'proxies:':" "$provider_path_check")" ] && [ -z "$(grep '"proxies:":' "$provider_path_check")" ] && [ -z "$(grep 'proxies:' "$provider_path_check")" ]; then
provider_path_check="$provider_path"
if [ -f "$provider_path_check" ]; then
if [ -z "$(grep "'proxies:':" "$provider_path_check")" ] && [ -z "$(grep '"proxies:":' "$provider_path_check")" ] && [ -z "$(grep 'proxies:' "$provider_path_check")" ]; then
proxy_provider_path_exist=0
fi
else
proxy_provider_path_exist=0
fi
else
proxy_provider_path_exist=0
fi
fi
done
else
proxy_provider_path_exist=1
fi
done
done
else
proxy_provider_path_exist=1
fi
done
fi
if [ -z "$(pidof clash)" ] && [ "$proxy_provider_mode" = 1 ]; then
echo "错误: OpenClash 启动失败,请到日志页面查看详细错误信息!" >$START_LOG
@ -782,6 +777,7 @@ if [ "$enable" -eq 1 ] && [ -f "$CONFIG_FILE" ]; then
yml_auth_custom "$CONFIG_FILE"
yml_cut "$CHANGE_FILE" "$RULE_FILE" "$DNS_FILE" "$CONFIG_FILE" "$PROXY_FILE" "$PROXY_PROVIDER_FILE" "$GROUP_FILE"
yml_dns_custom "$enable_custom_dns" "$DNS_FILE"
yml_provider_path "$PROXY_PROVIDER_FILE"
sh /usr/share/openclash/yml_change.sh >/dev/null 2>&1 "$LOGTIME" "$en_mode" "$enable_custom_dns" "$da_password" "$cn_port" "$proxy_port" "$CHANGE_FILE" "$ipv6_enable" "$http_port" "$socks_port" "$lan_ip" "$log_level" "$proxy_mode" "$intranet_allowed" "$en_mode_tun" &
sh /usr/share/openclash/yml_rules_change.sh >/dev/null 2>&1 "$LOGTIME" "$rule_source" "$enable_custom_clash_rules" "$RULE_FILE" "$set_rule_file" "$en_mode" "$enable_rule_proxy" "$BACKUP_FILE" &
wait

View File

@ -2177,7 +2177,6 @@ Rule:
- DOMAIN-SUFFIX,cca.mob.com,AdBlock
- DOMAIN-SUFFIX,ccb.uncle-ad.com,AdBlock
- DOMAIN-SUFFIX,ccbaihehq.com,AdBlock
- DOMAIN-SUFFIX,ccclub.cmbchina.com,AdBlock
- DOMAIN-SUFFIX,cccrir.com,AdBlock
- DOMAIN-SUFFIX,ccr.yxdown.com,AdBlock
- DOMAIN-SUFFIX,cctyly.com,AdBlock
@ -8529,7 +8528,9 @@ Rule:
# > Disney Plus
# - USER-AGENT,Disney*,GlobalTV
- DOMAIN,cdn.registerdisney.go.com,GlobalTV
- DOMAIN,cdn.cdn.unid.go.com,GlobalTV
- DOMAIN-SUFFIX,bamgrid.com,GlobalTV
- DOMAIN-SUFFIX,braze.com,GlobalTV
- DOMAIN-SUFFIX,conviva.com,GlobalTV
- DOMAIN-SUFFIX,disney.demdex.net,GlobalTV
- DOMAIN-SUFFIX,disneyplus.com,GlobalTV
@ -8633,7 +8634,14 @@ Rule:
# > ViuTV
# - USER-AGENT,ViuTV*,GlobalTV
- DOMAIN-SUFFIX,bootstrapcdn.com,GlobalTV
- DOMAIN-SUFFIX,cloudfront.net,GlobalTV
- DOMAIN-SUFFIX,cognito-identity.us-east-1.amazonaws.com,GlobalTV
- DOMAIN-SUFFIX,firebaseio.com,GlobalTV
- DOMAIN-SUFFIX,jwpcdn.com,GlobalTV
- DOMAIN-SUFFIX,jwplayer.com,GlobalTV
- DOMAIN-SUFFIX,mobileanalytics.us-east-1.amazonaws.com,GlobalTV
- DOMAIN-SUFFIX,nowe.com,GlobalTV
- DOMAIN-SUFFIX,viu.com,GlobalTV
- DOMAIN-SUFFIX,viu.tv,GlobalTV
- DOMAIN-SUFFIX,viu.now.com,GlobalTV
@ -8662,21 +8670,912 @@ Rule:
- DOMAIN-SUFFIX,nflximg.net,Netflix
- DOMAIN-SUFFIX,nflxso.net,Netflix
- DOMAIN-SUFFIX,nflxvideo.net,Netflix
- IP-CIDR,8.41.4.0/24,Netflix
- IP-CIDR,23.246.0.0/18,Netflix
- IP-CIDR,37.77.184.0/21,Netflix
- IP-CIDR,45.57.0.0/17,Netflix
- IP-CIDR,64.120.128.0/17,Netflix
- IP-CIDR,66.197.128.0/17,Netflix
- IP-CIDR,69.53.224.0/19,Netflix
- IP-CIDR,108.175.32.0/20,Netflix
- IP-CIDR,185.2.220.0/22,Netflix
- IP-CIDR,185.9.188.0/22,Netflix
- IP-CIDR,192.173.64.0/18,Netflix
- IP-CIDR,198.38.96.0/19,Netflix
- IP-CIDR,198.45.48.0/20,Netflix
- IP-CIDR,207.45.72.0/22,Netflix
- IP-CIDR,208.75.76.0/22,Netflix
- IP-CIDR,1.37.35.6/32,Netflix
- IP-CIDR,101.100.179.242/32,Netflix
- IP-CIDR,101.100.179.250/32,Netflix
- IP-CIDR,105.187.240.196/32,Netflix
- IP-CIDR,105.187.240.197/32,Netflix
- IP-CIDR,105.187.243.5/32,Netflix
- IP-CIDR,105.187.243.6/32,Netflix
- IP-CIDR,112.198.26.2/32,Netflix
- IP-CIDR,122.155.238.138/32,Netflix
- IP-CIDR,122.155.238.142/32,Netflix
- IP-CIDR,122.155.238.146/32,Netflix
- IP-CIDR,122.155.238.150/32,Netflix
- IP-CIDR,139.45.192.1/32,Netflix
- IP-CIDR,139.45.206.1/32,Netflix
- IP-CIDR,139.45.234.1/32,Netflix
- IP-CIDR,14.136.135.180/32,Netflix
- IP-CIDR,14.136.135.196/32,Netflix
- IP-CIDR,14.136.137.68/32,Netflix
- IP-CIDR,14.136.139.164/32,Netflix
- IP-CIDR,140.197.247.84/32,Netflix
- IP-CIDR,144.208.211.67/32,Netflix
- IP-CIDR,145.253.34.129/32,Netflix
- IP-CIDR,145.253.34.139/32,Netflix
- IP-CIDR,145.253.34.141/32,Netflix
- IP-CIDR,145.253.34.143/32,Netflix
- IP-CIDR,145.253.34.145/32,Netflix
- IP-CIDR,145.253.34.151/32,Netflix
- IP-CIDR,145.253.34.153/32,Netflix
- IP-CIDR,145.253.34.155/32,Netflix
- IP-CIDR,145.253.34.157/32,Netflix
- IP-CIDR,145.253.34.21/32,Netflix
- IP-CIDR,145.253.34.55/32,Netflix
- IP-CIDR,145.253.34.63/32,Netflix
- IP-CIDR,146.115.2.226/32,Netflix
- IP-CIDR,146.115.2.234/32,Netflix
- IP-CIDR,146.115.2.238/32,Netflix
- IP-CIDR,146.115.2.50/32,Netflix
- IP-CIDR,146.115.2.62/32,Netflix
- IP-CIDR,147.75.112.66/32,Netflix
- IP-CIDR,147.75.112.67/32,Netflix
- IP-CIDR,149.165.180.133/32,Netflix
- IP-CIDR,149.165.180.134/32,Netflix
- IP-CIDR,149.255.128.1/32,Netflix
- IP-CIDR,151.5.17.19/32,Netflix
- IP-CIDR,151.5.17.43/32,Netflix
- IP-CIDR,161.0.157.195/32,Netflix
- IP-CIDR,161.0.157.73/32,Netflix
- IP-CIDR,162.212.12.52/32,Netflix
- IP-CIDR,162.220.138.2/32,Netflix
- IP-CIDR,162.223.18.131/32,Netflix
- IP-CIDR,164.113.254.234/32,Netflix
- IP-CIDR,167.142.14.130/32,Netflix
- IP-CIDR,167.142.14.134/32,Netflix
- IP-CIDR,167.142.14.138/32,Netflix
- IP-CIDR,167.142.208.146/32,Netflix
- IP-CIDR,170.238.0.198/32,Netflix
- IP-CIDR,170.238.0.202/32,Netflix
- IP-CIDR,170.238.0.206/32,Netflix
- IP-CIDR,170.249.156.82/32,Netflix
- IP-CIDR,170.249.179.114/32,Netflix
- IP-CIDR,170.52.52.130/32,Netflix
- IP-CIDR,172.56.128.126/32,Netflix
- IP-CIDR,172.56.128.126/32,Netflix
- IP-CIDR,172.56.132.126/32,Netflix
- IP-CIDR,172.56.132.126/32,Netflix
- IP-CIDR,172.56.133.126/32,Netflix
- IP-CIDR,172.56.133.126/32,Netflix
- IP-CIDR,172.56.138.126/32,Netflix
- IP-CIDR,172.56.138.126/32,Netflix
- IP-CIDR,172.56.139.126/32,Netflix
- IP-CIDR,172.56.139.126/32,Netflix
- IP-CIDR,172.56.140.126/32,Netflix
- IP-CIDR,172.56.140.126/32,Netflix
- IP-CIDR,172.56.141.126/32,Netflix
- IP-CIDR,172.56.141.126/32,Netflix
- IP-CIDR,172.56.143.126/32,Netflix
- IP-CIDR,172.56.143.126/32,Netflix
- IP-CIDR,172.56.145.66/32,Netflix
- IP-CIDR,172.56.145.66/32,Netflix
- IP-CIDR,173.219.132.226/32,Netflix
- IP-CIDR,173.219.132.229/32,Netflix
- IP-CIDR,173.219.194.149/32,Netflix
- IP-CIDR,173.219.194.49/32,Netflix
- IP-CIDR,173.219.222.237/32,Netflix
- IP-CIDR,173.219.237.165/32,Netflix
- IP-CIDR,173.219.75.17/32,Netflix
- IP-CIDR,173.219.75.19/32,Netflix
- IP-CIDR,173.235.1.133/32,Netflix
- IP-CIDR,173.244.134.58/32,Netflix
- IP-CIDR,181.188.0.162/32,Netflix
- IP-CIDR,181.188.0.166/32,Netflix
- IP-CIDR,181.36.10.194/32,Netflix
- IP-CIDR,181.36.10.198/32,Netflix
- IP-CIDR,181.36.10.202/32,Netflix
- IP-CIDR,181.36.10.206/32,Netflix
- IP-CIDR,181.36.10.210/32,Netflix
- IP-CIDR,181.36.10.214/32,Netflix
- IP-CIDR,181.36.10.234/32,Netflix
- IP-CIDR,181.36.10.238/32,Netflix
- IP-CIDR,181.36.10.242/32,Netflix
- IP-CIDR,181.36.10.246/32,Netflix
- IP-CIDR,181.36.10.38/32,Netflix
- IP-CIDR,181.36.10.4/32,Netflix
- IP-CIDR,181.36.10.42/32,Netflix
- IP-CIDR,181.39.188.10/32,Netflix
- IP-CIDR,181.39.188.13/32,Netflix
- IP-CIDR,181.39.188.14/32,Netflix
- IP-CIDR,181.39.188.18/32,Netflix
- IP-CIDR,181.39.188.19/32,Netflix
- IP-CIDR,181.39.188.20/32,Netflix
- IP-CIDR,181.39.44.170/32,Netflix
- IP-CIDR,181.39.44.174/32,Netflix
- IP-CIDR,181.39.44.178/32,Netflix
- IP-CIDR,181.39.44.179/32,Netflix
- IP-CIDR,181.39.44.180/32,Netflix
- IP-CIDR,181.39.44.181/32,Netflix
- IP-CIDR,181.39.44.182/32,Netflix
- IP-CIDR,181.39.44.183/32,Netflix
- IP-CIDR,182.50.85.101/32,Netflix
- IP-CIDR,182.50.85.102/32,Netflix
- IP-CIDR,182.50.85.110/32,Netflix
- IP-CIDR,182.50.85.117/32,Netflix
- IP-CIDR,182.50.85.118/32,Netflix
- IP-CIDR,182.50.85.126/32,Netflix
- IP-CIDR,182.79.164.10/32,Netflix
- IP-CIDR,182.79.164.136/32,Netflix
- IP-CIDR,182.79.164.14/32,Netflix
- IP-CIDR,182.79.164.140/32,Netflix
- IP-CIDR,182.79.164.142/32,Netflix
- IP-CIDR,182.79.164.144/32,Netflix
- IP-CIDR,182.79.164.2/32,Netflix
- IP-CIDR,182.79.164.6/32,Netflix
- IP-CIDR,182.79.223.230/32,Netflix
- IP-CIDR,182.79.223.234/32,Netflix
- IP-CIDR,182.79.223.238/32,Netflix
- IP-CIDR,182.79.223.242/32,Netflix
- IP-CIDR,182.79.223.246/32,Netflix
- IP-CIDR,182.79.223.250/32,Netflix
- IP-CIDR,184.150.14.101/32,Netflix
- IP-CIDR,184.150.14.103/32,Netflix
- IP-CIDR,184.150.14.11/32,Netflix
- IP-CIDR,184.150.14.129/32,Netflix
- IP-CIDR,184.150.14.13/32,Netflix
- IP-CIDR,184.150.14.131/32,Netflix
- IP-CIDR,184.150.14.133/32,Netflix
- IP-CIDR,184.150.14.135/32,Netflix
- IP-CIDR,184.150.14.137/32,Netflix
- IP-CIDR,184.150.14.139/32,Netflix
- IP-CIDR,184.150.14.141/32,Netflix
- IP-CIDR,184.150.14.143/32,Netflix
- IP-CIDR,184.150.14.145/32,Netflix
- IP-CIDR,184.150.14.147/32,Netflix
- IP-CIDR,184.150.14.149/32,Netflix
- IP-CIDR,184.150.14.15/32,Netflix
- IP-CIDR,184.150.14.151/32,Netflix
- IP-CIDR,184.150.14.153/32,Netflix
- IP-CIDR,184.150.14.155/32,Netflix
- IP-CIDR,184.150.14.157/32,Netflix
- IP-CIDR,184.150.14.159/32,Netflix
- IP-CIDR,184.150.14.161/32,Netflix
- IP-CIDR,184.150.14.163/32,Netflix
- IP-CIDR,184.150.14.165/32,Netflix
- IP-CIDR,184.150.14.17/32,Netflix
- IP-CIDR,184.150.14.19/32,Netflix
- IP-CIDR,184.150.14.193/32,Netflix
- IP-CIDR,184.150.14.195/32,Netflix
- IP-CIDR,184.150.14.197/32,Netflix
- IP-CIDR,184.150.14.199/32,Netflix
- IP-CIDR,184.150.14.201/32,Netflix
- IP-CIDR,184.150.14.203/32,Netflix
- IP-CIDR,184.150.14.205/32,Netflix
- IP-CIDR,184.150.14.207/32,Netflix
- IP-CIDR,184.150.14.209/32,Netflix
- IP-CIDR,184.150.14.21/32,Netflix
- IP-CIDR,184.150.14.211/32,Netflix
- IP-CIDR,184.150.14.213/32,Netflix
- IP-CIDR,184.150.14.215/32,Netflix
- IP-CIDR,184.150.14.217/32,Netflix
- IP-CIDR,184.150.14.219/32,Netflix
- IP-CIDR,184.150.14.221/32,Netflix
- IP-CIDR,184.150.14.223/32,Netflix
- IP-CIDR,184.150.14.225/32,Netflix
- IP-CIDR,184.150.14.227/32,Netflix
- IP-CIDR,184.150.14.229/32,Netflix
- IP-CIDR,184.150.14.23/32,Netflix
- IP-CIDR,184.150.14.25/32,Netflix
- IP-CIDR,184.150.14.27/32,Netflix
- IP-CIDR,184.150.14.29/32,Netflix
- IP-CIDR,184.150.14.3/32,Netflix
- IP-CIDR,184.150.14.31/32,Netflix
- IP-CIDR,184.150.14.33/32,Netflix
- IP-CIDR,184.150.14.35/32,Netflix
- IP-CIDR,184.150.14.37/32,Netflix
- IP-CIDR,184.150.14.39/32,Netflix
- IP-CIDR,184.150.14.5/32,Netflix
- IP-CIDR,184.150.14.65/32,Netflix
- IP-CIDR,184.150.14.67/32,Netflix
- IP-CIDR,184.150.14.69/32,Netflix
- IP-CIDR,184.150.14.7/32,Netflix
- IP-CIDR,184.150.14.71/32,Netflix
- IP-CIDR,184.150.14.73/32,Netflix
- IP-CIDR,184.150.14.75/32,Netflix
- IP-CIDR,184.150.14.77/32,Netflix
- IP-CIDR,184.150.14.79/32,Netflix
- IP-CIDR,184.150.14.81/32,Netflix
- IP-CIDR,184.150.14.83/32,Netflix
- IP-CIDR,184.150.14.85/32,Netflix
- IP-CIDR,184.150.14.87/32,Netflix
- IP-CIDR,184.150.14.89/32,Netflix
- IP-CIDR,184.150.14.9/32,Netflix
- IP-CIDR,184.150.14.91/32,Netflix
- IP-CIDR,184.150.14.93/32,Netflix
- IP-CIDR,184.150.14.95/32,Netflix
- IP-CIDR,184.150.14.97/32,Netflix
- IP-CIDR,184.150.14.99/32,Netflix
- IP-CIDR,184.150.15.1/32,Netflix
- IP-CIDR,184.150.15.101/32,Netflix
- IP-CIDR,184.150.15.11/32,Netflix
- IP-CIDR,184.150.15.13/32,Netflix
- IP-CIDR,184.150.15.15/32,Netflix
- IP-CIDR,184.150.15.21/32,Netflix
- IP-CIDR,184.150.15.23/32,Netflix
- IP-CIDR,184.150.15.25/32,Netflix
- IP-CIDR,184.150.15.27/32,Netflix
- IP-CIDR,184.150.15.29/32,Netflix
- IP-CIDR,184.150.15.3/32,Netflix
- IP-CIDR,184.150.15.31/32,Netflix
- IP-CIDR,184.150.15.33/32,Netflix
- IP-CIDR,184.150.15.35/32,Netflix
- IP-CIDR,184.150.15.37/32,Netflix
- IP-CIDR,184.150.15.39/32,Netflix
- IP-CIDR,184.150.15.5/32,Netflix
- IP-CIDR,184.150.15.7/32,Netflix
- IP-CIDR,184.150.15.85/32,Netflix
- IP-CIDR,184.150.15.87/32,Netflix
- IP-CIDR,184.150.15.89/32,Netflix
- IP-CIDR,184.150.15.9/32,Netflix
- IP-CIDR,184.150.15.91/32,Netflix
- IP-CIDR,184.150.15.93/32,Netflix
- IP-CIDR,184.150.15.95/32,Netflix
- IP-CIDR,184.150.15.97/32,Netflix
- IP-CIDR,184.150.15.99/32,Netflix
- IP-CIDR,184.175.190.38/32,Netflix
- IP-CIDR,185.43.181.232/32,Netflix
- IP-CIDR,185.43.181.232/32,Netflix
- IP-CIDR,185.43.181.234/32,Netflix
- IP-CIDR,185.43.181.236/32,Netflix
- IP-CIDR,185.43.181.238/32,Netflix
- IP-CIDR,185.43.181.240/32,Netflix
- IP-CIDR,185.43.181.240/32,Netflix
- IP-CIDR,185.43.181.246/32,Netflix
- IP-CIDR,185.97.110.36/32,Netflix
- IP-CIDR,186.15.229.194/32,Netflix
- IP-CIDR,186.15.234.18/32,Netflix
- IP-CIDR,186.176.224.18/32,Netflix
- IP-CIDR,186.177.100.2/32,Netflix
- IP-CIDR,186.177.66.50/32,Netflix
- IP-CIDR,186.179.71.154/32,Netflix
- IP-CIDR,186.96.222.38/32,Netflix
- IP-CIDR,188.47.194.235/32,Netflix
- IP-CIDR,188.47.194.243/32,Netflix
- IP-CIDR,188.47.194.244/32,Netflix
- IP-CIDR,188.47.194.245/32,Netflix
- IP-CIDR,188.47.194.252/32,Netflix
- IP-CIDR,188.47.194.253/32,Netflix
- IP-CIDR,188.47.196.228/32,Netflix
- IP-CIDR,188.47.196.252/32,Netflix
- IP-CIDR,188.47.196.253/32,Netflix
- IP-CIDR,188.47.208.242/32,Netflix
- IP-CIDR,188.47.208.242/32,Netflix
- IP-CIDR,189.194.232.193/32,Netflix
- IP-CIDR,189.194.232.194/32,Netflix
- IP-CIDR,189.194.232.195/32,Netflix
- IP-CIDR,189.194.232.196/32,Netflix
- IP-CIDR,189.216.4.67/32,Netflix
- IP-CIDR,189.216.4.69/32,Netflix
- IP-CIDR,190.98.134.128/32,Netflix
- IP-CIDR,190.98.134.130/32,Netflix
- IP-CIDR,190.98.134.132/32,Netflix
- IP-CIDR,190.98.134.134/32,Netflix
- IP-CIDR,190.98.134.136/32,Netflix
- IP-CIDR,190.98.134.138/32,Netflix
- IP-CIDR,190.98.134.140/32,Netflix
- IP-CIDR,190.98.134.144/32,Netflix
- IP-CIDR,190.98.134.146/32,Netflix
- IP-CIDR,190.98.156.141/32,Netflix
- IP-CIDR,190.98.156.141/32,Netflix
- IP-CIDR,190.98.156.149/32,Netflix
- IP-CIDR,190.98.156.149/32,Netflix
- IP-CIDR,190.98.156.183/32,Netflix
- IP-CIDR,190.98.156.183/32,Netflix
- IP-CIDR,192.148.237.10/32,Netflix
- IP-CIDR,192.148.237.130/32,Netflix
- IP-CIDR,192.148.237.138/32,Netflix
- IP-CIDR,192.148.237.146/32,Netflix
- IP-CIDR,192.148.237.18/32,Netflix
- IP-CIDR,192.148.237.2/32,Netflix
- IP-CIDR,193.109.100.131/32,Netflix
- IP-CIDR,193.212.179.102/32,Netflix
- IP-CIDR,193.212.179.106/32,Netflix
- IP-CIDR,193.212.179.110/32,Netflix
- IP-CIDR,193.212.179.114/32,Netflix
- IP-CIDR,193.212.179.118/32,Netflix
- IP-CIDR,193.212.179.122/32,Netflix
- IP-CIDR,193.212.179.126/32,Netflix
- IP-CIDR,193.212.179.130/32,Netflix
- IP-CIDR,193.212.179.146/32,Netflix
- IP-CIDR,193.212.179.82/32,Netflix
- IP-CIDR,193.212.179.98/32,Netflix
- IP-CIDR,193.247.193.100/32,Netflix
- IP-CIDR,193.247.193.100/32,Netflix
- IP-CIDR,193.247.193.38/32,Netflix
- IP-CIDR,193.247.193.72/32,Netflix
- IP-CIDR,193.247.193.74/32,Netflix
- IP-CIDR,193.247.193.74/32,Netflix
- IP-CIDR,193.247.193.99/32,Netflix
- IP-CIDR,193.247.193.99/32,Netflix
- IP-CIDR,194.228.248.66/32,Netflix
- IP-CIDR,194.228.248.66/32,Netflix
- IP-CIDR,195.121.126.132/32,Netflix
- IP-CIDR,195.121.126.139/32,Netflix
- IP-CIDR,195.121.126.144/32,Netflix
- IP-CIDR,195.121.126.164/32,Netflix
- IP-CIDR,195.121.126.175/32,Netflix
- IP-CIDR,195.121.126.177/32,Netflix
- IP-CIDR,195.121.126.197/32,Netflix
- IP-CIDR,195.121.126.202/32,Netflix
- IP-CIDR,195.121.126.228/32,Netflix
- IP-CIDR,195.121.126.235/32,Netflix
- IP-CIDR,195.202.131.98/32,Netflix
- IP-CIDR,195.8.12.194/32,Netflix
- IP-CIDR,195.8.12.202/32,Netflix
- IP-CIDR,195.8.12.206/32,Netflix
- IP-CIDR,195.8.12.225/32,Netflix
- IP-CIDR,195.8.12.227/32,Netflix
- IP-CIDR,197.149.149.194/32,Netflix
- IP-CIDR,197.230.237.209/32,Netflix
- IP-CIDR,197.230.37.209/32,Netflix
- IP-CIDR,198.32.232.82/32,Netflix
- IP-CIDR,198.7.237.134/32,Netflix
- IP-CIDR,200.107.255.198/32,Netflix
- IP-CIDR,200.107.255.202/32,Netflix
- IP-CIDR,200.107.255.206/32,Netflix
- IP-CIDR,200.114.32.130/32,Netflix
- IP-CIDR,200.114.32.194/32,Netflix
- IP-CIDR,200.114.32.2/32,Netflix
- IP-CIDR,200.114.32.66/32,Netflix
- IP-CIDR,200.114.33.130/32,Netflix
- IP-CIDR,200.114.33.194/32,Netflix
- IP-CIDR,200.114.33.66/32,Netflix
- IP-CIDR,200.114.34.130/32,Netflix
- IP-CIDR,200.114.34.194/32,Netflix
- IP-CIDR,200.114.34.2/32,Netflix
- IP-CIDR,200.114.34.66/32,Netflix
- IP-CIDR,200.114.35.130/32,Netflix
- IP-CIDR,200.114.35.194/32,Netflix
- IP-CIDR,200.114.35.2/32,Netflix
- IP-CIDR,200.114.35.66/32,Netflix
- IP-CIDR,200.114.60.34/32,Netflix
- IP-CIDR,201.148.100.94/32,Netflix
- IP-CIDR,201.148.101.122/32,Netflix
- IP-CIDR,201.148.101.126/32,Netflix
- IP-CIDR,201.148.101.194/32,Netflix
- IP-CIDR,201.148.101.198/32,Netflix
- IP-CIDR,201.148.101.250/32,Netflix
- IP-CIDR,201.148.101.42/32,Netflix
- IP-CIDR,201.148.101.50/32,Netflix
- IP-CIDR,201.148.101.54/32,Netflix
- IP-CIDR,201.148.103.10/32,Netflix
- IP-CIDR,201.148.103.14/32,Netflix
- IP-CIDR,201.172.162.1/32,Netflix
- IP-CIDR,201.172.162.7/32,Netflix
- IP-CIDR,201.174.112.54/32,Netflix
- IP-CIDR,201.174.146.142/32,Netflix
- IP-CIDR,201.174.146.18/32,Netflix
- IP-CIDR,201.174.249.18/32,Netflix
- IP-CIDR,201.174.249.34/32,Netflix
- IP-CIDR,201.174.48.130/32,Netflix
- IP-CIDR,202.188.117.43/32,Netflix
- IP-CIDR,202.188.117.45/32,Netflix
- IP-CIDR,203.116.200.130/32,Netflix
- IP-CIDR,203.116.200.131/32,Netflix
- IP-CIDR,203.116.200.134/32,Netflix
- IP-CIDR,203.116.200.134/32,Netflix
- IP-CIDR,203.116.200.135/32,Netflix
- IP-CIDR,203.116.200.136/32,Netflix
- IP-CIDR,203.116.200.136/32,Netflix
- IP-CIDR,203.116.200.137/32,Netflix
- IP-CIDR,203.116.210.132/32,Netflix
- IP-CIDR,203.116.210.133/32,Netflix
- IP-CIDR,203.116.210.133/32,Netflix
- IP-CIDR,203.116.210.134/32,Netflix
- IP-CIDR,203.116.210.135/32,Netflix
- IP-CIDR,203.116.210.136/32,Netflix
- IP-CIDR,203.116.210.137/32,Netflix
- IP-CIDR,203.116.210.196/32,Netflix
- IP-CIDR,203.116.210.196/32,Netflix
- IP-CIDR,203.116.210.197/32,Netflix
- IP-CIDR,203.116.210.198/32,Netflix
- IP-CIDR,203.116.210.198/32,Netflix
- IP-CIDR,203.116.210.199/32,Netflix
- IP-CIDR,203.116.210.199/32,Netflix
- IP-CIDR,203.116.210.200/32,Netflix
- IP-CIDR,203.116.210.200/32,Netflix
- IP-CIDR,203.116.210.201/32,Netflix
- IP-CIDR,203.177.54.2/32,Netflix
- IP-CIDR,204.17.140.250/32,Netflix
- IP-CIDR,205.185.100.38/32,Netflix
- IP-CIDR,206.192.244.33/32,Netflix
- IP-CIDR,206.196.177.135/32,Netflix
- IP-CIDR,206.71.231.34/32,Netflix
- IP-CIDR,206.71.231.38/32,Netflix
- IP-CIDR,206.71.231.46/32,Netflix
- IP-CIDR,206.71.231.50/32,Netflix
- IP-CIDR,207.172.195.178/32,Netflix
- IP-CIDR,207.172.195.182/32,Netflix
- IP-CIDR,207.172.195.190/32,Netflix
- IP-CIDR,207.172.195.50/32,Netflix
- IP-CIDR,207.172.61.142/32,Netflix
- IP-CIDR,207.172.61.146/32,Netflix
- IP-CIDR,207.172.69.202/32,Netflix
- IP-CIDR,207.172.69.206/32,Netflix
- IP-CIDR,207.181.192.194/32,Netflix
- IP-CIDR,207.181.192.198/32,Netflix
- IP-CIDR,207.181.192.205/32,Netflix
- IP-CIDR,207.181.192.210/32,Netflix
- IP-CIDR,207.228.148.78/32,Netflix
- IP-CIDR,207.237.69.34/32,Netflix
- IP-CIDR,207.44.120.194/32,Netflix
- IP-CIDR,207.44.120.198/32,Netflix
- IP-CIDR,207.44.120.202/32,Netflix
- IP-CIDR,207.44.120.210/32,Netflix
- IP-CIDR,207.44.120.214/32,Netflix
- IP-CIDR,207.44.123.18/32,Netflix
- IP-CIDR,207.44.123.254/32,Netflix
- IP-CIDR,207.44.123.42/32,Netflix
- IP-CIDR,207.44.123.46/32,Netflix
- IP-CIDR,207.44.123.50/32,Netflix
- IP-CIDR,207.44.123.54/32,Netflix
- IP-CIDR,207.44.123.58/32,Netflix
- IP-CIDR,207.44.123.62/32,Netflix
- IP-CIDR,207.44.124.234/32,Netflix
- IP-CIDR,208.104.1.158/32,Netflix
- IP-CIDR,208.104.243.122/32,Netflix
- IP-CIDR,208.104.243.134/32,Netflix
- IP-CIDR,208.180.184.241/32,Netflix
- IP-CIDR,208.180.184.243/32,Netflix
- IP-CIDR,208.180.185.13/32,Netflix
- IP-CIDR,208.180.59.229/32,Netflix
- IP-CIDR,208.54.16.65/32,Netflix
- IP-CIDR,208.54.2.3/32,Netflix
- IP-CIDR,208.54.2.3/32,Netflix
- IP-CIDR,208.54.37.30/32,Netflix
- IP-CIDR,208.54.37.30/32,Netflix
- IP-CIDR,208.54.66.30/32,Netflix
- IP-CIDR,208.54.67.30/32,Netflix
- IP-CIDR,208.54.67.30/32,Netflix
- IP-CIDR,208.54.70.30/32,Netflix
- IP-CIDR,208.54.70.30/32,Netflix
- IP-CIDR,208.54.80.30/32,Netflix
- IP-CIDR,208.54.80.30/32,Netflix
- IP-CIDR,208.54.85.30/32,Netflix
- IP-CIDR,208.54.85.30/32,Netflix
- IP-CIDR,208.76.186.5/32,Netflix
- IP-CIDR,208.76.186.50/32,Netflix
- IP-CIDR,208.76.186.58/32,Netflix
- IP-CIDR,208.76.186.62/32,Netflix
- IP-CIDR,208.76.186.7/32,Netflix
- IP-CIDR,209.166.100.18/32,Netflix
- IP-CIDR,209.166.100.22/32,Netflix
- IP-CIDR,211.25.221.90/32,Netflix
- IP-CIDR,211.25.221.94/32,Netflix
- IP-CIDR,212.113.160.242/32,Netflix
- IP-CIDR,212.230.122.34/32,Netflix
- IP-CIDR,212.6.80.20/32,Netflix
- IP-CIDR,212.6.80.4/32,Netflix
- IP-CIDR,213.140.51.111/32,Netflix
- IP-CIDR,213.158.201.180/32,Netflix
- IP-CIDR,216.183.33.177/32,Netflix
- IP-CIDR,216.239.1.102/32,Netflix
- IP-CIDR,216.248.75.146/32,Netflix
- IP-CIDR,216.248.75.150/32,Netflix
- IP-CIDR,216.68.10.42/32,Netflix
- IP-CIDR,216.68.10.46/32,Netflix
- IP-CIDR,216.68.10.50/32,Netflix
- IP-CIDR,216.68.10.54/32,Netflix
- IP-CIDR,216.68.10.62/32,Netflix
- IP-CIDR,216.68.248.166/32,Netflix
- IP-CIDR,216.68.248.170/32,Netflix
- IP-CIDR,216.68.248.174/32,Netflix
- IP-CIDR,216.68.248.178/32,Netflix
- IP-CIDR,216.68.248.182/32,Netflix
- IP-CIDR,216.68.248.190/32,Netflix
- IP-CIDR,216.70.1.54/32,Netflix
- IP-CIDR,23.228.129.239/32,Netflix
- IP-CIDR,23.228.129.247/32,Netflix
- IP-CIDR,23.228.129.65/32,Netflix
- IP-CIDR,23.228.129.67/32,Netflix
- IP-CIDR,23.228.129.75/32,Netflix
- IP-CIDR,23.228.129.77/32,Netflix
- IP-CIDR,23.228.129.79/32,Netflix
- IP-CIDR,23.228.129.81/32,Netflix
- IP-CIDR,23.228.131.233/32,Netflix
- IP-CIDR,23.228.131.235/32,Netflix
- IP-CIDR,23.228.131.237/32,Netflix
- IP-CIDR,23.228.131.239/32,Netflix
- IP-CIDR,24.101.22.50/32,Netflix
- IP-CIDR,24.101.22.54/32,Netflix
- IP-CIDR,24.101.91.13/32,Netflix
- IP-CIDR,24.101.91.15/32,Netflix
- IP-CIDR,24.124.3.52/32,Netflix
- IP-CIDR,24.124.7.106/32,Netflix
- IP-CIDR,24.200.239.66/32,Netflix
- IP-CIDR,24.200.239.70/32,Netflix
- IP-CIDR,24.200.239.74/32,Netflix
- IP-CIDR,24.200.239.78/32,Netflix
- IP-CIDR,24.200.239.86/32,Netflix
- IP-CIDR,24.215.101.170/32,Netflix
- IP-CIDR,24.220.183.136/32,Netflix
- IP-CIDR,24.220.183.137/32,Netflix
- IP-CIDR,24.220.183.138/32,Netflix
- IP-CIDR,24.220.183.139/32,Netflix
- IP-CIDR,24.220.183.140/32,Netflix
- IP-CIDR,24.220.183.141/32,Netflix
- IP-CIDR,24.220.183.142/32,Netflix
- IP-CIDR,24.220.183.152/32,Netflix
- IP-CIDR,24.220.183.153/32,Netflix
- IP-CIDR,24.220.183.154/32,Netflix
- IP-CIDR,24.220.183.155/32,Netflix
- IP-CIDR,24.220.183.156/32,Netflix
- IP-CIDR,24.220.183.157/32,Netflix
- IP-CIDR,24.220.183.158/32,Netflix
- IP-CIDR,24.222.87.162/32,Netflix
- IP-CIDR,37.143.80.10/32,Netflix
- IP-CIDR,37.143.80.14/32,Netflix
- IP-CIDR,37.143.80.6/32,Netflix
- IP-CIDR,37.143.86.34/32,Netflix
- IP-CIDR,37.143.86.50/32,Netflix
- IP-CIDR,37.143.86.66/32,Netflix
- IP-CIDR,37.143.86.82/32,Netflix
- IP-CIDR,40.129.34.173/32,Netflix
- IP-CIDR,40.129.34.175/32,Netflix
- IP-CIDR,40.129.34.177/32,Netflix
- IP-CIDR,40.133.138.47/32,Netflix
- IP-CIDR,40.133.138.57/32,Netflix
- IP-CIDR,43.245.105.1/32,Netflix
- IP-CIDR,43.245.105.1/32,Netflix
- IP-CIDR,43.245.105.11/32,Netflix
- IP-CIDR,43.245.105.11/32,Netflix
- IP-CIDR,43.245.105.129/32,Netflix
- IP-CIDR,43.245.105.13/32,Netflix
- IP-CIDR,43.245.105.9/32,Netflix
- IP-CIDR,43.245.105.9/32,Netflix
- IP-CIDR,45.121.219.34/32,Netflix
- IP-CIDR,45.57.56.130/32,Netflix
- IP-CIDR,49.231.114.6/32,Netflix
- IP-CIDR,49.231.121.6/32,Netflix
- IP-CIDR,50.125.239.30/32,Netflix
- IP-CIDR,50.125.68.250/32,Netflix
- IP-CIDR,50.27.152.107/32,Netflix
- IP-CIDR,50.27.152.119/32,Netflix
- IP-CIDR,50.46.97.70/32,Netflix
- IP-CIDR,51.148.80.10/32,Netflix
- IP-CIDR,51.148.80.18/32,Netflix
- IP-CIDR,51.148.80.22/32,Netflix
- IP-CIDR,51.148.80.6/32,Netflix
- IP-CIDR,58.27.11.201/32,Netflix
- IP-CIDR,58.27.11.201/32,Netflix
- IP-CIDR,58.27.38.199/32,Netflix
- IP-CIDR,62.127.102.10/32,Netflix
- IP-CIDR,62.127.102.14/32,Netflix
- IP-CIDR,62.127.102.18/32,Netflix
- IP-CIDR,62.127.102.2/32,Netflix
- IP-CIDR,62.127.102.22/32,Netflix
- IP-CIDR,62.127.102.26/32,Netflix
- IP-CIDR,62.127.102.30/32,Netflix
- IP-CIDR,62.127.102.34/32,Netflix
- IP-CIDR,62.127.102.38/32,Netflix
- IP-CIDR,62.127.102.42/32,Netflix
- IP-CIDR,62.127.102.46/32,Netflix
- IP-CIDR,62.127.102.54/32,Netflix
- IP-CIDR,62.127.102.58/32,Netflix
- IP-CIDR,62.127.102.6/32,Netflix
- IP-CIDR,62.127.102.62/32,Netflix
- IP-CIDR,62.252.213.64/32,Netflix
- IP-CIDR,62.252.213.68/32,Netflix
- IP-CIDR,62.252.213.70/32,Netflix
- IP-CIDR,62.252.213.72/32,Netflix
- IP-CIDR,62.252.213.74/32,Netflix
- IP-CIDR,62.252.213.76/32,Netflix
- IP-CIDR,62.252.213.78/32,Netflix
- IP-CIDR,62.252.213.80/32,Netflix
- IP-CIDR,62.252.213.84/32,Netflix
- IP-CIDR,62.252.213.86/32,Netflix
- IP-CIDR,62.252.213.88/32,Netflix
- IP-CIDR,62.253.139.0/32,Netflix
- IP-CIDR,62.253.139.11/32,Netflix
- IP-CIDR,62.253.139.129/32,Netflix
- IP-CIDR,62.253.139.13/32,Netflix
- IP-CIDR,62.253.139.131/32,Netflix
- IP-CIDR,62.253.139.133/32,Netflix
- IP-CIDR,62.253.139.135/32,Netflix
- IP-CIDR,62.253.139.137/32,Netflix
- IP-CIDR,62.253.139.139/32,Netflix
- IP-CIDR,62.253.139.141/32,Netflix
- IP-CIDR,62.253.139.3/32,Netflix
- IP-CIDR,62.253.139.5/32,Netflix
- IP-CIDR,62.253.139.7/32,Netflix
- IP-CIDR,62.253.139.9/32,Netflix
- IP-CIDR,62.254.47.0/32,Netflix
- IP-CIDR,62.254.47.128/32,Netflix
- IP-CIDR,62.254.47.130/32,Netflix
- IP-CIDR,62.254.47.132/32,Netflix
- IP-CIDR,62.254.47.2/32,Netflix
- IP-CIDR,62.254.47.4/32,Netflix
- IP-CIDR,62.255.44.0/32,Netflix
- IP-CIDR,62.255.44.128/32,Netflix
- IP-CIDR,62.255.44.130/32,Netflix
- IP-CIDR,62.255.44.132/32,Netflix
- IP-CIDR,62.255.44.2/32,Netflix
- IP-CIDR,62.255.44.4/32,Netflix
- IP-CIDR,62.4.253.129/32,Netflix
- IP-CIDR,62.4.253.131/32,Netflix
- IP-CIDR,62.4.253.133/32,Netflix
- IP-CIDR,62.4.253.135/32,Netflix
- IP-CIDR,62.4.253.137/32,Netflix
- IP-CIDR,62.4.253.139/32,Netflix
- IP-CIDR,62.4.253.143/32,Netflix
- IP-CIDR,62.4.253.145/32,Netflix
- IP-CIDR,62.4.253.147/32,Netflix
- IP-CIDR,62.4.253.149/32,Netflix
- IP-CIDR,62.4.253.151/32,Netflix
- IP-CIDR,62.4.253.153/32,Netflix
- IP-CIDR,62.4.253.155/32,Netflix
- IP-CIDR,62.4.253.157/32,Netflix
- IP-CIDR,62.4.253.159/32,Netflix
- IP-CIDR,62.4.253.161/32,Netflix
- IP-CIDR,62.4.253.163/32,Netflix
- IP-CIDR,62.4.253.165/32,Netflix
- IP-CIDR,62.4.253.167/32,Netflix
- IP-CIDR,62.4.253.169/32,Netflix
- IP-CIDR,62.4.253.171/32,Netflix
- IP-CIDR,62.4.253.173/32,Netflix
- IP-CIDR,62.4.253.175/32,Netflix
- IP-CIDR,62.4.253.177/32,Netflix
- IP-CIDR,62.4.253.179/32,Netflix
- IP-CIDR,62.4.253.181/32,Netflix
- IP-CIDR,62.4.253.183/32,Netflix
- IP-CIDR,62.4.253.185/32,Netflix
- IP-CIDR,62.4.253.187/32,Netflix
- IP-CIDR,62.4.253.189/32,Netflix
- IP-CIDR,62.4.253.191/32,Netflix
- IP-CIDR,62.75.21.17/32,Netflix
- IP-CIDR,62.75.21.18/32,Netflix
- IP-CIDR,62.75.21.19/32,Netflix
- IP-CIDR,62.75.21.20/32,Netflix
- IP-CIDR,62.75.21.3/32,Netflix
- IP-CIDR,62.75.21.33/32,Netflix
- IP-CIDR,62.75.21.4/32,Netflix
- IP-CIDR,64.126.2.110/32,Netflix
- IP-CIDR,64.126.2.246/32,Netflix
- IP-CIDR,64.136.255.34/32,Netflix
- IP-CIDR,64.189.192.66/32,Netflix
- IP-CIDR,64.30.98.210/32,Netflix
- IP-CIDR,64.30.98.214/32,Netflix
- IP-CIDR,64.33.157.254/32,Netflix
- IP-CIDR,64.4.89.225/32,Netflix
- IP-CIDR,64.4.89.227/32,Netflix
- IP-CIDR,64.4.89.229/32,Netflix
- IP-CIDR,64.4.89.231/32,Netflix
- IP-CIDR,64.4.89.233/32,Netflix
- IP-CIDR,64.4.89.235/32,Netflix
- IP-CIDR,64.4.89.237/32,Netflix
- IP-CIDR,64.4.89.239/32,Netflix
- IP-CIDR,64.4.91.113/32,Netflix
- IP-CIDR,64.4.91.115/32,Netflix
- IP-CIDR,64.4.91.116/32,Netflix
- IP-CIDR,64.4.91.118/32,Netflix
- IP-CIDR,64.50.224.130/32,Netflix
- IP-CIDR,64.50.228.250/32,Netflix
- IP-CIDR,64.50.228.254/32,Netflix
- IP-CIDR,64.53.14.5/32,Netflix
- IP-CIDR,64.53.14.6/32,Netflix
- IP-CIDR,64.53.14.7/32,Netflix
- IP-CIDR,64.53.14.70/32,Netflix
- IP-CIDR,64.53.14.71/32,Netflix
- IP-CIDR,65.48.147.74/32,Netflix
- IP-CIDR,65.75.64.210/32,Netflix
- IP-CIDR,65.75.64.211/32,Netflix
- IP-CIDR,66.18.33.62/32,Netflix
- IP-CIDR,66.18.34.46/32,Netflix
- IP-CIDR,66.18.34.50/32,Netflix
- IP-CIDR,66.232.66.130/32,Netflix
- IP-CIDR,66.232.66.134/32,Netflix
- IP-CIDR,66.232.66.154/32,Netflix
- IP-CIDR,66.35.4.54/32,Netflix
- IP-CIDR,66.44.84.130/32,Netflix
- IP-CIDR,66.44.84.134/32,Netflix
- IP-CIDR,66.44.84.178/32,Netflix
- IP-CIDR,66.44.84.182/32,Netflix
- IP-CIDR,66.44.84.186/32,Netflix
- IP-CIDR,66.60.128.139/32,Netflix
- IP-CIDR,66.60.128.46/32,Netflix
- IP-CIDR,66.76.204.81/32,Netflix
- IP-CIDR,66.76.32.17/32,Netflix
- IP-CIDR,66.76.32.19/32,Netflix
- IP-CIDR,66.76.35.241/32,Netflix
- IP-CIDR,66.90.138.0/32,Netflix
- IP-CIDR,66.90.138.10/32,Netflix
- IP-CIDR,66.90.138.12/32,Netflix
- IP-CIDR,66.90.138.15/32,Netflix
- IP-CIDR,66.90.138.17/32,Netflix
- IP-CIDR,66.90.138.2/32,Netflix
- IP-CIDR,66.90.138.82/32,Netflix
- IP-CIDR,66.90.138.86/32,Netflix
- IP-CIDR,66.90.138.88/32,Netflix
- IP-CIDR,66.90.138.94/32,Netflix
- IP-CIDR,66.90.139.90/32,Netflix
- IP-CIDR,67.218.93.89/32,Netflix
- IP-CIDR,67.218.93.91/32,Netflix
- IP-CIDR,67.221.221.17/32,Netflix
- IP-CIDR,67.221.221.29/32,Netflix
- IP-CIDR,67.221.221.31/32,Netflix
- IP-CIDR,68.65.44.186/32,Netflix
- IP-CIDR,68.65.44.190/32,Netflix
- IP-CIDR,69.147.194.190/32,Netflix
- IP-CIDR,69.160.211.50/32,Netflix
- IP-CIDR,70.33.57.75/32,Netflix
- IP-CIDR,71.169.136.4/32,Netflix
- IP-CIDR,71.169.136.5/32,Netflix
- IP-CIDR,71.169.136.6/32,Netflix
- IP-CIDR,71.169.136.7/32,Netflix
- IP-CIDR,71.169.137.4/32,Netflix
- IP-CIDR,71.169.137.6/32,Netflix
- IP-CIDR,71.169.137.7/32,Netflix
- IP-CIDR,71.33.48.107/32,Netflix
- IP-CIDR,71.33.48.109/32,Netflix
- IP-CIDR,71.33.48.113/32,Netflix
- IP-CIDR,71.33.48.115/32,Netflix
- IP-CIDR,71.33.48.121/32,Netflix
- IP-CIDR,71.33.48.123/32,Netflix
- IP-CIDR,71.33.48.37/32,Netflix
- IP-CIDR,71.33.48.39/32,Netflix
- IP-CIDR,71.33.48.43/32,Netflix
- IP-CIDR,71.33.48.65/32,Netflix
- IP-CIDR,71.33.48.67/32,Netflix
- IP-CIDR,71.33.48.69/32,Netflix
- IP-CIDR,71.33.48.7/32,Netflix
- IP-CIDR,71.33.48.71/32,Netflix
- IP-CIDR,71.33.48.73/32,Netflix
- IP-CIDR,71.33.48.75/32,Netflix
- IP-CIDR,71.33.48.77/32,Netflix
- IP-CIDR,71.33.48.79/32,Netflix
- IP-CIDR,71.33.48.89/32,Netflix
- IP-CIDR,71.33.48.91/32,Netflix
- IP-CIDR,71.33.48.93/32,Netflix
- IP-CIDR,71.33.48.95/32,Netflix
- IP-CIDR,71.33.48.97/32,Netflix
- IP-CIDR,71.33.48.99/32,Netflix
- IP-CIDR,71.33.49.1/32,Netflix
- IP-CIDR,71.33.49.17/32,Netflix
- IP-CIDR,71.33.49.21/32,Netflix
- IP-CIDR,71.33.49.27/32,Netflix
- IP-CIDR,71.33.49.29/32,Netflix
- IP-CIDR,71.33.49.3/32,Netflix
- IP-CIDR,71.33.49.31/32,Netflix
- IP-CIDR,71.33.49.33/32,Netflix
- IP-CIDR,71.33.49.35/32,Netflix
- IP-CIDR,71.33.49.5/32,Netflix
- IP-CIDR,71.33.49.7/32,Netflix
- IP-CIDR,71.33.49.9/32,Netflix
- IP-CIDR,71.33.50.129/32,Netflix
- IP-CIDR,71.33.50.131/32,Netflix
- IP-CIDR,71.33.50.133/32,Netflix
- IP-CIDR,71.33.50.225/32,Netflix
- IP-CIDR,71.33.50.241/32,Netflix
- IP-CIDR,71.33.50.69/32,Netflix
- IP-CIDR,71.33.50.71/32,Netflix
- IP-CIDR,71.33.50.85/32,Netflix
- IP-CIDR,71.33.50.87/32,Netflix
- IP-CIDR,71.33.50.89/32,Netflix
- IP-CIDR,72.22.30.34/32,Netflix
- IP-CIDR,72.23.10.194/32,Netflix
- IP-CIDR,72.23.10.198/32,Netflix
- IP-CIDR,72.240.7.141/32,Netflix
- IP-CIDR,72.252.113.189/32,Netflix
- IP-CIDR,74.204.125.22/32,Netflix
- IP-CIDR,74.81.99.178/32,Netflix
- IP-CIDR,74.81.99.182/32,Netflix
- IP-CIDR,74.81.99.186/32,Netflix
- IP-CIDR,74.85.65.115/32,Netflix
- IP-CIDR,76.165.16.66/32,Netflix
- IP-CIDR,76.78.67.118/32,Netflix
- IP-CIDR,78.146.119.11/32,Netflix
- IP-CIDR,78.146.119.141/32,Netflix
- IP-CIDR,78.146.119.143/32,Netflix
- IP-CIDR,78.146.119.207/32,Netflix
- IP-CIDR,78.146.119.39/32,Netflix
- IP-CIDR,78.146.119.41/32,Netflix
- IP-CIDR,78.146.119.47/32,Netflix
- IP-CIDR,78.146.119.7/32,Netflix
- IP-CIDR,80.64.176.144/32,Netflix
- IP-CIDR,80.64.176.146/32,Netflix
- IP-CIDR,80.64.176.148/32,Netflix
- IP-CIDR,81.244.254.129/32,Netflix
- IP-CIDR,81.244.254.131/32,Netflix
- IP-CIDR,81.3.201.194/32,Netflix
- IP-CIDR,81.3.201.202/32,Netflix
- IP-CIDR,81.3.201.203/32,Netflix
- IP-CIDR,81.45.152.0/32,Netflix
- IP-CIDR,81.45.152.10/32,Netflix
- IP-CIDR,81.45.152.12/32,Netflix
- IP-CIDR,81.45.152.122/32,Netflix
- IP-CIDR,81.45.152.124/32,Netflix
- IP-CIDR,81.45.152.126/32,Netflix
- IP-CIDR,81.45.152.14/32,Netflix
- IP-CIDR,81.45.152.16/32,Netflix
- IP-CIDR,81.45.152.18/32,Netflix
- IP-CIDR,81.45.152.2/32,Netflix
- IP-CIDR,81.45.152.20/32,Netflix
- IP-CIDR,81.45.152.22/32,Netflix
- IP-CIDR,81.45.152.4/32,Netflix
- IP-CIDR,81.45.152.58/32,Netflix
- IP-CIDR,81.45.152.6/32,Netflix
- IP-CIDR,81.45.152.60/32,Netflix
- IP-CIDR,81.45.152.62/32,Netflix
- IP-CIDR,81.45.152.64/32,Netflix
- IP-CIDR,81.45.152.66/32,Netflix
- IP-CIDR,81.45.152.68/32,Netflix
- IP-CIDR,81.45.152.70/32,Netflix
- IP-CIDR,81.45.152.72/32,Netflix
- IP-CIDR,81.45.152.74/32,Netflix
- IP-CIDR,81.45.152.76/32,Netflix
- IP-CIDR,81.45.152.78/32,Netflix
- IP-CIDR,81.45.152.8/32,Netflix
- IP-CIDR,81.45.152.80/32,Netflix
- IP-CIDR,81.45.152.82/32,Netflix
- IP-CIDR,81.45.152.84/32,Netflix
- IP-CIDR,81.45.152.86/32,Netflix
- IP-CIDR,81.91.205.193/32,Netflix
- IP-CIDR,82.149.120.162/32,Netflix
- IP-CIDR,87.79.22.170/32,Netflix
- IP-CIDR,89.184.160.146/32,Netflix
- IP-CIDR,89.184.160.147/32,Netflix
- IP-CIDR,89.27.129.56/32,Netflix
- IP-CIDR,89.27.129.68/32,Netflix
- IP-CIDR,89.27.129.72/32,Netflix
- IP-CIDR,89.27.129.90/32,Netflix
- IP-CIDR,89.27.129.91/32,Netflix
- IP-CIDR,89.27.129.92/32,Netflix
- IP-CIDR,89.27.129.93/32,Netflix
- IP-CIDR,89.27.129.94/32,Netflix
- IP-CIDR,89.27.244.121/32,Netflix
- IP-CIDR,89.27.244.123/32,Netflix
- IP-CIDR,89.27.244.125/32,Netflix
- IP-CIDR,89.27.244.127/32,Netflix
- IP-CIDR,89.27.244.131/32,Netflix
- IP-CIDR,89.27.244.133/32,Netflix
- IP-CIDR,89.27.244.135/32,Netflix
- IP-CIDR,89.96.194.106/32,Netflix
- IP-CIDR,89.96.194.114/32,Netflix
- IP-CIDR,89.96.194.118/32,Netflix
- IP-CIDR,89.96.194.2/32,Netflix
- IP-CIDR,89.96.194.6/32,Netflix
- IP-CIDR,89.96.194.90/32,Netflix
- IP-CIDR,89.96.194.94/32,Netflix
- IP-CIDR,90.255.251.226/32,Netflix
- IP-CIDR,90.255.251.230/32,Netflix
- IP-CIDR,90.255.251.234/32,Netflix
- IP-CIDR,90.255.254.130/32,Netflix
- IP-CIDR,90.255.254.134/32,Netflix
- IP-CIDR,90.255.254.138/32,Netflix
- IP-CIDR,90.255.254.142/32,Netflix
- IP-CIDR,90.255.254.146/32,Netflix
- IP-CIDR,90.255.254.150/32,Netflix
- IP-CIDR,90.255.254.194/32,Netflix
- IP-CIDR,90.255.254.2/32,Netflix
- IP-CIDR,90.255.254.202/32,Netflix
- IP-CIDR,90.255.254.206/32,Netflix
- IP-CIDR,90.255.254.210/32,Netflix
- IP-CIDR,90.255.254.214/32,Netflix
- IP-CIDR,90.255.254.6/32,Netflix
- IP-CIDR,90.255.254.66/32,Netflix
- IP-CIDR,90.255.254.70/32,Netflix
- IP-CIDR,94.245.201.194/32,Netflix
- IP-CIDR,94.245.201.202/32,Netflix
- IP-CIDR,94.245.201.203/32,Netflix
- IP-CIDR,94.245.201.218/32,Netflix
- IP-CIDR,96.20.0.66/32,Netflix
- IP-CIDR,96.20.0.70/32,Netflix
- IP-CIDR,96.20.0.74/32,Netflix
- IP-CIDR,96.20.0.78/32,Netflix
- IP-CIDR,96.20.0.82/32,Netflix
- IP-CIDR,96.21.0.66/32,Netflix
- IP-CIDR,96.21.0.70/32,Netflix
- IP-CIDR,96.21.0.74/32,Netflix
- IP-CIDR,96.21.0.78/32,Netflix
- IP-CIDR,96.22.15.66/32,Netflix
- IP-CIDR,96.22.15.70/32,Netflix
- IP-CIDR,96.22.15.74/32,Netflix
- IP-CIDR,96.22.15.78/32,Netflix
- IP-CIDR,96.23.20.66/32,Netflix
- IP-CIDR,96.23.20.70/32,Netflix
- IP-CIDR,96.23.20.74/32,Netflix
- IP-CIDR,96.23.20.78/32,Netflix
- IP-CIDR,96.4.63.99/32,Netflix
# > Spotify
# - USER-AGENT,*Spotify*,Spotify
@ -8707,7 +9606,8 @@ Rule:
# > Fast
- DOMAIN-SUFFIX,fast.com,Speedtest
# > Speedtest
# > Speedtest by Ookla
# - USER-AGENT,SpeedTest*
- DOMAIN-KEYWORD,speedtest,Speedtest
- DOMAIN-SUFFIX,ooklaserver.net,Speedtest
@ -9394,8 +10294,6 @@ Rule:
- DOMAIN-SUFFIX,wikimedia.org,Proxy
- DOMAIN-SUFFIX,wikipedia.com,Proxy
- DOMAIN-SUFFIX,wikipedia.org,Proxy
- DOMAIN-SUFFIX,windows.com,Proxy
- DOMAIN-SUFFIX,windows.net,Proxy
- DOMAIN-SUFFIX,wn.com,Proxy
- DOMAIN-SUFFIX,wordpress.com,Proxy
- DOMAIN-SUFFIX,workflow.is,Proxy

File diff suppressed because one or more lines are too long

View File

@ -5,8 +5,9 @@ function index()
return
end
entry({"admin", "services", "openclash"},alias("admin", "services", "openclash", "client"), _("OpenClash"), 50).dependent = true
local page = entry({"admin", "services", "openclash"}, alias("admin", "services", "openclash", "client"), _("OpenClash"), 50)
page.dependent = true
page.acl_depends = { "luci-app-openclash" }
entry({"admin", "services", "openclash", "client"},form("openclash/client"),_("Overviews"), 20).leaf = true
entry({"admin", "services", "openclash", "status"},call("action_status")).leaf=true
entry({"admin", "services", "openclash", "state"},call("action_state")).leaf=true

View File

@ -158,6 +158,7 @@ o = s:taboption("dns", ListValue, "ipv6_enable", translate("Enable ipv6 Resolve"
o.description = font_red..bold_on..translate("Force Enable to Resolve ipv6 DNS Requests")..bold_off..font_off
o:value("0", translate("Disable"))
o:value("1", translate("Enable"))
o:depends("en_mode", "redir-host")
o.default=0
o = s:taboption("dns", ListValue, "disable_masq_cache", translate("Disable Dnsmasq's DNS Cache"))

View File

@ -125,7 +125,7 @@
</style>
</head>
<fieldset class="cbi-section">
<table>
<table width="100%">
<tr><td width="100%">
<body>
<div style="display: flex;">

View File

@ -1,5 +1,5 @@
<fieldset class="cbi-section">
<table>
<table width="100%">
<tr>
<td colspan="4" width="100%">
<p align="center">

View File

@ -1 +1 @@
<!doctype html><html lang="en" dir="ltr"><head><meta charset="UTF-8"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><link rel="icon" type="image/x-icon" href="https://cdn.jsdelivr.net/gh/Dreamacro/clash/docs/logo.png"/><title>Clash</title><link href="main.693efc9234a08d249710.css" rel="stylesheet"></head><body><div id="root"></div><script src="js/1.bundle.693efc9234a08d249710.min.js"></script><script src="js/bundle.693efc9234a08d249710.min.js"></script></body></html>
<!doctype html><html lang="en" dir="ltr"><head><meta charset="UTF-8"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><link rel="icon" type="image/x-icon" href="https://cdn.jsdelivr.net/gh/Dreamacro/clash/docs/logo.png"/><title>Clash</title><link href="main.587bc7edc5f3d06c94f4.css" rel="stylesheet"></head><body><div id="root"></div><script src="js/1.bundle.587bc7edc5f3d06c94f4.min.js"></script><script src="js/bundle.587bc7edc5f3d06c94f4.min.js"></script></body></html>

View File

@ -43,7 +43,7 @@ config_cus_up()
uci set openclash.config.config_path="$CONFIG_PATH"
uci commit openclash
fi
if [ "$servers_update" -eq "1" ] || [ ! -z "$keyword" ]; then
if [ "$servers_update" -eq 1 ] || [ ! -z "$keyword" ]; then
echo "配置文件【$name】替换成功,开始挑选节点..." >$START_LOG
uci set openclash.config.config_update_path="/etc/openclash/config/$name.yaml"
uci set openclash.config.servers_if_update=1
@ -100,45 +100,7 @@ config_su_check()
config_encode()
{
#proxy-providers
[ -z "$(grep "^proxy-provider:" "$CFG_FILE")" ] && {
sed -i "/^ \{1,\}proxy-provider:/c\proxy-provider:" "$CFG_FILE" 2>/dev/null
}
[ -z "$(grep "^proxy-provider:" "$CFG_FILE")" ] && {
sed -i "/^ \{0,\}proxy-providers:/c\proxy-provider:" "$CFG_FILE" 2>/dev/null
}
#proxy-groups
[ -z "$(grep "^Proxy Group:" "$CFG_FILE")" ] && {
sed -i "/^ \{0,\}\'Proxy Group\':/c\Proxy Group:" "$CFG_FILE" 2>/dev/null
sed -i '/^ \{0,\}\"Proxy Group\":/c\Proxy Group:' "$CFG_FILE" 2>/dev/null
sed -i "/^ \{1,\}Proxy Group:/c\Proxy Group:" "$CFG_FILE" 2>/dev/null
}
[ -z "$(grep "^Proxy Group:" "$CFG_FILE")" ] && {
sed -i "/^ \{0,\}proxy-groups:/c\Proxy Group:" "$CFG_FILE" 2>/dev/null
}
#proxies
[ -z "$(grep "^Proxy:" "$CFG_FILE")" ] && {
sed -i "/^ \{1,\}Proxy:/c\Proxy:" "$CFG_FILE" 2>/dev/null
}
[ -z "$(grep "^Proxy:" "$CFG_FILE")" ] && {
sed -i "/^proxies:/c\Proxy:" "$CFG_FILE" 2>/dev/null
}
[ -z "$(grep "^Proxy:" "$CFG_FILE")" ] && {
group_len=$(sed -n '/^Proxy Group:/=' "$CFG_FILE" 2>/dev/null)
proxies_len=$(sed -n '/proxies:/=' "$CFG_FILE" 2>/dev/null |sed -n 1p)
if [ "$proxies_len" -lt "$group_len" ]; then
sed -i "${proxies_len}c\Proxy:" "$CFG_FILE" 2>/dev/null
fi 2>/dev/null
}
#rules
[ -z "$(grep "^Rule:" "$CFG_FILE")" ] && {
sed -i "/^ \{1,\}Rule:/c\Rule:" "$CFG_FILE" 2>/dev/null
}
[ -z "$(grep "^Rule:" "$CFG_FILE")" ] && {
sed -i "/^ \{0,\}rules:/c\Rule:" "$CFG_FILE" 2>/dev/null
}
/usr/share/openclash/yml_field_name_ch.sh "$CFG_FILE"
}
config_error()

View File

@ -16,20 +16,16 @@ urlencode() {
}
if [ -s "$HISTORY_PATH" ]; then
for ((i=1;i<=3;i++))
cat $HISTORY_PATH |while read line
do
cat $HISTORY_PATH |while read line
do
if [ -z "$(echo $line |grep "#*#")" ]; then
continue
else
GROUP_NAME=$(urlencode "$(echo $line |awk -F '#*#' '{print $1}')")
NOW_NAME=$(echo $line |awk -F '#*#' '{print $3}')
[ ! -z "$GROUP_NAME" ] && {
curl -H "Authorization: Bearer ${SECRET}" -H "Content-Type:application/json" -X PUT -d '{"name":"'"$NOW_NAME"'"}' http://"$LAN_IP":"$PORT"/proxies/"$GROUP_NAME" >/dev/null 2>&1
}
fi
done >/dev/null 2>&1
sleep 1
if [ -z "$(echo $line |grep "#*#")" ]; then
continue
else
GROUP_NAME=$(urlencode "$(echo $line |awk -F '#*#' '{print $1}')")
NOW_NAME=$(echo $line |awk -F '#*#' '{print $3}')
[ ! -z "$GROUP_NAME" ] && {
curl -m 5 --retry 2 -H "Authorization: Bearer ${SECRET}" -H "Content-Type:application/json" -X PUT -d '{"name":"'"$NOW_NAME"'"}' http://"$LAN_IP":"$PORT"/proxies/"$GROUP_NAME" >/dev/null 2>&1
}
fi
done >/dev/null 2>&1
fi

View File

@ -0,0 +1,43 @@
#!/bin/sh
YML_FILE="$1"
#proxy-providers
[ -z "$(grep "^proxy-provider:" "$YML_FILE")" ] && {
sed -i "s/^ \{1,\}proxy-provider:/proxy-provider:/g" "$YML_FILE" 2>/dev/null
}
[ -z "$(grep "^proxy-provider:" "$YML_FILE")" ] && {
sed -i "s/^ \{0,\}proxy-providers:/proxy-provider:/g" "$YML_FILE" 2>/dev/null
}
#proxy-groups
[ -z "$(grep "^Proxy Group:" "$YML_FILE")" ] && {
sed -i "s/^ \{0,\}\'Proxy Group\':/Proxy Group:/g" "$YML_FILE" 2>/dev/null
sed -i 's/^ \{0,\}\"Proxy Group\":/Proxy Group:/g' "$YML_FILE" 2>/dev/null
sed -i "s/^ \{1,\}Proxy Group:/Proxy Group:/g" "$YML_FILE" 2>/dev/null
}
[ -z "$(grep "^Proxy Group:" "$YML_FILE")" ] && {
sed -i "s/^ \{0,\}proxy-groups:/Proxy Group:/g" "$YML_FILE" 2>/dev/null
}
#proxies
[ -z "$(grep "^Proxy:" "$YML_FILE")" ] && {
sed -i "s/^ \{1,\}Proxy:/Proxy:/g" "$YML_FILE" 2>/dev/null
}
[ -z "$(grep "^Proxy:" "$YML_FILE")" ] && {
sed -i "s/^proxies:/Proxy:/g" "$YML_FILE" 2>/dev/null
}
[ -z "$(grep "^Proxy:" "$YML_FILE")" ] && {
group_len=$(sed -n '/^Proxy Group:/=' "$YML_FILE" 2>/dev/null)
proxies_len=$(sed -n '/proxies:/=' "$YML_FILE" 2>/dev/null |sed -n 1p)
if [ "$proxies_len" -lt "$group_len" ]; then
sed -i "${proxies_len}s/proxies:/Proxy:/" "$YML_FILE" 2>/dev/null
fi 2>/dev/null
}
#rules
[ -z "$(grep "^Rule:" "$YML_FILE")" ] && {
sed -i "s/^ \{1,\}Rule:/Rule:/g" "$YML_FILE" 2>/dev/null
}
[ -z "$(grep "^Rule:" "$YML_FILE")" ] && {
sed -i "s/^ \{0,\}rules:/Rule:/g" "$YML_FILE" 2>/dev/null
}

View File

@ -1,12 +1,11 @@
#!/bin/bash
. /lib/functions.sh
status=$(ps|grep -c /usr/share/openclash/yml_groups_get.sh)
[ "$status" -gt "3" ] && exit 0
START_LOG="/tmp/openclash_start.log"
CFG_FILE="/etc/config/openclash"
servers_update=$(uci get openclash.config.servers_update 2>/dev/null)
servers_if_update=$(uci get openclash.config.servers_if_update 2>/dev/null)
rulesource=$(uci get openclash.config.rule_source 2>/dev/null)
CONFIG_FILE=$(uci get openclash.config.config_path 2>/dev/null)
CONFIG_NAME=$(echo "$CONFIG_FILE" |awk -F '/' '{print $5}' 2>/dev/null)
UPDATE_CONFIG_FILE=$(uci get openclash.config.config_update_path 2>/dev/null)
@ -55,7 +54,7 @@ else
awk '/Proxy Group:/,/Rule:/{print}' "$CONFIG_FILE" 2>/dev/null |sed 's/\"//g' 2>/dev/null |sed "s/\'//g" 2>/dev/null |sed 's/\t/ /g' 2>/dev/null >/tmp/yaml_group.yaml 2>&1
fi 2>/dev/null
#判断当前配置文件是否已经有策略组信息
#判断当前配置文件是否有策略组信息
cfg_group_name()
{
local section="$1"
@ -64,15 +63,12 @@ cfg_group_name()
if [ -z "$config" ]; then
return
fi
[ "$config" = "$CONFIG_NAME" ] && {
config_group_exist="1"
config_group_exist=1
}
}
config_load "openclash"
config_foreach cfg_group_name "groups"
#删除不必要的配置
cfg_delete()
{
@ -110,11 +106,14 @@ cfg_delete()
done
}
if [ "$servers_update" -ne "1" ] || [ "$servers_if_update" != "1" ] || [ -z "$config_group_exist" ]; then
cfg_delete
else
config_load "openclash"
config_foreach cfg_group_name "groups"
if [ "$servers_if_update" -eq 1 ] && [ "$config_group_exist" -eq 1 ]; then
/usr/share/openclash/yml_proxys_get.sh
exit 0
else
cfg_delete
fi
count=1

View File

@ -13,53 +13,10 @@ fi
if [ -f "$CFG_FILE" ]; then
#检查关键字避免后续操作出错
#proxy-providers
[ -z "$(grep "^proxy-provider:" "$CFG_FILE")" ] && {
sed -i "s/^ \{1,\}proxy-provider:/proxy-provider:/" "$CFG_FILE" 2>/dev/null
}
[ -z "$(grep "^proxy-provider:" "$CFG_FILE")" ] && {
sed -i "/^ \{0,\}proxy-providers:/c\proxy-provider:" "$CFG_FILE" 2>/dev/null
}
#proxy-groups
[ -z "$(grep "^Proxy Group:" "$CFG_FILE")" ] && {
sed -i "s/^ \{0,\}\'Proxy Group\':/Proxy Group:/" "$CFG_FILE" 2>/dev/null
sed -i 's/^ \{0,\}\"Proxy Group\":/Proxy Group:/' "$CFG_FILE" 2>/dev/null
sed -i "s/^ \{1,\}Proxy Group:/Proxy Group:/" "$CFG_FILE" 2>/dev/null
}
[ -z "$(grep "^Proxy Group:" "$CFG_FILE")" ] && {
sed -i "s/^ \{0,\}proxy-groups:/Proxy Group:/" "$CFG_FILE" 2>/dev/null
}
#proxies
[ -z "$(grep "^Proxy:" "$CFG_FILE")" ] && {
sed -i "/^ \{1,\}Proxy:/c\Proxy:" "$CFG_FILE" 2>/dev/null
}
[ -z "$(grep "^Proxy:" "$CFG_FILE")" ] && {
sed -i "/^proxies:/c\Proxy:" "$CFG_FILE" 2>/dev/null
}
[ -z "$(grep "^Proxy:" "$CFG_FILE")" ] && {
group_len=$(sed -n '/^Proxy Group:/=' "$CFG_FILE" 2>/dev/null)
proxies_len=$(sed -n '/proxies:/=' "$CFG_FILE" 2>/dev/null |sed -n 1p)
if [ "$proxies_len" -lt "$group_len" ]; then
sed -i "${proxies_len}c\Proxy:" "$CFG_FILE" 2>/dev/null
fi 2>/dev/null
}
#rules
[ -z "$(grep "^Rule:" "$CFG_FILE")" ] && {
sed -i "s/^ \{1,\}Rule:/Rule:/" "$CFG_FILE" 2>/dev/null
}
[ -z "$(grep "^Rule:" "$CFG_FILE")" ] && {
sed -i "/^ \{0,\}rules:/c\Rule:" "$CFG_FILE" 2>/dev/null
}
#dns
[ -z "$(grep "^dns:" "$CFG_FILE")" ] && {
sed -i "s/^ \{1,\}dns:/dns:/" "$CFG_FILE" 2>/dev/null
}
/usr/share/openclash/yml_field_name_ch.sh "$CFG_FILE"
#判断各个区位置
group_len=$(sed -n '/^Proxy Group:/=' "$CFG_FILE" 2>/dev/null)
provider_len=$(sed -n '/proxy-provider:/=' "$CONFIG_FILE" 2>/dev/null)
if [ "$provider_len" -ge "$group_len" ]; then
awk '/Proxy Group:/,/proxy-provider:/{print}' "$CFG_FILE" 2>/dev/null |sed "s/\'//g" 2>/dev/null |sed 's/\"//g' 2>/dev/null |sed 's/\t/ /g' 2>/dev/null |grep name: |awk -F 'name:' '{print $2}' |sed 's/,.*//' |sed 's/^ \{0,\}//' 2>/dev/null |sed 's/ \{0,\}$//' 2>/dev/null |sed 's/ \{0,\}\}\{0,\}$//g' 2>/dev/null >/tmp/Proxy_Group 2>&1

View File

@ -234,13 +234,17 @@ cat >> "$SERVER_FILE" <<-EOF
udp: $udp
EOF
fi
if [ ! -z "$obfss" ] && [ ! -z "$host" ]; then
if [ ! -z "$obfss" ]; then
cat >> "$SERVER_FILE" <<-EOF
$obfss
plugin-opts:
mode: $obfs
EOF
if [ ! -z "$host" ]; then
cat >> "$SERVER_FILE" <<-EOF
host: $host
EOF
fi
if [ "$obfss" = "plugin: v2ray-plugin" ]; then
if [ ! -z "$tls" ]; then
cat >> "$SERVER_FILE" <<-EOF

View File

@ -1,8 +1,63 @@
#!/bin/sh
check_def=0
check_def=0
/usr/share/openclash/yml_groups_name_get.sh
if [ "$2" != 0 ]; then
if [ "$(uci get openclash.config.Proxy)" = "读取错误,配置文件异常!" ]; then
#判断策略组是否存在
GlobalTV=$(uci get openclash.config.GlobalTV 2>/dev/null)
AsianTV=$(uci get openclash.config.AsianTV 2>/dev/null)
Proxy=$(uci get openclash.config.Proxy 2>/dev/null)
Apple=$(uci get openclash.config.Apple 2>/dev/null)
Netflix=$(uci get openclash.config.Netflix 2>/dev/null)
Spotify=$(uci get openclash.config.Spotify 2>/dev/null)
Steam=$(uci get openclash.config.Steam 2>/dev/null)
AdBlock=$(uci get openclash.config.AdBlock 2>/dev/null)
Netease_Music=$(uci get openclash.config.Netease_Music 2>/dev/null)
Speedtest=$(uci get openclash.config.Speedtest 2>/dev/null)
Telegram=$(uci get openclash.config.Telegram 2>/dev/null)
Microsoft=$(uci get openclash.config.Microsoft 2>/dev/null)
PayPal=$(uci get openclash.config.PayPal 2>/dev/null)
Domestic=$(uci get openclash.config.Domestic 2>/dev/null)
Others=$(uci get openclash.config.Others 2>/dev/null)
if [ "$2" = "ConnersHua_return" ]; then
if [ -z "$(grep "$Proxy" /tmp/Proxy_Group)" ]\
|| [ -z "$(grep "$Others" /tmp/Proxy_Group)" ];then
echo "${1} Warning: Because of The Different Porxy-Group's Name, Stop Setting The Other Rules!" >>/tmp/openclash.log
exit 0
fi
elif [ "$2" = "ConnersHua" ]; then
if [ -z "$(grep "$GlobalTV" /tmp/Proxy_Group)" ]\
|| [ -z "$(grep "$AsianTV" /tmp/Proxy_Group)" ]\
|| [ -z "$(grep "$Proxy" /tmp/Proxy_Group)" ]\
|| [ -z "$(grep "$Apple" /tmp/Proxy_Group)" ]\
|| [ -z "$(grep "$AdBlock" /tmp/Proxy_Group)" ]\
|| [ -z "$(grep "$Others" /tmp/Proxy_Group)" ]\
|| [ -z "$(grep "$Domestic" /tmp/Proxy_Group)" ]; then
echo "${1} Warning: Because of The Different Porxy-Group's Name, Stop Setting The Other Rules!" >>/tmp/openclash.log
exit 0
fi
elif [ "$2" = "lhie1" ]; then
if [ -z "$(grep "$GlobalTV" /tmp/Proxy_Group)" ]\
|| [ -z "$(grep "$AsianTV" /tmp/Proxy_Group)" ]\
|| [ -z "$(grep "$Proxy" /tmp/Proxy_Group)" ]\
|| [ -z "$(grep "$Apple" /tmp/Proxy_Group)" ]\
|| [ -z "$(grep "$Netflix" /tmp/Proxy_Group)" ]\
|| [ -z "$(grep "$Spotify" /tmp/Proxy_Group)" ]\
|| [ -z "$(grep "$Steam" /tmp/Proxy_Group)" ]\
|| [ -z "$(grep "$AdBlock" /tmp/Proxy_Group)" ]\
|| [ -z "$(grep "$Netease_Music" /tmp/Proxy_Group)" ]\
|| [ -z "$(grep "$Speedtest" /tmp/Proxy_Group)" ]\
|| [ -z "$(grep "$Telegram" /tmp/Proxy_Group)" ]\
|| [ -z "$(grep "$Microsoft" /tmp/Proxy_Group)" ]\
|| [ -z "$(grep "$PayPal" /tmp/Proxy_Group)" ]\
|| [ -z "$(grep "$Others" /tmp/Proxy_Group)" ]\
|| [ -z "$(grep "$Domestic" /tmp/Proxy_Group)" ]; then
echo "${1} Warning: Because of The Different Porxy-Group's Name, Stop Setting The Other Rules!" >>/tmp/openclash.log
exit 0
fi
fi
if [ "$Proxy" = "读取错误,配置文件异常!" ]; then
echo "${1} Warning: Can not Get The Porxy-Group's Name, Stop Setting The Other Rules!" >>/tmp/openclash.log
exit 0
else
@ -20,74 +75,59 @@ if [ "$2" != 0 ]; then
}
[ "$check_def" -ne 1 ] && {
GlobalTV=$(grep '##GlobalTV:' "$4" |awk -F ':' '{print $2}')
AsianTV=$(grep '##AsianTV:' "$4" |awk -F ':' '{print $2}')
Proxy=$(grep '##Proxy:' "$4" |awk -F ':' '{print $2}')
Apple=$(grep '##Apple:' "$4" |awk -F ':' '{print $2}')
Netflix=$(grep '##Netflix:' "$4" |awk -F ':' '{print $2}')
Spotify=$(grep '##Spotify:' "$4" |awk -F ':' '{print $2}')
Steam=$(grep '##Steam:' "$4" |awk -F ':' '{print $2}')
AdBlock=$(grep '##AdBlock:' "$4" |awk -F ':' '{print $2}')
Others=$(grep '##Others:' "$4" |awk -F ':' '{print $2}')
Domestic=$(grep '##Domestic:' "$4" |awk -F ':' '{print $2}')
Netease_Music=$(grep '##Netease_Music:' "$4" |awk -F ':' '{print $2}')
Speedtest=$(grep '##Speedtest:' "$4" |awk -F ':' '{print $2}')
Telegram=$(grep '##Telegram:' "$4" |awk -F ':' '{print $2}')
PayPal=$(grep '##PayPal:' "$4" |awk -F ':' '{print $2}')
Microsoft=$(grep '##Microsoft:' "$4" |awk -F ':' '{print $2}')
GlobalTV_YAML=$(grep '##GlobalTV:' "$4" |awk -F ':' '{print $2}')
AsianTV_YAML=$(grep '##AsianTV:' "$4" |awk -F ':' '{print $2}')
Proxy_YAML=$(grep '##Proxy:' "$4" |awk -F ':' '{print $2}')
Apple_YAML=$(grep '##Apple:' "$4" |awk -F ':' '{print $2}')
Netflix_YAML=$(grep '##Netflix:' "$4" |awk -F ':' '{print $2}')
Spotify_YAML=$(grep '##Spotify:' "$4" |awk -F ':' '{print $2}')
Steam_YAML=$(grep '##Steam:' "$4" |awk -F ':' '{print $2}')
AdBlock_YAML=$(grep '##AdBlock:' "$4" |awk -F ':' '{print $2}')
Others_YAML=$(grep '##Others:' "$4" |awk -F ':' '{print $2}')
Domestic_YAML=$(grep '##Domestic:' "$4" |awk -F ':' '{print $2}')
Netease_Music_YAML=$(grep '##Netease_Music:' "$4" |awk -F ':' '{print $2}')
Speedtest_YAML=$(grep '##Speedtest:' "$4" |awk -F ':' '{print $2}')
Telegram_YAML=$(grep '##Telegram:' "$4" |awk -F ':' '{print $2}')
PayPal_YAML=$(grep '##PayPal:' "$4" |awk -F ':' '{print $2}')
Microsoft_YAML=$(grep '##Microsoft:' "$4" |awk -F ':' '{print $2}')
if [ "$2" = "ConnersHua_return" ]; then
if [ "$(uci get openclash.config.Proxy)" != "$Proxy" ]\
|| [ "$(uci get openclash.config.Others)" != "$Others" ];then
if [ "$Proxy" != "$Proxy_YAML" ]\
|| [ "$Others" != "$Others_YAML" ];then
check_def=1
fi
fi
elif [ "$2" = "ConnersHua" ]; then
if [ "$(uci get openclash.config.GlobalTV)" != "$GlobalTV" ]\
|| [ "$(uci get openclash.config.AsianTV)" != "$AsianTV" ]\
|| [ "$(uci get openclash.config.Proxy)" != "$Proxy" ]\
|| [ "$(uci get openclash.config.Apple)" != "$Apple" ]\
|| [ "$(uci get openclash.config.AdBlock)" != "$AdBlock" ]\
|| [ "$(uci get openclash.config.Others)" != "$Others" ]\
|| [ "$(uci get openclash.config.Domestic)" != "$Domestic" ]; then
if [ "$GlobalTV" != "$GlobalTV_YAML" ]\
|| [ "$AsianTV" != "$AsianTV_YAML" ]\
|| [ "$Proxy" != "$Proxy_YAML" ]\
|| [ "$Apple" != "$Apple_YAML" ]\
|| [ "$AdBlock" != "$AdBlock_YAML" ]\
|| [ "$Others" != "$Others_YAML" ]\
|| [ "$Domestic" != "$Domestic_YAML" ]; then
check_def=1
fi
elif [ "$2" = "lhie1" ]; then
if [ "$(uci get openclash.config.GlobalTV)" != "$GlobalTV" ]\
|| [ "$(uci get openclash.config.AsianTV)" != "$AsianTV" ]\
|| [ "$(uci get openclash.config.Proxy)" != "$Proxy" ]\
|| [ "$(uci get openclash.config.Apple)" != "$Apple" ]\
|| [ "$(uci get openclash.config.Netflix)" != "$Netflix" ]\
|| [ "$(uci get openclash.config.Spotify)" != "$Spotify" ]\
|| [ "$(uci get openclash.config.Steam)" != "$Steam" ]\
|| [ "$(uci get openclash.config.AdBlock)" != "$AdBlock" ]\
|| [ "$(uci get openclash.config.Netease_Music)" != "$Netease_Music" ]\
|| [ "$(uci get openclash.config.Speedtest)" != "$Speedtest" ]\
|| [ "$(uci get openclash.config.Telegram)" != "$Telegram" ]\
|| [ "$(uci get openclash.config.Microsoft)" != "$Microsoft" ]\
|| [ "$(uci get openclash.config.PayPal)" != "$PayPal" ]\
|| [ "$(uci get openclash.config.Others)" != "$Others" ]\
|| [ "$(uci get openclash.config.Domestic)" != "$Domestic" ]; then
if [ "$GlobalTV" != "$GlobalTV_YAML" ]\
|| [ "$AsianTV" != "$AsianTV_YAML" ]\
|| [ "$Proxy" != "$Proxy_YAML" ]\
|| [ "$Apple" != "$Apple_YAML" ]\
|| [ "$Netflix" != "$Netflix_YAML" ]\
|| [ "$Spotify" != "$Spotify_YAML" ]\
|| [ "$Steam" != "$Steam_YAML" ]\
|| [ "$AdBlock" != "$AdBlock_YAML" ]\
|| [ "$Netease_Music" != "$Netease_Music_YAML" ]\
|| [ "$Speedtest" != "$Speedtest_YAML" ]\
|| [ "$Telegram" != "$Telegram_YAML" ]\
|| [ "$Microsoft" != "$Microsoft_YAML" ]\
|| [ "$PayPal" != "$PayPal_YAML" ]\
|| [ "$Others" != "$Others_YAML" ]\
|| [ "$Domestic" != "$Domestic_YAML" ]; then
check_def=1
fi
fi
}
if [ "$check_def" -eq 1 ]; then
GlobalTV=$(uci get openclash.config.GlobalTV 2>/dev/null)
AsianTV=$(uci get openclash.config.AsianTV 2>/dev/null)
Proxy=$(uci get openclash.config.Proxy 2>/dev/null)
Apple=$(uci get openclash.config.Apple 2>/dev/null)
Netflix=$(uci get openclash.config.Netflix 2>/dev/null)
Spotify=$(uci get openclash.config.Spotify 2>/dev/null)
Steam=$(uci get openclash.config.Steam 2>/dev/null)
AdBlock=$(uci get openclash.config.AdBlock 2>/dev/null)
Netease_Music=$(uci get openclash.config.Netease_Music 2>/dev/null)
Speedtest=$(uci get openclash.config.Speedtest 2>/dev/null)
Telegram=$(uci get openclash.config.Telegram 2>/dev/null)
Microsoft=$(uci get openclash.config.Microsoft 2>/dev/null)
PayPal=$(uci get openclash.config.PayPal 2>/dev/null)
Domestic=$(uci get openclash.config.Domestic 2>/dev/null)
Others=$(uci get openclash.config.Others 2>/dev/null)
if [ "$check_def" -eq 1 ]; then
if [ "$2" = "lhie1" ]; then
sed -i '/^Rule:/,$d' "$4"
cat /etc/openclash/lhie1.yaml >> "$4"
@ -129,8 +169,8 @@ if [ "$2" != 0 ]; then
-e "s/,DIRECT$/,${Others}#d/g" -e "/Rule:/a\##Others:${Others}"\
-e "s/#d//g" "$4"
fi
fi
fi
fi
fi
elif [ "$2" = 0 ]; then
[ -f "$8" ] && {
grep '##source:' "$4" 1>/dev/null