From b0bca4dce08285142d1888e31a5e16f53ba20767 Mon Sep 17 00:00:00 2001
From: LEAN-ESX <coolsnowwolf@gmail.com>
Date: Sat, 7 Dec 2019 07:16:07 -0800
Subject: [PATCH] luci-app-ssr-plus: fix trojan init script

---
 package/lean/luci-app-ssr-plus/Makefile             |  2 +-
 .../luci-app-ssr-plus/root/etc/init.d/shadowsocksr  |  8 ++++----
 .../root/usr/share/shadowsocksr/gentrojanconfig.lua | 13 ++++---------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile
index 3a1512216..984a84678 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:=1
-PKG_RELEASE:=128
+PKG_RELEASE:=129
 
 PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks \
 	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray \
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 196728bd1..c4e3ee999 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
@@ -126,8 +126,8 @@ EOF
         lua /usr/share/shadowsocksr/genv2config.lua $GLOBAL_SERVER tcp $(uci_get_by_name $1 local_port) > /var/etc/v2-ssr-retcp.json
         sed -i 's/\\//g' /var/etc/v2-ssr-retcp.json
       elif [ "$stype" == "trojan" ] ;then
-        lua /usr/share/shadowsocksr/gentrojanconfig.lua $GLOBAL_SERVER $stype $usr_dns $usr_port $local_port > $config_file
-        sed -i 's/\\//g' $config_file
+        lua /usr/share/shadowsocksr/gentrojanconfig.lua $GLOBAL_SERVER nat $(uci_get_by_name $1 local_port) > /var/etc/trojan-ssr-retcp.json
+        sed -i 's/\\//g' /var/etc/trojan-ssr-retcp.json
 fi
 }
 
@@ -338,7 +338,7 @@ start_redir() {
     $sscmd -config /var/etc/v2-ssr-retcp.json >/dev/null 2>&1 &
     echo "$(date "+%Y-%m-%d %H:%M:%S") $($sscmd -version | head -1) Started!" >> /tmp/ssrplus.log
   elif [ "$stype" == "trojan" ] ;then
-    $sscmd --config $CONFIG_FILE >> /tmp/ssrplus.log 2>&1 &
+    $sscmd --config /var/etc/trojan-ssr-retcp.json >> /tmp/ssrplus.log 2>&1 &
     echo "$(date "+%Y-%m-%d %H:%M:%S") $($sscmd --version 2>&1 | head -1) Started!" >> /tmp/ssrplus.log
 	fi
 	
@@ -359,7 +359,7 @@ start_redir() {
         $ucmd -config /var/etc/v2-ssr-reudp.json >/dev/null 2>&1 & 
      elif [ "$stype" == "trojan" ] ;then
         gen_config_file $UDP_RELAY_SERVER 1
-        $ucmd --config $CONFIG_UDP_FILE >> /tmp/ssrplus.log 2>&1 &  
+        $ucmd --config /var/etc/trojan-ssr-retcp.json >> /tmp/ssrplus.log 2>&1 &  
     fi
    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 bca0cd41e..9d85bc41d 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
@@ -2,29 +2,24 @@ local ucursor = require "luci.model.uci".cursor()
 local json = require "luci.jsonc"
 local server_section = arg[1]
 local proto = arg[2] 
-local usr_dns = arg[3]
-local usr_port = arg[4]
-local local_port = arg[5]
+local local_port = arg[3]
 
 local server = ucursor:get_all("shadowsocksr", server_section)
 
 local trojan = {
-    -- error = "/var/ssrplus.log",
     log_level = 3,
     run_type = proto,
     local_addr = "0.0.0.0",
     local_port = tonumber(local_port),
     remote_addr = server.server,
     remote_port = tonumber(server.server_port),
-    target_addr = usr_dns,
-    target_port = tonumber(usr_port),
     udp_timeout = 60,
     -- 传入连接
     password = {server.password},
     -- 传出连接
-    ssl = (server.tls) and {
-        verify = (server.insecure == "1") and false or true,
-        verify_hostname = (server.insecure == "1") and false or true,
+    ssl =  {
+        verify = false,
+        verify_hostname = (server.tls == "1") and false or true,
         cert = "",
         ciper = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-RSA-AES128-SHA:ECDHE-RSA-AES256-SHA:RSA-AES128-GCM-SHA256:RSA-AES256-GCM-SHA384:RSA-AES128-SHA:RSA-AES256-SHA:RSA-3DES-EDE-SHA",
         sni = server.tls_host,