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 branch 'test' into develop

Browse source
This commit is contained in:
suyuan 2020-09-23 23:38:57 +08:00
commit a0eb87506a
15 changed files with 299 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/main.yml vendored
View file

@ -71,7 +71,7 @@ jobs:
path: /home/runner/work/omr/${{ matrix.OMR_TARGET }}/source/bin
- if: steps.branch_name.outputs.SOURCE_BRANCH == ''
name: Deploy - Create directory
uses: fifsky/ssh-action@master
uses: ysurac/ssh-action@master
env:
SOURCE_NAME: ${{ steps.branch_name.outputs.SOURCE_NAME }}
SOURCE_BRANCH: ${{ steps.branch_name.outputs.SOURCE_BRANCH }}
@ -85,7 +85,7 @@ jobs:
key: ${{ secrets.PRIVATE_KEY }}
- if: steps.branch_name.outputs.SOURCE_BRANCH != ''
name: Deploy - Create directory
uses: fifsky/ssh-action@master
uses: ysurac/ssh-action@master
env:
SOURCE_NAME: ${{ steps.branch_name.outputs.SOURCE_NAME }}
SOURCE_BRANCH: ${{ steps.branch_name.outputs.SOURCE_BRANCH }}
@ -106,7 +106,7 @@ jobs:
mv ${OMR_TARGET}/source/bin ${GITHUB_WORKSPACE}/
- if: steps.branch_name.outputs.SOURCE_BRANCH == ''
name: Deploy - Upload via rsync
uses: up9cloud/action-rsync@master
uses: ysurac/action-rsync@master
env:
ARGS: -av --delete-after
TARGET: /www/wwwroot/55860.com/bak/down/release/${{steps.branch_name.outputs.SOURCE_TAG}}/${{matrix.OMR_TARGET}}
@ -121,7 +121,7 @@ jobs:
GITHUB_WORKSPACE: ${{ steps.branch_name.outputs.WORKSPACE }}
- if: steps.branch_name.outputs.SOURCE_BRANCH != ''
name: Deploy - Upload via rsync
uses: up9cloud/action-rsync@master
uses: ysurac/action-rsync@master
env:
ARGS: -av --delete-after
TARGET: /www/wwwroot/55860.com/bak/down/${{ steps.branch_name.outputs.SOURCE_BRANCH }}/${{env.OMR_KERNEL}}/${{matrix.OMR_TARGET}}

4
bcm27xx-eeprom/Makefile
View file

@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=bcm27xx-eeprom
PKG_VERSION:=0512377e948552105741be10088772d2ecd8bf70
PKG_VERSION:=1a099a5a9de4cbd71a68afaa6421fd3b9cf3ef2e
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/raspberrypi/rpi-eeprom/tar.gz/$(PKG_VERSION)?
PKG_HASH:=6e02e40762f21d39d3585dbce66794fa7055a0d0440c133e0664fd77a96d70ee
PKG_HASH:=c991a69fb92f60fb03cb0d0d482dafd162ae1ad0fb279509d9e2489055891ac3
PKG_LICENSE:=BSD-3-Clause Custom
PKG_LICENSE_FILES:=LICENSE

11
luci-app-mptcp/luasrc/view/mptcp/multipath.htm
View file

