fix

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

@@ -26,11 +26,7 @@ end
 function interface_from_device(dev)
 	for _, iface in ipairs(net:get_networks()) do
 		local ifacen = iface:name()
-		local ifacename = ""
-		ifacename = ucic:get("network",ifacen,"device")
-		if ifacename == "" then
-			ifacename = ucic:get("network",ifacen,"ifname")
-		end
+		local ifacename = ucic:get("network",ifacen,"ifname")
 		if ifacename == dev then
 			return ifacen
 		end
@@ -38,17 +34,6 @@ function interface_from_device(dev)
 	return ""
 end
 
-function uci_device_from_interface(intf)
-	intfname = ucic:get("network",intf,"device")
-	deviceuci = ""
-	ucic:foreach("network", "device", function(s)
-		if intfname == ucic:get("network",s[".name"],"name") then
-		    deviceuci = s[".name"]
-		end
-	end)
-	return deviceuci
-end
-
 function wizard_add()
 	local gostatus = true
 	
@@ -128,10 +113,7 @@ function wizard_add()
 		end)
 		local defif = "eth0"
 		if add_interface_ifname == "" then
-			local defif1 = ucic:get("network","wan1_dev","device") or ""
-			if defif1 == "" then
-				defif1 = ucic:get("network","wan1_dev","ifname") or ""
-			end
+			local defif1 = ucic:get("network","wan1_dev","ifname") or ""
 			if defif1 ~= "" then
 				defif = defif1
 			end
@@ -144,29 +126,17 @@ function wizard_add()
 		if ointf ~= "" then
 			if ucic:get("network",ointf,"type") == "" then
 				ucic:set("network",ointf,"type","macvlan")
-				ucic:set("network",ointf,"device",ointf)
-				ucic:set("network",ointf .. "_dev","device")
-				ucic:set("network",ointf .. "_dev","type","macvlan")
-				ucic:set("network",ointf .. "_dev","mode","vepa")
-				ucic:set("network",ointf .. "_dev","ifname",defif)
-				ucic:set("network",ointf .. "_dev","name",ointf)
 			end
 			wanif = "wan" .. i
 		end
 		
 		ucic:set("network","wan" .. i,"interface")
-		ucic:set("network","wan" .. i,"device",defif)
+		ucic:set("network","wan" .. i,"ifname",defif)
 		ucic:set("network","wan" .. i,"proto","static")
 		ucic:set("openmptcprouter","wan" .. i,"interface")
 		if ointf ~= "" then
 			ucic:set("network","wan" .. i,"type","macvlan")
-			ucic:set("network","wan" .. i,"device","wan" .. i)
 			ucic:set("network","wan" .. i,"masterintf",defif)
-			ucic:set("network","wan" .. i .. "_dev","device")
-			ucic:set("network","wan" .. i .. "_dev","type","macvlan")
-			ucic:set("network","wan" .. i .. "_dev","mode","vepa")
-			ucic:set("network","wan" .. i .. "_dev","ifname",defif)
-			ucic:set("network","wan" .. i .. "_dev","name","wan" .. i)
 		end
 		ucic:set("network","wan" .. i,"ip4table","wan")
 		if multipath_master then
@@ -201,7 +171,7 @@ function wizard_add()
 		ucic:set("sqm","wan" .. i,"script","simple.qos")
 		ucic:set("sqm","wan" .. i,"qdisc_advanced","0")
 		ucic:set("sqm","wan" .. i,"linklayer","none")
-		ucic:set("sqm","wan" .. i,"enabled","1")
+		ucic:set("sqm","wan" .. i,"enabled","0")
 		ucic:set("sqm","wan" .. i,"debug_logging","0")
 		ucic:set("sqm","wan" .. i,"verbosity","5")
 		ucic:set("sqm","wan" .. i,"download","0")
@@ -227,10 +197,7 @@ function wizard_add()
 	local delete_intf = luci.http.formvaluetable("delete") or ""
 	if delete_intf ~= "" then
 		for intf, _ in pairs(delete_intf) do
-			local defif = ucic:get("network",intf,"ifname") or ""
-			if defif == "" then
-				defif = ucic:get("network",intf,"ifname")
-			end
+			local defif = ucic:get("network",intf,"ifname")
 			ucic:delete("network",intf)
 			if ucic:get("network",intf .. "_dev") ~= "" then
 				ucic:delete("network",intf .. "_dev")
@@ -284,7 +251,6 @@ function wizard_add()
 		local sqmenabled = luci.http.formvalue("cbid.sqm.%s.enabled" % intf) or "0"
 		local multipath = luci.http.formvalue("cbid.network.%s.multipath" % intf) or "on"
 		local lan = luci.http.formvalue("cbid.network.%s.lan" % intf) or "0"
-		local ttl = luci.http.formvalue("cbid.network.%s.ttl" % intf) or ""
 		if typeintf ~= "" then
 			if typeintf == "normal" then
 				typeintf = ""
@@ -296,48 +262,15 @@ function wizard_add()
 		end
 		if typeintf == "macvlan" and masterintf ~= "" then
 			ucic:set("network",intf,"type","macvlan")
-			ucic:set("network",intf .. "_dev","device")
-			ucic:set("network",intf .. "_dev","type","macvlan")
-			ucic:set("network",intf .. "_dev","ifname",masterinf)
-			ucic:set("network",intf .. "_dev","mode","vepa")
-			ucic:set("network",intf .. "_dev","name",intf)
 			ucic:set("network",intf,"masterintf",masterintf)
 		elseif typeintf == "" and ifname ~= "" and (proto == "static" or proto == "dhcp" or proto == "dhcpv6") then
-			ucic:set("network",intf,"device",ifname)
-			if uci_device_from_interface(intf) == "" then
-				ucic:set("network",intf .. "_dev","device")
-				ucic:set("network",intf .. "_dev","name",ifname)
-			end
+			ucic:set("network",intf,"ifname",ifname)
 		elseif typeintf == "" and device ~= "" and proto == "ncm" then
 			ucic:set("network",intf,"device",device_ncm)
-			if uci_device_from_interface(intf) == "" then
-				ucic:set("network",intf .. "_dev","device")
-				ucic:set("network",intf .. "_dev","name",device_ncm)
-			end
 		elseif typeintf == "" and device ~= "" and proto == "qmi" then
 			ucic:set("network",intf,"device",device_qmi)
-			if uci_device_from_interface(intf) == "" then
-				ucic:set("network",intf .. "_dev","device")
-				ucic:set("network",intf .. "_dev","name",device_qmi)
-			end
 		elseif typeintf == "" and device ~= "" and proto == "modemmanager" then
 			ucic:set("network",intf,"device",device_manager)
-			if uci_device_from_interface(intf) == "" then
-				ucic:set("network",intf .. "_dev","device")
-				ucic:set("network",intf .. "_dev","name",device_manager)
-			end
-		elseif typeintf == "" and ifname ~= "" and proto == "static" then
-			ucic:set("network",intf,"device",ifname)
-			if uci_device_from_interface(intf) == "" then
-				ucic:set("network",intf .. "_dev","device")
-				ucic:set("network",intf .. "_dev","name",ifname)
-			end
-		end
-		if typeintf ~= "macvlan" and ucic:get("network",intf .. "_dev","type") == "macvlan" then
-			ucic:delete("network",intf .. "_dev","type")
-			ucic:delete("network",intf .. "_dev","mode")
-			ucic:delete("network",intf .. "_dev","ifname")
-			ucic:delete("network",intf .. "_dev","macaddr")
 		end
 		if proto == "pppoe" then
 			ucic:set("network",intf,"pppd_options","persist maxfail 0")
@@ -345,13 +278,6 @@ function wizard_add()
 		if proto ~= "other" then
 			ucic:set("network",intf,"proto",proto)
 		end
-
-		uci_device = uci_device_from_interface(intf)
-		if uci_device == "" then
-			uci_device = intf .. "_dev"
-		end
-		ucic:set("network",uci_device,"ttl",ttl)
-
 		ucic:set("network",intf,"apn",apn)
 		ucic:set("network",intf,"pincode",pincode)
 		ucic:set("network",intf,"delay",delay)
@@ -416,10 +342,7 @@ function wizard_add()
 		if not ucic:get("sqm",intf) ~= "" then
 			local defif = get_device(intf)
 			if defif == "" then
