From 598ecf47041257280302d450fedea55ce7b30593 Mon Sep 17 00:00:00 2001 From: Beginner-Go <70857188+Beginner-Go@users.noreply.github.com> Date: Thu, 4 Feb 2021 17:40:47 +0000 Subject: [PATCH] luci-app-vssr: sync with upstream source Signed-off-by: CN_SZTL --- package/ctcgfw/luci-app-vssr/Makefile | 8 +------- .../ctcgfw/luci-app-vssr/luasrc/controller/vssr.lua | 2 +- .../luci-app-vssr/luasrc/model/cbi/vssr/client.lua | 7 +------ .../luci-app-vssr/luasrc/model/cbi/vssr/socks5.lua | 8 ++++---- package/ctcgfw/luci-app-vssr/po/zh-cn/vssr.po | 12 ++++++------ package/ctcgfw/luci-app-vssr/root/etc/config/vssr | 0 package/ctcgfw/luci-app-vssr/root/etc/init.d/vssr | 4 ++-- 7 files changed, 15 insertions(+), 26 deletions(-) mode change 100755 => 100644 package/ctcgfw/luci-app-vssr/root/etc/config/vssr diff --git a/package/ctcgfw/luci-app-vssr/Makefile b/package/ctcgfw/luci-app-vssr/Makefile index 84c59cf56c..a0b9f3fd9d 100644 --- a/package/ctcgfw/luci-app-vssr/Makefile +++ b/package/ctcgfw/luci-app-vssr/Makefile @@ -8,11 +8,10 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Trojan \ - CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_plugin \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Xray \ -LUCI_TITLE:=LuCI support for PassWall +LUCI_TITLE:=A New SS/SSR/Xray/Trojan LuCI interface LUCI_PKGARCH:=all LUCI_DEPENDS:= \ +bash +coreutils +coreutils-base64 +dnsmasq-full +ip-full +ipset +iptables-mod-tproxy \ @@ -22,7 +21,6 @@ LUCI_DEPENDS:= \ +PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server:shadowsocksr-libev-ssr-server \ +PACKAGE_$(PKG_NAME)_INCLUDE_Trojan:trojan \ +PACKAGE_$(PKG_NAME)_INCLUDE_Trojan:ipt2socks \ - +PACKAGE_$(PKG_NAME)_INCLUDE_V2ray:v2ray \ +PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_plugin:v2ray-plugin \ +PACKAGE_$(PKG_NAME)_INCLUDE_Xray:xray-core @@ -40,10 +38,6 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Trojan bool "Include Trojan" default y if i386||x86_64||arm||aarch64 -config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray - bool "Include V2ray" - default n - config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_plugin bool "Include Shadowsocks V2ray Plugin" default y if i386||x86_64||arm||aarch64 diff --git a/package/ctcgfw/luci-app-vssr/luasrc/controller/vssr.lua b/package/ctcgfw/luci-app-vssr/luasrc/controller/vssr.lua index 303d6062f5..7c5df5e781 100644 --- a/package/ctcgfw/luci-app-vssr/luasrc/controller/vssr.lua +++ b/package/ctcgfw/luci-app-vssr/luasrc/controller/vssr.lua @@ -15,7 +15,7 @@ function index() entry({'admin', 'services', 'vssr', 'subscribe_config'}, cbi('vssr/subscribe-config', {hideapplybtn = true, hidesavebtn = true, hideresetbtn = true}), _('Subscribe'), 12).leaf = true -- 订阅设置 entry({'admin', 'services', 'vssr', 'control'}, cbi('vssr/control'), _('Access Control'), 13).leaf = true -- 访问控制 entry({'admin', 'services', 'vssr', 'router'}, cbi('vssr/router'), _('Router Config'), 14).leaf = true -- 访问控制 - if nixio.fs.access('/usr/bin/v2ray/v2ray') or nixio.fs.access('/usr/bin/v2ray') or nixio.fs.access('/usr/bin/xray') or nixio.fs.access('/usr/bin/xray/xray') then + if nixio.fs.access('/usr/bin/xray') or nixio.fs.access('/usr/bin/xray/xray') then entry({'admin', 'services', 'vssr', 'socks5'}, cbi('vssr/socks5'), _('Local Proxy'), 15).leaf = true -- Socks5代理 end entry({'admin', 'services', 'vssr', 'advanced'}, cbi('vssr/advanced'), _('Advanced Settings'), 16).leaf = true -- 高级设置 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 2a70cd38a8..49fa54338c 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 @@ -62,7 +62,7 @@ local route_label = { } -- [[ Global Setting ]]-- -s = m:section(TypedSection, 'global', translate('Basic Settings [SS|SSR|V2ray|Xray|Trojan]')) +s = m:section(TypedSection, 'global', translate('Basic Settings [SS|SSR|Xray|Trojan]')) s.anonymous = true o = s:option(ListValue, 'global_server', translate('Main Server')) @@ -79,11 +79,6 @@ o:value('same', translate('Same as Main Server')) for _, key in pairs(server_table) do o:value(key.name, key.gname) end -if nixio.fs.access('/usr/bin/xray') or nixio.fs.access('/usr/bin/xray/xray') then - o = s:option(Flag, 'use_xray', translate('Use Xray instead of V2ray')) - o.rmempty = false -end - o = s:option(Flag, 'v2ray_flow', translate('Open v2ray route')) o.rmempty = false diff --git a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/socks5.lua b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/socks5.lua index 68b146942d..1a813d443d 100644 --- a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/socks5.lua +++ b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/socks5.lua @@ -15,8 +15,8 @@ local sys = require 'luci.sys' m = Map(vssr) -- [[ SOCKS5 Proxy ]]-- -if nixio.fs.access('/usr/bin/v2ray/v2ray') or nixio.fs.access('/usr/bin/v2ray') or nixio.fs.access('/usr/bin/xray') or nixio.fs.access('/usr/bin/xray/xray') then - s = m:section(TypedSection, 'socks5_proxy', translate('V2ray SOCKS5 Proxy')) +if nixio.fs.access('/usr/bin/xray') or nixio.fs.access('/usr/bin/xray/xray') then + s = m:section(TypedSection, 'socks5_proxy', translate('Xray SOCKS5 Proxy')) s.anonymous = true o = s:option(Flag, 'enable_server', translate('Enable Servers')) @@ -43,8 +43,8 @@ if nixio.fs.access('/usr/bin/v2ray/v2ray') or nixio.fs.access('/usr/bin/v2ray') end -- [[ Http Proxy ]]-- -if nixio.fs.access('/usr/bin/v2ray/v2ray') or nixio.fs.access('/usr/bin/v2ray') or nixio.fs.access('/usr/bin/xray') or nixio.fs.access('/usr/bin/xray/xray') then - s = m:section(TypedSection, 'http_proxy', translate('V2ray HTTP Proxy')) +if nixio.fs.access('/usr/bin/xray') or nixio.fs.access('/usr/bin/xray/xray') then + s = m:section(TypedSection, 'http_proxy', translate('Xray HTTP Proxy')) s.anonymous = true o = s:option(Flag, 'enable_server', translate('Enable Servers')) diff --git a/package/ctcgfw/luci-app-vssr/po/zh-cn/vssr.po b/package/ctcgfw/luci-app-vssr/po/zh-cn/vssr.po index bfebab30af..7fdd3ee318 100644 --- a/package/ctcgfw/luci-app-vssr/po/zh-cn/vssr.po +++ b/package/ctcgfw/luci-app-vssr/po/zh-cn/vssr.po @@ -172,11 +172,11 @@ msgstr "编辑服务器配置" msgid "Alias" msgstr "别名" -msgid "V2ray SOCKS5 Proxy" -msgstr "V2ray SOCKS5 代理" +msgid "Xray SOCKS5 Proxy" +msgstr "Xray SOCKS5 代理" -msgid "V2ray HTTP Proxy" -msgstr "V2ray HTTP 代理" +msgid "Xray HTTP Proxy" +msgstr "Xray HTTP 代理" msgid "Server" msgstr "服务器" @@ -389,8 +389,8 @@ msgstr "通过代理更新" msgid "GFW List" msgstr "GFW列表" -msgid "Basic Settings [SS|SSR|V2ray|Xray|Trojan]" -msgstr "基本设置 [SS|SSR|V2ray|Xray|Trojan]" +msgid "Basic Settings [SS|SSR|Xray|Trojan]" +msgstr "基本设置 [SS|SSR|Xray|Trojan]" msgid "Main Server" msgstr "主服务器" diff --git a/package/ctcgfw/luci-app-vssr/root/etc/config/vssr b/package/ctcgfw/luci-app-vssr/root/etc/config/vssr old mode 100755 new mode 100644 diff --git a/package/ctcgfw/luci-app-vssr/root/etc/init.d/vssr b/package/ctcgfw/luci-app-vssr/root/etc/init.d/vssr index dd75665473..522704687a 100755 --- a/package/ctcgfw/luci-app-vssr/root/etc/init.d/vssr +++ b/package/ctcgfw/luci-app-vssr/root/etc/init.d/vssr @@ -62,7 +62,7 @@ find_bin() { ssr) ret="ssr-redir" ;; ssr-local) ret="ssr-local" ;; ssr-server) ret="ssr-server" ;; - v2ray | vless) [[ $is_xray = "1" ]] && ret="xray" || ret="v2ray" ;; + v2ray | vless) ret="xray" ;; trojan) ret="trojan" ;; esac echo $(find /usr -perm /+x -type f -name $ret) @@ -644,7 +644,7 @@ stop() { if [ $(uci_get_by_type global monitor_enable) = 1 ]; then kill -9 $(busybox ps -w | grep vssr-monitor | grep -v grep | awk '{print $1}') >/dev/null 2>&1 fi - killall -q -9 ss-redir ss-local obfs-local ssr-redir ssr-local ssr-server v2ray v2ray-plugin xray trojan microsocks ipt2socks dns2socks pdnsd + killall -q -9 ss-redir ss-local obfs-local ssr-redir ssr-local ssr-server v2ray-plugin xray trojan microsocks ipt2socks dns2socks pdnsd if [ -f "/tmp/dnsmasq.d/dnsmasq-ssr.conf" ]; then rm -rf /tmp/dnsmasq.d/dnsmasq-ssr.conf /tmp/dnsmasq.ssr /tmp/dnsmasq.oversea