From 9cf7ebae5faa6ad4a898a1085e91ba40afb2f23c Mon Sep 17 00:00:00 2001
From: Mattraks <16359027+Mattraks@users.noreply.github.com>
Date: Tue, 14 Apr 2020 09:25:17 +0800
Subject: [PATCH] luci-app-ssr-plus:Fix kcptun startup errors (#4303)

* Fix Errors

* Updated version

* luci-app-ssr-plus:require "luci.model.uci"

* luci-app-ssr-plus:Revised explanation
---
 package/lean/luci-app-ssr-plus/Makefile       |  2 +-
 .../model/cbi/shadowsocksr/client-config.lua  |  2 +-
 .../root/etc/init.d/shadowsocksr              | 20 +++++++++----------
 .../share/shadowsocksr/gentrojanconfig.lua    |  2 +-
 .../usr/share/shadowsocksr/genv2config.lua    |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile
index 313b2dae5..dfcb59cb1 100644
--- a/package/lean/luci-app-ssr-plus/Makefile
+++ b/package/lean/luci-app-ssr-plus/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-ssr-plus
 PKG_VERSION:=176
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
index 48e113359..a404d2824 100644
--- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
+++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
@@ -14,7 +14,7 @@ local function isKcptun(file)
 	if not nixio.fs.access(file, "rwx", "rx", "rx") then
 		nixio.fs.chmod(file, 755)
 	end
-	local str = uci.sys.exec(file .. " -v | awk '{printf $1}'")
+	local str = luci.sys.exec(file .. " -v | awk '{printf $1}'")
 	return (str:lower() == "kcptun")
 end
 
diff --git a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
index 48910f018..ec84911de 100755
--- a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
+++ b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
@@ -339,17 +339,17 @@ start_redir_tcp() {
 		for i in $(seq 1 $threads); do
 			$bin -c $CONFIG_FILE $ARG_OTA -f /var/run/ssr-retcp_$i.pid >/dev/null 2>&1
 		done
-		echo "$(date "+%Y-%m-%d %H:%M:%S") Master node:$name $threads Threads Started!" >>/tmp/ssrplus.log
+		echo "$(date "+%Y-%m-%d %H:%M:%S") Main node:$name $threads Threads Started!" >>/tmp/ssrplus.log
 		;;
 	v2ray)
 		$bin -config /var/etc/v2-ssr-retcp.json >/dev/null 2>&1 &
-		echo "$(date "+%Y-%m-%d %H:%M:%S") Master node:$($bin -version | head -1) Started!" >>/tmp/ssrplus.log
+		echo "$(date "+%Y-%m-%d %H:%M:%S") Main node:$($bin -version | head -1) Started!" >>/tmp/ssrplus.log
 		;;
 	trojan)
 		for i in $(seq 1 $threads); do
 			$bin --config /var/etc/trojan-ssr-retcp.json >/dev/null 2>&1 &
 		done
-		echo "$(date "+%Y-%m-%d %H:%M:%S") Master node:$($bin --version 2>&1 | head -1) , $threads Threads Started!" >>/tmp/ssrplus.log
+		echo "$(date "+%Y-%m-%d %H:%M:%S") Main node:$($bin --version 2>&1 | head -1) , $threads Threads Started!" >>/tmp/ssrplus.log
 		;;
 	socks5)
 		/usr/share/shadowsocksr/genred2config.sh "/var/etc/redsocks-ssr-retcp.conf" socks5 tcp $(uci_get_by_name $GLOBAL_SERVER local_port) \
@@ -358,14 +358,14 @@ start_redir_tcp() {
 		for i in $(seq 1 $threads); do
 			$bin -c /var/etc/redsocks-ssr-retcp.conf >/dev/null 2>&1
 		done
-		echo "$(date "+%Y-%m-%d %H:%M:%S") Master node:Socks5 REDIRECT/TPROXY $threads Threads Started!" >>/tmp/ssrplus.log
+		echo "$(date "+%Y-%m-%d %H:%M:%S") Main node:Socks5 REDIRECT/TPROXY $threads Threads Started!" >>/tmp/ssrplus.log
 		;;
 	tun)
 		/usr/share/shadowsocksr/genred2config.sh "/var/etc/redsocks-ssr-retcp.conf" vpn $(uci_get_by_name $GLOBAL_SERVER iface "br-lan") $(uci_get_by_name $GLOBAL_SERVER local_port)
 		for i in $(seq 1 $threads); do
 			$bin -c /var/etc/redsocks-ssr-retcp.conf >/dev/null 2>&1
 		done
-		echo "$(date "+%Y-%m-%d %H:%M:%S") Master node:Network Tunnel REDIRECT $threads Threads Started!" >>/tmp/ssrplus.log
+		echo "$(date "+%Y-%m-%d %H:%M:%S") Main node:Network Tunnel REDIRECT $threads Threads Started!" >>/tmp/ssrplus.log
 		;;
 	esac
 	return 0
