From 1bb4822dca6113f73e3bc89e2acf15935e6f8e92 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 3 Dec 2014 15:17:05 +0100 Subject: Rework LuCI build system * Rename subdirectories to their repective OpenWrt package names * Make each LuCI module its own standalone package * Deploy a shared luci.mk which is used by each module Makefile Signed-off-by: Jo-Philipp Wich --- applications/luci-diag-devinfo/Makefile | 4 - .../luasrc/controller/luci_diag/devinfo_common.lua | 195 --------------------- .../controller/luci_diag/luci_diag_devinfo.lua | 56 ------ .../controller/luci_diag/netdiscover_common.lua | 101 ----------- .../luasrc/controller/luci_diag/smap_common.lua | 112 ------------ .../luasrc/model/cbi/luci_diag/mactodevinfo.lua | 36 ---- .../model/cbi/luci_diag/netdiscover_devinfo.lua | 33 ---- .../cbi/luci_diag/netdiscover_devinfo_config.lua | 30 ---- .../luci_diag/netdiscover_devinfo_config_mini.lua | 30 ---- .../cbi/luci_diag/netdiscover_devinfo_mini.lua | 33 ---- .../luasrc/model/cbi/luci_diag/smap_devinfo.lua | 33 ---- .../model/cbi/luci_diag/smap_devinfo_config.lua | 35 ---- .../cbi/luci_diag/smap_devinfo_config_mini.lua | 36 ---- .../model/cbi/luci_diag/smap_devinfo_mini.lua | 33 ---- .../luasrc/view/diag/smapsection.htm | 137 --------------- .../luasrc/view/diag/smapvalue.htm | 21 --- .../luci-diag-devinfo/root/etc/config/luci_devinfo | 20 --- 17 files changed, 945 deletions(-) delete mode 100644 applications/luci-diag-devinfo/Makefile delete mode 100644 applications/luci-diag-devinfo/luasrc/controller/luci_diag/devinfo_common.lua delete mode 100644 applications/luci-diag-devinfo/luasrc/controller/luci_diag/luci_diag_devinfo.lua delete mode 100644 applications/luci-diag-devinfo/luasrc/controller/luci_diag/netdiscover_common.lua delete mode 100644 applications/luci-diag-devinfo/luasrc/controller/luci_diag/smap_common.lua delete mode 100644 applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/mactodevinfo.lua delete mode 100644 applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo.lua delete mode 100644 applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config.lua delete mode 100644 applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_config_mini.lua delete mode 100644 applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/netdiscover_devinfo_mini.lua delete mode 100644 applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo.lua delete mode 100644 applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config.lua delete mode 100644 applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_config_mini.lua delete mode 100644 applications/luci-diag-devinfo/luasrc/model/cbi/luci_diag/smap_devinfo_mini.lua delete mode 100644 applications/luci-diag-devinfo/luasrc/view/diag/smapsection.htm delete mode 100644 applications/luci-diag-devinfo/luasrc/view/diag/smapvalue.htm delete mode 100644 applications/luci-diag-devinfo/root/etc/config/luci_devinfo (limited to 'applications/luci-diag-devinfo') diff --git a/applications/luci-diag-devinfo/Makefile b/applications/luci-diag-devinfo/Makefile deleted file mode 100644 index 3844248ed..000000000 --- a/applications/luci-diag-devinfo/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -PO=diag_devinfo - -include ../../build/config.mk -include ../../build/module.mk diff --git a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/devinfo_common.lua b/applications/luci-diag-devinfo/luasrc/controller/luci_diag/devinfo_common.lua deleted file mode 100644 index c124cd310..000000000 --- a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/devinfo_common.lua +++ /dev/null @@ -1,195 +0,0 @@ ---[[ - -Luci diag - Diagnostics controller module -(c) 2009 Daniel Dickinson - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -]]-- - -module("luci.controller.luci_diag.devinfo_common", package.seeall) - -require("luci.i18n") -require("luci.util") -require("luci.sys") -require("luci.cbi") -require("luci.model.uci") - -local translate = luci.i18n.translate -local DummyValue = luci.cbi.DummyValue -local SimpleSection = luci.cbi.SimpleSection - -function index() - return -- no-op -end - -function run_processes(outnets, cmdfunc) - i = next(outnets, nil) - while (i) do - outnets[i]["output"] = luci.sys.exec(cmdfunc(outnets, i)) - i = next(outnets, i) - end -end - -function parse_output(devmap, outnets, haslink, type, mini, debug) - local curnet = next(outnets, nil) - - while (curnet) do - local output = outnets[curnet]["output"] - local subnet = outnets[curnet]["subnet"] - local ports = outnets[curnet]["ports"] - local interface = outnets[curnet]["interface"] - local netdevs = {} - devlines = luci.util.split(output) - if not devlines then - devlines = {} - table.insert(devlines, output) - end - - local j = nil - j = next(devlines, j) - - local found_a_device = false - - while (j) do - if devlines[j] and ( devlines[j] ~= "" ) then - found_a_device = true - local devtable - local row = {} - devtable = luci.util.split(devlines[j], ' | ') - row["ip"] = devtable[1] - if (not mini) then - row["mac"] = devtable[2] - end - if ( devtable[4] == 'unknown' ) then - row["vendor"] = devtable[3] - else - row["vendor"] = devtable[4] - end - row["type"] = devtable[5] - if (not mini) then - row["model"] = devtable[6] - end - if (haslink) then - row["config_page"] = devtable[7] - end - - if (debug) then - row["raw"] = devlines[j] - end - table.insert(netdevs, row) - end - j = next(devlines, j) - end - if not found_a_device then - local row = {} - row["ip"] = curnet - if (not mini) then - row["mac"] = "" - end - if (type == "smap") then - row["vendor"] = luci.i18n.translate("No SIP devices") - else - row["vendor"] = luci.i18n.translate("No devices detected") - end - row["type"] = luci.i18n.translate("check other networks") - if (not mini) then - row["model"] = "" - end - if (haslink) then - row["config_page"] = "" - end - if (debug) then - row["raw"] = output - end - table.insert(netdevs, row) - end - local s - if (type == "smap") then - if (mini) then - s = devmap:section(luci.cbi.Table, netdevs, luci.i18n.translate("SIP devices discovered for") .. " " .. curnet) - else - local interfacestring = "" - if ( interface ~= "" ) then - interfacestring = ", " .. interface - end - s = devmap:section(luci.cbi.Table, netdevs, luci.i18n.translate("SIP devices discovered for") .. " " .. curnet .. " (" .. subnet .. ":" .. ports .. interfacestring .. ")") - end - s.template = "diag/smapsection" - else - if (mini) then - s = devmap:section(luci.cbi.Table, netdevs, luci.i18n.translate("Devices discovered for") .. " " .. curnet) - else - local interfacestring = "" - if ( interface ~= "" ) then - interfacestring = ", " .. interface - end - s = devmap:section(luci.cbi.Table, netdevs, luci.i18n.translate("Devices discovered for") .. " " .. curnet .. " (" .. subnet .. interfacestring .. ")") - end - end - s:option(DummyValue, "ip", translate("IP Address")) - if (not mini) then - s:option(DummyValue, "mac", translate("MAC Address")) - end - s:option(DummyValue, "vendor", translate("Vendor")) - s:option(DummyValue, "type", translate("Device Type")) - if (not mini) then - s:option(DummyValue, "model", translate("Model")) - end - if (haslink) then - s:option(DummyValue, "config_page", translate("Link to Device")) - end - if (debug) then - s:option(DummyValue, "raw", translate("Raw")) - end - curnet = next(outnets, curnet) - end -end - -function get_network_device(interface) - local state = luci.model.uci.cursor_state() - state:load("network") - local dev - - return state:get("network", interface, "ifname") -end - - -function cbi_add_networks(field) - uci.cursor():foreach("network", "interface", - function (section) - if section[".name"] ~= "loopback" then - field:value(section[".name"]) - end - end - ) - field.titleref = luci.dispatcher.build_url("admin", "network", "network") -end - -function config_devinfo_scan(map, scannet) - local o - o = scannet:option(luci.cbi.Flag, "enable", translate("Enable")) - o.optional = false - o.rmempty = false - - o = scannet:option(luci.cbi.Value, "interface", translate("Interface")) - o.optional = false - luci.controller.luci_diag.devinfo_common.cbi_add_networks(o) - - local scansubnet - scansubnet = scannet:option(luci.cbi.Value, "subnet", translate("Subnet")) - scansubnet.optional = false - - o = scannet:option(luci.cbi.Value, "timeout", translate("Timeout"), translate("Time to wait for responses in seconds (default 10)")) - o.optional = true - - o = scannet:option(luci.cbi.Value, "repeat_count", translate("Repeat Count"), translate("Number of times to send requests (default 1)")) - o.optional = true - - o = scannet:option(luci.cbi.Value, "sleepreq", translate("Sleep Between Requests"), translate("Milliseconds to sleep between requests (default 100)")) - o.optional = true -end diff --git a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/luci_diag_devinfo.lua b/applications/luci-diag-devinfo/luasrc/controller/luci_diag/luci_diag_devinfo.lua deleted file mode 100644 index 7a2fbd91a..000000000 --- a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/luci_diag_devinfo.lua +++ /dev/null @@ -1,56 +0,0 @@ ---[[ - -Luci diag - Diagnostics controller module -(c) 2009 Daniel Dickinson - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -]]-- - -module("luci.controller.luci_diag.luci_diag_devinfo", package.seeall) - -function index() - local e - - e = entry({"admin", "voice", "diag", "phones"}, arcombine(cbi("luci_diag/smap_devinfo"), cbi("luci_diag/smap_devinfo_config")), _("Phones"), 10) - e.leaf = true - e.subindex = true - e.dependent = true - - e = entry({"admin", "voice", "diag", "phones", "config"}, cbi("luci_diag/smap_devinfo_config"), _("Configure"), 10) - - e = entry({"admin", "status", "smap_devinfo"}, cbi("luci_diag/smap_devinfo"), _("SIP Devices on Network"), 120) - e.leaf = true - e.dependent = true - - e = entry({"admin", "network", "diag_config", "netdiscover_devinfo_config"}, cbi("luci_diag/netdiscover_devinfo_config"), _("Network Device Scan"), 100) - e.leaf = true - e.dependent = true - - e = entry({"admin", "network", "diag_config", "smap_devinfo_config"}, cbi("luci_diag/smap_devinfo_config"), _("SIP Device Scan")) - e.leaf = true - e.dependent = true - - e = entry({"admin", "status", "netdiscover_devinfo"}, cbi("luci_diag/netdiscover_devinfo"), _("Devices on Network"), 90) - e.dependent = true - - e = entry({"admin", "network", "mactodevinfo"}, cbi("luci_diag/mactodevinfo"), _("MAC Device Info Overrides"), 190) - e.dependent = true - - e = entry({"mini", "diag", "phone_scan"}, cbi("luci_diag/smap_devinfo_mini"), _("Phone Scan"), 100) - e.dependent = true - - e = entry({"mini", "voice", "phones", "phone_scan_config"}, cbi("luci_diag/smap_devinfo_config_mini"), _("Config Phone Scan"), 90) - e.dependent = true - - e = entry({"mini", "diag", "netdiscover_devinfo"}, cbi("luci_diag/netdiscover_devinfo_mini"), _("Network Device Scan"), 10) - e.dependent = true - - e = entry({"mini", "network", "netdiscover_devinfo_config"}, cbi("luci_diag/netdiscover_devinfo_config_mini"), _("Device Scan Config")) - e.dependent = true - -end diff --git a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/netdiscover_common.lua b/applications/luci-diag-devinfo/luasrc/controller/luci_diag/netdiscover_common.lua deleted file mode 100644 index 592ca1eaa..000000000 --- a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/netdiscover_common.lua +++ /dev/null @@ -1,101 +0,0 @@ ---[[ - -Luci diag - Diagnostics controller module -(c) 2009 Daniel Dickinson - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -]]-- - -module("luci.controller.luci_diag.netdiscover_common", package.seeall) - -require("luci.i18n") -require("luci.util") -require("luci.sys") -require("luci.cbi") -require("luci.model.uci") - -local translate = luci.i18n.translate -local DummyValue = luci.cbi.DummyValue -local SimpleSection = luci.cbi.SimpleSection - -function index() - return -- no-op -end - -function get_params() - - local netdiscover_uci = luci.model.uci.cursor() - netdiscover_uci:load("luci_devinfo") - local nettable = netdiscover_uci:get_all("luci_devinfo") - - local i - local subnet - local netdout - - local outnets = {} - - i = next(nettable, nil) - - while (i) do - if (netdiscover_uci:get("luci_devinfo", i) == "netdiscover_scannet") then - local scannet = netdiscover_uci:get_all("luci_devinfo", i) - if scannet["subnet"] and (scannet["subnet"] ~= "") and scannet["enable"] and ( scannet["enable"] == "1") then - local output = "" - local outrow = {} - outrow["interface"] = scannet["interface"] - outrow["timeout"] = 10 - local timeout = tonumber(scannet["timeout"]) - if timeout and ( timeout > 0 ) then - outrow["timeout"] = scannet["timeout"] - end - - outrow["repeat_count"] = 1 - local repcount = tonumber(scannet["repeat_count"]) - if repcount and ( repcount > 0 ) then - outrow["repeat_count"] = scannet["repeat_count"] - end - - outrow["sleepreq"] = 100 - local repcount = tonumber(scannet["sleepreq"]) - if repcount and ( repcount > 0 ) then - outrow["sleepreq"] = scannet["sleepreq"] - end - - outrow["subnet"] = scannet["subnet"] - outrow["output"] = output - outnets[i] = outrow - end - end - i = next(nettable, i) - end - return outnets -end - -function command_function(outnets, i) - local interface = luci.controller.luci_diag.devinfo_common.get_network_device(outnets[i]["interface"]) - - return "/usr/bin/netdiscover-to-devinfo " .. outnets[i]["subnet"] .. " " .. interface .. " " .. outnets[i]["timeout"] .. " -r " .. outnets[i]["repeat_count"] .. " -s " .. outnets[i]["sleepreq"] .. " 0 ) then - outrow["timeout"] = scannet["timeout"] - end - - outrow["repeat_count"] = 1 - local repcount = tonumber(scannet["repeat_count"]) - if repcount and ( repcount > 0 ) then - outrow["repeat_count"] = scannet["repeat_count"] - end - - outrow["sleepreq"] = 100 - local repcount = tonumber(scannet["sleepreq"]) - if repcount and ( repcount > 0 ) then - outrow["sleepreq"] = scannet["sleepreq"] - end - - if scannet["interface"] and ( scannet["interface"] ~= "" ) then - outrow["interface"] = scannet["interface"] - else - outrow["interface"] = "" - end - - outrow["ports"] = ports - outrow["output"] = output - outnets[i] = outrow - end - end - i = next(nettable, i) - end - return outnets -end - -function command_function(outnets, i) - - local interface = luci.controller.luci_diag.devinfo_common.get_network_device(outnets[i]["interface"]) - - return "/usr/bin/netsmap-to-devinfo -r " .. outnets[i]["subnet"] .. " -t " .. outnets[i]["timeout"] .. " -i " .. interface .. " -x -p " .. outnets[i]["ports"] .. " -c " .. outnets[i]["repeat_count"] .. " -s " .. outnets[i]["sleepreq"] .. " -<%- -local rowcnt = 1 -function rowstyle() - rowcnt = rowcnt + 1 - return (rowcnt % 2) + 1 -end --%> - - -
- <% if self.title and #self.title > 0 then -%> - <%=self.title%> - <%- end %> -
<%=self.description%>
-
- <%- local count = 0 -%> - - - <%- if not self.anonymous then -%> - <%- if self.sectionhead then -%> - - <%- else -%> - - <%- end -%> - <%- end -%> - <%- for i, k in pairs(self.children) do if not k.optional then -%> - - <%- count = count + 1; end; end; if self.extedit or self.addremove then -%> - - <%- count = count + 1; end -%> - - - <%- if not self.anonymous then -%> - <%- if self.sectiondesc then -%> - - <%- else -%> - - <%- end -%> - <%- end -%> - <%- for i, k in pairs(self.children) do if not k.optional then -%> - - <%- end; end; if self.extedit or self.addremove then -%> - - <%- end -%> - - <%- local isempty = true - for i, k in ipairs(self:cfgsections()) do - section = k - isempty = false - scope = { valueheader = "cbi/cell_valueheader", valuefooter = "cbi/cell_valuefooter" } - -%> - - <% if not self.anonymous then -%> - - <%- end %> - - <%- for k, node in ipairs(self.children) do -%> - <%- if not node.optional then -%> - <%- nodevalue = node:cfgvalue(section) -%> - <%- if nodevalue and ( nodevalue ~= "" ) and string.find(nodevalue, 'http://', 1, plain) then - node.href = nodevalue - node.template = "diag/smapvalue" - end - -%> - <%- node:render(section, scope or {}) -%> - <%- end -%> - <%- end -%> - - <%- if self.extedit or self.addremove then -%> - - <%- end -%> - - <%- end -%> - - <%- if isempty then -%> - - - - <%- end -%> -
<%=self.sectionhead%>  - <%- if k.titleref then -%><%- end -%> - <%-=k.title-%> - <%- if k.titleref then -%><%- end -%> -  
<%=self.sectiondesc%><%=k.description%>