-				defif = ucic:get("network",intf,"device") or ""
-				if defif == "" then
-					defif = ucic:get("network",intf,"ifname") or ""
-				end
+				defif = ucic:get("network",intf,"ifname") or ""
 			end
 			ucic:set("sqm",intf,"queue")
 			ucic:set("sqm",intf,"interface",defif)
@@ -519,7 +442,7 @@ function wizard_add()
 		ucic:set("network","omrvpn","proto","bonding")
 	end
 	if vpn_intf ~= "" then
-		ucic:set("network","omrvpn","device",vpn_intf)
+		ucic:set("network","omrvpn","ifname",vpn_intf)
 		ucic:set("sqm","omrvpn","interface",vpn_intf)
 		ucic:save("network")
 		ucic:commit("network")
@@ -886,7 +809,7 @@ function wizard_add()
 
 	local dsvpn_key = luci.http.formvalue("dsvpn_key")
 	if dsvpn_key ~= "" then
-		ucic:set("dsvpn","vpn","port","65401")
+		ucic:set("dsvpn","vpn","port","65011")
 		ucic:set("dsvpn","vpn","key",dsvpn_key)
 		ucic:set("dsvpn","vpn","localip","10.255.251.2")
 		ucic:set("dsvpn","vpn","remoteip","10.255.251.1")
@@ -971,7 +894,7 @@ function wizard_add()
 	-- Restart all
 	menuentry = ucic:get("openmptcprouter","settings","menu") or "openmptcprouter"
 	if gostatus == true then
-		--luci.sys.call("/etc/init.d/macvlan restart >/dev/null 2>/dev/null")
+		luci.sys.call("/etc/init.d/macvlan restart >/dev/null 2>/dev/null")
 		luci.sys.call("(env -i /bin/ubus call network reload) >/dev/null 2>/dev/null")
 		luci.sys.call("ip addr flush dev tun0 >/dev/null 2>/dev/null")
 		luci.sys.call("/etc/init.d/omr-tracker stop >/dev/null 2>/dev/null")
@@ -993,7 +916,6 @@ function wizard_add()
 		luci.sys.call("/etc/init.d/omr-6in4 restart >/dev/null 2>/dev/null")
 		luci.sys.call("/etc/init.d/vnstat restart >/dev/null 2>/dev/null")
 		luci.sys.call("/etc/init.d/v2ray restart >/dev/null 2>/dev/null")
-		luci.sys.call("/etc/init.d/sysntpd restart >/dev/null 2>/dev/null")
 		luci.http.redirect(luci.dispatcher.build_url("admin/system/" .. menuentry:lower() .. "/status"))
 	else
 		luci.http.redirect(luci.dispatcher.build_url("admin/system/" .. menuentry:lower() .. "/wizard"))
@@ -1190,19 +1112,6 @@ function settings_add()
 	local sfe_bridge = luci.http.formvalue("sfe_bridge") or "0"
 	ucic:set("openmptcprouter","settings","sfe_bridge",sfe_bridge)
 
-	-- Enable/disable SIP ALG
-	local sipalg = luci.http.formvalue("sipalg") or "0"
-	ucic:set("openmptcprouter","settings","sipalg",sipalg)
-	ucic:foreach("firewall", "zone", function (section)
-		ucic:set("firewall",section[".name"],"auto_helper",sipalg)
-	end)
-	if sipalg == "1" then
-		luci.sys.call("modprobe nf_conntrack_ip >/dev/null 2>/dev/null")
-		luci.sys.call("modprobe nf_nat_sip >/dev/null 2>/dev/null")
-	else
-		luci.sys.call("rmmod nf_nat_sip >/dev/null 2>/dev/null")
-		luci.sys.call("rmmod nf_conntrack_ip >/dev/null 2>/dev/null")
-	end
 
 	ucic:save("openmptcprouter")
 	ucic:commit("openmptcprouter")

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

@@ -219,12 +219,6 @@
 		    </div>
 		</div>
 	    </div>
-	    <div class="cbi-value">
-		<label class="cbi-value-title"><%:Enable SIP ALG%></label>
-		<div class="cbi-value-field">
-		    <input type="checkbox" name="sipalg" class="cbi-input-checkbox" value="1" <% if luci.model.uci.cursor():get("openmptcprouter","settings","sipalg") == "1" then %>checked<% end %>>
-		</div>
-	    </div>
 	</fieldset>
 	<hr />
 	<fieldset class="cbi-section" id="other">

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

@@ -19,7 +19,7 @@
 --    along with OverTheBox.  If not, see (http://www.gnu.org/licenses/)
 -%>
 <%
--- Copyright 2018-2022 Ycarus (Yannick Chabanois) ycarus@zugaina.org for OpenMPTCProuter
+-- Copyright 2018-2020 Ycarus (Yannick Chabanois) ycarus@zugaina.org for OpenMPTCProuter
 --
 -- Small changes to make this work with OpenMPTCProuter
 -- New features: 
@@ -307,9 +307,7 @@ local statuslogo = ucic:get("openmptcprouter","settings","statuslogo") or "openm
 					} 
 					if (mArray.openmptcprouter.vps_time_accurate == false)
 					{
-						var vps_time = new Date(mArray.openmptcprouter.vps_time*1000).toISOString();
-						var omr_time = new Date(mArray.openmptcprouter.omr_time*1000).toISOString();
-						statusMessage += '<%:Big time difference between the server and the router%> (' + vps_time + '/' + omr_time + ') <br/>';
+						statusMessage += '<%:Big time difference between the server and the router%>' + '<br/>';
 					}
 				}
 				if (statusMessage !== "" && statusMessageClass !== "error")

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

@@ -7,17 +7,11 @@
 	local sys = require "luci.sys"
 	local ut = require "luci.util"
 	local ifaces = sys.net:devices()
-	local ifttyu = nixio.fs.glob("/dev/ttyUSB*")
-	local ifttyc = nixio.fs.glob("/dev/cdc-wdm*")
 	menuentry = uci:get("openmptcprouter","settings","menu") or "openmptcprouter"
 	function device_notvirtual(dev)
-		if dev:match("^eth.*") or dev:match("^wwan.*") or dev:match("^tun.*") or dev:match("/") then
-			return true
-		end
-		networks = net:get_networks()
-		for _, iface in ipairs(networks) do
+		for _, iface in ipairs(net:get_networks()) do
 			local ifacen = iface:name()
-			local ifacename = uci:get("network",ifacen,"device")
+			local ifacename = uci:get("network",ifacen,"ifname")
 			local ifacetype = uci:get("network",ifacen,"type") or ""
 			local ifaceproto = uci:get("network",ifacen,"proto") or ""
 			--if ifacename == dev and (ifacetype == "macvlan" or ifacetype == "bridge" or ifaceproto == "6in4") then
@@ -434,7 +428,7 @@
 <% 
     for _, iface in ipairs(net:get_networks()) do
 	local ifname = iface:name()
-	local firewall_lan = luci.util.trim(luci.sys.exec("uci -q get firewall.zone_lan.network | tr ' ' '\n' | grep \'^" .. ifname .. "$\'"))
+	local firewall_lan = luci.util.trim(luci.sys.exec("uci -q get firewall.zone_lan.network | grep " .. ifname))
 	if firewall_lan ~= "" then
 %>
 	    <h3><%=ifname%></h3>
@@ -479,7 +473,7 @@
 				if not (ifacea == "lo" or ifacea == "6in4-omr6in4" or ifacea == "mlvpn0" or ifacea:match("^ifb.*") or ifacea:match("^sit.*") or ifacea:match("^gre.*") or ifacea:match("^ip6.*") or ifacea:match("^teql.*") or ifacea:match("^erspan.*") or ifacea:match("^tun.*") or ifacea:match("^bond.*")) and device_notvirtual(ifacea) then
 				    if uci:get("network",ifname,"proto") ~= "macvlan" then
 			%>
-			<option value="<%=ifacea%>"<% if uci:get("network",ifname,"device") == ifacea then iffind = 1 %> selected="selected"<% end %>><%=ifacea%></option>
+			<option value="<%=ifacea%>"<% if uci:get("network",ifname,"ifname") == ifacea then iffind = 1 %> selected="selected"<% end %>><%=ifacea%></option>
 			<%
 				    else
 			%>
@@ -489,9 +483,9 @@
 				end
 			    end
 			    if uci:get("network",ifname,"proto") ~= "macvlan" then
-				    if iffind == 0 and uci:get("network",ifname,"device") ~= nil then
+				    if iffind == 0 and uci:get("network",ifname,"ifname") ~= nil then
 			%>
