298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

luci-app-ssr-plus:Fix kcptun startup errors (#4303)

Browse Source 
* Fix Errors

* Updated version

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

* luci-app-ssr-plus:Revised explanation
This commit is contained in:
Mattraks 2020-04-14 09:25:17 +08:00 committed by GitHub
parent f7cdc54602
commit 9cf7ebae5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/lean/luci-app-ssr-plus/Makefile
View File

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-ssr-plus PKG_NAME:=luci-app-ssr-plus
PKG_VERSION:=176 PKG_VERSION:=176
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

2
package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
View File

@ -14,7 +14,7 @@ local function isKcptun(file)
if not nixio.fs.access(file, "rwx", "rx", "rx") then if not nixio.fs.access(file, "rwx", "rx", "rx") then
nixio.fs.chmod(file, 755) nixio.fs.chmod(file, 755)
end 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") return (str:lower() == "kcptun")
end end

20
package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
View File

@ -339,17 +339,17 @@ start_redir_tcp() {
for i in $(seq 1 $threads); do for i in $(seq 1 $threads); do
$bin -c $CONFIG_FILE $ARG_OTA -f /var/run/ssr-retcp_$i.pid >/dev/null 2>&1 $bin -c $CONFIG_FILE $ARG_OTA -f /var/run/ssr-retcp_$i.pid >/dev/null 2>&1
done 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) v2ray)
$bin -config /var/etc/v2-ssr-retcp.json >/dev/null 2>&1 & $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) trojan)
for i in $(seq 1 $threads); do for i in $(seq 1 $threads); do
$bin --config /var/etc/trojan-ssr-retcp.json >/dev/null 2>&1 & $bin --config /var/etc/trojan-ssr-retcp.json >/dev/null 2>&1 &
done 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) socks5)
/usr/share/shadowsocksr/genred2config.sh "/var/etc/redsocks-ssr-retcp.conf" socks5 tcp $(uci_get_by_name $GLOBAL_SERVER local_port) \ /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 for i in $(seq 1 $threads); do
$bin -c /var/etc/redsocks-ssr-retcp.conf >/dev/null 2>&1 $bin -c /var/etc/redsocks-ssr-retcp.conf >/dev/null 2>&1
done 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) 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) /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 for i in $(seq 1 $threads); do
$bin -c /var/etc/redsocks-ssr-retcp.conf >/dev/null 2>&1 $bin -c /var/etc/redsocks-ssr-retcp.conf >/dev/null 2>&1
done 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 esac
return 0 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 $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 $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 & 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) v2ray)
lua /usr/share/shadowsocksr/genv2config.lua $NETFLIX_SERVER tcp 4321 1088 >/var/etc/v2-ssr-netflix.json 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 & $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 & 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) trojan)
lua /usr/share/shadowsocksr/gentrojanconfig.lua $NETFLIX_SERVER nat 4321 >/var/etc/trojan-ssr-netflix.json 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 sed -i 's/\\//g' /var/etc/trojan-ssr-socksdns.json
$bin --config /var/etc/trojan-ssr-socksdns.json >/dev/null 2>&1 & $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 & 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) socks5)
/usr/share/shadowsocksr/genred2config.sh "/var/etc/redsocks-ssr-netflix.conf" socks5 tcp 4321 \ /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 $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 & 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 & 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) tun)
/usr/share/shadowsocksr/genred2config.sh "/var/etc/redsocks-ssr-netflix.conf" vpn $(uci_get_by_name $NETFLIX_SERVER iface "br-lan") 4321 /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 $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 & 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 & 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 esac
fi fi

2
package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gentrojanconfig.lua
View File

@ -1,4 +1,4 @@
local ucursor = require "uci".cursor() local ucursor = require "luci.model.uci".cursor()
local json = require "luci.jsonc" local json = require "luci.jsonc"
local server_section = arg[1] local server_section = arg[1]
local proto = arg[2] local proto = arg[2]

2
package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config.lua
View File

@ -1,4 +1,4 @@
local ucursor = require "uci".cursor() local ucursor = require "luci.model.uci".cursor()
local json = require "luci.jsonc" local json = require "luci.jsonc"
local server_section = arg[1] local server_section = arg[1]
local proto = arg[2] local proto = arg[2]