@@ -434,13 +434,13 @@ start_shunt() {
 			$bin -c /var/etc/shadowsocksr_n.json $ARG_OTA -f /var/run/ssr-netflix.pid >/dev/null 2>&1
 			$bin2 -c /var/etc/shadowsocksr_s.json $ARG_OTA -f /var/run/ssr-socksdns.pid >/dev/null 2>&1
 			dns2socks 127.0.0.1:1088 8.8.8.8:53 127.0.0.1:5555 -q >/dev/null 2>&1 &
-			echo "$(date "+%Y-%m-%d %H:%M:%S") Netflix Bypass:$name Started!" >>/tmp/ssrplus.log
+			echo "$(date "+%Y-%m-%d %H:%M:%S") Netflix shunt:$name Started!" >>/tmp/ssrplus.log
 			;;
 		v2ray)
 			lua /usr/share/shadowsocksr/genv2config.lua $NETFLIX_SERVER tcp 4321 1088 >/var/etc/v2-ssr-netflix.json
 			$bin -config /var/etc/v2-ssr-netflix.json >/dev/null 2>&1 &
 			dns2socks 127.0.0.1:1088 8.8.8.8:53 127.0.0.1:5555 -q >/dev/null 2>&1 &
-			echo "$(date "+%Y-%m-%d %H:%M:%S") Netflix Bypass:$($bin -version | head -1) Started!" >>/tmp/ssrplus.log
+			echo "$(date "+%Y-%m-%d %H:%M:%S") Netflix shunt:$($bin -version | head -1) Started!" >>/tmp/ssrplus.log
 			;;
 		trojan)
 			lua /usr/share/shadowsocksr/gentrojanconfig.lua $NETFLIX_SERVER nat 4321 >/var/etc/trojan-ssr-netflix.json
@@ -450,7 +450,7 @@ start_shunt() {
 			sed -i 's/\\//g' /var/etc/trojan-ssr-socksdns.json
 			$bin --config /var/etc/trojan-ssr-socksdns.json >/dev/null 2>&1 &
 			dns2socks 127.0.0.1:1088 8.8.8.8:53 127.0.0.1:5555 -q >/dev/null 2>&1 &
-			echo "$(date "+%Y-%m-%d %H:%M:%S") Netflix Bypass:$($bin --version 2>&1 | head -1) Started!" >>/tmp/ssrplus.log
+			echo "$(date "+%Y-%m-%d %H:%M:%S") Netflix shunt:$($bin --version 2>&1 | head -1) Started!" >>/tmp/ssrplus.log
 			;;
 		socks5)
 			/usr/share/shadowsocksr/genred2config.sh "/var/etc/redsocks-ssr-netflix.conf" socks5 tcp 4321 \
@@ -459,14 +459,14 @@ start_shunt() {
 			$bin -c /var/etc/redsocks-ssr-netflix.conf >/dev/null 2>&1
 			microsocks -i 127.0.0.1 -p 1088 ssr-socksdns >/dev/null 2>&1 &
 			dns2socks 127.0.0.1:1088 8.8.8.8:53 127.0.0.1:5555 -q >/dev/null 2>&1 &
-			echo "$(date "+%Y-%m-%d %H:%M:%S") Netflix Bypass:Socks5 Started!" >>/tmp/ssrplus.log
+			echo "$(date "+%Y-%m-%d %H:%M:%S") Netflix shunt:Socks5 Started!" >>/tmp/ssrplus.log
 			;;
 		tun)
 			/usr/share/shadowsocksr/genred2config.sh "/var/etc/redsocks-ssr-netflix.conf" vpn $(uci_get_by_name $NETFLIX_SERVER iface "br-lan") 4321
 			$bin -c /var/etc/redsocks-ssr-netflix.conf >/dev/null 2>&1
 			microsocks -i 127.0.0.1 -p 1088 ssr-socksdns >/dev/null 2>&1 &
 			dns2socks 127.0.0.1:1088 8.8.8.8:53 127.0.0.1:5555 -q >/dev/null 2>&1 &
-			echo "$(date "+%Y-%m-%d %H:%M:%S") Netflix Bypass:Network Tunnel REDIRECT Started!" >>/tmp/ssrplus.log
+			echo "$(date "+%Y-%m-%d %H:%M:%S") Netflix shunt:Network Tunnel REDIRECT Started!" >>/tmp/ssrplus.log
 			;;
 		esac
 	fi
diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gentrojanconfig.lua b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gentrojanconfig.lua
index 9474777d0..275811174 100644
--- a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gentrojanconfig.lua
+++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gentrojanconfig.lua
@@ -1,4 +1,4 @@
-local ucursor = require "uci".cursor()
+local ucursor = require "luci.model.uci".cursor()
 local json = require "luci.jsonc"
 local server_section = arg[1]
 local proto = arg[2]
diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config.lua b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config.lua
index 36e7efae4..23d5bd906 100644
--- a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config.lua
+++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config.lua
@@ -1,4 +1,4 @@
-local ucursor = require "uci".cursor()
+local ucursor = require "luci.model.uci".cursor()
 local json = require "luci.jsonc"
 local server_section = arg[1]
 local proto = arg[2]