Merge pull request #81 from Ysurac/develop

sync

luci-app-mlvpn/htdocs/luci-static/resources/view/services/mlvpn.js

@@ -46,8 +46,8 @@ return L.view.extend({
 		o.rmempty = false;
 
 		o = s.taboption('general', form.Value, 'firstport', _('First Port'));
-		o.default  = "65201"
+		o.default  = "65201";
-		o.datatype = "port"
+		o.datatype = "port";
 		o.rmempty  = false;
 
 		o = s.taboption('general', form.Value, 'password', _('Password'));
@@ -55,26 +55,29 @@ return L.view.extend({
 		o.modalonly = true;
 
 		o = s.taboption('general', form.Value, 'interface_name', _('Interface name'));
-		o.default     = "mlvpn0"
+		o.default     = "mlvpn0";
-		o.placeholder = "mlvpn0"
+		o.placeholder = "mlvpn0";
 		o.rmempty     = false;
 		o.modalonly   = true;
 
 		o = s.taboption('advanced', form.Value, 'timeout', _('Timeout (s)'));
 		o.default   = '30';
-		o.datatype  = "uinteger"
+		o.datatype  = "uinteger";
 		o.rmempty   = false;
 		o.modalonly = true;
 
 		o = s.taboption('advanced', form.Value, 'reorder_buffer_size', _('Reorder buffer size'));
 		o.default   = '128';
-		o.datatype  = "uinteger"
+		o.datatype  = "uinteger";
 		o.rmempty   = false;
 		o.modalonly = true;
 
+		o = s.taboption('advanced', form.Flag, 'cleartext_data', _('Disable encryption'));
+		o.default   = o.disabled;
+
 		o = s.taboption('advanced', form.Value, 'loss_tolerance', _('Loss tolerance'));
 		o.default   = '50';
-		o.datatype  = "uinteger"
+		o.datatype  = "uinteger";
 		o.rmempty   = false;
 		o.modalonly = true;
 

luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua

@@ -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

luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm

@@ -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 />';

luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter

@@ -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);

luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js

@@ -511,7 +511,7 @@ return view.extend({
 
 					var new_ifnames = L.toArray(value);
 
-					if (value == undefined)
+					if (value == null)
 						return;
 
 					old_ifnames.sort();

mlvpn/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mlvpn
-PKG_VERSION:=67f9f31d
+PKG_VERSION:=2263bab
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/zehome/MLVPN.git
-PKG_SOURCE_VERSION:=58418fd847fe833d1e626d4b7d08f0e623756c5c
+PKG_SOURCE_VERSION:=2263bab7e5f983e1daa33887b53120c12646398f
-PKG_SOURCE_DATE:=2020-09-01
+PKG_SOURCE_DATE:=2020-12-16
 #PKG_SOURCE_URL:=https://github.com/markfoodyburton/MLVPN.git
 #PKG_SOURCE_VERSION:=8f9720978b28c1954f9f229525333547283316d2
 #PKG_SOURCE_DATE:=2018-09-03

mlvpn/files/etc/init.d/mlvpn

@@ -40,6 +40,8 @@ start() {
 	password="$(uci -q get mlvpn.general.password)"
 	reorder_buffer_size="$(uci -q get mlvpn.general.reorder_buffer_size)"
 	loss_tolerence="$(uci -q get mlvpn.general.loss_tolerence)"
+	cleartext_data="$(uci -q get mlvpn.general.cleartext_data)"
+	[ -z "$cleartext_data" ] && cleartext_data="0"
 	host="$(uci -q get mlvpn.general.host)"
 	firstport="$(uci -q get mlvpn.general.firstport)"
 	
@@ -57,6 +59,7 @@ start() {
 	reorder_buffer = yes
 	reorder_buffer_size = ${reorder_buffer_size}
 	loss_tolerence = ${loss_tolerence}
+	cleartext_data = ${cleartext_data}
 	password = "${password}"
 	mtu = 1452
 	EOF