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 'pr/32' into test

Browse source
This commit is contained in:
suyuan 2020-11-22 23:36:54 +08:00
commit aba28de776
8 changed files with 48 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,20 +8,19 @@ local ipc = require "luci.ip"
module("luci.controller.openmptcprouter", package.seeall) module("luci.controller.openmptcprouter", package.seeall)
function index() function index()
-- entry({"admin", "openmptcprouter"}, firstchild(), _("OpenMPTCProuter"), 19).index = true local ucic = luci.model.uci.cursor()
-- entry({"admin", "openmptcprouter", "wizard"}, template("openmptcprouter/wizard"), _("Wizard"), 1).leaf = true menuentry = ucic:get("openmptcprouter","settings","menu") pr "OpenMPTCProuter"
-- entry({"admin", "openmptcprouter", "wizard_add"}, post("wizard_add")).leaf = true entry({"admin", "system", menuentry:lower()}, alias("admin", "system", menuentry:lower(), "wizard"), _(menuentry), 1)
entry({"admin", "system", "openmptcprouter"}, alias("admin", "system", "openmptcprouter", "wizard"), _("OpenMPTCProuter"), 1) entry({"admin", "system", menuentry:lower(), "wizard"}, template("openmptcprouter/wizard"), _("Settings Wizard"), 1)
entry({"admin", "system", "openmptcprouter", "wizard"}, template("openmptcprouter/wizard"), _("Settings Wizard"), 1) entry({"admin", "system", menuentry:lower(), "wizard_add"}, post("wizard_add"))
entry({"admin", "system", "openmptcprouter", "wizard_add"}, post("wizard_add")) entry({"admin", "system", menuentry:lower(), "status"}, template("openmptcprouter/wanstatus"), _("Status"), 2).leaf = true
entry({"admin", "system", "openmptcprouter", "status"}, template("openmptcprouter/wanstatus"), _("Status"), 2).leaf = true entry({"admin", "system", menuentry:lower(), "interfaces_status"}, call("interfaces_status")).leaf = true
entry({"admin", "system", "openmptcprouter", "interfaces_status"}, call("interfaces_status")).leaf = true entry({"admin", "system", menuentry:lower(), "settings"}, template("openmptcprouter/settings"), _("Advanced Settings"), 3).leaf = true
entry({"admin", "system", "openmptcprouter", "settings"}, template("openmptcprouter/settings"), _("Advanced Settings"), 3).leaf = true entry({"admin", "system", menuentry:lower(), "settings_add"}, post("settings_add"))
entry({"admin", "system", "openmptcprouter", "settings_add"}, post("settings_add")) entry({"admin", "system", menuentry:lower(), "update_vps"}, post("update_vps"))
entry({"admin", "system", "openmptcprouter", "update_vps"}, post("update_vps")) entry({"admin", "system", menuentry:lower(), "backup"}, template("openmptcprouter/backup"), _("Backup on server"), 3).leaf = true
entry({"admin", "system", "openmptcprouter", "backup"}, template("openmptcprouter/backup"), _("Backup on server"), 3).leaf = true entry({"admin", "system", menuentry:lower(), "backupgr"}, post("backupgr"))
entry({"admin", "system", "openmptcprouter", "backupgr"}, post("backupgr")) entry({"admin", "system", menuentry:lower(), "debug"}, template("openmptcprouter/debug"), _("Show all settings"), 5).leaf = true
entry({"admin", "system", "openmptcprouter", "debug"}, template("openmptcprouter/debug"), _("Show all settings"), 5).leaf = true
end end
function interface_from_device(dev) function interface_from_device(dev)
@ -730,6 +729,7 @@ function wizard_add()
ucic:commit("openmptcprouter") ucic:commit("openmptcprouter")
-- Restart all -- Restart all
menuentry = ucic:get("openmptcprouter","settings","menu") or "openmptcprouter"
if gostatus == true then 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("(env -i /bin/ubus call network reload) >/dev/null 2>/dev/null")
@ -751,9 +751,9 @@ function wizard_add()
luci.sys.call("/etc/init.d/mptcpovervpn restart >/dev/null 2>/dev/null") luci.sys.call("/etc/init.d/mptcpovervpn 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/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/v2ray restart >/dev/null 2>/dev/null")
luci.http.redirect(luci.dispatcher.build_url("admin/system/openmptcprouter/status")) luci.http.redirect(luci.dispatcher.build_url("admin/system/" .. menuentry:lower() .. "/status"))
else else
luci.http.redirect(luci.dispatcher.build_url("admin/system/openmptcprouter/wizard")) luci.http.redirect(luci.dispatcher.build_url("admin/system/" .. menuentry:lower() .. "/wizard"))
end end
return return
end end
@ -914,7 +914,8 @@ function settings_add()
luci.sys.call("/etc/init.d/omr-6in4 restart >/dev/null 2>/dev/null") luci.sys.call("/etc/init.d/omr-6in4 restart >/dev/null 2>/dev/null")
-- Done, redirect -- Done, redirect
luci.http.redirect(luci.dispatcher.build_url("admin/system/openmptcprouter/settings")) menuentry = ucic:get("openmptcprouter","settings","menu") or "openmptcprouter"
luci.http.redirect(luci.dispatcher.build_url("admin/system/" .. menuentry:lower() .. "/settings"))
return return
end end
@ -937,7 +938,8 @@ function backupgr()
if send_backup ~= "" then if send_backup ~= "" then
luci.sys.call("/etc/init.d/openmptcprouter-vps backup_send >/dev/null 2>/dev/null") luci.sys.call("/etc/init.d/openmptcprouter-vps backup_send >/dev/null 2>/dev/null")
end end
luci.http.redirect(luci.dispatcher.build_url("admin/system/openmptcprouter/backup")) menuentry = ucic:get("openmptcprouter","settings","menu") or "openmptcprouter"
luci.http.redirect(luci.dispatcher.build_url("admin/system/" .. menuentry:lower() .. "/backup"))
return return
end end

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

