modules/freifunk: fix same problem

[project/luci.git] / modules / freifunk / luasrc / model / cbi / freifunk / public_status.lua

diff --git a/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua b/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua
index 08201f7..2192697 100644 (file)
--- a/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua
+++ b/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua
@@ -1,6 +1,7 @@
 require "luci.sys"
 require "luci.tools.webadmin"
 
+local bit = require "bit"
 local uci = luci.model.uci.cursor_state()
 
 local ffzone = luci.tools.webadmin.firewall_find_zone("freifunk")
@@ -19,23 +20,23 @@ f:field(DummyValue, "_system", translate("system")).value = system
 f:field(DummyValue, "_cpu", translate("m_i_processor")).value = model
 
 local load1, load5, load15 = luci.sys.loadavg()
-f:field(DummyValue, "_la", translate("load")).value = 
+f:field(DummyValue, "_la", translate("load")).value =
 string.format("%.2f, %.2f, %.2f", load1, load5, load15)
 
-f:field(DummyValue, "_memtotal", translate("m_i_memory")).value = 
+f:field(DummyValue, "_memtotal", translate("m_i_memory")).value =
 string.format("%.2f MB (%.0f%% %s, %.0f%% %s, %.0f%% %s)",
        tonumber(memtotal) / 1024,
        100 * memcached / memtotal,
-       translate("mem_cached") or "",
+       tostring(translate("mem_cached"), "")),
        100 * membuffers / memtotal,
-  translate("mem_buffered") or "",
-  100 * memfree / memtotal,
-  translate("mem_free") or "")
+       tostring(translate("mem_buffered", "")),
+       100 * memfree / memtotal,
+       tostring(translate("mem_free", ""))
 
 f:field(DummyValue, "_systime", translate("m_i_systemtime")).value =
 os.date("%c")
 
-f:field(DummyValue, "_uptime", translate("m_i_uptime")).value = 
+f:field(DummyValue, "_uptime", translate("m_i_uptime")).value =
 luci.tools.webadmin.date_format(tonumber(uptime))
 
 
@@ -46,7 +47,10 @@ local wifidata = luci.sys.wifi.getiwconfig()
 local ifaces = {}
 
 for k, v in pairs(wireless) do
-       if v[".type"] == "wifi-iface" and luci.util.contains(ffwifs, v.device) then
+       if v[".type"] == "wifi-iface" and (
+               luci.util.contains(ffwifs, v.device) or
+               ( #ffwifs == 0 and (not v.encryption or v.encryption == "none") ) )
+       then
                table.insert(ifaces, v)
        end
 end
@@ -69,7 +73,7 @@ essid = s:option(DummyValue, "ssid", "ESSID")
 bssid = s:option(DummyValue, "_bsiid", "BSSID")
 function bssid.cfgvalue(self, section)
        local ifname = self.map:get(section, "ifname")
-       return (wifidata[ifname] and (wifidata[ifname].Cell 
+       return (wifidata[ifname] and (wifidata[ifname].Cell
                or wifidata[ifname]["Access Point"])) or "-"
 end
 
@@ -124,7 +128,7 @@ function chan.cfgvalue(self, section)
        return self.map:get(section, "Channel")
        or self.map:get(section, "Frequency")
        or "-"
-end 
+end
 
 t2:option(DummyValue, "Encryption key", translate("iwscan_encr"))
 
@@ -137,37 +141,76 @@ t2:option(DummyValue, "Noise level", translate("iwscan_noise"))
 r = SimpleForm("routes", "Standardrouten")
 r.submit = false
 r.reset = false
+
 local routes = {}
 for i, route in ipairs(luci.sys.net.routes()) do
-       if route.Destination == "00000000" then
+       if route.dest:prefix() == 0 then
                routes[#routes+1] = route
        end
 end
-       
+
 v = r:section(Table, routes)
-       
+
 net = v:option(DummyValue, "iface", translate("network"))
 function net.cfgvalue(self, section)
-       return luci.tools.webadmin.iface_get_network(routes[section].Iface)
-       or routes[section].Iface
+       return luci.tools.webadmin.iface_get_network(routes[section].device)
+       or routes[section].device
 end
 
 target  = v:option(DummyValue, "target", translate("target"))
 function target.cfgvalue(self, section)
-       return luci.ip.Hex(routes[section].Destination, 32):string()
+       return routes[section].dest:network():string()
 end
 
 netmask = v:option(DummyValue, "netmask", translate("netmask"))
 function netmask.cfgvalue(self, section)
-       return luci.ip.Hex(routes[section].Mask, 32):string()
+       return routes[section].dest:mask():string()
 end
 
 gateway = v:option(DummyValue, "gateway", translate("gateway"))
 function gateway.cfgvalue(self, section)
-       return luci.ip.Hex(routes[section].Gateway, 32):string()
+       return routes[section].gateway:string()
+end
+
+metric = v:option(DummyValue, "metric", translate("metric"))
+function metric.cfgvalue(self, section)
+       return routes[section].metric
+end
+
+
+local routes6 = {}
+for i, route in ipairs(luci.sys.net.routes6() or {}) do
+       if route.dest:prefix() == 0 then
+               routes6[#routes6+1] = route
+       end
 end
 
-metric = v:option(DummyValue, "Metric", translate("metric"))
+if #routes6 > 0 then
+       v6 = r:section(Table, routes6)
+
+       net = v6:option(DummyValue, "iface", translate("network"))
+       function net.cfgvalue(self, section)
+               return luci.tools.webadmin.iface_get_network(routes6[section].device)
+               or routes6[section].device
+       end
+
+       target  = v6:option(DummyValue, "target", translate("target"))
+       function target.cfgvalue(self, section)
+               return routes6[section].dest:string()
+       end
 
+       gateway = v6:option(DummyValue, "gateway6", translate("gateway6"))
+       function gateway.cfgvalue(self, section)
+               return routes6[section].source:string()
+       end
+
+       metric = v6:option(DummyValue, "metric", translate("metric"))
+       function metric.cfgvalue(self, section)
+               local metr = routes6[section].metric
+               local lower = bit.band(metr, 0xffff)
+               local higher = bit.rshift(bit.band(metr, 0xffff0000), 16)
+               return "%04X%04X" % {higher, lower}
+       end
+end
 
 return f, m, r