From 857a452f575872ddb9d1dc882c4ee475f5dfdaec Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@gmail.com>
Date: Mon, 17 Feb 2020 18:37:14 +0800
Subject: [PATCH] luci-app-vssr: sync with upstream source

---
 package/ctcgfw/luci-app-vssr/Makefile                       | 4 ++--
 .../ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/client.lua   | 2 ++
 package/ctcgfw/luci-app-vssr/luasrc/view/vssr/ping1.htm     | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/package/ctcgfw/luci-app-vssr/Makefile b/package/ctcgfw/luci-app-vssr/Makefile
index 92d428cbea..95d221875d 100644
--- a/package/ctcgfw/luci-app-vssr/Makefile
+++ b/package/ctcgfw/luci-app-vssr/Makefile
@@ -132,10 +132,10 @@ define Package/luci-app-vssr
             +PACKAGE_$(PKG_NAME)_INCLUDE_ipt2socks:ipt2socks \
             +PACKAGE_$(PKG_NAME)_INCLUDE_dnscrypt_proxy:dnscrypt-proxy-full \
             +PACKAGE_$(PKG_NAME)_INCLUDE_dnsforwarder:dnsforwarder \
-            +PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS:ChinaDNS \
+            +PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS:openwrt_chinadns \
             +PACKAGE_$(PKG_NAME)_INCLUDE_haproxy:haproxy \
             +PACKAGE_$(PKG_NAME)_INCLUDE_privoxy:privoxy \
-            +PACKAGE_$(PKG_NAME)_INCLUDE_udpspeeder:udpspeeder \
+            +PACKAGE_$(PKG_NAME)_INCLUDE_udpspeeder:speederv2-tunnel \
             +PACKAGE_$(PKG_NAME)_INCLUDE_udp2raw-tunnel:udp2raw-tunnel \
             +PACKAGE_$(PKG_NAME)_INCLUDE_simple-obfs:simple-obfs \
             +PACKAGE_$(PKG_NAME)_INCLUDE_simple-obfs-server:simple-obfs-server \
diff --git a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/client.lua b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/client.lua
index eccb661dea..56589cbb4a 100644
--- a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/client.lua
+++ b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/client.lua
@@ -233,4 +233,6 @@ o = s:option(Button,"check_port",translate("Check Server Port"))
 o.template = "vssr/checkport"
 o.value =translate("No Check")
 
+m:section(SimpleSection).template  = "vssr/status2"
+
 return m
diff --git a/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/ping1.htm b/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/ping1.htm
index e01ea20af2..5281070999 100644
--- a/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/ping1.htm
+++ b/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/ping1.htm
@@ -7,7 +7,7 @@
 	//<![CDATA[
 	var pings = document.getElementsByClassName('pingtime');
 	for(var i = 0; i < pings.length; i++) {
-		XHR.get('/cgi-bin/luci/admin/vpn/greatwall/ping', {
+		XHR.get('/cgi-bin/luci/admin/vpn/vssr/ping', {
 				index: i,
 				domain: pings[i].getAttribute("hint")
 			},
@@ -15,7 +15,7 @@
 				pings[result.index].innerHTML = (result.ping ? "<b><font color=green>"+result.ping+"</font></b> ms" : "<b><font color=red> 检测失败 </font></b>");
 			}
 		);
-		XHR.poll(10,'/cgi-bin/luci/admin/vpn/greatwall/ping',{
+		XHR.poll(10,'/cgi-bin/luci/admin/vpn/vssr/ping',{
 				index: i,
 				domain: pings[i].getAttribute("hint")
 			},
@@ -25,4 +25,4 @@
 		);
 	}
 	//]]>
-</script>
\ No newline at end of file
+</script>