From d3184b9e7953d9ad3ed04b722a953ac75272f88f Mon Sep 17 00:00:00 2001 From: Manuel Munz Date: Wed, 9 Jan 2013 18:50:07 +0000 Subject: [PATCH] applications: add luci-freifunk-diagnostics which is a clone of diagnostics in admin-full --- .../luci-freifunk-diagnostics/Makefile | 2 + .../luci-freifunk-diagnostics/ipkg/postinst | 4 + .../luasrc/controller/freifunk/diag.lua | 82 ++++++++++++ .../luasrc/view/freifunk/diagnostics.htm | 120 ++++++++++++++++++ .../uci-defaults/luci-freifunk-diagnostics | 2 + 5 files changed, 210 insertions(+) create mode 100644 applications/luci-freifunk-diagnostics/Makefile create mode 100644 applications/luci-freifunk-diagnostics/ipkg/postinst create mode 100644 applications/luci-freifunk-diagnostics/luasrc/controller/freifunk/diag.lua create mode 100644 applications/luci-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm create mode 100644 applications/luci-freifunk-diagnostics/root/etc/uci-defaults/luci-freifunk-diagnostics diff --git a/applications/luci-freifunk-diagnostics/Makefile b/applications/luci-freifunk-diagnostics/Makefile new file mode 100644 index 000000000..f7fac7740 --- /dev/null +++ b/applications/luci-freifunk-diagnostics/Makefile @@ -0,0 +1,2 @@ +include ../../build/config.mk +include ../../build/module.mk diff --git a/applications/luci-freifunk-diagnostics/ipkg/postinst b/applications/luci-freifunk-diagnostics/ipkg/postinst new file mode 100644 index 000000000..cc814c365 --- /dev/null +++ b/applications/luci-freifunk-diagnostics/ipkg/postinst @@ -0,0 +1,4 @@ +#!/bin/sh +[ -n "${IPKG_INSTROOT}" ] || { + ( . /etc/uci-defaults/luci-freifunk-diagnostics ) && rm -f /etc/uci-defaults/luci-freifunk-diagnostics +} diff --git a/applications/luci-freifunk-diagnostics/luasrc/controller/freifunk/diag.lua b/applications/luci-freifunk-diagnostics/luasrc/controller/freifunk/diag.lua new file mode 100644 index 000000000..2a5db6751 --- /dev/null +++ b/applications/luci-freifunk-diagnostics/luasrc/controller/freifunk/diag.lua @@ -0,0 +1,82 @@ +--[[ +LuCI - Lua Configuration Interface + +Copyright 2008 Steven Barth +Copyright 2011 Jo-Philipp Wich +Copyright 2013 Manuel Munz + +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.freifunk.diag", package.seeall) + +function index() + local uci = require("luci.model.uci").cursor() + local page + page = node("freifunk", "status", "diagnostics") + page.target = template("freifunk/diagnostics") + page.title = _("Diagnostics") + page.order = 60 + + page = entry({"freifunk", "status", "diag_ping"}, call("diag_ping"), nil) + page.leaf = true + + page = entry({"freifunk", "status", "diag_nslookup"}, call("diag_nslookup"), nil) + page.leaf = true + + page = entry({"freifunk", "status", "diag_traceroute"}, call("diag_traceroute"), nil) + page.leaf = true + + page = entry({"freifunk", "status", "diag_ping6"}, call("diag_ping6"), nil) + page.leaf = true + + page = entry({"freifunk", "status", "diag_traceroute6"}, call("diag_traceroute6"), nil) + page.leaf = true +end + +function diag_command(cmd, addr) + if addr and addr:match("^[a-zA-Z0-9%-%.:_]+$") then + luci.http.prepare_content("text/plain") + + local util = io.popen(cmd % addr) + if util then + while true do + local ln = util:read("*l") + if not ln then break end + luci.http.write(ln) + luci.http.write("\n") + end + + util:close() + end + + return + end + + luci.http.status(500, "Bad address") +end + +function diag_ping(addr) + diag_command("ping -c 5 -W 1 %q 2>&1", addr) +end + +function diag_traceroute(addr) + diag_command("traceroute -q 1 -w 1 -n %q 2>&1", addr) +end + +function diag_nslookup(addr) + diag_command("nslookup %q 2>&1", addr) +end + +function diag_ping6(addr) + diag_command("ping6 -c 5 %q 2>&1", addr) +end + +function diag_traceroute6(addr) + diag_command("traceroute6 -q 1 -w 2 -n %q 2>&1", addr) +end diff --git a/applications/luci-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm b/applications/luci-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm new file mode 100644 index 000000000..5794a433e --- /dev/null +++ b/applications/luci-freifunk-diagnostics/luasrc/view/freifunk/diagnostics.htm @@ -0,0 +1,120 @@ +<%# +LuCI - Lua Configuration Interface +Copyright 2010 Jo-Philipp Wich + +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$ + +-%> + +<%+header%> + +<% +local fs = require "nixio.fs" +local has_ping6 = fs.access("/bin/ping6") or fs.access("/usr/bin/ping6") +local has_traceroute6 = fs.access("/usr/bin/traceroute6") +%> + + + + +
"> +
+

<%:Diagnostics%>

+ +
+ <%:Network Utilities%> + +
+ +
+
+ <% if has_ping6 then %> + + + <% else %> + + <% end %> +
+ +
+
+ <% if has_traceroute6 then %> + + + <% else %> + + <% end %> + <% if not has_traceroute6 then %> +

 

+

<%:Install iputils-traceroute6 for IPv6 traceroute%>

+ <% end %> +
+ +
+
+ +
+ +

+ +
+
+ + +
+ +<%+footer%> diff --git a/applications/luci-freifunk-diagnostics/root/etc/uci-defaults/luci-freifunk-diagnostics b/applications/luci-freifunk-diagnostics/root/etc/uci-defaults/luci-freifunk-diagnostics new file mode 100644 index 000000000..963d8a4ef --- /dev/null +++ b/applications/luci-freifunk-diagnostics/root/etc/uci-defaults/luci-freifunk-diagnostics @@ -0,0 +1,2 @@ +#!/bin/sh +rm -f /tmp/luci-indexcache -- 2.25.1