@ -3,9 +3,9 @@
-- Copyright 2015 OVH (OverTheBox@ovh.net)
-- Simon Lelievre (simon.lelievre@corp.ovh.com)
-- Sebastien Duponcheel (sebastien.duponcheel@ovh.net)
-- Copyright 2018-2020 Ycarus - Yannick Chabanois (ycarus@zugaina.org)
-- Copyright 2018-2020 Ycarus - Yannick Chabanois (ycarus@zugaina.org) for OpenMPTCProuter
--
-- This file is part of OverTheBox for OpenWrt.
-- Part of this file come from OverTheBox for OpenWrt.
--
-- OverTheBox is free software: you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
@ -45,6 +45,9 @@
end
local curifname = luci.http.formvalue("dev") or "all"
local bandwidthtotalurl = "admin/network/mptcp/multipath_bandwidth"
local bandwidthintfurl = "admin/network/mptcp/interface_bandwidth"
-%>
<%+header%>
@ -246,7 +249,7 @@
labelup_scale.innerHTML = String.format('<%:(%d minutes window, %d seconds interval)%>', 3, data_wanted / 60);
/* render datasets, start update interval */
XHR.poll(3, '<%=build_url("admin/network/mptcp/multipath_bandwidth", all)%>', null,
XHR.poll(3, '<%=build_url(bandwidthtotalurl, all)%>', null,
function(x, dataarray)
{
var data_max_dnl = 0;
@ -779,7 +782,7 @@
label_scale.innerHTML = String.format('<%:(%d minute window, %d second interval)%>', data_wanted / 60, 3);
/* render datasets, start update interval */
XHR.poll(3, '<%=build_url("admin/network/mptcp/interface_bandwidth", curifname)%>', null,
XHR.poll(3, '<%=build_url(bandwidthintfurl, curifname)%>', null,
function(x, data)
{
var data_max = 0;

24
luci-app-omr-bypass/htdocs/luci-static/resources/view/services/omr-bypass.js
View file

@ -28,6 +28,9 @@ return L.view.extend({
s.anonymous = true;
s.nodescriptions = true;
o = s.option(form.Flag, 'enabled', _('Enabled'));
o.default = o.enabled;
o = s.option(form.Value, 'name', _('Domain'));
o.rmempty = false;
@ -44,6 +47,9 @@ return L.view.extend({
s.anonymous = true;
s.nodescriptions = true;
o = s.option(form.Flag, 'enabled', _('Enabled'));
o.default = o.enabled;
o = s.option(form.Value, 'ip', _('IP'));
o.rmempty = false;
@ -60,6 +66,9 @@ return L.view.extend({
s.anonymous = true;
s.nodescriptions = true;
o = s.option(form.Flag, 'enabled', _('Enabled'));
o.default = o.enabled;
o = s.option(form.Value, 'dport', _('port'));
o.rmempty = false;
@ -83,6 +92,9 @@ return L.view.extend({
s.anonymous = true;
s.nodescriptions = true;
o = s.option(form.Flag, 'enabled', _('Enabled'));
o.default = o.enabled;
o = s.option(form.Value, 'sport', _('port'));
o.rmempty = false;
@ -106,6 +118,9 @@ return L.view.extend({
s.anonymous = true;
s.nodescriptions = true;
o = s.option(form.Flag, 'enabled', _('Enabled'));
o.default = o.enabled;
o = s.option(form.Value, 'mac', _('source MAC-Address'));
o.datatype = 'list(unique(macaddr))';
o.rmempty = false;
@ -127,6 +142,9 @@ return L.view.extend({
s.anonymous = true;
s.nodescriptions = true;
o = s.option(form.Flag, 'enabled', _('Enabled'));
o.default = o.enabled;
o = s.option(form.Value, 'ip', _('IP Address'));
o.datatype = 'or(ip4addr,ip6addr)';
o.rmempty = false;
@ -150,6 +168,9 @@ return L.view.extend({
s.anonymous = true;
s.nodescriptions = true;
o = s.option(form.Flag, 'enabled', _('Enabled'));
o.default = o.enabled;
o = s.option(form.Value, 'asn', _('ASN'));
o.rmempty = false;
@ -166,6 +187,9 @@ return L.view.extend({
s.anonymous = true;
s.nodescriptions = true;
o = s.option(form.Flag, 'enabled', _('Enabled'));
o.default = o.enabled;
o = s.option(form.Value, 'proto', _('Protocol/Service'));
o.rmempty = false;
o.load = function(section_id) {

28
luci-app-omr-bypass/root/etc/init.d/omr-bypass
View file

@ -39,8 +39,11 @@ _bypass_ip() {
_bypass_domains() {
local domain
local intf
local enabled
config_get domain $1 name
config_get intf $1 interface
config_get enabled $1 enabled
[ "$enabled" = "0" ] && return
_bypass_domain $domain $intf
}
@ -82,8 +85,11 @@ _bypass_domain() {
_bypass_mac() {
local mac
local intf
local enabled
config_get mac $1 mac
config_get intf $1 interface
config_get enabled $1 enabled
[ "$enabled" = "0" ] && return
local intfid="$(uci -q get omr-bypass.$intf.id)"
[ -z "$intf" ] && intf="all"
@ -120,8 +126,11 @@ _bypass_mac() {
_bypass_lan_ip() {
local ip
local intf
local enabled
config_get ip $1 ip
config_get intf $1 interface
config_get enabled $1 enabled
[ "$enabled" = "0" ] && return
local intfid="$(uci -q get omr-bypass.$intf.id)"
[ -z "$intf" ] && intf="all"
@ -171,9 +180,14 @@ _bypass_lan_ip() {
_bypass_dest_port() {
local intf
local enabled
local dport
local proto
config_get dport $1 dport
config_get proto $1 proto
config_get intf $1 interface
config_get enabled $1 enabled
[ "$enabled" = "0" ] && return
local intfid="$(uci -q get omr-bypass.$intf.id)"
[ -z "$intf" ] && intf="all"
@ -221,9 +235,14 @@ _bypass_dest_port() {
_bypass_src_port() {
local intf
local enabled
local sport
local proto
config_get sport $1 sport
config_get proto $1 proto
config_get intf $1 interface
config_get enabled $1 enabled
[ "$enabled" = "0" ] && return
local intfid="$(uci -q get omr-bypass.$intf.id)"
[ -z "$intf" ] && intf="all"
@ -272,8 +291,11 @@ _bypass_src_port() {
_bypass_proto() {
local proto
local intf
local enabled
config_get proto $1 proto
config_get intf $1 interface
config_get enabled $1 enabled
[ "$enabled" = "0" ] && return
local intfid="$(uci -q get omr-bypass.$intf.id)"
[ -z "$intf" ] && intf="all"
@ -411,16 +433,22 @@ _intf_rule() {
_bypass_ip_set() {
local ip
local interface
local enabled
config_get ip $1 ip
config_get interface $1 interface
config_get enabled $1 enabled
[ "$enabled" = "0" ] && return
_bypass_ip $ip $interface
}
_bypass_asn() {
local asn
local interface
local enabled
config_get asn $1 asn
config_get interface $1 interface
config_get enabled $1 enabled
[ "$enabled" = "0" ] && return
local asnips
asnips=`curl --max-time 4 -s -k https://stat.ripe.net/data/announced-prefixes/data.json?resource=${asn} | jsonfilter -q -e '@.data.prefixes.*.prefix'`
for ip in $asnips; do

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

@ -228,6 +228,8 @@ function wizard_add()
local auth = luci.http.formvalue("cbid.network.%s.auth" % intf) or ""
local mode = luci.http.formvalue("cbid.network.%s.mode" % intf) or ""
local sqmenabled = luci.http.formvalue("cbid.sqm.%s.enabled" % intf) or "0"
local multipath = luci.http.formvalue("cbid.sqm.%s.multipath" % intf) or "on"
local lan = luci.http.formvalue("cbid.sqm.%s.lan" % intf) or "0"
if typeintf == "normal" then
typeintf = ""
end
@ -251,6 +253,11 @@ function wizard_add()
ucic:set("network",intf,"auth",auth)
ucic:set("network",intf,"mode",mode)
ucic:set("network",intf,"label",label)
if lan == "1" then
ucic:set("network",intf,"multipath","off")
else
ucic:set("network",intf,"multipath",multipath)
end
ucic:set("network",intf,"defaultroute",0)
ucic:set("network",intf,"peerdns",0)
if ipaddr ~= "" then

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

@ -19,7 +19,7 @@
-- along with OverTheBox. If not, see (http://www.gnu.org/licenses/)
-%>
<%
-- Copyright 2018 Ycarus (Yannick Chabanois) ycarus@zugaina.org
-- Copyright 2018-2020 Ycarus (Yannick Chabanois) ycarus@zugaina.org for OpenMPTCProuter
--
-- Small changes to make this work with OpenMPTCProuter
-- New features:
@ -48,7 +48,7 @@
}
}
function formatBytes(a,b=2){if(0===a)return"0 Bytes";const c=0>b?0:b,d=Math.floor(Math.log(a)/Math.log(1024));return parseFloat((a/Math.pow(1024,d)).toFixed(c))+" "+["Bytes","KiB","MiB","GiB","TiB","PiB","EiB","ZiB","YiB"][d]}
XHR.poll(20, '/cgi-bin/luci/admin/system/openmptcprouter/interfaces_status', null,
XHR.poll(20, '<%=build_url("admin/system/openmptcprouter/interfaces_status")%>', null,
function(x, mArray)
{
var status = document.getElementById('openmptcprouter_status');

90
luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
View file

@ -342,16 +342,75 @@ end
</div>
</fieldset>
</span>
<fieldset class="cbi-section" id="laninterfaces">
<legend><%:LAN interfaces settings%></legend>
<%
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[0].network | grep " .. ifname))
if firewall_lan ~= "" then
%>
<h3><%=ifname%></h3>
<fieldset class="cbi-section-node" id="cbi-openmptcprouter-<%=ifname%>">
<input type="hidden" name="intf.<%=ifname%>" value="<%=ifname%>" />
<div class="cbi-value" id="cbi-network-<%=ifname%>-label" data-index="1">
<label class="cbi-value-title"><%:Label%></label>
<div class="cbi-value-field">
<input type="hidden" id="cbid.network.<%=ifname%>.lan" name="cbid.network.<%=ifname%>.lan" value="1">
<input type="text" id="cbid.network.<%=ifname%>.label" name="cbid.network.<%=ifname%>.label" class="cbi-input-text" value="<%=uci:get("network",ifname,"label")%>">
<br />
<div class="cbi-value-description">
<%:Label for the interface%>
</div>
</div>
</div>
<div class="cbi-value" id="cbi-network-<%=ifname%>-proto" data-index="3">
<label class="cbi-value-title"><%:Protocol%></label>
<div class="cbi-value-field">
<% findproto = 0 %>
<select class="cbi-input-select" data-update="change" id="cbid.network.<%=ifname%>.proto" name="cbid.network.<%=ifname%>.proto" size="1">
<option id="cbid.network.<%=ifname%>.proto-static" value="static"<% if uci:get("network",ifname,"proto") == "static" or uci:get("network",ifname,"proto") == "" then findproto = 1 %> selected="selected"<% end %>><%:Static address%></option>
<option id="cbid.network.<%=ifname%>.proto-dhcp" value="dhcp"<% if uci:get("network",ifname,"proto") == "dhcp" then findproto = 1 %> selected="selected"<% end %>><%:DHCP%></option>
<option id="cbid.network.<%=ifname%>.proto-other" value="other"<% if uci:get("network",ifname,"proto") ~= nil and findproto ~= 1 then %> selected="selected"<% end %>><%:Other%></option>
</select>
<br />
<div class="cbi-value-description">
<%:You can use DHCP if you have multiple real ethernet ports.%>
</div>
</div>
</div>
<div class="cbi-value" id="cbi-network-<%=ifname%>-address" data-depends="[{&#34;cbid.network.<%=ifname%>.proto&#34;:&#34;static&#34;},{&#34;cbid.network.<%=ifname%>.type&#34;:&#34;macvlan&#34;}]" data-index="5">
<label class="cbi-value-title"><%:IPv4 address%></label>
<div class="cbi-value-field">
<input type="text" id="cbid.network.<%=ifname%>.ipaddr" name="cbid.network.<%=ifname%>.ipaddr" class="cbi-input-text" value="<%=uci:get("network",ifname,"ipaddr")%>" data-type="ip4addr">
</div>
</div>
<div class="cbi-value" id="cbi-network-<%=ifname%>-netmask" data-depends="[{&#34;cbid.network.<%=ifname%>.proto&#34;:&#34;static&#34;},{&#34;cbid.network.<%=ifname%>.type&#34;:&#34;macvlan&#34;}]" data-index="6">
<label class="cbi-value-title"><%:IPv4 netmask%></label>
<div class="cbi-value-field">
<input type="text" id="cbid.network.<%=ifname%>.netmask" name="cbid.network.<%=ifname%>.netmask" class="cbi-input-text" value="<%=uci:get("network",ifname,"netmask") or "255.255.255.0"%>" data-type="ip4addr">
</div>
</div>
</fieldset>
<%
end
end
%>
<fieldset class="cbi-section" id="interfaces">
<legend><%:Interfaces settings%></legend>
<div class="cbi-section-descr"><%:You must disable DHCP on your modems and set IP in different networks.%></div>
<%
for _, iface in ipairs(net:get_networks()) do
local ifname = iface:name()
local multipath = uci:get("network",ifname,"multipath")
local multipathvpn = uci:get("openmptcprouter",ifname,"multipathvpn")
local vpn = uci:get("openmptcprouter",ifname,"vpn")
if (multipath ~= nil and multipath ~= "off" and vpn ~= "1") or multipathvpn == "1" then
local firewall_wan = luci.util.trim(luci.sys.exec("uci -q get firewall.@zone[1].network | grep " .. ifname))
if firewall_wan ~= "" then
-- local multipath = uci:get("network",ifname,"multipath")
-- local multipathvpn = uci:get("openmptcprouter",ifname,"multipathvpn")
-- local vpn = uci:get("openmptcprouter",ifname,"vpn")
-- if (multipath ~= nil and multipath ~= "off" and vpn ~= "1") or multipathvpn == "1" then
%>
<div class="cbi-section-remove right">
<input type="submit" name="delete.<%=ifname%>" value="<%:Delete%>" class="cbi-button" />
@ -409,13 +468,13 @@ end
<div class="cbi-value-field">
<% findproto = 0 %>
<select class="cbi-input-select" data-update="change" id="cbid.network.<%=ifname%>.proto" name="cbid.network.<%=ifname%>.proto" size="1">
<option id="cbid.network.<%=ifname%>.proto-static" value="static"<% if uci:get("network",ifname,"proto") == "static" then findproto = 1 %> selected="selected"<% end %>><%:Static address%></option>
<option id="cbid.network.<%=ifname%>.proto-static" value="static"<% if uci:get("network",ifname,"proto") == "static" or uci:get("network",ifname,"proto") == nil then findproto = 1 %> selected="selected"<% end %>><%:Static address%></option>
<option id="cbid.network.<%=ifname%>.proto-dhcp" value="dhcp"<% if uci:get("network",ifname,"proto") == "dhcp" then findproto = 1 %> selected="selected"<% end %>><%:DHCP%></option>
<option id="cbid.network.<%=ifname%>.proto-modemmanager" value="modemmanager"<% if uci:get("network",ifname,"proto") == "modemmanager" then findproto = 1 %> selected="selected"<% end %>><%:ModemManager%></option>
<option id="cbid.network.<%=ifname%>.proto-ncm" value="ncm"<% if uci:get("network",ifname,"proto") == "ncm" then findproto = 1 %> selected="selected"<% end %>><%:NCM%></option>
<option id="cbid.network.<%=ifname%>.proto-pppoe" value="pppoe"<% if uci:get("network",ifname,"proto") == "pppoe" then findproto = 1 %> selected="selected"<% end %>><%:PPPoE%></option>
<option id="cbid.network.<%=ifname%>.proto-qmi" value="qmi"<% if uci:get("network",ifname,"proto") == "qmi" then findproto = 1 %> selected="selected"<% end %>><%:QMI%></option>
<option id="cbid.network.<%=ifname%>.proto-other" value="other"<% if uci:get("network",ifname,"proto") ~= nil and findproto ~= "1" then %> selected="selected"<% end %>><%:Other%></option>
<option id="cbid.network.<%=ifname%>.proto-other" value="other"<% if uci:get("network",ifname,"proto") ~= nil and findproto ~= 1 then %> selected="selected"<% end %>><%:Other%></option>
</select>
<br />
<div class="cbi-value-description">
@ -605,6 +664,17 @@ end
<input type="text" id="cbid.network.<%=ifname%>.delay" name="cbid.network.<%=ifname%>.delay" class="cbi-input-text" value="<%=uci:get("network",ifname,"delay")%>">
</div>
</div>
<div class="cbi-value" id="cbi-network-<%=ifname%>-multipath" data-index="13">
<label class="cbi-value-title"><%:Multipath TCP%></label>
<div class="cbi-value-field">
<select class="cbi-input-select" data-update="change" id="cbid.network.<%=ifname%>.multipath" name="cbid.network.<%=ifname%>.multipath" size="1">
<option value="on"<% if uci:get("network",ifname,"multipath") == "on" then %> selected="selected"<% end %>><%:Enabled%></option>
<option value="off"<% if uci:get("network",ifname,"multipath") == "off" then %> selected="selected"<% end %>><%:Disabled%></option>
<option value="master"<% if uci:get("network",ifname,"multipath") == "master" then %> selected="selected"<% end %>><%:Master%></option>
<option value="backup"<% if uci:get("network",ifname,"multipath") == "backup" then %> selected="selected"<% end %>><%:Backup%></option>
</select>
</div>
</div>
<%
local download = "0"
@ -621,7 +691,7 @@ end
end
end
%>
<div class="cbi-value" data-index="13">
<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 %> />
@ -631,7 +701,7 @@ end
</div>
</div>
</div>
<div class="cbi-value" data-index="14">
<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 %> />
@ -641,7 +711,7 @@ end
</div>
</div>
</div>
<div class="cbi-value" data-index="15">
<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">
@ -657,7 +727,7 @@ end
-->
</div>
</div>
<div class="cbi-value" data-index="16">
<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">

164
luci-app-openmptcprouter/po/templates/openmptcprouter.pot
View file

@ -14,7 +14,7 @@ msgstr ""
msgid "API username to retrieve personnalized settings from the server."
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:554
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:613
msgid "APN"
msgstr ""
@ -22,7 +22,7 @@ msgstr ""
msgid "Add a new server"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:694
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:764
msgid "Add an interface"
msgstr ""
@ -51,10 +51,14 @@ msgid ""
"processor."
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:580
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:639
msgid "Authentication Type"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:674
msgid "Backup"
msgstr ""
#: luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua:22
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/backup.htm:8
msgid "Backup on server"
@ -68,7 +72,7 @@ msgstr ""
msgid "Beta"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:378
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:437
msgid "Bridge"
msgstr ""
@ -81,18 +85,18 @@ msgid ""
"By default proxy is used for any traffic that is TCP (and UDP for V2Ray)."
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:585
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:644
msgid "CHAP"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:382
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:441
msgid ""
"Choose MacVLAN if you want to create a virtual interface based on a physical "
"interface."
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:402
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:448
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:461
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:507
msgid "Choose physical interface."
msgstr ""
@ -100,7 +104,8 @@ msgstr ""
msgid "Common server settings"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:413
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:373
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:472
msgid "DHCP"
msgstr ""
@ -117,13 +122,13 @@ msgid "Default VPN"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:62
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:357
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:416
msgid "Delete"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:480
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:507
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:528
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:539
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:566
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:587
msgid "Device"
msgstr ""
@ -180,7 +185,11 @@ msgstr ""
msgid "Disable tracebox test"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:645
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:672
msgid "Disabled"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:715
msgid "Download speed (Kb/s)"
msgstr ""
@ -193,7 +202,7 @@ msgstr ""
msgid "Enable IPv6"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:635
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:705
msgid "Enable SQM"
msgstr ""
@ -209,6 +218,10 @@ msgstr ""
msgid "Enable debug logs"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:671
msgid "Enabled"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:217
msgid "Encryption"
msgstr ""
@ -225,7 +238,7 @@ msgstr ""
msgid "Force retrieve settings"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:574
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:633
msgid "GPRS only"
msgstr ""
@ -274,15 +287,17 @@ msgstr ""
msgid "IPv4 TCP SYN retries2"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:454
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:383
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:513
msgid "IPv4 address"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:470
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:529
msgid "IPv4 gateway"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:464
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:389
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:523
msgid "IPv4 netmask"
msgstr ""
@ -294,7 +309,7 @@ msgstr ""
msgid "IPv6 settings"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:346
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:402
msgid "Interfaces settings"
msgstr ""
@ -313,15 +328,21 @@ msgid ""
"settings from OpenMPTCProuter."
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:572
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:346
msgid "LAN interfaces settings"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:631
msgid "LTE"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:363
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:357
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:422
msgid "Label"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:368
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:363
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:427
msgid "Label for the interface"
msgstr ""
@ -338,14 +359,18 @@ msgstr ""
msgid "MLVPN password"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:625
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:695
msgid "MPTCP over VPN"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:377
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:436
msgid "MacVLAN"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:673
msgid "Master"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:276
msgid "Master interface selection"
msgstr ""
@ -358,28 +383,32 @@ msgstr ""
msgid "Minimum scaling CPU frequency"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:569
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:628
msgid "Modem default"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:603
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:662
msgid "Modem init timeout"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:414
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:473
msgid "ModemManager"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:415
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:668
msgid "Multipath TCP"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:474
msgid "NCM"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:583
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:642
msgid "NONE"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:797
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:799
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:792
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:794
msgid "Network overview"
msgstr ""
@ -399,7 +428,7 @@ msgstr ""
msgid "None"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:376
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:435
msgid "Normal"
msgstr ""
@ -442,48 +471,50 @@ msgstr ""
msgid "Optimize for latency instead of bandwidth"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:418
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:374
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:477
msgid "Other"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:584
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:643
msgid "PAP"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:586
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:645
msgid "PAP/CHAP"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:597
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:656
msgid "PAP/CHAP password"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:591
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:650
msgid "PAP/CHAP username"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:560
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:619
msgid "PIN code"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:416
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:475
msgid "PPPoE"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:387
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:427
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:446
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:486
msgid "Physical interface"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:570
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:629
msgid "Prefer LTE"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:571
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:630
msgid "Prefer UMTS"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:408
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:368
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:467
msgid "Protocol"
msgstr ""
@ -491,7 +522,7 @@ msgstr ""
msgid "Proxy settings"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:417
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:476
msgid "QMI"
msgstr ""
@ -508,7 +539,7 @@ msgid "Retrieve settings from server"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:324
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:703
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:773
msgid "Save & Apply"
msgstr ""
@ -524,7 +555,7 @@ msgstr ""
msgid "Scaling governor"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:697
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:767
msgid "Select the device you want to base the interface on."
msgstr ""
@ -555,15 +586,15 @@ msgstr ""
msgid "Server username"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:566
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:625
msgid "Service Type"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:459
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:518
msgid "Set an IP in the same network as the modem"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:475
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:534
msgid "Set here IP of the modem"
msgstr ""
@ -583,12 +614,12 @@ msgid ""
"all traffic if ShadowSocks is disabled."
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:655
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:725
msgid ""
"Set value between 80-95% of max download speed link. 0 to disable SQM/QoS."
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:671
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:741
msgid ""
"Set value between 80-95% of max upload speed link. 0 to disable SQM/QoS."
msgstr ""
@ -610,7 +641,8 @@ msgstr ""
msgid "Show all settings"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:412
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:372
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:471
msgid "Static address"
msgstr ""
@ -648,7 +680,7 @@ msgid ""
"retransmissions remain unacknowledged."
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:373
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:432
msgid "Type"
msgstr ""
@ -661,7 +693,7 @@ msgstr ""
msgid "UBOND password"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:573
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:632
msgid "UMTS/GPRS"
msgstr ""
@ -681,12 +713,12 @@ msgstr ""
msgid "Update server"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:661
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:731
msgid "Upload speed (Kb/s)"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:650
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:666
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:720
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:736
msgid "Used by Glorytun UDP and SQM/QoS if enabled. 0 to use default value."
msgstr ""
@ -720,11 +752,15 @@ msgstr ""
msgid "Wizard"
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:630
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:700
msgid "You can enable MPTCP over VPN if your provider filter Multipath TCP."
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:422
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:378
msgid "You can use DHCP if you have multiple real ethernet ports."
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:481
msgid ""
"You can use DHCP if you have multiple real ethernet ports. Select other if "
"you want to use another protocol available in Network Interfaces page."
@ -734,7 +770,7 @@ msgstr ""
msgid "You can use a public IPv6 prefix only if you set only one server."
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:347
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:403
msgid "You must disable DHCP on your modems and set IP in different networks."
msgstr ""
@ -742,11 +778,11 @@ msgstr ""
msgid "You should disable IPv6 here if server doesn't provide IPv6."
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:640
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:710
msgid "You should disable SQM for LTE or any interfaces with variable speed."
msgstr ""
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:575
#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:634
msgid "auto"
msgstr ""

5
luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/include/10_router.js
View file

@ -344,6 +344,11 @@ return baseclass.extend({
value: datestr
},
load: {
title: _('Load Average'),
value: Array.isArray(systeminfo.load) ? '%.2f, %.2f, %.2f'.format(systeminfo.load[0] / 65535.0,systeminfo.load[1] / 65535.0,systeminfo.load[2] / 65535.0) : null
},
kernel: {
title: _('Kernel Version'),
value: boardinfo.kernel

13
luci-theme-openmptcprouter/root/etc/uci-defaults/luci-theme-openmptcprouter
View file

@ -1,7 +1,10 @@
#!/bin/sh
uci batch <<-EOF
set luci.themes.OpenMPTCProuter=/luci-static/openmptcprouter
set luci.main.mediaurlbase=/luci-static/openmptcprouter
commit luci
EOF
if [ "$(uci -q get luci.themes.OpenMPTCProuter)" = "" ]; then
uci batch <<-EOF
set luci.themes.OpenMPTCProuter=/luci-static/openmptcprouter
set luci.main.mediaurlbase=/luci-static/openmptcprouter
commit luci
EOF
fi
exit 0

11
mptcp/files/etc/init.d/mptcp
View file

@ -55,12 +55,16 @@ interface_multipath_settings() {
config_get enabled "$config" auto "1"
config_get iface "$config" ifname
[ -z "$iface" ] && iface=$(ifstatus "$config" | jsonfilter -q -e '@["l3_device"]')
count=$(($count+1))
id=$count
if [ "$(uci -q get openmptcprouter.${config}.metric)" = "" ]; then
count=$(($count+1))
else
count="$(uci -q get openmptcprouter.${config}.metric)"
fi
config_set "$config" metric $count
uci -q set network.${config}.metric=$count
uci -q set openmptcprouter.${config}.metric=$count
config_get mode "$config" multipath
id=$count
[ "$mode" = "" ] && {
mode="$(uci -q get openmptcprouter.${config}.multipath)"
[ -n "$mode" ] && uci -q set network.${config}.multipath="$mode"
@ -108,7 +112,8 @@ interface_multipath_settings() {
[ "$enabled" = "0" ] && return 0
[ -n "$intf" ] && [ "$iface" != "$intf" ] && return 0
[ -z "$iface" ] && return 0
[ "$config" = "omrvpn" ] && return 0
#[ "$config" = "omrvpn" ] && return 0
[ "$config" = "omrvpn" ] && mode="off"
[ -n "$(ifconfig | grep $iface)" ] || return 0
[ "$(echo $iface | grep _dev)" != "" ] && return 0

5
mptcp/files/usr/share/omr/post-tracking.d/post-tracking
View file

@ -179,11 +179,12 @@ set_server_all_routes() {
while [ "$(ip r show $serverip | grep -v nexthop | sed 's/ //g' | tr -d '\n')" != "$serverip" ] && [ "$(ip r show $serverip | grep -v nexthop | sed 's/ //g' | tr -d '\n')" != "" ]; do
ip r del $serverip
done
_log "Set server $server ($serverip) default route $serverip $routesintf nbintf $nbintf"
_log "Set server $server ($serverip) default route $serverip $routesintf"
ip route replace $serverip scope global $routesintf
_log "New server route is $(ip r show $serverip metric 0 | tr -d '\t' | tr -d '\n')"
}
[ -n "$routesintfbackup" ] && ([ "$nbintfb" -gt "1" ] && [ "$(ip r show $serverip metric 999 | tr -d '\t' | tr -d '\n')" != "$serverip $routesintfbackup " ]) || ([ "$nbintfb" = "1" ] && [ "$(ip r show $serverip metric 999 | grep $uintfb)" = "" ]) && {
_log "Set server $server ($serverip) backup default route $serverip $routesintfbackup nbintfb $nbintfb $OMR_TRACKER_DEVICE $uintfb"
_log "Set server $server ($serverip) backup default route $serverip $routesintfbackup nbintfb $nbintfb $OMR_TRACKER_DEVICE"
ip route replace $serverip scope global metric 999 $routesintfbackup
}
fi

3
openmptcprouter/files/etc/init.d/openmptcprouter-vps
View file

@ -1283,10 +1283,11 @@ _backup_send() {
backup_data="$(cat /tmp/backup.tar.gz | base64 | tr -d '\n')"
backup_sha256sum="$(sha256sum /tmp/backup.tar.gz | awk '{print $1}')"
[ -n "$backup_data" ] && {
logger -t "OMR-VPS" "Send backup file to server"
logger -t "OMR-VPS" "Send backup file to server $servername"
local backupjson
backupjson='{"data": "'$backup_data'","sha256sum": "'$backup_sha256sum'"}'
_set_json "backuppost" "$backupjson"
uci -q set openmptcprouter.$servername.lastbackup=$(date +%s)
}
}

19
openmptcprouter/files/etc/uci-defaults/2091-omr-wifi Executable file
View file

@ -0,0 +1,19 @@
#!/bin/sh
if [ "$(uci -q get wireless.radio0)" != "" ];
if [ "$(uci -q get wireless.radio0.country)" = "" ]; then
uci -q batch <<-EOF >/dev/null
set wireless.radio0.country='00'
set wireless.default_radio0.skip_inactivity_poll='1'
commit wireless
EOF
fi
if [ "$(uci -q get wireless.default_radio0.network)" = "lan" ]; then
uci -q batch <<-EOF >/dev/null
set wireless.default_radio0.network='wifi'
commit wireless
EOF
fi
fi
exit 0