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

Fix in VPS script and little change in status page

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2019-08-07 23:09:02 +02:00
parent d8adb2b6ab
commit 4b84f92a88
4 changed files with 76 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -456,8 +456,8 @@ function wizard_add()
if dsvpn_key ~= "" then
ucic:set("dsvpn","vpn","port","65011")
ucic:set("dsvpn","vpn","key",dsvpn_key)
ucic:set("glorytun","vpn","localip","10.255.251.2")
ucic:set("glorytun","vpn","remoteip","10.255.251.1")
ucic:set("dsvpn","vpn","localip","10.255.251.2")
ucic:set("dsvpn","vpn","remoteip","10.255.251.1")
ucic:set("network","omr6in4","ipaddr","10.255.251.2")
ucic:set("network","omr6in4","peeraddr","10.255.251.1")
ucic:set("network","omrvpn","proto","none")
@ -764,6 +764,14 @@ end
-- Modified by Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
-- Under GPL3+
function interfaces_status()
local ut = require "luci.util"
local rv = ut.ubus("openmptcprouter", "status", {}) or {_=0}
luci.http.prepare_content("application/json")
luci.http.write_json(rv)
end
function old_interfaces_status()
local ut = require "luci.util"
local ntm = require "luci.model.network".init()
local uci = require "luci.model.uci".cursor()

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

@ -59,17 +59,25 @@
temp += '<a href="#">';
var equipmentIcon = '<img src="<%=resource%>/computer.png" />';
if (mArray.openmptcprouter.remote_from_lease)
if (mArray.openmptcprouter.remote_addr)
{
var title = String.format('<br /><strong>%s (%s)</strong>', mArray.openmptcprouter.remote_hostname ? mArray.openmptcprouter.remote_hostname : _('You'), mArray.openmptcprouter.remote_addr)
if (mArray.openmptcprouter.remote_from_lease)
{
var title = String.format('<br /><strong>%s (%s)</strong>', mArray.openmptcprouter.remote_hostname ? mArray.openmptcprouter.remote_hostname : _('You'), mArray.openmptcprouter.remote_addr)
var statusMessageClass = "";
var statusIcon = "<%=resource%>/openmptcprouter/images/statusOK.png";
var statusMessage = "";
} else {
var title = String.format("%s (%s)",'You', mArray.openmptcprouter.remote_addr);
var statusMessageClass = "warning";
var statusIcon = "<%=resource%>/openmptcprouter/images/statusWarning.png";
var statusMessage = _('Your IP was not leased by this router');
}
} else {
var title = String.format('<br /><strong>%s</strong>', _('You'))
var statusMessageClass = "";
var statusIcon = "<%=resource%>/openmptcprouter/images/statusOK.png";
var statusMessage = "";
} else {
var title = String.format("%s (%s)",'You', mArray.openmptcprouter.remote_addr);
var statusMessageClass = "warning";
var statusIcon = "<%=resource%>/openmptcprouter/images/statusWarning.png";
var statusMessage = _('Your IP was not leased by this router');
}
var content = "";