zhao/openwrt_helloworld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert-luci-app-ssr-plus-drop-vmess-node-with-alterID

Browse Source
This commit is contained in:
coolsnowwolf 2024-01-04 11:20:48 +08:00 committed by sbwml
parent f1c401ae97
commit 5670c4719a
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -569,6 +569,13 @@ o.datatype = "uinteger"
o.default = 1500 o.default = 1500
o.rmempty = true o.rmempty = true
-- AlterId
o = s:option(Value, "alter_id", translate("AlterId"))
o.datatype = "port"
o.default = 16
o.rmempty = true
o:depends({type = "v2ray", v2ray_protocol = "vmess"})
-- VmessId -- VmessId
o = s:option(Value, "vmess_id", translate("Vmess/VLESS ID (UUID)")) o = s:option(Value, "vmess_id", translate("Vmess/VLESS ID (UUID)"))
o.rmempty = true o.rmempty = true

1
luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm
View File

@ -252,6 +252,7 @@ function import_ssr_url(btn, urlname, sid) {
document.getElementsByName('cbid.shadowsocksr.' + sid + '.alias')[0].value = ssm.ps; document.getElementsByName('cbid.shadowsocksr.' + sid + '.alias')[0].value = ssm.ps;
document.getElementsByName('cbid.shadowsocksr.' + sid + '.server')[0].value = ssm.add; document.getElementsByName('cbid.shadowsocksr.' + sid + '.server')[0].value = ssm.add;
document.getElementsByName('cbid.shadowsocksr.' + sid + '.server_port')[0].value = ssm.port; document.getElementsByName('cbid.shadowsocksr.' + sid + '.server_port')[0].value = ssm.port;
document.getElementsByName('cbid.shadowsocksr.' + sid + '.alter_id')[0].value = ssm.aid;
document.getElementsByName('cbid.shadowsocksr.' + sid + '.vmess_id')[0].value = ssm.id; document.getElementsByName('cbid.shadowsocksr.' + sid + '.vmess_id')[0].value = ssm.id;
document.getElementsByName('cbid.shadowsocksr.' + sid + '.transport')[0].value = ssm.net; document.getElementsByName('cbid.shadowsocksr.' + sid + '.transport')[0].value = ssm.net;
document.getElementsByName('cbid.shadowsocksr.' + sid + '.transport')[0].dispatchEvent(event); document.getElementsByName('cbid.shadowsocksr.' + sid + '.transport')[0].dispatchEvent(event);

1
luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua
View File

@ -23,6 +23,7 @@ function vmess_vless()
users = { users = {
{ {
id = server.vmess_id, id = server.vmess_id,
alterId = (server.v2ray_protocol == "vmess" or not server.v2ray_protocol) and tonumber(server.alter_id) or nil,
security = (server.v2ray_protocol == "vmess" or not server.v2ray_protocol) and server.security or nil, security = (server.v2ray_protocol == "vmess" or not server.v2ray_protocol) and server.security or nil,
encryption = (server.v2ray_protocol == "vless") and server.vless_encryption or nil, encryption = (server.v2ray_protocol == "vless") and server.vless_encryption or nil,
flow = ((server.tls == '1') or (server.reality == '1')) and server.tls_flow or nil flow = ((server.tls == '1') or (server.reality == '1')) and server.tls_flow or nil

5
luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua
View File

@ -173,6 +173,7 @@ local function processData(szType, content)
result.server = info.add result.server = info.add
result.server_port = info.port result.server_port = info.port
result.transport = info.net result.transport = info.net
result.alter_id = info.aid
result.vmess_id = info.id result.vmess_id = info.id
result.alias = info.ps result.alias = info.ps
-- result.mux = 1 -- result.mux = 1
@ -228,10 +229,6 @@ local function processData(szType, content)
else else
result.tls = "0" result.tls = "0"
end end
-- https://www.v2fly.org/config/protocols/vmess.html#vmess-md5-认证信息-淘汰机制
if info.aid and (tonumber(info.aid) > 0) then
result.server = nil
end
elseif szType == "ss" then elseif szType == "ss" then
local idx_sp = 0 local idx_sp = 0
local alias = "" local alias = ""