modules/admin-full: add realtime iface status to config page
authorJo-Philipp Wich <jow@openwrt.org>
Mon, 25 Oct 2010 22:26:08 +0000 (22:26 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Mon, 25 Oct 2010 22:26:08 +0000 (22:26 +0000)
modules/admin-full/luasrc/controller/admin/network.lua
modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
modules/admin-full/luasrc/view/admin_network/iface_status.htm [new file with mode: 0644]
modules/admin-full/luasrc/view/admin_network/wifi_status.htm

index 14af771585a927224647383b769434353c836ded..d677797801059a6ecafa02fd624b33d1d96307cc 100644 (file)
@@ -27,22 +27,22 @@ function index()
                end
        )
 
-       local page  = node("admin", "network")
+       local page
+
+       page = node("admin", "network")
        page.target = alias("admin", "network", "network")
        page.title  = i18n("Network")
        page.order  = 50
        page.index  = true
 
        if has_switch then
-               local page  = node("admin", "network", "vlan")
+               page  = node("admin", "network", "vlan")
                page.target = cbi("admin_network/vlan")
                page.title  = i18n("Switch")
                page.order  = 20
        end
 
        if has_wifi and has_wifi.size > 0 then
-               local page
-
                page = entry({"admin", "network", "wireless"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), i18n("Wifi"), 15)
                page.leaf = true
                page.subindex = true
@@ -60,11 +60,14 @@ function index()
                page.leaf = true
        end
 
-       local page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), i18n("Interfaces"), 10)
+       page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), i18n("Interfaces"), 10)
        page.leaf   = true
        page.subindex = true
 
-       local page = entry({"admin", "network", "add"}, cbi("admin_network/iface_add"), nil)
+       page = entry({"admin", "network", "add"}, cbi("admin_network/iface_add"), nil)
+       page.leaf = true
+
+       page = entry({"admin", "network", "iface_status"}, call("iface_status"), nil)
        page.leaf = true
 
        uci:foreach("network", "interface",
@@ -79,18 +82,18 @@ function index()
        )
 
        if nixio.fs.access("/etc/config/dhcp") then
-               local page  = node("admin", "network", "dhcpleases")
+               page  = node("admin", "network", "dhcpleases")
                page.target = cbi("admin_network/dhcpleases")
                page.title  = i18n("DHCP Leases")
                page.order  = 30
        end
 
-       local page  = node("admin", "network", "hosts")
+       page  = node("admin", "network", "hosts")
        page.target = cbi("admin_network/hosts")
        page.title  = i18n("Hostnames")
        page.order  = 40
 
-       local page  = node("admin", "network", "routes")
+       page  = node("admin", "network", "routes")
        page.target = cbi("admin_network/routes")
        page.title  = i18n("Static Routes")
        page.order  = 50
@@ -162,40 +165,90 @@ function wifi_delete(network)
        luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless"))
 end
 
-function wifi_status()
-       local function jsondump(x)
-               if x == nil then
-                       luci.http.write("null")
-               elseif type(x) == "table" then
-                       local k, v
-                       if type(next(x)) == "number" then
-                               luci.http.write("[ ")
-                               for k, v in ipairs(x) do
-                                       jsondump(v)
-                                       if next(x, k) then
-                                               luci.http.write(", ")
-                                       end
+function jsondump(x)
+       if x == nil then
+               luci.http.write("null")
+       elseif type(x) == "table" then
+               local k, v
+               if type(next(x)) == "number" then
+                       luci.http.write("[ ")
+                       for k, v in ipairs(x) do
+                               jsondump(v)
+                               if next(x, k) then
+                                       luci.http.write(", ")
                                end
-                               luci.http.write(" ]")
-                       else
-                               luci.http.write("{ ")
-                               for k, v in pairs(x) do
-                               luci.http.write("%q: " % k)
-                                       jsondump(v)
-                                       if next(x, k) then
-                                               luci.http.write(", ")
-                                       end
+                       end
+                       luci.http.write(" ]")
+               else
+                       luci.http.write("{ ")
+                       for k, v in pairs(x) do
+                       luci.http.write("%q: " % k)
+                               jsondump(v)
+                               if next(x, k) then
+                                       luci.http.write(", ")
                                end
-                               luci.http.write(" }")
                        end
-               elseif type(x) == "number" or type(x) == "boolean" then
-                       luci.http.write(tostring(x))
-               elseif type(x) == "string" then
-                       luci.http.write("%q" % tostring(x))
+                       luci.http.write(" }")
                end
+       elseif type(x) == "number" or type(x) == "boolean" then
+               luci.http.write(tostring(x))
+       elseif type(x) == "string" then
+               luci.http.write("%q" % tostring(x))
        end
+end
+
 
