1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00

Merge pull request #362 from Ysurac/develop

sync
This commit is contained in:
suyuan 2023-10-06 02:14:46 -05:00 committed by GitHub
commit 7af6c96027
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions

View file

@ -926,8 +926,8 @@ function wizard_add()
ucic:set("xray","omrout","s_trojan_user_security","aes-128-gcm") ucic:set("xray","omrout","s_trojan_user_security","aes-128-gcm")
ucic:set("xray","omrout","s_socks_user_security","aes-128-gcm") ucic:set("xray","omrout","s_socks_user_security","aes-128-gcm")
ucic:set("xray","omrout","s_shadowsocks_method","2022-blake3-aes-256-gcm") ucic:set("xray","omrout","s_shadowsocks_method","2022-blake3-aes-256-gcm")
ucic:set("shadowsocks-rust","sss0","s_shadowsocks_method","2022-blake3-aes-256-gcm") ucic:set("shadowsocks-rust","sss0","method","2022-blake3-aes-256-gcm")
ucic:set("shadowsocks-rust","sss1","s_shadowsocks_method","2022-blake3-aes-256-gcm") ucic:set("shadowsocks-rust","sss1","method","2022-blake3-aes-256-gcm")
elseif encryption == "aes-256-cfb" then elseif encryption == "aes-256-cfb" then
ucic:set("openmptcprouter","settings","encryption","aes-256-cfb") ucic:set("openmptcprouter","settings","encryption","aes-256-cfb")
ucic:set("shadowsocks-libev","sss0","method","aes-256-cfb") ucic:set("shadowsocks-libev","sss0","method","aes-256-cfb")
@ -945,15 +945,15 @@ function wizard_add()
ucic:set("xray","omrout","s_trojan_user_security","aes-128-gcm") ucic:set("xray","omrout","s_trojan_user_security","aes-128-gcm")
ucic:set("xray","omrout","s_socks_user_security","aes-128-gcm") ucic:set("xray","omrout","s_socks_user_security","aes-128-gcm")
ucic:set("xray","omrout","s_shadowsocks_method","2022-blake3-aes-256-gcm") ucic:set("xray","omrout","s_shadowsocks_method","2022-blake3-aes-256-gcm")
ucic:set("shadowsocks-rust","sss0","s_shadowsocks_method","2022-blake3-aes-256-gcm") ucic:set("shadowsocks-rust","sss0","method","2022-blake3-aes-256-gcm")
ucic:set("shadowsocks-rust","sss1","s_shadowsocks_method","2022-blake3-aes-256-gcm") ucic:set("shadowsocks-rust","sss1","method","2022-blake3-aes-256-gcm")
elseif encryption == "chacha20-ietf-poly1305" then elseif encryption == "chacha20-ietf-poly1305" then
ucic:set("openmptcprouter","settings","encryption","chacha20") ucic:set("openmptcprouter","settings","encryption","chacha20")
ucic:set("shadowsocks-libev","sss0","method","chacha20-ietf-poly1305") ucic:set("shadowsocks-libev","sss0","method","chacha20-ietf-poly1305")
ucic:set("shadowsocks-libev","sss1","method","chacha20-ietf-poly1305") ucic:set("shadowsocks-libev","sss1","method","chacha20-ietf-poly1305")
ucic:set("glorytun","vpn","chacha20","1") ucic:set("glorytun","vpn","chacha20","1")
ucic:set("glorytun-udp","vpn","chacha","1") ucic:set("glorytun-udp","vpn","chacha","1")
ucic:set("openvpn","omr","cipher","AES-256-CBC") ucic:set("openvpn","omr","cipher","AES-256-GCM")
ucic:set("mlvpn","general","cleartext_data","0") ucic:set("mlvpn","general","cleartext_data","0")
ucic:set("v2ray","omrout","s_vmess_user_security","chacha20-poly1305") ucic:set("v2ray","omrout","s_vmess_user_security","chacha20-poly1305")
ucic:set("v2ray","omrout","s_vless_user_security","chacha20-poly1305") ucic:set("v2ray","omrout","s_vless_user_security","chacha20-poly1305")
@ -964,8 +964,10 @@ function wizard_add()
ucic:set("xray","omrout","s_trojan_user_security","chacha20-poly1305") ucic:set("xray","omrout","s_trojan_user_security","chacha20-poly1305")
ucic:set("xray","omrout","s_socks_user_security","chacha20-poly1305") ucic:set("xray","omrout","s_socks_user_security","chacha20-poly1305")
ucic:set("xray","omrout","s_shadowsocks_method","2022-blake3-chacha20-poly1305") ucic:set("xray","omrout","s_shadowsocks_method","2022-blake3-chacha20-poly1305")
ucic:set("shadowsocks-rust","sss0","s_shadowsocks_method","2022-blake3-chacha20-poly1305") --ucic:set("shadowsocks-rust","sss0","method","2022-blake3-chacha20-poly1305")
ucic:set("shadowsocks-rust","sss1","s_shadowsocks_method","2022-blake3-chacha20-poly1305") --ucic:set("shadowsocks-rust","sss1","method","2022-blake3-chacha20-poly1305")
ucic:set("shadowsocks-rust","sss0","method","2022-blake3-aes-256-gcm")
ucic:set("shadowsocks-rust","sss1","method","2022-blake3-aes-256-gcm")
else else
ucic:set("openmptcprouter","settings","encryption","other") ucic:set("openmptcprouter","settings","encryption","other")
end end

View file

@ -28,7 +28,7 @@ menuentry = ucic:get("openmptcprouter","settings","menu") or "openmptcprouter"
lastmodif="" lastmodif=""
allbackup=luci.model.uci.cursor():get("openmptcprouter",servername,"allbackup") allbackup=luci.model.uci.cursor():get("openmptcprouter",servername,"allbackup")
for _, backup in pairs(allbackup) do for _, backup in pairs(allbackup) do
filemodif=split(backup, '|') filemodif=luci.util.split(backup, '|')
if filemodif[2] ~= lastmodif then if filemodif[2] ~= lastmodif then
lastmodif=filemodif[2] lastmodif=filemodif[2]
%> %>