-				<option value="<%=uci:get("network",ifname,"device")%>" selected="selected"><%=uci:get("network",ifname,"device")%></option>
+				<option value="<%=uci:get("network",ifname,"ifname")%>" selected="selected"><%=uci:get("network",ifname,"ifname")%></option>
 			<%
 				    end
 			    else
@@ -537,7 +531,7 @@
 <% 
     for _, iface in ipairs(net:get_networks()) do
 	local ifname = iface:name()
-	local firewall_wan = luci.util.trim(luci.sys.exec("uci -q get firewall.zone_wan.network | tr ' ' '\n' | grep \'^" .. ifname .. "$\'"))
+	local firewall_wan = luci.util.trim(luci.sys.exec("uci -q get firewall.zone_wan.network | grep " .. ifname))
 	if firewall_wan ~= "" then
 
 --	local multipath = uci:get("network",ifname,"multipath")
@@ -622,7 +616,7 @@
 			    <select class="cbi-input-select" data-update="change" id="cbid.network.<%=ifname%>.intf" name="cbid.network.<%=ifname%>.intf" size="1">
 			<%
 			    iffind=0
-			    uciifname=uci:get("network",ifname,"device")
+			    uciifname=uci:get("network",ifname,"ifname")
 			    if uciifname ~= nil then
 				if uciifname:match("/") then
 				    realifname=uciifname
@@ -688,7 +682,7 @@
 		<div class="cbi-value" id="cbi-network-<%=ifname%>-ipv6address" data-index="8">
 		    <label class="cbi-value-title"><%:IPv6 address%></label>
 		    <div class="cbi-value-field">
-			<input type="text" id="cbid.network.<%=ifname%>.ip6addr" name="cbid.network.<%=ifname%>.ip6addr" class="cbi-input-text" value="<%=value%>" data-type="ip6addr" data-optional="true">
+			<input type="text" id="cbid.network.<%=ifname%>.ip6addr" name="cbid.network.<%=ifname%>.ip6addr" class="cbi-input-text" value="<%=value%>" data-type="ip6addr">
 			<br />
 			<div class="cbi-value-description">
 			    <%:Set an IP in the same network as the modem%>
@@ -702,7 +696,7 @@
 		<div class="cbi-value" id="cbi-network-<%=ifname%>-ip6gw" data-index="9">
 		    <label class="cbi-value-title"><%:IPv6 gateway%></label>
 		    <div class="cbi-value-field">
-			<input type="text" id="cbid.network.<%=ifname%>.ip6gw" name="cbid.network.<%=ifname%>.ip6gw" class="cbi-input-text" value="<%=uci:get("network",ifname,"ip6gw")%>" data-type="ip6addr"  data-optional="true">
+			<input type="text" id="cbid.network.<%=ifname%>.ip6gw" name="cbid.network.<%=ifname%>.ip6gw" class="cbi-input-text" value="<%=uci:get("network",ifname,"ip6gw")%>" data-type="ip6addr">
 			<br />
 			<div class="cbi-value-description">
 			    <%:Set here IP of the modem%>
@@ -749,12 +743,14 @@
 			    <select class="cbi-input-select" data-update="change" id="cbid.network.<%=ifname%>.device.ncm" name="cbid.network.<%=ifname%>.device.ncm" size="1">
 			<%
 			    iffind=0
-			    for tty in ifttyu do
+			    iftty = nixio.fs.glob("/dev/ttyUSB*")
+			    for tty in iftty do
 			%>
 			<option value="<%=tty%>"<% if uci:get("network",ifname,"device") == tty then iffind = 1 %> selected="selected"<% end %>><%=tty%></option>
 			<%
 			    end
-			    for tty in ifttyc do
+			    iftty = nixio.fs.glob("/dev/cdc-wdm*")
+			    for tty in iftty do
 			%>
 			<option value="<%=tty%>"<% if uci:get("network",ifname,"device") == tty then iffind = 1 %> selected="selected"<% end %>><%=tty%></option>
 			<%
@@ -774,7 +770,8 @@
 			    <select class="cbi-input-select" data-update="change" id="cbid.network.<%=ifname%>.device.qmi" name="cbid.network.<%=ifname%>.device.qmi" size="1">
 			<%
 			    iffind=0
-			    for tty in ifttyc do
+			    iftty = nixio.fs.glob("/dev/cdc-wdm*")
+			    for tty in iftty do
 			%>
 			<option value="<%=tty%>"<% if uci:get("network",ifname,"device") == tty then iffind = 1 %> selected="selected"<% end %>><%=tty%></option>
 			<%
@@ -896,16 +893,6 @@
 		<%
 		    end
 		%>
-		<div class="cbi-value" data-index="14">
-		    <label class="cbi-value-title"><%:Force TTL%></label>
-		    <div class="cbi-value-field">
-			<input type="text" name="cbid.network.<%=ifname%>.ttl" class="cbi-input-text" value="<%=ttl%>" data-type="uinteger" data-optional="true">
-			<br />
-			<div class="cbi-value-description">
-			    <%:You can force a TTL. Some LTE provider detect tethering by inpecting packet TTL value, setting it to 65 often solve the issue.%>
-			</div>
-		    </div>
-		</div>
 
 		<%
 			local download = "0"
@@ -922,7 +909,7 @@
 			--	end
 			--end
 		%>
-		<div class="cbi-value" data-index="15">
+		<div class="cbi-value" data-index="14">
 		    <label class="cbi-value-title"><%:MPTCP over VPN%></label>
 		    <div class="cbi-value-field">
 			<input class="cbi-input-checkbox" type="checkbox" name="multipathvpn.<%=ifname%>.enabled" value="1" <% if uci:get("openmptcprouter",ifname,"multipathvpn") == "1" then %>checked<% end %> />
@@ -932,7 +919,7 @@
 			</div>
 		    </div>
 		</div>
-		<div class="cbi-value" data-index="16">
+		<div class="cbi-value" data-index="15">
 		    <label class="cbi-value-title"><%:Enable SQM%></label>
 		    <div class="cbi-value-field">
 			<input class="cbi-input-checkbox" type="checkbox" name="cbid.sqm.<%=ifname%>.enabled" value="1" <% if uci:get("sqm",ifname,"enabled") == "1" then %>checked<% end %> />
@@ -942,7 +929,7 @@
 			</div>
 		    </div>
 		</div>
-		<div class="cbi-value" data-index="17">
+		<div class="cbi-value" data-index="16">
 		    <label class="cbi-value-title"><%:Download speed (Kb/s)%></label>
 		    <div class="cbi-value-field">
 			<input type="text" name="cbid.sqm.<%=ifname%>.download" class="cbi-input-text" value="<%=download%>" data-type="uinteger">
@@ -958,7 +945,7 @@
 			-->
 		    </div>
 		</div>
-		<div class="cbi-value" data-index="18">
+		<div class="cbi-value" data-index="17">
 		    <label class="cbi-value-title"><%:Upload speed (Kb/s)%></label>
 		    <div class="cbi-value-field">
 			<input type="text" name="cbid.sqm.<%=ifname%>.upload" class="cbi-input-text" value="<%=upload%>" data-type="uinteger">

luci-app-openmptcprouter/po/de/openmptcprouter.po

@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2022-02-19 10:30+0000\n"
-"Last-Translator: Weblate Admin <contact@openmptcprouter.com>\n"
+"PO-Revision-Date: 2020-10-21 12:55+0000\n"
+"Last-Translator: Anonymous <noreply@weblate.org>\n"
 "Language-Team: German <http://weblate.openmptcprouter.com/projects/omr/"
 "luciapplicationsopenmptcprouter/de/>\n"
 "Language: de\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.10.1\n"
+"X-Generator: Weblate 4.0.4\n"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:307
 msgid "A Dead Simple VPN is a TCP VPN that can replace Glorytun TCP"
@@ -23,12 +23,10 @@ msgstr "Schlüssel 'Dead Simple VPN'"
 msgid ""
 "A second server's IP can be set for dual IPv4/IPv6 server if WAN IPv6 are set"
 msgstr ""
-"Die zweite IP eines Servers kann für Dual-IPv4/IPv6-Server festgelegt "
-"werden, wenn WAN-IPv6 eingerichtet ist"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:111
 msgid "API username to retrieve personnalized settings from the server."
