diff options
16 files changed, 76 insertions, 17 deletions
diff --git a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua index cf5708051..64ee9f548 100644 --- a/applications/luci-app-mwan3/luasrc/controller/mwan3.lua +++ b/applications/luci-app-mwan3/luasrc/controller/mwan3.lua @@ -1,3 +1,7 @@ +-- Copyright 2014 Aedan Renner <chipdankly@gmail.com> +-- Copyright 2018 Florian Eckert <fe@dev.tdt.de> +-- Licensed to the public under the GNU General Public License v2. + module("luci.controller.mwan3", package.seeall) sys = require "luci.sys" @@ -111,11 +115,11 @@ function diagnosticsData(interface, task) function get_gateway(inteface) local dump = require("luci.util").ubus("network.interface.%s" % interface, "status", {}) local gateway - if dump then + if dump and dump.route then local _, route for _, route in ipairs(dump.route) do if dump.route[_].target == "0.0.0.0" then - gateway = dump.route[_].nexthop + gateway = dump.route[_].nexthop end end end diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua index b53d288d0..d8f90e1e2 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/globalsconfig.lua @@ -1,16 +1,5 @@ ---[[ -LuCI - Lua Configuration Interface - -Copyright 2017 Florian Eckert <fe@dev.tdt.de> - -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$ -]]-- +-- Copyright 2017 Florian Eckert <fe@dev.tdt.de> +-- Licensed to the public under the GNU General Public License v2. local net = require "luci.model.network".init() diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua index 166f07791..920dc6afb 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua @@ -1,3 +1,7 @@ +-- Copyright 2014 Aedan Renner <chipdankly@gmail.com +-- Copyright 2018 Florian Eckert <fe@dev.tdt.de> +-- Licensed to the public under the GNU General Public License v2. + dsp = require "luci.dispatcher" @@ -77,7 +81,7 @@ function configCheck() local dump = require("luci.util").ubus("network.interface.%s" % iface, "status", {}) overview[iface]["default_route"] = false - if dump then + if dump and dump.route then local _, route for _, route in ipairs(dump.route) do if dump.route[_].target == "0.0.0.0" then diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua index 9f1db08be..3a896d3bc 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua @@ -1,3 +1,7 @@ +-- Copyright 2014 Aedan Renner <chipdankly@gmail.com> +-- Copyright 2018 Florian Eckert <fe@dev.tdt.de> +-- Licensed to the public under the GNU General Public License v2. + dsp = require "luci.dispatcher" arg[1] = arg[1] or "" diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua index ebe1162c5..9b4ab102d 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua @@ -1,3 +1,7 @@ +-- Copyright 2014 Aedan Renner <chipdankly@gmail.com> +-- Copyright 2018 Florian Eckert <fe@dev.tdt.de> +-- Licensed to the public under the GNU General Public License v2. + dsp = require "luci.dispatcher" diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua index ade357f81..27d9a3e85 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/memberconfig.lua @@ -1,3 +1,7 @@ +-- Copyright 2014 Aedan Renner <chipdankly@gmail.com> +-- Copyright 2018 Florian Eckert <fe@dev.tdt.de> +-- Licensed to the public under the GNU General Public License v2. + dsp = require "luci.dispatcher" arg[1] = arg[1] or "" diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/notify.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/notify.lua index 1019302ac..6f87a3d75 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/notify.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/notify.lua @@ -1,3 +1,7 @@ +-- Copyright 2014 Aedan Renner <chipdankly@gmail.com> +-- Copyright 2018 Florian Eckert <fe@dev.tdt.de> +-- Licensed to the public under the GNU General Public License v2. + local fs = require "nixio.fs" local ut = require "luci.util" script = "/etc/mwan3.user" diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua index 6d2ce7130..7f1278206 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua @@ -1,3 +1,7 @@ +-- Copyright 2014 Aedan Renner <chipdankly@gmail.com> +-- Copyright 2018 Florian Eckert <fe@dev.tdt.de> +-- Licensed to the public under the GNU General Public License v2. + dsp = require "luci.dispatcher" diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua index 1f8da0f2d..d1a063d09 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua @@ -1,3 +1,7 @@ +-- Copyright 2014 Aedan Renner <chipdankly@gmail.com> +-- Copyright 2018 Florian Eckert <fe@dev.tdt.de> +-- Licensed to the public under the GNU General Public License v2. + dsp = require "luci.dispatcher" arg[1] = arg[1] or "" diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua index 5b19693e6..cb2a99537 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua @@ -1,3 +1,7 @@ +-- Copyright 2014 Aedan Renner <chipdankly@gmail.com> +-- Copyright 2018 Florian Eckert <fe@dev.tdt.de> +-- Licensed to the public under the GNU General Public License v2. + dsp = require "luci.dispatcher" diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua index 712ada03e..84adfcf91 100644 --- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua +++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua @@ -1,3 +1,7 @@ +-- Copyright 2014 Aedan Renner <chipdankly@gmail.com> +-- Copyright 2018 Florian Eckert <fe@dev.tdt.de> +-- Licensed to the public under the GNU General Public License v2. + dsp = require "luci.dispatcher" arg[1] = arg[1] or "" diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm b/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm index 279f140ba..6dc3d1274 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/overview_status_interface.htm @@ -1,3 +1,9 @@ +<%# + Copyright 2014 Aedan Renner <chipdankly@gmail.com> + Copyright 2018 Florian Eckert <fe@dev.tdt.de> + Licensed to the public under the GNU General Public License v2. +-%> + <script type="text/javascript">//<![CDATA[ XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "status", "mwan", "interface_status")%>', null, function(x, status) diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm b/applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm index 708479cf8..b7bb6de1c 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/status_detail.htm @@ -1,3 +1,9 @@ +<%# + Copyright 2014 Aedan Renner <chipdankly@gmail.com> + Copyright 2018 Florian Eckert <fe@dev.tdt.de> + Licensed to the public under the GNU General Public License v2. +-%> + <%+header%> <ul class="cbi-tabmenu"> diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm b/applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm index d524e101e..f9a0fa2be 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/status_diagnostics.htm @@ -1,3 +1,9 @@ +<%# + Copyright 2014 Aedan Renner <chipdankly@gmail.com> + Copyright 2018 Florian Eckert <fe@dev.tdt.de> + Licensed to the public under the GNU General Public License v2. +-%> + <%+header%> <ul class="cbi-tabmenu"> @@ -67,7 +73,7 @@ <option value="ping_trackips"><%:Ping tracking IP%></option> <option value="check_rules"><%:Check IP rules%></option> <option value="check_routes"><%:Check routing table%></option> - <option value="hotplug_ifup"><%:Hotplug ifup%>"</option> + <option value="hotplug_ifup"><%:Hotplug ifup%></option> <option value="hotplug_ifdown"><%:Hotplug ifdown%></option> </select> </div> diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm b/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm index 1c9123c70..2fb5ea484 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/status_interface.htm @@ -1,3 +1,9 @@ +<%# + Copyright 2014 Aedan Renner <chipdankly@gmail.com> + Copyright 2018 Florian Eckert <fe@dev.tdt.de> + Licensed to the public under the GNU General Public License v2. +-%> + <%+header%> <ul class="cbi-tabmenu"> diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/status_troubleshooting.htm b/applications/luci-app-mwan3/luasrc/view/mwan/status_troubleshooting.htm index 348bf947f..b812e5b88 100644 --- a/applications/luci-app-mwan3/luasrc/view/mwan/status_troubleshooting.htm +++ b/applications/luci-app-mwan3/luasrc/view/mwan/status_troubleshooting.htm @@ -1,3 +1,9 @@ +<%# + Copyright 2014 Aedan Renner <chipdankly@gmail.com> + Copyright 2018 Florian Eckert <fe@dev.tdt.de> + Licensed to the public under the GNU General Public License v2. +-%> + <%+header%> <ul class="cbi-tabmenu"> |