http://www.apache.org/licenses/LICENSE-2.0
-$Id$
-
-%>
<%-
local fwm = require "luci.model.firewall".init()
local net
+ local ifaces = { }
local netlist = { }
for _, net in ipairs(ntm:get_networks()) do
if net:name() ~= "loopback" then
- netlist[#netlist+1] = net:name()
+ local z = fwm:get_zone_by_network(net:name())
+ ifaces[#ifaces+1] = net:name()
+ netlist[#netlist+1] = {
+ net:name(), z and z:name() or "-", z
+ }
end
end
+
+ table.sort(netlist,
+ function(a, b)
+ if a[2] ~= b[2] then
+ return a[2] < b[2]
+ else
+ return a[1] < b[1]
+ end
+ end)
-%>
<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
<script type="text/javascript">//<![CDATA[
function iface_shutdown(id, reconnect) {
- if (!reconnect && !confirm(String.format('<%_Really shutdown interface "%s" ?\nYou might lose access to this router if you are connected via this interface.%>', id)))
+ if (!reconnect && !confirm(String.format('<%_Really shutdown interface "%s" ?\nYou might lose access to this device if you are connected via this interface.%>', id)))
return;
var d = document.getElementById(id + '-ifc-description');
if (s)
{
s.parentNode.style.display = 'block';
- s.innerHTML = '<%:Waiting for router...%>';
+ s.innerHTML = '<%:Waiting for changes to be applied...%>';
}
- var rcxhr = new XHR();
- rcxhr.get('<%=luci.dispatcher.build_url("admin", "network")%>/iface_' + (reconnect ? 'reconnect' : 'shutdown') + '/' + id, null,
+ XHR.get('<%=luci.dispatcher.build_url("admin", "network")%>/iface_' + (reconnect ? 'reconnect' : 'shutdown') + '/' + id, null,
function(x)
{
if (s)
var wifidevs = <%=luci.http.write_json(netdevs)%>;
var arptable = <%=luci.http.write_json(arpcache)%>;
- (function() {
- var func = arguments.callee;
- iwxhr.get('<%=luci.dispatcher.build_url("admin", "network", "iface_status", table.concat(netlist, ","))%>', null,
- function(x, ifcs)
+ XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "network", "iface_status", table.concat(ifaces, ","))%>', null,
+ function(x, ifcs)
+ {
+ if (ifcs)
{
- if (ifcs)
+ for (var idx = 0; idx < ifcs.length; idx++)
{
- for (var i = 0; i < ifcs.length; i++)
- {
- var ifc = ifcs[i];
- var rxb = ifc.rx_bytes || 0;
- var txb = ifc.tx_bytes || 0;
- var rxp = ifc.rx_packets || 0;
- var txp = ifc.tx_packets || 0;
- var mac = ifc.macaddr;
- var upt = null;
-
- var html = '';
+ var ifc = ifcs[idx];
+ var html = '';
- var icon;
- if (ifc.is_up)
- {
- if (ifc.uptime)
- upt = String.format('%t', ifc.uptime);
-
- icon = "<%=resource%>/icons/%s.png";
- }
- else
- {
- icon = "<%=resource%>/icons/%s_disabled.png";
- }
+ var s = document.getElementById(ifc.id + '-ifc-devices');
+ if (s)
+ {
+ var stat = String.format(
+ '<img src="<%=resource%>/icons/%s%s.png" style="width:16px; height:16px; vertical-align:middle" />',
+ ifc.type,
+ ifc.is_up ? '' : '_disabled'
+ );
- var s = document.getElementById(ifc.id + '-ifc-devices');
- if (s)
+ if (ifc.subdevices && ifc.subdevices.length)
{
- var stat = String.format(
- '<img src="<%=resource%>/icons/%s%s.png" style="width:16px; height:16px; vertical-align:middle" />',
- ifc.type,
- ifc.is_up ? '' : '_disabled'
- );
+ stat += ' <strong>(';
- if (ifc.subdevices && ifc.subdevices.length)
+ for (var j = 0; j < ifc.subdevices.length; j++)
{
- stat += ' <strong>(';
-
- for (var j = 0; j < ifc.subdevices.length; j++)
- {
- var sif = ifc.subdevices[j];
+ var sif = ifc.subdevices[j];
+
+ stat += String.format(
+ '<img src="<%=resource%>/icons/%s%s.png" style="width:16px; height:16px; vertical-align:middle" title="%h" />',
+ sif.type,
+ sif.is_up ? '' : '_disabled',
+ sif.name
+ );
+ }
- stat += String.format(
- '<img src="<%=resource%>/icons/%s%s.png" style="width:16px; height:16px; vertical-align:middle" title="%q" />',
- sif.type,
- sif.is_up ? '' : '_disabled',
- sif.name
- );
- }
+ stat += ')</strong>';
+ }
- stat += ')</strong>';
- }
+ stat += String.format(
+ '<br /><small>%h</small>',
+ ifc.name
+ );
- stat += String.format(
- '<br /><small>%s</small>',
- ifc.name
- );
+ s.innerHTML = stat;
+ }
- s.innerHTML = stat;
+ var d = document.getElementById(ifc.id + '-ifc-description');
+ if (d && ifc.proto && ifc.ifname)
+ {
+ if (ifc.is_up)
+ {
+ html += String.format('<strong><%:Uptime%>:</strong> %t<br />', ifc.uptime);
}
- var d = document.getElementById(ifc.id + '-ifc-description');
- if (d && ifc.ifname)
+ if (ifc.type != 'tunnel')
{
- if (upt)
- {
- html += String.format('<strong><%:Uptime%>:</strong> %s<br />', upt);
- }
-
- if (ifc.type != 'tunnel')
- {
- html += String.format('<strong><%:MAC Address%>:</strong> %s<br />', mac);
- }
-
- html += String.format(
- '<strong><%:RX%></strong>: %.2mB (%d <%:Pkts.%>)<br />' +
- '<strong><%:TX%></strong>: %.2mB (%d <%:Pkts.%>)<br />',
- rxb, rxp, txb, txp
- );
+ html += String.format('<strong><%:MAC-Address%>:</strong> %s<br />', ifc.macaddr);
+ }
- if (ifc.ipaddrs && ifc.ipaddrs.length)
- {
- html += '<strong><%:IPv4%>: </strong>';
+ html += String.format(
+ '<strong><%:RX%></strong>: %.2mB (%d <%:Pkts.%>)<br />' +
+ '<strong><%:TX%></strong>: %.2mB (%d <%:Pkts.%>)<br />',
+ ifc.rx_bytes, ifc.rx_packets,
+ ifc.tx_bytes, ifc.tx_packets
+ );
- for (var i = 0; i < ifc.ipaddrs.length; i++)
- html += String.format(
- '%s%s/%d',
- i ? ', ' : '',
- ifc.ipaddrs[i].addr,
- ifc.ipaddrs[i].prefix
- );
+ if (ifc.ipaddrs && ifc.ipaddrs.length)
+ {
+ html += '<strong><%:IPv4%>: </strong>';
- html += '<br />';
- }
+ for (var i = 0; i < ifc.ipaddrs.length; i++)
+ html += String.format(
+ '%s%s/%d',
+ i ? ', ' : '',
+ ifc.ipaddrs[i].addr,
+ ifc.ipaddrs[i].prefix
+ );
- if (ifc.ip6addrs && ifc.ip6addrs.length)
- {
- html += '<strong><%:IPv6%>: </strong>';
+ html += '<br />';
+ }
- for (var i = 0; i < ifc.ip6addrs.length; i++)
- html += String.format(
- '%s%s/%d',
- i ? ', ' : '',
- ifc.ip6addrs[i].addr.toUpperCase(),
- ifc.ip6addrs[i].prefix
- );
+ if (ifc.ip6addrs && ifc.ip6addrs.length)
+ {
+ html += '<strong><%:IPv6%>: </strong>';
- html += '<br />';
- }
+ for (var i = 0; i < ifc.ip6addrs.length; i++)
+ html += String.format(
+ '%s%s/%d',
+ i ? ', ' : '',
+ ifc.ip6addrs[i].addr.toUpperCase(),
+ ifc.ip6addrs[i].prefix
+ );
- d.innerHTML = html;
- }
- else if (d)
- {
- d.innerHTML = '<em><%:Interface not present or not connected yet.%></em>';
+ html += '<br />';
}
+
+ d.innerHTML = html;
+ }
+ else if (d && !ifc.proto)
+ {
+ var e = document.getElementById(ifc.id + '-ifc-edit');
+ if (e)
+ e.disabled = true;
+
+ d.innerHTML = String.format(
+ '<em><%:Unsupported protocol type.%></em><br />' +
+ '<a href="%h"><%:Install protocol extensions...%></a>',
+ '<%=luci.dispatcher.build_url("admin/system/packages")%>?query=luci-proto&display=available'
+ );
+ }
+ else if (d && !ifc.ifname)
+ {
+ d.innerHTML = String.format(
+ '<em><%:Network without interfaces.%></em><br />' +
+ '<a href="<%=luci.dispatcher.build_url("admin/network/network/%s")%>?tab.network.%s=physical"><%:Assign interfaces...%></a>',
+ ifc.name, ifc.name
+ );
+ }
+ else if (d)
+ {
+ d.innerHTML = '<em><%:Interface not present or not connected yet.%></em>';
}
}
-
- window.setTimeout(func, 5000);
}
- )
- })();
+ }
+ );
//]]></script>
<fieldset class="cbi-section" style="display:none">
<legend><%:Reconnecting interface%></legend>
<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" />
- <span id="ifc-rc-status"><%:Waiting for router...%></span>
+ <span id="ifc-rc-status"><%:Waiting for changes to be applied...%></span>
</fieldset>
<div class="cbi-map">
</tr>
<%
for i, net in ipairs(netlist) do
- local z = fwm:get_zone_by_network(net)
+ local z = net[3]
local c = z and z:get_color() or "#EEEEEE"
local t = z and translate("Part of zone %q" % z:name()) or translate("No zone assigned")
%>
<tr class="cbi-section-table-row cbi-rowstyle-<%=i % 2 + 1%>">
<td class="cbi-value-field" style="padding:3px">
- <div style="background-color:#FFFFFF; border:1px solid #CCCCCC; margin:0 10px">
- <div style="border-bottom:1px solid #CCCCCC; padding:2px; background-color:<%=c%>" title="<%=pcdata(t)%>">
- <strong><%=net:upper()%></strong>
+ <div class="ifacebox">
+ <div class="ifacebox-head" style="background-color:<%=c%>" title="<%=pcdata(t)%>">
+ <strong><%=net[1]:upper()%></strong>
</div>
- <div style="padding:2px" id="<%=net%>-ifc-devices">
+ <div class="ifacebox-body" id="<%=net[1]%>-ifc-devices">
<img src="<%=resource%>/icons/ethernet_disabled.png" style="width:16px; height:16px" /><br />
<small>?</small>
</div>
</div>
</td>
- <td class="cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px" id="<%=net%>-ifc-description">
+ <td class="cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px" id="<%=net[1]%>-ifc-description">
<em><%:Collecting data...%></em>
</td>
- <td style="width:340px">
- <input type="button" class="cbi-button cbi-button-add" style="width:80px; background-image:url(<%=resource%>/cbi/reload.gif)" onclick="iface_shutdown('<%=net%>', true)" title="<%:Reconnect this interface%>" value="<%:Connect%>" />
- <input type="button" class="cbi-button cbi-button-add" style="width:80px; background-image:url(<%=resource%>/cbi/reset.gif)" onclick="iface_shutdown('<%=net%>', false)" title="<%:Shutdown this interface%>" value="<%:Stop%>" />
- <input type="button" class="cbi-button cbi-button-add" style="width:80px; background-image:url(<%=resource%>/cbi/edit.gif)" onclick="location.href='<%=luci.dispatcher.build_url("admin/network/network", net)%>'" title="<%:Edit this interface%>" value="<%:Edit%>" />
- <input type="button" class="cbi-button cbi-button-add" style="width:80px; background-image:url(<%=resource%>/cbi/remove.gif)" onclick="if (confirm('<%:Really delete this interface? The deletion cannot be undone!\nYou might lose access to this router if you are connected via this interface.%>')) location.href='<%=luci.dispatcher.build_url("admin/network/iface_delete", net)%>'" title="<%:Delete this interface%>" value="<%:Delete%>" />
+ <td style="width:420px">
+ <input type="button" class="cbi-button cbi-button-reload" style="width:100px" onclick="iface_shutdown('<%=net[1]%>', true)" title="<%:Reconnect this interface%>" value="<%:Connect%>" />
+ <input type="button" class="cbi-button cbi-button-reset" style="width:100px" onclick="iface_shutdown('<%=net[1]%>', false)" title="<%:Shutdown this interface%>" value="<%:Stop%>" />
+ <input type="button" class="cbi-button cbi-button-edit" style="width:100px" onclick="location.href='<%=luci.dispatcher.build_url("admin/network/network", net[1])%>'" title="<%:Edit this interface%>" value="<%:Edit%>" id="<%=net[1]%>-ifc-edit" />
+ <input type="button" class="cbi-button cbi-button-remove" style="width:100px" onclick="if (confirm('<%:Really delete this interface? The deletion cannot be undone!\nYou might lose access to this device if you are connected via this interface.%>')) location.href='<%=luci.dispatcher.build_url("admin/network/iface_delete", net[1])%>'" title="<%:Delete this interface%>" value="<%:Delete%>" />
</td>
</tr>
<% end %>
projects / project / luci.git / blobdiff