-msgstr "API Benutzername zum Download der Einstellungen vom Server."
+msgstr "API Benutzername zum Download der Settings vom Server."
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:809
 msgid "APN"
@@ -90,7 +88,7 @@ msgstr "Backup der Router-Einstellungen auf den Server"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:371
 msgid "Balancing"
-msgstr "Ausgleich"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:22
 msgid "Beta"
@@ -98,11 +96,11 @@ msgstr "Beta"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:310
 msgid "Big time difference between the server and the router"
-msgstr "Großer Zeitunterschied zwischen dem Server und dem Router"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:564
 msgid "Bridge"
-msgstr "Netzwerkbrücke"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:618
 msgid "Bridge can't have multipath enabled"
@@ -115,27 +113,28 @@ msgstr ""
 "übertragen."
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:221
+#, fuzzy
 msgid ""
 "By default proxy is used for any traffic that is TCP (and UDP for V2Ray)."
 msgstr ""
-"Standard wird TCP Netzwerk Verkehr über Proxy übertragen (Auch UDP für "
-"V2Ray)."
+"IP-Pakete, die nicht TCP sind, werden standardmäßig mit einem VPN-Protokoll "
+"übertragen."
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:840
 msgid "CHAP"
-msgstr "CHAP"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:271
 msgid "Can\\'t access and use server part"
-msgstr "Kann Server Teil nicht öffnen und verwenden"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:297
 msgid "Can\\'t contact Server Admin Script"
-msgstr "Kann nicht verbinden zum Server Admin Skript"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:287
 msgid "Can\\'t get public IP address from ShadowSocks"
-msgstr "Kann keine Public IP Adresse vom ShadowSocks beziehen"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:290
 msgid "Can\\'t get public IP address from V2Ray"
@@ -143,7 +142,7 @@ msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:284
 msgid "Can\\'t ping server"
-msgstr "Kann Server nicht pingen"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:415
 msgid "China"
@@ -154,22 +153,20 @@ msgid ""
 "Choose MacVLAN if you want to create a virtual interface based on a physical "
 "interface."
 msgstr ""
-"Wähle MacVLAN um ein virtuelles Interface basierend auf ein Physikalisches "
-"Interface an zu legen."
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:502
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:588
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:647
 msgid "Choose physical interface."
-msgstr "Wähle physikalische Schnittstelle."
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:135
 msgid "Core temp:"
-msgstr "Kerntemperatur:"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:410
 msgid "Country"
-msgstr "Land"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:407
 #, fuzzy
@@ -182,20 +179,22 @@ msgid "DHCP"
 msgstr "DHCP"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:600
+#, fuzzy
 msgid "DHCPv6"
-msgstr "DHCPv6"
+msgstr "DHCP"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:188
 msgid "DNS issue: can\\'t resolve hostname"
-msgstr "DNS Problem: Hostnamen nicht beziehbar"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:355
 msgid "Debug"
-msgstr "Debug"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:223
+#, fuzzy
 msgid "Default Proxy"
-msgstr "Standard Proxy"
+msgstr "Standard VPN"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:337
 msgid "Default VPN"
@@ -210,7 +209,7 @@ msgstr "Löschen"
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:768
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:789
 msgid "Device"
-msgstr "Gerät"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:253
 #, fuzzy
@@ -233,12 +232,13 @@ msgstr ""
 "Abschalten von TCP-Fast-Open für Linux und die ShadowsSocks-Einstellungen"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:295
+#, fuzzy
 msgid "Disable default gateway"
-msgstr "Default Gateway aus"
+msgstr "Gateway-Ping aus"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:300
 msgid "Disable default gateway, no internet if VPS are down"
-msgstr "Default Gateway aus, kein Internet wenn VPS down ist"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:193
 msgid "Disable external check"
@@ -254,12 +254,13 @@ msgid "Disable gateway ping check in status page"
 msgstr "Gateway-Ping Statusüberprüfung aus"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:279
+#, fuzzy
 msgid "Disable interfaces auto rename"
-msgstr "Automatische Umbenennung von Interfaces deaktivieren"
+msgstr "Externe Prüfung aus"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:330
 msgid "Disable multipath test using tracebox"
-msgstr "Deaktiviere multipath Test mittels Tracebox"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:335
 #, fuzzy
@@ -276,8 +277,9 @@ msgid ""
 msgstr "Portweiterleitungen in der Server-Firewall zu diesem Router abschalten"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:284
+#, fuzzy
 msgid "Disable renaming interfaces"
-msgstr "Umbenennung der Schnittstelle deaktivieren"
+msgstr "Bezeichnung der Schnittstelle"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:315
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:320
@@ -286,12 +288,14 @@ msgid "Disable route loop detection"
 msgstr "Server-Ping aus"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:144
+#, fuzzy
 msgid "Disable server"
-msgstr "Server deaktivieren"
+msgstr "Server-Ping aus"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:248
+#, fuzzy
 msgid "Disable server http test"
-msgstr "Server-http-Test aus"
+msgstr "Server-Ping aus"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:305
 msgid "Disable server ping"
@@ -302,14 +306,15 @@ msgid "Disable server ping status check"
 msgstr "Server-Ping Status-Prüfung aus"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:325
+#, fuzzy
 msgid "Disable tracebox test"
-msgstr "Deaktiviere tracebox Test"
+msgstr "Externe Prüfung aus"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:189
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:871
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:887
 msgid "Disabled"
-msgstr "inaktiv"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:933
 msgid "Download speed (Kb/s)"
@@ -346,12 +351,13 @@ msgid "Enable ShadowSocks Obfuscating"
 msgstr "Shadowsocks-Verschleierung aktiv"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:213
+#, fuzzy
 msgid "Enable TCP Low Latency"
-msgstr "Aktiviere TCP Low Latency"
+msgstr "TCP-Fast-Open aus"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:360
 msgid "Enable debug logs"
-msgstr "Aktiviere debug Logs"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:190
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:870
@@ -364,30 +370,31 @@ msgid "Encryption"
 msgstr "Verschlüsselung"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:280
+#, fuzzy
 msgid "Encryption method is used for Shadowsocks, V2Ray, Glorytun and OpenVPN."
-msgstr ""
-"Verschlüsselungverfahren  wird verwendet für Shadowsocks, V2Ray, Glorytun "
-"and OpenVPN."
+msgstr "Verschlüsselungverfahren wird ebenfalls für Glorytun genutzt."
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:176
 msgid "Filesystem is readonly"
-msgstr "Filesystem ist nur lesen"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:419
 msgid "For China, set an accessible DNS and disable DNSSEC."
 msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:178
+#, fuzzy
 msgid "Force retrieve all keys from server."
-msgstr "Erzwingen alle Schlüssel vom Server runter zu laden."
+msgstr "API Benutzername zum Download der Settings vom Server."
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:173
+#, fuzzy
 msgid "Force retrieve settings"
-msgstr "Erzwingen Einstellungen runter zu laden."
+msgstr "Server-Einstellungen"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:829
 msgid "GPRS only"
-msgstr "Nur GPRS"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:561
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:764
@@ -465,13 +472,15 @@ msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:683
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:710
+#, fuzzy
 msgid "IPv6 address"
-msgstr "IPv6-Adresse"
+msgstr "IPv4-Adresse"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:697
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:720
+#, fuzzy
 msgid "IPv6 gateway"
-msgstr "IPv6-Standardgateway"
+msgstr "IPv4-Standardgateway"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:632
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:804
@@ -479,8 +488,9 @@ msgid "IPv6 route received"
 msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:184
+#, fuzzy
 msgid "IPv6 settings"
-msgstr "IPv6-Einstellungen"
+msgstr "VPN-Einstellungen"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:209
 msgid "IPv6 tunnel DOWN"
@@ -627,7 +637,7 @@ msgstr ""
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:867
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:883
 msgid "Multipath TCP"
-msgstr "Multipath-TCP"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:601
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:607
@@ -780,7 +790,7 @@ msgstr "Nur eine Verbindung kann als 'primär' definiert werden."
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:391
 msgid "Only work with Shadowsocks as proxy."
-msgstr "Funktioniert nur mit Shadowsocks als Proxy."
+msgstr ""
 
 #: luci-app-openmptcprouter/root/usr/share/luci/menu.d/luci-app-openmptcprouter.json:3
 msgid "OpenMPTCProuter"
@@ -792,7 +802,7 @@ msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:218
 msgid "Optimize for latency instead of bandwidth"
