From c383af3c3a56d859fe745fdc33bad2cc1aa474e6 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Fri, 28 Feb 2020 18:37:57 +0800 Subject: [PATCH] luci-app-vssr: sync with upstream source --- package/ctcgfw/luci-app-vssr/Makefile | 4 +- .../luasrc/model/cbi/vssr/advanced.lua | 80 ------------------- .../luasrc/model/cbi/vssr/status.lua | 27 +++---- .../luasrc/model/cbi/vssr/subscription.lua | 2 +- package/ctcgfw/luci-app-vssr/po/zh-cn/vssr.po | 4 +- .../root/usr/share/vssr/genv2config.lua | 8 +- 6 files changed, 19 insertions(+), 106 deletions(-) diff --git a/package/ctcgfw/luci-app-vssr/Makefile b/package/ctcgfw/luci-app-vssr/Makefile index 4895273346..51793d24bd 100644 --- a/package/ctcgfw/luci-app-vssr/Makefile +++ b/package/ctcgfw/luci-app-vssr/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-vssr -PKG_VERSION:=1.13 -PKG_RELEASE:=20200225-4 +PKG_VERSION:=1.14 +PKG_RELEASE:=20200228-4 PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray \ diff --git a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/advanced.lua b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/advanced.lua index 9863c6a98e..931d82cb1c 100644 --- a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/advanced.lua +++ b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/advanced.lua @@ -1,86 +1,6 @@ local vssr = "vssr" local uci = luci.model.uci.cursor() local server_table = {} -local encrypt_methods = { - "none", - "table", - "rc4", - "rc4-md5-6", - "rc4-md5", - "aes-128-cfb", - "aes-192-cfb", - "aes-256-cfb", - "aes-128-ctr", - "aes-192-ctr", - "aes-256-ctr", - "bf-cfb", - "camellia-128-cfb", - "camellia-192-cfb", - "camellia-256-cfb", - "cast5-cfb", - "des-cfb", - "idea-cfb", - "rc2-cfb", - "seed-cfb", - "salsa20", - "chacha20", - "chacha20-ietf", -} - -local protocol = { - "origin", - "verify_deflate", - "auth_sha1_v4", - "auth_aes128_sha1", - "auth_aes128_md5", - "auth_chain_a", - "auth_chain_b", - "auth_chain_c", - "auth_chain_d", - "auth_chain_e", - "auth_chain_f", -} - -obfs = { - "plain", - "http_simple", - "http_post", - "random_head", - "tls1.2_ticket_auth", -} - -local raw_mode = { - "faketcp", - "udp", - "icmp", -} - -local seq_mode = { - "0", - "1", - "2", - "3", - "4", -} - -local cipher_mode = { - "none", - "xor", - "aes128cbc", -} - -local auth_mode = { - "none", - "simple", - "md5", - "crc32", -} - -local speeder_mode = { - "0", - "1", -} - uci:foreach(vssr, "servers", function(s) if s.alias then server_table[s[".name"]] = "[%s]:%s" %{string.upper(s.type), s.alias} diff --git a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/status.lua b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/status.lua index f9b70bf6b7..3ca90cace3 100644 --- a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/status.lua +++ b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/status.lua @@ -1,7 +1,7 @@ -- Copyright (C) 2017 yushi studio -- Licensed to the public under the GNU General Public License v3. -local IPK_Version="20200225.1.13" +local IPK_Version="20200228.1.14" local m, s, o local redir_run=0 local reudp_run=0 @@ -247,20 +247,6 @@ else s.value = translate("Not Running") end - - - - -if nixio.fs.access("/usr/bin/ssr-local") then -s=m:field(DummyValue,"sock5_run",translate("SOCKS5 Proxy")) -s.rawhtml = true -if sock5_run == 1 then -s.value =font_blue .. bold_on .. translate("Running") .. bold_off .. font_off -else -s.value = translate("Not Running") -end -end - if nixio.fs.access("/usr/bin/ss-local") then s=m:field(DummyValue,"ssock5_run",translate("SSOCKS5 Proxy")) s.rawhtml = true @@ -271,6 +257,17 @@ s.value = translate("Not Running") end end +if nixio.fs.access("/usr/bin/ssr-local") then +s=m:field(DummyValue,"sock5_run",translate("SSR SOCKS5 Proxy")) +s.rawhtml = true +if sock5_run == 1 then +s.value =font_blue .. bold_on .. translate("Running") .. bold_off .. font_off +else +s.value = translate("Not Running") +end +end + + if nixio.fs.access("/usr/bin/v2ray/v2ray") then s=m:field(DummyValue,"ssock5_run",translate("V2SOCKS5 Proxy")) s.rawhtml = true diff --git a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/subscription.lua b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/subscription.lua index f6a3b26f41..11c5b58bff 100644 --- a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/subscription.lua +++ b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/subscription.lua @@ -58,7 +58,7 @@ o.inputstyle = "reset" o.write = function() uci:delete_all("vssr", "servers", function(s) return true end) uci:commit("vssr") - luci.sys.call("uci commit vssrsr && /etc/init.d/vssr stop") + luci.sys.call("uci commit vssr && /etc/init.d/vssr stop") luci.http.redirect(luci.dispatcher.build_url("admin", "vpn", "vssr", "servers")) return 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 8307338e6b..c4b3f75bfe 100644 --- a/package/ctcgfw/luci-app-vssr/po/zh-cn/vssr.po +++ b/package/ctcgfw/luci-app-vssr/po/zh-cn/vssr.po @@ -517,7 +517,7 @@ msgid "GFW List" msgstr "GFW列表" msgid "ShadowSocksR Plus+ Settings" -msgstr "ShadowSocksR Plus+ 设置（支持SS/SSR/V2RAY）" +msgstr "ShadowSocksR Plus+ 设置（支持SS/SSR/V2RAY/Trojan）" msgid "Main Server" msgstr "主服务器" @@ -749,7 +749,7 @@ msgid "Appointlist List" msgstr "加速列表" msgid "udp2raw tunnel" -msgstr "隧道" +msgstr "UDP隧道" msgid "Enable udp2raw" msgstr "启用 udp2raw" diff --git a/package/ctcgfw/luci-app-vssr/root/usr/share/vssr/genv2config.lua b/package/ctcgfw/luci-app-vssr/root/usr/share/vssr/genv2config.lua index 1b67a0d343..6fdbdc3dcc 100755 --- a/package/ctcgfw/luci-app-vssr/root/usr/share/vssr/genv2config.lua +++ b/package/ctcgfw/luci-app-vssr/root/usr/share/vssr/genv2config.lua @@ -108,14 +108,10 @@ local tw_video_rule = { local netflix_rule = { type = "field", domain = { - "netflix.com", "netflix.net", "nflxso.net", "nflxext.com", + "netflix", "nflxso.net", "nflxext.com", "nflximg.com", "nflximg.net", "nflxvideo.net" }, - ip = { - "23.246.0.0/12", "37.77.0.0/12", "45.57.0.0/12", "64.120.128.0/17", - "66.197.128.0/17", "108.175.0.0/12", "185.2.0.0/12", "185.9.188.0/22", - "192.173.64.0/18", "198.38.0.0/12", "198.45.0.0/12" - }, + outboundTag = "netflix" }