@ -1,9 +1,11 @@
<%+header%> <%+header%>
<% <%
luci.sys.call("/etc/init.d/openmptcprouter-vps backup_list >/dev/null 2>/dev/null") luci.sys.call("/etc/init.d/openmptcprouter-vps backup_list >/dev/null 2>/dev/null")
local ucic = luci.model.uci.cursor()
menuentry = ucic:get("openmptcprouter","settings","menu") or "openmptcprouter"
%> %>
<% if stderr and #stderr > 0 then %><pre class="error"><%=pcdata(stderr)%></pre><% end %> <% if stderr and #stderr > 0 then %><pre class="error"><%=pcdata(stderr)%></pre><% end %>
<form class="inline" method="post" action="<%=url('admin/system/openmptcprouter/backupgr')%>"> <form class="inline" method="post" action="<%=url('admin/system/' .. menuentry:lower() .. '/backupgr')%>">
<div class="cbi-map"> <div class="cbi-map">
<h2 name="content"><%:Backup on server%></h2> <h2 name="content"><%:Backup on server%></h2>
<fieldset class="cbi-section" id="networks"> <fieldset class="cbi-section" id="networks">

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

@ -3,6 +3,8 @@
<% if stderr and #stderr > 0 then %><pre class="error"><%=pcdata(stderr)%></pre><% end %> <% if stderr and #stderr > 0 then %><pre class="error"><%=pcdata(stderr)%></pre><% end %>
<% <%
local latest_omr_version=luci.model.uci.cursor():get("openmptcprouter","latest_versions","vps") local latest_omr_version=luci.model.uci.cursor():get("openmptcprouter","latest_versions","vps")
local ucic = luci.model.uci.cursor()
menuentry = ucic:get("openmptcprouter","settings","menu") or "openmptcprouter"
omr_test = false omr_test = false
uci:foreach("openmptcprouter","server", function(s) uci:foreach("openmptcprouter","server", function(s)
servername = s[".name"] servername = s[".name"]
@ -13,7 +15,7 @@
end) end)
if omr_test == true then if omr_test == true then
%> %>
<form class="inline" method="post" action="<%=url('admin/system/openmptcprouter/update_vps')%>"> <form class="inline" method="post" action="<%=url('admin/system/' .. menuentry:lower() .. '/update_vps')%>">
<div class="cbi-map"> <div class="cbi-map">
<h2 name="content"><%:Update VPS%></h2> <h2 name="content"><%:Update VPS%></h2>
<fieldset class="cbi-section" id="update"> <fieldset class="cbi-section" id="update">
@ -34,7 +36,7 @@
%> %>
<hr /> <hr />
<form class="inline" method="post" action="<%=url('admin/system/openmptcprouter/settings_add')%>"> <form class="inline" method="post" action="<%=url('admin/system/' .. menuentry:lower() .. '/settings_add')%>">
<div class="cbi-map"> <div class="cbi-map">
<h2 name="content"><%:Advanced Settings%></h2> <h2 name="content"><%:Advanced Settings%></h2>
<fieldset class="cbi-section" id="networks"> <fieldset class="cbi-section" id="networks">

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