-msgstr "Für niedrige Latenz anstatt für Bandbreite optimieren"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:455
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:605
@@ -839,11 +849,11 @@ msgstr "Interface hinzufügen"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:825
 msgid "Prefer LTE"
-msgstr "Bevorzuge LTE"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:826
 msgid "Prefer UMTS"
-msgstr "Bevorzuge UMTS"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:94
 #, fuzzy
@@ -911,8 +921,9 @@ msgid "Scaling governor"
 msgstr "Methode der CPU-Taktung"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:95
+#, fuzzy
 msgid "Secondary server IP"
-msgstr "zweite Server IP"
+msgstr "Server IPv4"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:992
 msgid "Select the device you want to base the interface on."
@@ -952,8 +963,9 @@ msgid "Server username"
 msgstr "Server-Benutzername"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:821
+#, fuzzy
 msgid "Service Type"
-msgstr "Dienst Typ"
+msgstr "Server-Schlüssel"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:401
 msgid "Set VPN to use for MPTCP over VPN."
@@ -1094,7 +1106,7 @@ msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:559
 msgid "Type"
-msgstr "Typ"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:331
 msgid "UBOND can replace Glorytun with connections with same latency"
@@ -1164,8 +1176,9 @@ msgid "VLAN"
 msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:184
+#, fuzzy
 msgid "VPN is not running"
-msgstr "VPN läuft nicht"
+msgstr "VPN-Einstellungen"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:286
 msgid "VPN settings"
@@ -1300,7 +1313,7 @@ msgstr "Statische Adresse"
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:516
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:749
 msgid "latency:"
-msgstr "Latenz:"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:520
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:753
@@ -1339,12 +1352,14 @@ msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:496
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:741
+#, fuzzy
 msgid "wan address:"
-msgstr "öffentliche IP Adresse:"
+msgstr "Statische Adresse"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:500
+#, fuzzy
 msgid "wan ipv6 address:"
-msgstr "öffentliche ipv6 Adresse:"
+msgstr "Statische Adresse"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:508
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:512

luci-app-openmptcprouter/po/fr/openmptcprouter.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2022-02-19 07:53+0000\n"
+"PO-Revision-Date: 2021-06-01 06:35+0000\n"
 "Last-Translator: Weblate Admin <contact@openmptcprouter.com>\n"
 "Language-Team: French <http://weblate.openmptcprouter.com/projects/omr/"
 "luciapplicationsopenmptcprouter/fr/>\n"
@@ -87,7 +87,7 @@ msgstr "Type d'authentification"
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:873
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:889
 msgid "Backup"
-msgstr "Remplaçant"
+msgstr "Sauvegarder"
 
 #: luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua:21
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/backup.htm:10
@@ -112,7 +112,7 @@ msgstr "Passerelle"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:618
 msgid "Bridge can't have multipath enabled"
-msgstr "Les passerelles ne peuvent pas utiliser le protocole multipath"
+msgstr "Un pont ne peut avoir multipath d'activer"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:287
 msgid "By default VPN is used for any traffic that is not TCP."

luci-app-openmptcprouter/po/it/openmptcprouter.po

@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2022-02-19 10:30+0000\n"
-"Last-Translator: Weblate Admin <contact@openmptcprouter.com>\n"
+"PO-Revision-Date: 2020-12-01 17:19+0000\n"
+"Last-Translator: Giuseppe Dipierro <giuseppe.dipierro@uania.com>\n"
 "Language-Team: Italian <http://weblate.openmptcprouter.com/projects/omr/"
 "luciapplicationsopenmptcprouter/it/>\n"
 "Language: it\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.10.1\n"
+"X-Generator: Weblate 4.0.4\n"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:307
 msgid "A Dead Simple VPN is a TCP VPN that can replace Glorytun TCP"
@@ -23,8 +23,6 @@ msgstr "Chiave Dead Simple VPN"
 msgid ""
 "A second server's IP can be set for dual IPv4/IPv6 server if WAN IPv6 are set"
 msgstr ""
-"Può essere impostato un secondo IP per il doppio server IPv4/IPv6 se è stato "
-"impostato il server WAN IPv6"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:111
 msgid "API username to retrieve personnalized settings from the server."
@@ -108,7 +106,7 @@ msgstr "Ponte"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:618
 msgid "Bridge can't have multipath enabled"
-msgstr "Il Bridge non può avere il multipath abilitato"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:287
 msgid "By default VPN is used for any traffic that is not TCP."
@@ -140,8 +138,9 @@ msgid "Can\\'t get public IP address from ShadowSocks"
 msgstr "Impossibile ottenere un indirizzo IP pubblico da ShadowSocks"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:290
+#, fuzzy
 msgid "Can\\'t get public IP address from V2Ray"
-msgstr "Impossibile ottenere un indirizzo IP pubblico da V2Ray"
+msgstr "Impossibile ottenere un indirizzo IP pubblico da ShadowSocks"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:284
 msgid "Can\\'t ping server"
@@ -149,7 +148,7 @@ msgstr "Impossibile eseguire il ping del server"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:415
 msgid "China"
-msgstr "Cina"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:568
 msgid ""
@@ -171,11 +170,12 @@ msgstr "Temp. Nucleo:"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:410
 msgid "Country"
-msgstr "Nazione"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:407
+#, fuzzy
 msgid "Country settings"
-msgstr "Impostazioni nazionali del router"
+msgstr "Impostazioni del router"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:454
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:599
@@ -183,8 +183,9 @@ msgid "DHCP"
 msgstr "DHCP"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:600
+#, fuzzy
 msgid "DHCPv6"
-msgstr "DHCPv6"
+msgstr "DHCP"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:188
 msgid "DNS issue: can\\'t resolve hostname"
@@ -214,13 +215,15 @@ msgid "Device"
 msgstr "Dispositivo"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:253
+#, fuzzy
 msgid "Disable HTTP test on Server API in status page"
-msgstr "Disabilitare il test HTTP sulle API Server nella pagina di stato"
+msgstr "Disabilitare il controllo dello stato del ping del server"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:345
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:350
+#, fuzzy
 msgid "Disable ModemManager"
-msgstr "Disabilita ModemManager"
+msgstr "ModemManager"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:203
 msgid "Disable TCP Fast Open"
@@ -248,20 +251,24 @@ msgid "Disable gateway ping"
 msgstr "Disabilita il ping del gateway"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:243
+#, fuzzy
 msgid "Disable gateway ping check in status page"
-msgstr "Disabilita il controllo del ping del gateway nella pagina di stato"
+msgstr "Disabilitare il controllo dello stato del ping del gateway"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:279
+#, fuzzy
 msgid "Disable interfaces auto rename"
-msgstr "Disabilita auto rinomina interfacce"
+msgstr "Disabilita il test Tracebox"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:330
 msgid "Disable multipath test using tracebox"
 msgstr "Disabilita il test multipath usando tracebox"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:335
+#, fuzzy
+#| msgid "Disabled"
 msgid "Disable nDPI"
-msgstr "Disabilita nDPI"
+msgstr "Disabilitato"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:340
 msgid "Disable nDPI, used for protocols in OMR-ByPass"
@@ -275,8 +282,9 @@ msgstr ""
 "a questo router"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:284
+#, fuzzy
 msgid "Disable renaming interfaces"
-msgstr "Disabilita rinomina interfaccia"
+msgstr "Etichetta per l&#39;interfaccia"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:315
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:320
@@ -289,8 +297,9 @@ msgid "Disable server"
 msgstr "Disabilita il server"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:248
+#, fuzzy
 msgid "Disable server http test"
-msgstr "Disabilita http test server"
+msgstr "Disabilita il ping del server"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:305
 msgid "Disable server ping"
@@ -320,11 +329,12 @@ msgstr "Cambiamento dinamico"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:390
 msgid "Enable Bridge Acceleration"
-msgstr "Abilita Accelerazione modalità Bridge"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:209
+#, fuzzy
 msgid "Enable DNS64"
-msgstr "Abilita DNS64"
+msgstr "Abilita MQ"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:384
 msgid "Enable Fast Patch offloading for connections"
@@ -373,7 +383,7 @@ msgstr "Il filesystem è di sola lettura"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:419
 msgid "For China, set an accessible DNS and disable DNSSEC."
-msgstr "Per la Cina, imposta un DNS accessibile e disabilita DNSSEC."
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:178
 msgid "Force retrieve all keys from server."
