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

Merge pull request #81 from Ysurac/develop

Browse source 
sync
This commit is contained in:
suyuan 2021-03-08 10:48:14 +08:00 • committed by GitHub
commit 2779ce4657
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 29 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
View file

@ -649,6 +649,7 @@ function wizard_add()
ucic:set("shadowsocks-libev","sss0","method","none")
ucic:set("shadowsocks-libev","sss1","method","none")
ucic:set("openvpn","omr","cipher","none")
ucic:set("mlvpn","general","cleartext_data","1")
ucic:set("v2ray","omrout","s_vmess_user_security","none")
ucic:set("v2ray","omrout","s_vless_user_security","none")
elseif encryption == "aes-256-gcm" then
@ -657,6 +658,7 @@ function wizard_add()
ucic:set("glorytun","vpn","chacha20","0")
ucic:set("glorytun-udp","vpn","chacha","0")
ucic:set("openvpn","omr","cipher","AES-256-GCM")
ucic:set("mlvpn","general","cleartext_data","0")
ucic:set("v2ray","omrout","s_vmess_user_security","aes-128-gcm")
ucic:set("v2ray","omrout","s_vless_user_security","aes-128-gcm")
elseif encryption == "aes-256-cfb" then
@ -665,6 +667,7 @@ function wizard_add()
ucic:set("glorytun","vpn","chacha20","0")
ucic:set("glorytun-udp","vpn","chacha","0")
ucic:set("openvpn","omr","cipher","AES-256-CFB")
ucic:set("mlvpn","general","cleartext_data","0")
ucic:set("v2ray","omrout","s_vmess_user_security","aes-128-gcm")
ucic:set("v2ray","omrout","s_vless_user_security","aes-128-gcm")
elseif encryption == "chacha20-ietf-poly1305" then
@ -673,6 +676,7 @@ function wizard_add()
ucic:set("glorytun","vpn","chacha20","1")
ucic:set("glorytun-udp","vpn","chacha","1")
ucic:set("openvpn","omr","cipher","AES-256-CBC")
ucic:set("mlvpn","general","cleartext_data","0")
ucic:set("v2ray","omrout","s_vmess_user_security","chacha20-poly1305")
ucic:set("v2ray","omrout","s_vless_user_security","chacha20-poly1305")
end

6
luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
View file

@ -424,6 +424,7 @@ local statuslogo = ucic:get("openmptcprouter","settings","statuslogo") or "openm
ip6addr=replaceLastNChars(ip6addr,"x",6);
}
var ifname = mArray.wans[i].ifname;
var iftype = mArray.wans[i].iftype;
var whois = mArray.wans[i].whois;
var whois6 = mArray.wans[i].whois6;
var signal = mArray.wans[i].signal;
@ -596,6 +597,11 @@ local statuslogo = ucic:get("openmptcprouter","settings","statuslogo") or "openm
statusMessage += '<%:Network interface duplicated%>' + '<br />';
statusMessageClass = "error";
}
if(iftype == "bridge")
{
statusMessage += '<%:Bridge can't have multipath enabled%>' + '<br />';
statusMessageClass = "error";
}
if(duplicatemac)
{
statusMessage += '<%:Network interface MAC address duplicated%>' + '<br />';

2
luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
View file

@ -1119,6 +1119,7 @@ function interfaces_status()
local proto = section["proto"] or ""
local ipv6 = section["ipv6"] or "0"
local mac = section ["macaddr"] or ""
local itype = section ["type"] or ""
--if not ipaddr or not gateway then return end
-- Don't show if0 in the overview
@ -1479,6 +1480,7 @@ function interfaces_status()
rx = rx,
tx = tx,
zonewan = zonewan,
iftype = itype,
}
if ifname ~= nil and ifname:match("^tun.*") then
table.insert(mArray.tunnels, data);