Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #981 from NvrBst/pull-request-ipv6_prefix_status_display

Browse source 
mod-admin-full: Add IPv6 Prefix Delegation information to Status Pages
This commit is contained in:
Jo-Philipp Wich 2017-01-28 13:45:44 +01:00 committed by GitHub
commit e6f158b2ee
5 changed files with 53 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/luci-base/luasrc/model/network.lua
View file

@ -950,6 +950,13 @@ function protocol.dns6addrs(self)
return dns return dns
end end
function protocol.ip6prefix(self)
local prefix = self:_ubus("ipv6-prefix")
if prefix and #prefix > 0 then
return "%s/%d" %{ prefix[1].address, prefix[1].mask }
end
end
function protocol.is_bridge(self) function protocol.is_bridge(self)
return (not self:is_virtual() and self:type() == "bridge") return (not self:is_virtual() and self:type() == "bridge")
end end

1
modules/luci-mod-admin-full/luasrc/controller/admin/network.lua
View file

@ -238,6 +238,7 @@ function iface_status(ifaces)
ipaddrs = net:ipaddrs(), ipaddrs = net:ipaddrs(),
ip6addrs = net:ip6addrs(), ip6addrs = net:ip6addrs(),
dnsaddrs = net:dnsaddrs(), dnsaddrs = net:dnsaddrs(),
ip6prefix = net:ip6prefix(),
name = device:shortname(), name = device:shortname(),
type = device:type(), type = device:type(),
ifname = device:name(), ifname = device:name(),

5
modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview.htm
View file

@ -165,6 +165,11 @@
); );
} }
if (ifc.ip6prefix)
{
html += String.format('<strong><%:IPv6-PD%>:</strong> %s<br />', ifc.ip6prefix);
}
d.innerHTML = html; d.innerHTML = html;
} }
else if (d && !ifc.proto) else if (d && !ifc.proto)

5
modules/luci-mod-admin-full/luasrc/view/admin_network/iface_status.htm
View file

@ -55,6 +55,11 @@
); );
} }
if (ifc.ip6prefix)
{
html += String.format('<strong><%:IPv6-PD%>:</strong> %s<br />', ifc.ip6prefix);
}
d.innerHTML = html; d.innerHTML = html;
} }
else if (d) else if (d)

43
modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
View file

@ -76,12 +76,14 @@
if wan6 then if wan6 then
rv.wan6 = { rv.wan6 = {
ip6addr = wan6:ip6addr(), ip6addr = wan6:ip6addr(),
gw6addr = wan6:gw6addr(), gw6addr = wan6:gw6addr(),
dns = wan6:dns6addrs(), dns = wan6:dns6addrs(),
uptime = wan6:uptime(), ip6prefix = wan6:ip6prefix(),
ifname = wan6:ifname(), uptime = wan6:uptime(),
link = wan6:adminlink() proto = wan6:proto(),
ifname = wan6:ifname(),
link = wan6:adminlink()
} }
end end
@ -233,9 +235,34 @@
if (ifc6 && ifc6.ifname && ifc6.proto != 'none') if (ifc6 && ifc6.ifname && ifc6.proto != 'none')
{ {
var s = String.format( var s = String.format(
'<strong><%:Address%>: </strong>%s<br />' + '<strong><%:Type%>: </strong>%s%s<br />',
ifc6.proto, (ifc6.ip6prefix) ? '-pd' : ''
);
if (!ifc6.ip6prefix)
{
s += String.format(
'<strong><%:Address%>: </strong>%s<br />',
(ifc6.ip6addr) ? ifc6.ip6addr : '::'
);
}
else
{
s += String.format(
'<strong><%:Prefix Delegated%>: </strong>%s<br />',
ifc6.ip6prefix
);
if (ifc6.ip6addr)
{
s += String.format(
'<strong><%:Address%>: </strong>%s<br />',
ifc6.ip6addr
);
}
}
s += String.format(
'<strong><%:Gateway%>: </strong>%s<br />', '<strong><%:Gateway%>: </strong>%s<br />',
(ifc6.ip6addr) ? ifc6.ip6addr : '::',
(ifc6.gw6addr) ? ifc6.gw6addr : '::' (ifc6.gw6addr) ? ifc6.gw6addr : '::'
); );