@@ -393,8 +403,9 @@ msgid "Gateway DOWN"
 msgstr "Tipi di pagamento"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:564
+#, fuzzy
 msgid "Gateway IPv6 DOWN"
-msgstr "Gateway IPv6 SPENTO"
+msgstr "Tipi di pagamento"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:295
 msgid "Glorytun TCP is used by default for UDP and ICMP"
@@ -464,13 +475,15 @@ msgstr "Prefisso IPv6"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:683
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:710
+#, fuzzy
 msgid "IPv6 address"
-msgstr "Indirizzi IPv6"
+msgstr "Indirizzi IPv4"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:697
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:720
+#, fuzzy
 msgid "IPv6 gateway"
-msgstr "Gateway IPv6"
+msgstr "Gateway IPv4"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:632
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:804
@@ -491,7 +504,7 @@ msgstr "IPv6:"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:214
 msgid "If host support NAT64, you can enable DNS64 support."
-msgstr "Se l'host supporta NAT64, puoi abilitare il supporto DNS64."
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:529
 msgid "Interfaces settings"
@@ -575,16 +588,15 @@ msgid "MPTCP over VPN"
 msgstr "MPTCP su VPN"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:390
+#, fuzzy
 msgid "MPTCP over VPN settings"
-msgstr "Impostazioni MPTCP su VPN"
+msgstr "MPTCP su VPN"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:391
 msgid ""
 "MPTCP over VPN should be used only when Multipath TCP is blocked on a "
 "connection."
 msgstr ""
-"MPTCP su VPN deve essere usato solo quando il Multipath TCP è bloccatp su "
-"una connessione."
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:563
 msgid "MacVLAN"
@@ -638,7 +650,7 @@ msgstr "Lo stato corrente di Multipath è"
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:596
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:782
 msgid "Multipath master already defined"
-msgstr "Multipath principale già definito"
+msgstr "Multipath master già definito"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:567
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:767
@@ -654,8 +666,9 @@ msgid "NONE"
 msgstr "NESSUNO"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:623
+#, fuzzy
 msgid "Network interface MAC address duplicated"
-msgstr "Interfaccia di rete con MAC address duplicata"
+msgstr "Interfaccia di rete duplicata"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:613
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:799
@@ -663,8 +676,9 @@ msgid "Network interface duplicated"
 msgstr "Interfaccia di rete duplicata"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:579
+#, fuzzy
 msgid "Network interface not in WAN firewall zone"
-msgstr "Interfaccia di rete non in WAN firewall zone"
+msgstr "Interfaccia di rete duplicata"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:899
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:901
@@ -685,17 +699,18 @@ msgid "No IPv6 access"
 msgstr "Nessun accesso IPv6"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:575
+#, fuzzy
 msgid "No Server http response after 1 second"
-msgstr "Nessuna risposta dal server HTTP dopo 1 secondo"
+msgstr "Nessuna risposta al ping del server dopo 1 secondo"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:571
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:771
 msgid "No Server ping response after 1 second"
-msgstr "Nessuna risposta al ping dal server dopo 1 secondo"
+msgstr "Nessuna risposta al ping del server dopo 1 secondo"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:656
 msgid "No WAN with multipath enabled:"
-msgstr "Nessuna WAN con multipath abilitata:"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/backup.htm:26
 msgid "No available backup on server."
@@ -720,12 +735,14 @@ msgid "No output"
 msgstr "Nessun output"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:293
+#, fuzzy
 msgid "No public IP address detected in less than 1 second"
-msgstr "Nessun indirizzo IP pubblico rilevato in meno di 1 secondo"
+msgstr "Nessun indirizzo IP WAN rilevato in meno di 1 secondo"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:267
+#, fuzzy
 msgid "No server IP address, No public IP address"
-msgstr "Nessun indirizzo IP del server, nessun indirizzo IP pubblico"
+msgstr "Nessun indirizzo IP del server, nessun indirizzo IP WAN"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:280
 msgid "No server defined"
@@ -766,15 +783,13 @@ msgstr "Al cambio della procedura guidata"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:233
 msgid "Only ShadowSocks is supported with server multiple IPs for now."
-msgstr "Solo ShadowSocks è supportato con server multi IP per adesso."
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:877
 msgid ""
 "Only one interface must be set as \"Master\", this should be the most stable "
 "interface."
 msgstr ""
-"Solo un' interfaccia può essere impostata come \"Master\", deve essere "
-"impostata l'interfaccia più stabile."
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:135
 msgid "Only one server can be master, else all servers are set as backup."
@@ -784,7 +799,7 @@ msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:391
 msgid "Only work with Shadowsocks as proxy."
-msgstr "Funziona solo con Shadowsocks come proxy."
+msgstr ""
 
 #: luci-app-openmptcprouter/root/usr/share/luci/menu.d/luci-app-openmptcprouter.json:3
 msgid "OpenMPTCProuter"
@@ -846,8 +861,9 @@ msgid "Prefer UMTS"
 msgstr "Preferisci UMTS"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:94
+#, fuzzy
 msgid "Primary server IP"
-msgstr "IP principale del server"
+msgstr "Indirizzo IP del server"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:449
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:594
@@ -880,7 +896,7 @@ msgstr "Reindirizza tutte le porte dal server a questo router"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:999
 msgid "Reset"
-msgstr "Resetta"
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/backup.htm:32
 msgid "Restore backup"
@@ -908,8 +924,9 @@ msgid "Scaling governor"
 msgstr "Governatore in scala"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:95
+#, fuzzy
 msgid "Secondary server IP"
-msgstr "IP secondario del server"
+msgstr "Indirizzo IP del server"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:992
 msgid "Select the device you want to base the interface on."
@@ -951,7 +968,7 @@ msgstr "Tipo di servizio"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:401
 msgid "Set VPN to use for MPTCP over VPN."
-msgstr "Seleziona la VPN da utilizzare per MPTCP su VPN."
+msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:658
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:688
@@ -1208,7 +1225,7 @@ msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:65
 msgid "Wizard"
-msgstr "Procedura guidata"
+msgstr "Wizard"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:414
 msgid "World"

luci-app-openmptcprouter/po/zh_Hans/openmptcprouter.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2022-01-11 10:52+0000\n"
+"PO-Revision-Date: 2021-06-02 09:51+0000\n"
 "Last-Translator: antrouter <xinyangla@188.com>\n"
 "Language-Team: Chinese (Simplified) <http://weblate.openmptcprouter.com/"
 "projects/omr/luciapplicationsopenmptcprouter/zh_Hans/>\n"
@@ -113,7 +113,7 @@ msgstr "默认情况下，VPN用于非TCP的任何流量."
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:221
 msgid ""
 "By default proxy is used for any traffic that is TCP (and UDP for V2Ray)."
-msgstr "默认情况下，仅代理TCP（如果选用V2Ray则代理TCP跟UDP还有ICMP任何）流量。"
+msgstr "默认情况下，代理用于任何TCP（对于V2Ray是UDP）流量。"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:840
 msgid "CHAP"
@@ -946,7 +946,9 @@ msgstr "将服务器设置为主服务器"
 msgid ""
 "Set the default Proxy used for TCP when ShadowSocks is enabled, for TCP and "
 "UDP when V2Ray is enabled."
-msgstr "启用ShadowSocks时用于默认代理TC流量，启用V2Ray时用于默认代理TCP和UDP还有ICMP任何流量."
+msgstr ""
+"设置启用ShadowSocks时用于TCP的默认代理，启用V2Ray时设置用于TCP和UDP的默认代"
+"理."
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:384
 msgid ""
@@ -1096,7 +1098,7 @@ msgstr "V2Ray没有运行"
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:254
 msgid "V2Ray is used for TCP and UDP."
-msgstr "V2Ray用于TCP和UDP代理."
+msgstr "V2Ray用于TCP和UDP传输."
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:251
 msgid "V2Ray user"

luci-app-openmptcprouter/root/bin/anonymous_config.sh

@@ -21,6 +21,5 @@ uci show | \
 	-e "/vpn\.key=/s/......$/xxxxxx'/" \
 	-e "/vps\.key=/s/......$/xxxxxx'/" \
 	-e "/wgkey=/s/......$/xxxxxx'/" \
-	-e "/key=/s/......$/xxxxxx'/" \
 	-e "/ula_prefix=2/s/=.........../='xxxxxxxxxxx/" \
 	-e "/token=/s/............$/xxxxxx'/"

