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

luci-app-ssr-plus: switch to Xray's WireGuard implementation

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2022-12-01 01:42:28 +08:00 committed by sbwml
parent 59de8c6af3
commit 545b213a1e
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -193,6 +193,8 @@ o:value("trojan", translate("Trojan"))
o:value("shadowsocks", translate("Shadowsocks")) o:value("shadowsocks", translate("Shadowsocks"))
if is_installed("sagernet-core") then if is_installed("sagernet-core") then
o:value("shadowsocksr", translate("ShadowsocksR")) o:value("shadowsocksr", translate("ShadowsocksR"))
end
if is_finded("xray") then
o:value("wireguard", translate("WireGuard")) o:value("wireguard", translate("WireGuard"))
end end
o:value("socks", translate("Socks")) o:value("socks", translate("Socks"))
@ -604,6 +606,7 @@ o.rmempty = true
-- [[ WireGuard 部分 ]]-- -- [[ WireGuard 部分 ]]--
o = s:option(DynamicList, "local_addresses", translate("Local addresses")) o = s:option(DynamicList, "local_addresses", translate("Local addresses"))
o.datatype = "cidr"
o:depends({type = "v2ray", v2ray_protocol = "wireguard"}) o:depends({type = "v2ray", v2ray_protocol = "wireguard"})
o.rmempty = true o.rmempty = true

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

@ -76,13 +76,16 @@ function socks_http()
end end
function wireguard() function wireguard()
outbound_settings = { outbound_settings = {
address = server.server, secretKey = server.private_key,
port = tonumber(server.server_port), address = server.local_addresses,
localAddresses = server.local_addresses, peers = {
privateKey = server.private_key, {
peerPublicKey = server.peer_pubkey, publicKey = server.peer_pubkey,
preSharedKey = server.preshared_key or nil, preSharedKey = server.preshared_key,
mtu = tonumber(server.mtu) or 1500 endpoint = server.server .. ":" .. server.server_port
}
},
mtu = tonumber(server.mtu)
} }
end end
local outbound = {} local outbound = {}