Merge pull request #543 from Mattraks/patch

luci-app-ssr-plus: Basic data update

luci-app-ssr-plus/root/etc/ssrplus/china_ssr.txt

@@ -3273,7 +3273,6 @@
 103.86.60.0/22
 103.86.80.0/22
 103.86.84.0/22
-103.86.88.0/22
 103.86.204.0/22
 103.86.208.0/22
 103.86.212.0/22
@@ -3656,7 +3655,6 @@
 103.109.248.0/22
 103.110.80.0/23
 103.110.92.0/22
-103.110.100.0/22
 103.110.116.0/22
 103.110.127.0/24
 103.110.128.0/23
@@ -4145,6 +4143,10 @@
 103.166.54.0/23
 103.166.84.0/23
 103.166.138.0/23
+103.166.242.0/23
+103.166.246.0/23
+103.167.0.0/23
+103.167.36.0/23
 103.192.0.0/22
 103.192.4.0/22
 103.192.8.0/22
@@ -4886,7 +4888,6 @@
 103.231.20.0/22
 103.231.64.0/22
 103.231.68.0/22
-103.231.144.0/22
 103.231.180.0/22
 103.231.184.0/22
 103.231.244.0/22
@@ -5484,7 +5485,9 @@
 116.193.164.0/22
 116.193.176.0/21
 116.194.0.0/15
-116.196.0.0/16
+116.196.0.0/17
+116.196.128.0/18
+116.196.192.0/18
 116.197.160.0/22
 116.197.164.0/22
 116.198.0.0/16
@@ -5959,7 +5962,8 @@
 124.64.0.0/15
 124.66.0.0/17
 124.67.0.0/16
-124.68.0.0/14
+124.68.0.0/15
+124.70.0.0/15
 124.72.0.0/16
 124.73.0.0/16
 124.74.0.0/15
@@ -6092,7 +6096,8 @@
 140.179.0.0/16
 140.205.0.0/16
 140.206.0.0/15
-140.210.0.0/16
+140.210.0.0/17
+140.210.128.0/17
 140.224.0.0/16
 140.237.0.0/16
 140.240.0.0/16
@@ -6210,6 +6215,7 @@
 157.148.0.0/16
 157.156.0.0/16
 157.255.0.0/16
+158.60.128.0/17
 158.79.0.0/16
 159.27.0.0/16
 159.75.0.0/16

luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua

@@ -327,7 +327,7 @@ local function processData(szType, content)
 			if not params.type or params.type == "tcp" then
 				if params.security == "xtls" then
 					result.xtls = "1"
-					result.tls_host = params.sni or host[1]
+					result.tls_host = params.sni
 					result.vless_flow = params.flow
 				else
 					result.xtls = "0"
@@ -338,7 +338,7 @@ local function processData(szType, content)
 				result.ws_path = params.path or "/"
 			end
 			if params.type == 'http' then
-				result.h2_host = params.host or host[1]
+				result.h2_host = params.host
 				result.h2_path = params.path or "/"
 			end
 			if params.type == 'kcp' then
@@ -362,7 +362,7 @@ local function processData(szType, content)
 			
 			if params.security == "tls" then
 				result.tls = "1"
-				result.tls_host = params.sni or host[1]
+				result.tls_host = params.sni
 			else
 				result.tls = "0"
 			end