luci-app-openmptcprouter/root/bin/omr-modemmanager

@@ -10,7 +10,7 @@ timeout 1 mmcli -L | while read MODEM; do
 		OPERATOR=$(echo "$MODEM_INFO" | grep 'modem.3gpp.operator-name ' | awk -F": " '{print $2}')
 		NUMBER=$(echo "$MODEM_INFO" | grep 'modem.generic.own-numbders.value[1]' | awk -F": " '{print $2}')
 		STATE=$(echo "$MODEM_INFO" | grep 'modem.generic.state ' | awk -F": " '{print $2}')
-		TYPE=$(echo "$MODEM_INFO" | grep 'modem.generic.access-technologies.value\[1\]' | awk -F": " '{print $2}')
+		TYPE=$(echo "$MODEM_INFO" | grep 'modem.generic.access-technologies.values[1]' | awk -F": " '{print $2}')
 		[ -z "$INFO" ] && echo $PERCENT
 		[ "$INFO" = "all" ] && echo "$PERCENT;$OPERATOR;$NUMBER;$STATE;$TYPE"
 		exit

luci-app-openmptcprouter/root/bin/omr-mptcp-intf

@@ -12,17 +12,9 @@ get_mptcp_from_server() {
 	get_mptcp() {
 		serverip=$1
 		if [ "$(echo $serverip | grep :)" ]; then
-			if [ -f /proc/sys/net/mptcp/enabled ]; then
-				support="$(mptcpize run curl -s -k -6 -m ${timeout} --interface $intf https://[$serverip]:$serverport/mptcpsupport)"
-			else
-				support="$(curl -s -k -6 -m ${timeout} --interface $intf https://[$serverip]:$serverport/mptcpsupport)"
-			fi
+			support="$(curl -s -k -6 -m ${timeout} --interface $intf https://[$serverip]:$serverport/mptcpsupport)"
 		else
-			if [ -f /proc/sys/net/mptcp/enabled ]; then
-				support="$(mptcpize run curl -s -k -4 -m ${timeout} --interface $intf https://$serverip:$serverport/mptcpsupport)"
-			else
-				support="$(curl -s -k -4 -m ${timeout} --interface $intf https://$serverip:$serverport/mptcpsupport)"
-			fi
+			support="$(curl -s -k -4 -m ${timeout} --interface $intf https://$serverip:$serverport/mptcpsupport)"
 		fi
 		[ -n "$support" ] && {
 			support=$(echo $support | jsonfilter -e '@.mptcp')
@@ -64,10 +56,8 @@ get_mptcp_from_website6() {
 support=""
 config_load openmptcprouter
 config_foreach get_mptcp_from_server server
-if [ ! -f /proc/sys/net/mptcp/enabled ] && [ -z "$support" ]; then
-	[ -n "$(ip -4 a show dev $intf)" ] && get_mptcp_from_website
-	[ -n "$(ip -6 a show dev $intf)" ] && get_mptcp_from_website6
-fi
+[ -z "$support" ] && [ -n "$(ip -4 a show dev $intf)" ] && get_mptcp_from_website
+[ -z "$support" ] && [ -n "$(ip -6 a show dev $intf)" ] && get_mptcp_from_website6
 if [ "$support" = "working" ]; then
 	echo "MPTCP enabled"
 elif [ "$support" = "not working" ]; then

luci-app-openmptcprouter/root/etc/init.d/openmptcprouter

@@ -6,8 +6,6 @@ START=5
 
 USE_PROCD=1
 
-. /lib/functions/network.sh
-
 omr_intf_del() {
 	[ -z "$1" ] && return
 	uci -q delete openmptcprouter.$1
@@ -20,15 +18,12 @@ omr_intf_check() {
 omr_intf_set() {
 	local device
 	local ifname
-	network_get_device ifname $1
-	[ -z "$ifname" ] && network_get_physdev ifname $1
-	[ -z "$ifname" ] && config_get ifname "$1" device
-	[ -z "$ifname" ] && config_get ifname "$1" ifname
-	[ -z "$ifname" ] && ifname=$(ifstatus "$1" | jsonfilter -q -e '@["l3_device"]')
-	#config_get devicename "$1" _modem_device
-	devicename=${ifname}
+	config_get ifname "$1" ifname
+	config_get device "$1" device
 	config_get type "$1" type
 
+	[ -z "$ifname" ] && ifname=$(ifstatus "$1" | jsonfilter -q -e '@["l3_device"]')
+
 	if [ "$type" != "macvlan" ] && [ -n "$ifname" ] && [ -f /sys/class/net/${ifname}/device/uevent ]; then
 		devicepath=$(readlink -f /sys/class/net/${ifname})
 		if [ -n "$devicepath" ] && [ "$(echo ${devicepath} | grep virtual)" = "" ] && [ "$(cat /sys/class/net/${ifname}/device/uevent | grep PRODUCT)" != "" ] && [ "$(cat /sys/class/net/${ifname}/device/uevent | grep PCI_SLOT_NAME)" = "" ]; then
@@ -39,11 +34,11 @@ omr_intf_set() {
 			uci -q set network.$1.modalias="$(cat /sys/class/net/${ifname}/device/uevent | grep MODALIAS | cut -d '=' -f2 | tr -d '\n')-$mac"
 			uci -q set network.$1.product="$(cat /sys/class/net/${ifname}/device/uevent | grep PRODUCT | cut -d '=' -f2 | tr -d '\n')"
 		elif [ -n "$devicepath" ] && ([ "$(echo ${devicepath} | grep virtual)" != "" ] || [ "$(echo ${devicepath} | grep virtual)" = "" ] && [ "$(cat /sys/class/net/${ifname}/device/uevent | grep PRODUCT)" = "" ] || [ "$(cat /sys/class/net/${ifname}/device/uevent | grep PCI_SLOT_NAME)" != "" ] || [ "$(cat /sys/class/net/${ifname}tmp/device/uevent)" != "" ]); then
-			#uci -q delete network.$1.device
+			uci -q delete network.$1.device
 			uci -q delete network.$1.modalias
 			uci -q delete network.$1.product
 		fi
-	elif [ "$type" != "macvlan" ] &&  [ -n "$devicename" ] && [ -f /sys/bus/usb-serial/devices/${devicename}/device/uevent ] && [ "$(cat /sys/class/net/${ifname}/device/uevent | grep PRODUCT)" != "" ]; then
+	elif [ "$type" != "macvlan" ] &&  [ -n "$device" ] && [ -f /sys/bus/usb-serial/devices/${devicename}/device/uevent ] && [ "$(cat /sys/class/net/${ifname}/device/uevent | grep PRODUCT)" != "" ]; then
 		mac=""
 		if [ -f /sys/class/net/${ifname}/address ]; then
 			mac="$(cat /sys/class/net/${ifname}/address | tr -d '\n')"
@@ -61,10 +56,7 @@ omr_set_settings() {
 	local ifname
 	local multipath
 	config_get multipath "$1" multipath
-	network_get_device ifname $1
-	[ -z "$ifname" ] && network_get_physdev ifname $1
-	[ -z "$ifname" ] && config_get ifname "$1" device
-	[ -z "$ifname" ] && config_get ifname "$1" ifname
+	config_get ifname "$1" ifname
 	config_get device "$1" device
 	config_get proto "$1" proto
 	config_get type "$1" type
@@ -84,8 +76,7 @@ omr_set_settings() {
 	[ -z "$addlatency" ] && addlatency=0
 	devicename=$(echo "$device" | cut -d'/' -f3)
 
-	ifname=$(ifstatus "$1" | jsonfilter -q -e '@["l3_device"]')
-	[ -z "$ifname" ] && config_get ifname "$1" ifname
+	[ -z "$ifname" ] && ifname=$(ifstatus "$1" | jsonfilter -q -e '@["l3_device"]')
 	[ -n "$(echo $ifname | grep '@')" ] && ifname=$(ifstatus "$1" | jsonfilter -q -e '@["device"]')
 
 	if [ -n "$ifname" ]; then
@@ -153,13 +144,15 @@ start_service() {
 			del_list dhcp.@dnsmasq[0].server='127.0.0.1#5353'
 			add_list dhcp.@dnsmasq[0].server='114.114.114.114'
 			set dhcp.@dnsmasq[0].dnsseccheckunsigned='0'
-			delete dhcp.@dnsmasq[0].dnssec
+			delete dhcp.@dnsmasq[0].dnssec='1'
 			commit dhcp
 		EOF
 	elif [ "$(uci -q get openmptcprouter.settings.country)" = "world" ] && [ -n "$(uci -q get dhcp.@dnsmasq[0].server | grep '114.114.114.114')" ]; then
 		uci -q batch <<-EOF > /dev/null
 			add_list dhcp.@dnsmasq[0].server='127.0.0.1#5353'
 			del_list dhcp.@dnsmasq[0].server='114.114.114.114'
+			set dhcp.@dnsmasq[0].dnsseccheckunsigned='1'
+			set dhcp.@dnsmasq[0].dnssec='1'
 			commit dhcp
 		EOF
 	fi

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

@@ -11,7 +11,7 @@ local jsonc  = require "luci.jsonc"
 function interface_from_device(dev)
 	for _, iface in ipairs(net:get_networks()) do
 		local ifacen = iface:name()
-		local ifacename = ucic:get("network",ifacen,"device")
+		local ifacename = ucic:get("network",ifacen,"ifname")
 		if ifacename == dev then
 			return ifacen
 		end
@@ -72,7 +72,7 @@ function add_interface(add_interface_ifname)
 	end
 
 	ucic:set("network","wan" .. i,"interface")
-	ucic:set("network","wan" .. i,"device",defif)
+	ucic:set("network","wan" .. i,"ifname",defif)
 	ucic:set("network","wan" .. i,"proto","static")
 	if ointf ~= "" then
 		ucic:set("network","wan" .. i,"type","macvlan")
@@ -128,7 +128,7 @@ end
 
 function remove_interface(intf)
 	-- Remove existing interface
-	local defif = ucic:get("network",intf,"device")
+	local defif = ucic:get("network",intf,"ifname")
 	ucic:delete("network",intf)
 	ucic:delete("network",intf .. "_dev")
 	ucic:save("network")
@@ -170,7 +170,7 @@ function set_interface(intf,proto,ipaddr,netmask,gateway,sqmenabled,downloadspee
 	if not ucic:get("sqm",intf) ~= "" then
 		local defif = get_device(intf)
 		if defif == "" then
-			defif = ucic:get("network",intf,"device") or ""
+			defif = ucic:get("network",intf,"ifname") or ""
 		end
 		ucic:set("sqm",intf,"queue")
 		ucic:set("sqm",intf,"interface",defif)
@@ -268,7 +268,7 @@ function default_vpn(default_vpn)
 		ucic:set("network","omrvpn","proto","dhcp")
 	end
 	if vpn_intf ~= "" then
-		ucic:set("network","omrvpn","device",vpn_intf)
+		ucic:set("network","omrvpn","ifname",vpn_intf)
 		ucic:save("network")
 		ucic:commit("network")
 	end
@@ -824,7 +824,7 @@ function interfaces_status()
 				if mArray.openmptcprouter["external_check"] ~= false then
 					mArray.openmptcprouter["proxy_addr"] = ut.trim(sys.exec("curl -s -4 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m " .. timeout .. " " .. check_ipv4_website))
 					if mArray.openmptcprouter["proxy_addr"] == "" then
-						mArray.openmptcprouter["proxy_addr"] = ut.trim(sys.exec("curl -s -4 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m " .. timeout .. " ifconfig.me"))
+						mArray.openmptcprouter["proxy_addr"] = ut.trim(sys.exec("curl -s -4 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m " .. timeout .. " ifconfig.co"))
 					end
 					--mArray.openmptcprouter["ss_addr6"] = sys.exec("curl -s -6 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m 3 http://ipv6.openmptcprouter.com")
 				end
@@ -931,11 +931,6 @@ function interfaces_status()
 					else
 						mArray.openmptcprouter["vps_admin"] = false
 						mArray.openmptcprouter["vps_admin_error_msg"] = "No result"
-						uci:set("openmptcprouter",s[".name"],"admin_error","1")
-						mArray.openmptcprouter["vps_admin_error"] = true
-						uci:delete("openmptcprouter",s[".name"],"token")
-						uci:save("openmptcprouter",s[".name"])
-						uci:commit("openmptcprouter",s[".name"])
 					end
 				else
 					mArray.openmptcprouter["vps_admin"] = false
@@ -966,10 +961,7 @@ function interfaces_status()
 	if string.find(sys.exec("/usr/bin/pgrep '^(/usr/sbin/)?glorytun(-udp)?$'"), "%d+") or string.find(sys.exec("/usr/bin/pgrep '^(/usr/sbin/)?dsvpn?$'"), "%d+") or string.find(sys.exec("/usr/bin/pgrep '^(/usr/sbin/)?mlvpn?$'"), "%d+") or string.find(sys.exec("/usr/bin/pgrep '^(/usr/sbin/)?openvpn?$'"), "%d+") then
 		mArray.openmptcprouter["tun_service"] = true
 		mArray.openmptcprouter["tun_ip"] = get_ip("omrvpn")
-		local tun_dev = uci:get("network","omrvpn","device")
-		if tun_dev == "" then
-			tun_dev = uci:get("network","omrvpn","ifname")
-		end
+		local tun_dev = uci:get("network","omrvpn","ifname")
 		if tun_dev == "" then
 			tun_dev = get_device("omrvpn")
 		end
@@ -1027,7 +1019,7 @@ function interfaces_status()
 			mArray.openmptcprouter["multi_vpn"] = true
 		end
 	end
-
+	
 	-- check Shadowsocks is running
 	mArray.openmptcprouter["shadowsocks_service"] = false
 	if string.find(sys.exec("/usr/bin/pgrep ss-redir"), "%d+") then
@@ -1035,16 +1027,10 @@ function interfaces_status()
 	end
 
 	mArray.openmptcprouter["shadowsocks_enabled"] = true
-	local ss_server = "1"
-	ucic:foreach("shadowsocks-libev", "server", function(s)
-		if uci:get("shadowsocks-libev",s[".name"],"disabled") == "0" then
-			ss_server = "0"
-		end
-	end)
+	local ss_server = uci:get("shadowsocks-libev","sss0","disabled") or "0"
 	if ss_server == "1" then
 		mArray.openmptcprouter["shadowsocks_enabled"] = false
 	end
-
 	-- check V2Ray is running
 	mArray.openmptcprouter["v2ray_service"] = false
 	if string.find(sys.exec("/usr/bin/pgrep v2ray"), "%d+") then
@@ -1153,14 +1139,14 @@ function interfaces_status()
 
 	    local ifname = get_device(interface)
 	    if ifname == "" or ifname == nil then
-		ifname = section["device"] or ""
+		ifname = section["ifname"] or ""
 	    end
 	    --if ifname ~= nil and ifname:match("^tun.*") and interface:match("^ovpn.*") then
 	    --ifname = get_device(interface:sub(5))
 	    --end
 	    
 	    duplicateif = false
-	    if ifname ~= "" and ifname ~= nil and not (section["device"] ~= nil and section["device"]:match("^@.*")) and (proto == "static" or proto == "dhcp") then
+	    if ifname ~= "" and ifname ~= nil and not (section["ifname"] ~= nil and section["ifname"]:match("^@.*")) then
 		if allintf[ifname] then
 		    connectivity = "ERROR"
 		    duplicateif = true
@@ -1170,7 +1156,7 @@ function interfaces_status()
 	    end
 
 	    duplicatemac = false
-	    if mac ~= "" and mac ~= nil and not (section["device"] ~= nil and section["device"]:match("^@.*")) and not (ifname ~= nil and ifname:match("%.")) then
+	    if mac ~= "" and mac ~= nil and not (section["ifname"] ~= nil and section["ifname"]:match("^@.*")) then
 		if allmac[mac] then
 		    connectivity = "ERROR"
 		    duplicatemac = true
@@ -1385,8 +1371,7 @@ function interfaces_status()
 		    if adminport == "" then
 			    adminport = "65500"
 		    end
-		    -- httping disable for now, with -l (ssl) timeout is ignored
-		    if false and server_ping == "UP" and uci:get("openmptcprouter", "settings", "disableserverhttptest") ~= "1" and ipaddr ~= "" and adminport ~= "" then
+		    if server_ping == "UP" and uci:get("openmptcprouter", "settings", "disableserverhttptest") ~= "1" and ipaddr ~= "" and adminport ~= "" then
 			    local server_http_result = ""
 			    local server_http_test = ""
 			    if mArray.openmptcprouter["service_addr_ip"] ~= "" then