<%=k%>

 - <%- if self.extedit then -%> - - <%=self.extedit:format(section)%> - <%- elseif type(self.extedit) == "function" then -%> - <%=self:extedit(section)%> - <%- end -%> - " title="<%:Edit%>"><%:Edit%> - <%- end; if self.addremove then %> - - <%- end -%> -

<%:This section contains no values yet%>
- - <% if self.error then %> -
-
    <% for _, c in pairs(self.error) do for _, e in ipairs(c) do -%> -
  • <%=luci.util.pcdata(e):gsub("\n","
    ")%>
    • - <%- end end %>
-
- <% end %> - - <%- if self.addremove then -%> - <% if self.template_addremove then include(self.template_addremove) else -%> -
- <% if self.anonymous then %> - - <% else %> - <% if self.invalid_cts then -%>
<% end %> - - - <% if self.invalid_cts then -%> -
<%:Invalid%>
- <%- end %> - <% end %> -
- <%- end %> - <%- end -%> -
-
- diff --git a/applications/luci-diag-devinfo/luasrc/view/diag/smapvalue.htm b/applications/luci-diag-devinfo/luasrc/view/diag/smapvalue.htm deleted file mode 100644 index 60aa70a30..000000000 --- a/applications/luci-diag-devinfo/luasrc/view/diag/smapvalue.htm +++ /dev/null @@ -1,21 +0,0 @@ -<%# -LuCI - Lua Configuration Interface -(c) 2009 Daniel Dickinson - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -$Id$ - --%> - -<%+cbi/valueheader%> -<% if self.href then %><% end -%> - <%=luci.util.pcdata(self:cfgvalue(section))%> -<%- if self.href then %><%end%> -  - -<%+cbi/valuefooter%> diff --git a/applications/luci-diag-devinfo/root/etc/config/luci_devinfo b/applications/luci-diag-devinfo/root/etc/config/luci_devinfo deleted file mode 100644 index 1bcdc198c..000000000 --- a/applications/luci-diag-devinfo/root/etc/config/luci_devinfo +++ /dev/null @@ -1,20 +0,0 @@ -config 'smap_scannet' 'SIP_LAN' - option 'enable' '0' - option 'interface' 'lan' - option 'subnet' '192.168.99.0/24' - -config 'smap_scannet' 'SIP_WAN' - option 'enable' '0' - option 'interface' 'wan' - option 'subnet' '216.218.0.0/16' - -config 'netdiscover_scannet' 'SCAN_LAN' - option 'enable' '0' - option 'interface' 'lan' - option 'subnet' '192.168.99.0/24' - -config 'netdiscover_scannet' 'SCAN_WAN' - option 'enable' '0' - option 'interface' 'wan' - option 'subnet' '216.218.0.0/16' - -- cgit v1.2.3