+function iface_status()
+       local path  = luci.dispatcher.context.requestpath
+       local iface = path[#path]
+       local data  = { }
+       local info
+       local x = luci.model.uci.cursor_state()
 
+       local dev = x:get("network", iface, "device") or ""
+       if #dev == 0 or dev:match("^%d") or dev:match("%W") then
+               dev = x:get("network", iface, "ifname") or ""
+               dev = dev:match("%S+")
+       end
+
+       for _, info in ipairs(nixio.getifaddrs()) do
+               local name = info.name:match("[^:]+")
+               if name == dev then
+                       if info.family == "packet" then
+                               data.flags   = info.flags
+                               data.stats   = info.data
+                               data.macaddr = info.addr
+                               data.ifname  = name
+                       elseif info.family == "inet" then
+                               data.ipaddrs = data.ipaddrs or { }
+                               data.ipaddrs[#data.ipaddrs+1] = {
+                                       addr      = info.addr,
+                                       broadaddr = info.broadaddr,
+                                       dstaddr   = info.dstaddr,
+                                       netmask   = info.netmask,
+                                       prefix    = info.prefix
+                               }
+                       elseif info.family == "inet6" then
+                               data.ip6addrs = data.ip6addrs or { }
+                               data.ip6addrs[#data.ip6addrs+1] = {
+                                       addr    = info.addr,
+                                       netmask = info.netmask,
+                                       prefix  = info.prefix
+                               }
+                       end
+               end
+       end
+
+       if next(data) then
+               luci.http.prepare_content("application/json")
+               jsondump(data)
+               return
+       end
+
+       luci.http.status(404, "No such device")
+end
+
+function wifi_status()
        local path = luci.dispatcher.context.requestpath
        local dev  = path[#path]
        local iw   = luci.sys.wifi.getiwinfo(dev)
@@ -206,7 +259,7 @@ function wifi_status()
                for _, f in ipairs({
                        "channel", "frequency", "txpower", "bitrate", "signal", "noise",
                        "quality", "quality_max", "mode", "ssid", "bssid", "country",
-                       "encryption", "mbssid_support", "ifname"
+                       "encryption", "ifname"
                }) do
                        j[f] = iw[f]
                end
index 753779925b2c1051486775738402fb10bff76150..916c26b4fbdff1437da930bfbcbcb2f8e6ab7f2f 100644 (file)
@@ -45,6 +45,10 @@ if has_6in4  then s:tab("tunnel", translate("Tunnel Settings")) end
 s:tab("physical", translate("Physical Settings"))
 s:tab("firewall", translate("Firewall Settings"))
 
+st = s:taboption("general", DummyValue, "__status", translate("Status"))
+st.template = "admin_network/iface_status"
+st.network  = arg[1]
+
 --[[
 back = s:taboption("general", DummyValue, "_overview", translate("Overview"))
 back.value = ""
@@ -161,12 +165,12 @@ function fwzone.write(self, section, value)
 end
 
 ipaddr = s:taboption("general", Value, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
-ipaddr.rmempty = true
+ipaddr.optional = true
 ipaddr.datatype = "ip4addr"
 ipaddr:depends("proto", "static")
 
 nm = s:taboption("general", Value, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"))
-nm.rmempty = true
+nm.optional = true
 nm.datatype = "ip4addr"
 nm:depends("proto", "static")
 nm:value("255.255.255.0")
@@ -185,7 +189,7 @@ bcast:depends("proto", "static")
 
 if has_ipv6 then
        ip6addr = s:taboption("ipv6", Value, "ip6addr", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"), translate("<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix"))
-       ip6addr.rmempty = true
+       ip6addr.optional = true
        ip6addr.datatype = "ip6addr"
        ip6addr:depends("proto", "static")
        ip6addr:depends("proto", "6in4")
@@ -196,11 +200,12 @@ if has_ipv6 then
        ip6gw:depends("proto", "static")
 end
 
-dns = s:taboption("general", Value, "dns", translate("<abbr title=\"Domain Name System\">DNS</abbr>-Server"),
-       translate("You can specify multiple DNS servers separated by space here. Servers entered here will override " ..
+dns = s:taboption("general", DynamicList, "dns", translate("<abbr title=\"Domain Name System\">DNS</abbr>-Server"),
+       translate("You can specify multiple DNS servers here, press enter to add a new entry. Servers entered here will override " ..
                "automatically assigned ones."))
 
 dns.optional = true
+dns.cast = "string"
 dns.datatype = "ipaddr"
 dns:depends("peerdns", "")
 
diff --git a/modules/admin-full/luasrc/view/admin_network/iface_status.htm b/modules/admin-full/luasrc/view/admin_network/iface_status.htm
new file mode 100644 (file)
index 0000000..4deebee
--- /dev/null
@@ -0,0 +1,95 @@
+<%+cbi/valueheader%>
+
+<script type="text/javascript"><![CDATA[
+       var iwxhr = new XHR();
+       (function() {
+               iwxhr.get('<%=luci.dispatcher.build_url("admin", "network", "iface_status", self.network)%>', null,
+                       function(x)
+                       {
+                               var ifc = x.responseText ? eval('(' + x.responseText + ')') : { };
+                               if (ifc)
+                               {
+                                       var is_up = (ifc.flags && ifc.flags.up);
+                                       var rxb = ifc.stats ? (ifc.stats["rx_bytes"] / 1024) : 0;
+                                       var txb = ifc.stats ? (ifc.stats["tx_bytes"] / 1024) : 0;
+                                       var rxp = ifc.stats ? ifc.stats["rx_packets"] : 0;
+                                       var txp = ifc.stats ? ifc.stats["tx_packets"] : 0;
+                                       var mac = ifc.macaddr ? ifc.macaddr : '00:00:00:00:00:00';
+
+                                       var icon;
+                                       if (is_up)
+                                               icon = "<%=resource%>/icons/ethernet.png";
+                                       else
+                                               icon = "<%=resource%>/icons/ethernet_disabled.png";
+
+                                       var s = document.getElementById('<%=self.option%>-ifc-signal');
+                                       if (s)
+                                               s.innerHTML = String.format(
+                                                       '<img src="%s" style="width:16px; height:16px" /><br />' +
+                                                       '<small>%s</small>', icon, ifc.ifname ? ifc.ifname : '?'
+                                               );
+
+                                       var d = document.getElementById('<%=self.option%>-ifc-description');
+                                       if (d && ifc.ifname)
+                                       {
+                                               d.innerHTML = String.format(
+                                                       '<strong><%:MAC Address%>:</strong> %s<br />' +
+                                                       '<strong><%:RX%></strong>: %.2f <%:KB%> (%d <%:Pkts.%>)<br />' +
+                                                       '<strong><%:TX%></strong>: %.2f <%:KB%> (%d <%:Pkts.%>)<br />',
+                                                               mac, rxb, rxp, txb, txp
+                                               );
+
+                                               if (ifc.ipaddrs && ifc.ipaddrs.length)
+                                               {
+                                                       d.innerHTML += '<strong><%:IPv4%>: </strong>';
+
+                                                       for (var i = 0; i < ifc.ipaddrs.length; i++)
+                                                               d.innerHTML += String.format(
+                                                                       '%s%s/%d',
+                                                                       i ? ', ' : '',
+                                                                       ifc.ipaddrs[i].addr,
+                                                                       ifc.ipaddrs[i].prefix
+                                                               );
+
+                                                       d.innerHTML += '<br />';
+                                               }
+
+                                               if (ifc.ip6addrs && ifc.ip6addrs.length)
+                                               {
+                                                       d.innerHTML += '<strong><%:IPv6%>: </strong>';
+
+                                                       for (var i = 0; i < ifc.ip6addrs.length; i++)
+                                                               d.innerHTML += String.format(
+                                                                       '%s%s/%d',
+                                                                       i ? ', ' : '',
+                                                                       ifc.ip6addrs[i].addr,
+                                                                       ifc.ip6addrs[i].prefix
+                                                               );
+
+                                                       d.innerHTML += '<br />';
+                                               }
+                                       }
+                                       else if (d)
+                                               d.innerHTML = '<%:Interface not present or not connected yet.%>';
+                               }
+                       }
+               )
+
+               window.setTimeout(arguments.callee, 5000);
+       })();
+]]></script>
+
+<table>
+       <tr class="cbi-section-table">
+               <td></td>
+               <td class="cbi-value-field" style="width:16px; padding:3px; text-align:center" id="<%=self.option%>-ifc-signal">
+                       <img src="<%=resource%>/icons/ethernet_disabled.png" style="width:16px; height:16px" /><br />
+                       <small>?</small>
+               </td>
+               <td class="cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px" id="<%=self.option%>-ifc-description">
+                       <em><%:Collecting data...%></em>
+               </td>
+       </tr>
+</table>
+
+<%+cbi/valuefooter%>
index 044549d5297761e6dc1ce9e1b9b66a8820508f5e..fee8db498bda5648e890bd641b770d47bf328b6e 100644 (file)
@@ -2,7 +2,7 @@
 
 <script type="text/javascript"><![CDATA[
        var iwxhr = new XHR();
-       window.setInterval(function() {
+       (function() {
                iwxhr.get('<%=luci.dispatcher.build_url("admin", "network", "wireless_status", self.ifname)%>', null,
                        function(x)
                        {
@@ -58,7 +58,9 @@
                                }
                        }
                )
-       }, 5000);
+
+               window.setTimeout(arguments.callee, 5000);
+       })();
 ]]></script>
 
 <table>