@ -31,6 +31,10 @@
-- * Many tests -- * Many tests
-%> -%>
<%+header%> <%+header%>
<%
local ucic = luci.model.uci.cursor()
menuentry = ucic:get("openmptcprouter","settings","menu") or "openmptcprouter"
%>
<link rel="stylesheet" type="text/css" href="<%=resource%>/openmptcprouter/css/wanstatus.css?v=git-20"/> <link rel="stylesheet" type="text/css" href="<%=resource%>/openmptcprouter/css/wanstatus.css?v=git-20"/>
<script type="text/javascript" src="<%=resource%>/seedrandom.js?v=git-20"></script> <script type="text/javascript" src="<%=resource%>/seedrandom.js?v=git-20"></script>
<script type="text/javascript" src="<%=resource%>/cbi.js?v=git-20"></script> <script type="text/javascript" src="<%=resource%>/cbi.js?v=git-20"></script>
@ -48,7 +52,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]} 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, '<%=build_url("admin/system/openmptcprouter/interfaces_status")%>', null, XHR.poll(20, '<%=build_url("admin/system/" .. menuentry:lower() .. "/interfaces_status")%>', null,
function(x, mArray) function(x, mArray)
{ {
var status = document.getElementById('openmptcprouter_status'); var status = document.getElementById('openmptcprouter_status');
@ -218,7 +222,7 @@
temp += '</td></tr>'; temp += '</td></tr>';
temp += '<tr><td><div class="vertdash" ></div></td></tr>'; temp += '<tr><td><div class="vertdash" ></div></td></tr>';
temp += '<tr><td>'; temp += '<tr><td>';
temp += '<a href="<%=url('admin/system/openmptcprouter/wizard')%>" id="omr-vps">'; temp += '<a href="<%=url('admin/system/' .. menuentry:lower() .. '/wizard')%>" id="omr-vps">';
var statusIcon = "<%=resource%>/openmptcprouter/images/statusOK.png"; var statusIcon = "<%=resource%>/openmptcprouter/images/statusOK.png";
var equipmentIcon = '<img src="<%=resource%>/server.png" />'; var equipmentIcon = '<img src="<%=resource%>/server.png" />';
content = ""; content = "";

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

@ -7,7 +7,7 @@
local sys = require "luci.sys" local sys = require "luci.sys"
local ut = require "luci.util" local ut = require "luci.util"
local ifaces = sys.net:devices() local ifaces = sys.net:devices()
menuentry = uci:get("openmptcprouter","settings","menu") or "openmptcprouter"
function device_notvirtual(dev) function device_notvirtual(dev)
for _, iface in ipairs(net:get_networks()) do for _, iface in ipairs(net:get_networks()) do
local ifacen = iface:name() local ifacen = iface:name()
@ -35,7 +35,7 @@
} }
</script> </script>
<% if stderr and #stderr > 0 then %><pre class="error"><%=pcdata(stderr)%></pre><% end %> <% if stderr and #stderr > 0 then %><pre class="error"><%=pcdata(stderr)%></pre><% end %>
<form class="inline" method="post" action="<%=url('admin/system/openmptcprouter/wizard_add')%>" enctype="multipart/form-data"> <form class="inline" method="post" action="<%=url('admin/system/' .. menuentry:lower() .. '/wizard_add')%>" enctype="multipart/form-data">
<div class="cbi-map"> <div class="cbi-map">
<h2 name="content"><%:Wizard%></h2> <h2 name="content"><%:Wizard%></h2>
<fieldset class="cbi-section" id="server"> <fieldset class="cbi-section" id="server">

4
luci-app-openmptcprouter/root/etc/hotplug.d/net/99-omr-rename
View file

@ -14,6 +14,10 @@ _set_intf_name() {
config_get device $intfname device config_get device $intfname device
config_get modalias $intfname modalias config_get modalias $intfname modalias
config_get ifname $intfname ifname config_get ifname $intfname ifname
config_get type $intfname ifname
if [ "$type" = "tunnel" ] || [ "$type" = "bridge" ]; then
return
fi
[ -n "$modalias" ] && { [ -n "$modalias" ] && {
if [ -f /sys/class/net/${INTERFACE}/device/uevent ]; then if [ -f /sys/class/net/${INTERFACE}/device/uevent ]; then
chk_modalias=$MODALIAS chk_modalias=$MODALIAS

6
luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter
View file

@ -107,6 +107,12 @@ if [ "$(uci -q get openmptcprouter.settings.scaling_governor)" = "" ]; then
commit openmptcprouter commit openmptcprouter
EOF EOF
fi fi
if [ "$(uci -q get openmptcprouter.settings.menu)" = "" ]; then
uci -q batch <<-EOF >/dev/null
set openmptcprouter.settings.menu='OpenMPTCProuter'
commit openmptcprouter
EOF
fi
sed -i 's/net.ipv4.tcp_retries2=3$/net.ipv4.tcp_retries2=15/' /etc/sysctl.d/zzz_openmptcprouter.conf sed -i 's/net.ipv4.tcp_retries2=3$/net.ipv4.tcp_retries2=15/' /etc/sysctl.d/zzz_openmptcprouter.conf

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

@ -703,6 +703,9 @@ function interfaces_status()
local tracker_port = uci:get("shadowsocks-libev","tracker","local_port") local tracker_port = uci:get("shadowsocks-libev","tracker","local_port")
if mArray.openmptcprouter["external_check"] ~= false then if mArray.openmptcprouter["external_check"] ~= false then
mArray.openmptcprouter["ss_addr"] = ut.trim(sys.exec("curl -s -4 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m " .. timeout .. " " .. check_ipv4_website)) mArray.openmptcprouter["ss_addr"] = ut.trim(sys.exec("curl -s -4 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m " .. timeout .. " " .. check_ipv4_website))
if mArray.openmptcprouter["ss_addr"] == "" then
mArray.openmptcprouter["ss_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") --mArray.openmptcprouter["ss_addr6"] = sys.exec("curl -s -6 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m 3 http://ipv6.openmptcprouter.com")
end end
end end