Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-olsr-viz: migrate to js

Browse source 
Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>

luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>

luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>

luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>

luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>

luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>

luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>

luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>

luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>

luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js fix tag

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>

luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js fix var name

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>

luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js use load for script & fix bugs

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>

luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js fix script

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>

luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js fix bugs

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>

luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js fix view

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>

luci-app-olsr-viz: migrate to js fix script

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>

luci-app-olsr-viz: migrate to js fix view

luci-app-olsr-viz: migrate to js

luci-app-olsr-viz: migrate to js fix script

Signed-off-by: Ayushman Tripathi <ayushmantripathi7724@gmail.com>

luci-app-olsr-viz: migrate to js
This commit is contained in:
Ayushman Tripathi 2023-07-13 11:49:43 +05:30
parent ff166c6a06
commit 00cfca13b5
8 changed files with 439 additions and 346 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
applications/luci-app-olsr-viz/htdocs/cgi-bin/olsr-viz.sh
View file

@ -1,40 +0,0 @@
#!/bin/sh
echo Content-type: text/html
echo
cat << EOF
<SCRIPT LANGUAGE="JavaScript" TYPE="text/javascript">
var css=document.styleSheets[0];
if (null!=css.insertRule) {
css.insertRule(".label {color:black;background-color:white}", css.cssRules.length);
}
else {
css.addRule(".label", "color:black");
css.addRule(".label", "background-color:white");
}
</SCRIPT>
<SCRIPT SRC="/luci-static/resources/olsr-viz.js" LANGUAGE="JavaScript1.2" TYPE="text/javascript"></SCRIPT>
<DIV ID="main"
STYLE="width: 100%; height: 93%; border: 1px solid #ccc; margin-left:auto; margin-right:auto; text-align:center; overflow: scroll">
<DIV ID="edges" STYLE="width: 1px; height: 1px; position: relative; z-index:2"></DIV>
<DIV ID="nodes" STYLE="width: 1px; height: 1px; position: relative; z-index:4"></DIV>
</DIV>
<DIV STYLE="z-index:99">
<FORM ACTION="">
<P><B TITLE="Bestimmt die Vergrößerungsstufe.">Zoom</B>&#160;<A HREF="javascript:set_scale(scale+0.1)">+</A>&#160;<A HREF="javascript:set_scale(scale-0.1)">&ndash;</A>&#160;<INPUT ID="zoom" NAME="zoom" TYPE="text" VALUE="2.0" SIZE="5" ONCHANGE="set_scale()">&#160;
| &#160;<B TITLE="Beschränkt die Anzeige auf eine maximale Hop-Entfernung.">Metrik</B>&#160;<A HREF="javascript:set_maxmetric(maxmetric+1)">+</A>&#160;<A HREF="javascript:if(0<maxmetric)set_maxmetric(maxmetric-1)">&ndash;</A>&#160;<INPUT ID="maxmetric" NAME="maxmetric" TYPE="text" VALUE="3" SIZE="4" ONCHANGE="set_maxmetric(this.value)">&#160;
| &#160;<B TITLE="Schaltet die automatischen Layout-Optimierung ein.">Optimierung</B><INPUT ID="auto_declump" NAME="auto_declump" TYPE="checkbox" ONCHANGE="set_autodeclump(this.checked)" CHECKED="CHECKED">&#160;
| &#160;<B TITLE="Zeige Hostnamen an.">Hostnamen</B><INPUT ID="show_hostnames" NAME="show_hostnames" TYPE="checkbox" ONCHANGE="set_showdesc(this.checked)" CHECKED="CHECKED">&#160;
| &#160;<A HREF="javascript:viz_save()" TITLE="Speichert die aktuellen Einstellungen in einem Cookie.">Speichern</A>&#160;
| &#160;<A HREF="javascript:viz_reset()" TITLE="Startet das Viz-Skriptprogramm neu.">Zur&uuml;cksetzen</A></P>
</FORM></DIV>
<SPAN ID="debug" STYLE="visibility:hidden;"></SPAN>
<IFRAME ID="RSIFrame" NAME="RSIFrame" STYLE="border:0px; width:0px; height:0px; visibility:hidden;">
</IFRAME>
<SCRIPT LANGUAGE="JavaScript1.2" TYPE="text/javascript">
viz_setup("RSIFrame","main","nodes","edges");
viz_update();
</SCRIPT>
EOF

48
applications/luci-app-olsr-viz/htdocs/cgi-bin/vizdata.sh
View file

@ -1,48 +0,0 @@
#!/bin/sh
echo Content-type: text/html
echo
cat<<EOF
<HTML>
<HEAD>
<TITLE>OLSR-VIZ Data</TITLE>
<META CONTENT="text/html; charset=iso-8859-1" HTTP-EQUIV="Content-Type">
<META CONTENT="no-cache" HTTP-EQUIV="cache-control">
</HEAD>
<BODY>
<script language='JavaScript1.2' type='text/javascript'>
EOF
# sed + txtinfo plugin
re_ip='[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}'
re_sep='[[:space:]]\{1,\}'
re_nosep='[^[:space:]]\{1,\}'
wget http://127.0.0.1:2006/all -qO - | sed -n "
/^Table: Links$/,/^$/ {
s# # - #g
s#\($re_ip\)$re_sep\($re_ip\)\($re_sep$re_nosep\)\{3\}$re_sep\($re_nosep\)#parent.touch_edge(parent.touch_node('\1').set_metric(1).update(),parent.touch_node('\2').set_metric(1).update(),'\4');#p
}
/^Table: Topology$/,/^$/ {
s#\($re_ip\)$re_sep\($re_ip\)\($re_sep$re_nosep\)\{2\}$re_sep\($re_nosep\)#parent.touch_edge(parent.touch_node('\1').update(),parent.touch_node('\2').update(),'\4');#p
}
/^Table: HNA$/,/^$/ {
s#\($re_ip\)/\([0-9]\{1,\}\)$re_sep\($re_ip\)#parent.touch_hna(parent.touch_node('\3'),'\1','\2');#p
}
/^Table: Routes$/,/^$/ {
s#\($re_ip\)/32$re_sep$re_nosep$re_sep\($re_nosep\).*#parent.touch_node('\1').set_metric('\2').update();#p
}
"
hosts=$(uci show olsrd|grep hosts_file|cut -d "=" -f 2)
if [ -n $hosts ]; then
sed -n "
s#\($re_ip\)$re_sep\($re_nosep\)$re_sep.*#parent.touch_node('\1').set_desc('\2');#p
" < $hosts
fi
cat<<EOF
parent.viz_callback();
</script>
</BODY></HTML>
EOF

412
applications/luci-app-olsr-viz/htdocs/luci-static/resources/olsr-viz.js
View file

@ -34,8 +34,6 @@ Changes:
2010-12-11: Changed some paths to make it work with Kamikaze and Luci -- soma 2010-12-11: Changed some paths to make it work with Kamikaze and Luci -- soma
*/ */
var cgi_url = "/cgi-bin/vizdata.sh";
var maxmetric = 3; var maxmetric = 3;
var iconvariant = "-mini"; var iconvariant = "-mini";
var nodes = new Array(); var nodes = new Array();
@ -63,62 +61,39 @@ var now_secs = 5;
// dom elements // dom elements
var IFrameObj; var IFrameObj;
var maindiv; var mainDiv;
var nodediv; var nodeDiv;
var edgediv; var edgeDiv;
var zoomInput;
/******* CALL TO SERVER ********/ var maxmetricInput;
function callToServer(URL) { var debugSpan;
var IFrameDoc;
if (IFrameObj.document) {
// For IE5 + opera
IFrameDoc = IFrameObj.document;
}
else if (IFrameObj.contentDocument) {
// For NS6
IFrameDoc = IFrameObj.contentDocument;
}
else if (IFrameObj.contentWindow) {
// For IE5.5 and IE6
IFrameDoc = IFrameObj.contentWindow.document;
}
else {
// opera? hmmmm
return true;
}
IFrameDoc.location.replace(URL);
return false;
}
/******** EDGE CLASS ********/ /******** EDGE CLASS ********/
function edge(n1,n2){ function edge(n1, n2) {
this.getHTML = function() this.getHTML = function () {
{
var nh = ""; var nh = "";
if(this.n1.metric > maxmetric || this.n2.metric > maxmetric) { if (this.n1.metric > maxmetric || this.n2.metric > maxmetric) {
return ""; return "";
} }
var x = this.n1.x*scale; var x = this.n1.x * scale;
var y = this.n1.y*scale; var y = this.n1.y * scale;
var dx = this.n2.x*scale - x; var dx = this.n2.x * scale - x;
var dy = this.n2.y*scale - y; var dy = this.n2.y * scale - y;
x += xoff*scale + 75; x += xoff * scale + 75;
y += yoff*scale + 15; y += yoff * scale + 15;
var imgtag = "<img src='/luci-static/resources/olsr-viz/dot_" var imgtag = "<img src='/luci-static/resources/olsr-viz/dot_"
if (this.etx > 0 && this.etx < 2) { if (this.etx > 0 && this.etx < 2) {
imgtag += "good.gif'"; imgtag += "good.gif'";
} }
else if(this.etx > 2 && this.etx < 5) { else if (this.etx > 2 && this.etx < 5) {
imgtag += "ok.gif'"; imgtag += "ok.gif'";
} }
else if(this.etx > 5 && this.etx < 10) { else if (this.etx > 5 && this.etx < 10) {
imgtag += "weak.gif'"; imgtag += "weak.gif'";
} }
else { else {
@ -126,43 +101,40 @@ function edge(n1,n2){
} }
imgtag += " alt='ETX: " + this.etx + "' title='ETX: " + this.etx + "' "; imgtag += " alt='ETX: " + this.etx + "' title='ETX: " + this.etx + "' ";
var d = Math.sqrt(dx*dx+dy*dy); var d = Math.sqrt(dx * dx + dy * dy);
for (var j = 0; j < d; j += 15) { for (var j = 0; j < d; j += 15) {
nh += imgtag + "style='top:" nh += imgtag + "style='top:"
+ parseInt(y+dy * j / d) + "px; left:" + parseInt(y + dy * j / d) + "px; left:"
+ parseInt(x+dx * j / d) + "px; " + parseInt(x + dx * j / d) + "px; "
+ "width: 4px; height: 4px; position: absolute; z-index: 2' >"; + "width: 4px; height: 4px; position: absolute; z-index: 2' >";
} }
nh += "<div style='top:" nh += "<div style='top:"
+ parseInt(y+dy * 0.5 - 5) + "px; left:" + parseInt(y + dy * 0.5 - 5) + "px; left:"
+ parseInt(x+dx * 0.5 - 24) + "px; " + parseInt(x + dx * 0.5 - 24) + "px; "
+ "position: absolute; z-index: 3; width: 48px; text-align: center;' >" + "position: absolute; z-index: 3; width: 48px; text-align: center;' >"
+ "<span class='label etx' >" + this.etx + "</span></div>"; + "<span class='label etx' >" + this.etx + "</span></div>";
return nh; return nh;
} }
this.isIdle = function() this.isIdle = function () {
{
return (now_secs - this.lastseen > idle_timeout); return (now_secs - this.lastseen > idle_timeout);
} }
this.isDead = function() this.isDead = function () {
{
return (now_secs - this.lastseen > erase_timeout); return (now_secs - this.lastseen > erase_timeout);
} }
this.cleanup = function() this.cleanup = function () {
{ if (this.n1 && this.n1.weight) {
if(this.n1 && this.n1.weight) {
this.n1.weight--; this.n1.weight--;
} }
if(this.n2 && this.n2.weight) { if (this.n2 && this.n2.weight) {
this.n2.weight--; this.n2.weight--;
} }
if(this.n1 && this.n2) { if (this.n1 && this.n2) {
delete this.n1.edges[n2.ip]; delete this.n1.edges[n2.ip];
delete this.n2.edges[n1.ip]; delete this.n2.edges[n1.ip];
} }
@ -180,10 +152,9 @@ function edge(n1,n2){
return this; return this;
} }
function getEdgeKey(ip1,ip2) function getEdgeKey(ip1, ip2) {
{
var key = ""; var key = "";
if(ip1 > ip2) { if (ip1 > ip2) {
key = ip2 + "-" + ip1; key = ip2 + "-" + ip1;
} }
else { else {
@ -192,12 +163,11 @@ function getEdgeKey(ip1,ip2)
return key; return key;
} }
function touch_edge(n1,n2,etx) function touch_edge(n1, n2, etx) {
{ var key = getEdgeKey(n1.ip, n2.ip);
var key = getEdgeKey(n1.ip,n2.ip);
var e = edges[key]; var e = edges[key];
if(!e) { if (!e) {
e = new edge(n1,n2); e = new edge(n1, n2);
edges[key] = e; edges[key] = e;
} }
e.etx = etx; e.etx = etx;
@ -207,27 +177,26 @@ function touch_edge(n1,n2,etx)
/******** NODE CLASS ********/ /******** NODE CLASS ********/
function node(ip) { function node(ip) {
this.getHTML = function() this.getHTML = function () {
{
var nh; var nh;
if(this.metric > maxmetric) { if (this.metric > maxmetric) {
return ""; return "";
} }
var igw = 0; var igw = 0;
for(var h in this.hna) { for (var h in this.hna) {
if(h == "0.0.0.0") { if (h == "0.0.0.0") {
igw = 1; igw = 1;
break; break;
} }
} }
nh = nh =
"<div id='node_" + this.ip + "' onmousedown='dragstart(this)' style=" "<div id='node_" + this.ip + "' onmousedown='dragstart(this)' style="
+ "'top: " + parseInt((this.y+yoff)*scale) + "px; " + "'top: " + parseInt((this.y + yoff) * scale) + "px; "
+ "left: " + parseInt((this.x+xoff)*scale) + "px; " + "left: " + parseInt((this.x + xoff) * scale) + "px; "
+ "width: 150px; height: 1px; z-index: 4; " + "width: 150px; height: 1px; z-index: 4; "
+ "position: absolute; background-color: transparent;' >" + "position: absolute; background-color: transparent;' >"
+ "<div><img src='/luci-static/resources/olsr-viz/node"+(igw ? "-hna" : "")+iconvariant + ".gif'" + "<div><img src='/luci-static/resources/olsr-viz/node" + (igw ? "-hna" : "") + iconvariant + ".gif'"
+ " alt='node " + this.ip + "' style='border: none;'><br />" + " alt='node " + this.ip + "' style='border: none;'><br />"
+ "<a href='http://" + this.ip + "/'>" + "<a href='http://" + this.ip + "/'>"
+ "<span class='label ip'>" + this.ip + "</span></a>" + "<span class='label ip'>" + this.ip + "</span></a>"
@ -237,32 +206,29 @@ function node(ip) {
return nh; return nh;
} }
this.isIdle = function() this.isIdle = function () {
{
return (now_secs - this.lastseen > idle_timeout); return (now_secs - this.lastseen > idle_timeout);
} }
this.isDead = function() this.isDead = function () {
{
return (now_secs - this.lastseen > erase_timeout); return (now_secs - this.lastseen > erase_timeout);
} }
this.cleanup = function() this.cleanup = function () {
{
ncount--; ncount--;
} }
this.set_metric = function(metric) { this.set_metric = function (metric) {
this.metric = metric; this.metric = metric;
return this; return this;
} }
this.set_desc = function(desc) { this.set_desc = function (desc) {
this.desc = desc this.desc = desc
return this; return this;
} }
this.update = function() { this.update = function () {
this.lastseen = now_secs; this.lastseen = now_secs;
return this; return this;
} }
@ -270,8 +236,8 @@ function node(ip) {
this.ip = ip; this.ip = ip;
this.x = 0; this.x = 0;
this.y = 0; this.y = 0;
this.dx_last=0; this.dx_last = 0;
this.dy_last=0; this.dy_last = 0;
this.placed = false; this.placed = false;
this.weight = 0; this.weight = 0;
this.edges = new Array(); this.edges = new Array();
@ -286,7 +252,7 @@ function node(ip) {
function touch_node(ip) { function touch_node(ip) {
var n = nodes[ip]; var n = nodes[ip];
if(!n) { if (!n) {
n = new node(ip); n = new node(ip);
nodes[ip] = n; nodes[ip] = n;
// newnodes.push(n); // newnodes.push(n);
@ -298,24 +264,24 @@ function touch_node(ip) {
function place_new_nodes() { function place_new_nodes() {
var nc = 0; var nc = 0;
for(var i = 0;i<newnodes.length;i++){ for (var i = 0; i < newnodes.length; i++) {
var n = newnodes[i]; var n = newnodes[i];
if(n.placed){continue;} if (n.placed) { continue; }
var sp; var sp;
if(sp = getCookie("node_"+n.ip)) { if (sp = getCookie("node_" + n.ip)) {
var xy = sp.split("x"); var xy = sp.split("x");
debug_writeln("sp: "+sp+" xy[0]: "+xy[0]+" xy[1]: "+xy[1]); debug_writeln(("sp: " + sp + " xy[0]: " + xy[0] + " xy[1]: " + xy[1]));
n.x = parseFloat(xy[0]); n.x = parseFloat(xy[0]);
n.y = parseFloat(xy[1]); n.y = parseFloat(xy[1]);
} }
else if(n.weight>1){ else if (n.weight > 1) {
// see if we find already placed nodes // see if we find already placed nodes
var ox=0, oy=0; var ox = 0, oy = 0;
var dx=0, dy=0; var dx = 0, dy = 0;
var c=0; var c = 0;
for(var e in n.edges){ for (var e in n.edges) {
if(nodes[e] && nodes[e].placed){ if (nodes[e] && nodes[e].placed) {
if(!ox && !oy) { if (!ox && !oy) {
ox = nodes[e].x; ox = nodes[e].x;
oy = nodes[e].y; oy = nodes[e].y;
} }
@ -326,35 +292,35 @@ function place_new_nodes() {
c++; c++;
} }
} }
if(c>0) { if (c > 0) {
n.x = ox + dx/c + Math.random()*iel/2-iel/4; n.x = ox + dx / c + Math.random() * iel / 2 - iel / 4;
n.y = oy + dy/c + Math.random()*iel/2-iel/4; n.y = oy + dy / c + Math.random() * iel / 2 - iel / 4;
} }
} }
else { else {
// begin somewhere // begin somewhere
n.x = Math.random()*400; n.x = Math.random() * 400;
n.y = Math.random()*400; n.y = Math.random() * 400;
} }
n.placed = true; n.placed = true;
nc++; nc++;
} }
newnodes.length=0; newnodes.length = 0;
return nc; return nc;
} }
/******** HNA CLASS ********/ /******** HNA CLASS ********/
function hna(gw,net,mask) { function hna(gw, net, mask) {
this.gw = gw; this.gw = gw;
this.net = net; this.net = net;
this.mask = mask; this.mask = mask;
return this; return this;
} }
function touch_hna(node,net,mask) { function touch_hna(node, net, mask) {
var h = node.hna[net]; var h = node.hna[net];
if(!h) { if (!h) {
h = new hna(node.ip,net,mask); h = new hna(node.ip, net, mask);
node.hna[net] = h; node.hna[net] = h;
} }
@ -363,42 +329,39 @@ function touch_hna(node,net,mask) {
} }
/******** VIZ SETUP AND SETTINGS ********/ /******** VIZ SETUP AND SETTINGS ********/
function viz_setup(iframeid,maindivid,nodedivid,edgedivid) { function viz_setup(iframe, maindiv, nodediv, edgediv, debugspan, zoominput, maxmetricinput) {
// assign a reference to the // assign a reference to the
// object to our global variable IFrameObj. // object to our global variable IFrameObj.
IFrameObj=document.getElementById(iframeid); IFrameObj = iframe;
if (document.frames) {
// this is for IE5 Mac, because it will only
// allow access to the document object
// of the IFrame if we access it through
// the document.frames array
IFrameObj = document.frames[iframeid];
}
draginit(); draginit();
maindiv=document.getElementById(maindivid); mainDiv = maindiv;
nodediv=document.getElementById(nodedivid); nodeDiv = nodediv;
edgediv=document.getElementById(edgedivid); edgeDiv = edgediv;
debugSpan = debugspan;
zoomInput = zoominput;
maxmetricInput = maxmetricinput;
// autosave on exit? // autosave on exit?
var autosave; var autosave;
if((autosave = getCookie("prefs_autosave"))) { if ((autosave = getCookie("prefs_autosave"))) {
auto_save = parseInt(autosave); auto_save = parseInt(autosave);
} }
viz_autosave(auto_save); viz_autosave(auto_save);
// maximum metric of surrounding nodes // maximum metric of surrounding nodes
var mmx; var mmx = (getCookie("prefs_maxmetric"))||3;
if(mmx = getCookie("prefs_maxmetric")) { set_maxmetric(mmx, true, true);
set_maxmetric(mmx,true,true);
}
// scale of view // scale of view
var savescale; var savescale;
if((savescale = getCookie("prefs_scale")) && if ((savescale = getCookie("prefs_scale")) &&
(savescale = parseFloat(savescale))) { (savescale = parseFloat(savescale))) {
set_scale(savescale,true); set_scale(savescale, true);
}
else {
set_scale(2.0, true);
} }
// scroll - FIXME // scroll - FIXME
@ -417,53 +380,49 @@ function viz_setup(iframeid,maindivid,nodedivid,edgedivid) {
*/ */
} }
function viz_save() function viz_save() {
{
// let cookie survive a month // let cookie survive a month
var exp = new Date(); var exp = new Date();
exp.setTime(exp.getTime() + 2592000000); exp.setTime(exp.getTime() + 2592000000);
// save node positions // save node positions
for(var ip in nodes) for (var ip in nodes) {
{ if (nodes[ip].metric > maxmetric) {
if(nodes[ip].metric > maxmetric) {
continue; continue;
} }
setCookie("node_"+ip,nodes[ip].x+"x"+nodes[ip].y,exp); // setCookie("node_"+ip,nodes[ip].x+"x"+nodes[ip].y,exp);
} }
// save maxmetric // save maxmetric
setCookie("prefs_maxmetric",maxmetric,exp); setCookie("prefs_maxmetric", maxmetric, exp);
// save zooming // save zooming
setCookie("prefs_scale",scale,exp); setCookie("prefs_scale", scale, exp);
// save scroll - FIXME // save scroll - FIXME
setCookie("prefs_innerview", setCookie("prefs_innerview",
parseInt(maindiv.scrollLeft)+"x"+parseInt(maindiv.scrollTop)+"x"+ parseInt(mainDiv.scrollLeft) + "x" + parseInt(mainDiv.scrollTop) + "x" +
parseInt(vwidth*scale)+"x"+parseInt(vheight*scale),exp); parseInt(vwidth * scale) + "x" + parseInt(vheight * scale), exp);
} }
function viz_autosave(autosave) function viz_autosave(autosave) {
{
auto_save = autosave; auto_save = autosave;
if(auto_save) { if (auto_save) {
document.body.onunload=viz_save; document.body.onunload = viz_save;
} }
else { else {
deleteCookie("prefs_autosave"); deleteCookie("prefs_autosave");
} }
} }
function viz_reset() function viz_reset() {
{
deleteAllCookies(); deleteAllCookies();
for(var ip in nodes) { for (var ip in nodes) {
delete nodes[ip]; delete nodes[ip];
} }
for(var e in edges) { for (var e in edges) {
delete edges[e]; delete edges[e];
} }
viz_update(); window.location.reload();
} }
var updateTimer = 0; var updateTimer = 0;
@ -471,8 +430,7 @@ function viz_update() {
if (updateTimer) { if (updateTimer) {
clearTimeout(updateTimer); clearTimeout(updateTimer);
} }
now_secs = new Date().getTime()/1000; now_secs = new Date().getTime() / 1000;
callToServer(cgi_url);
} }
function viz_callback() { function viz_callback() {
@ -480,7 +438,7 @@ function viz_callback() {
clearTimeout(updateTimer); clearTimeout(updateTimer);
} }
if(place_new_nodes() > 0 && auto_declump) { if (place_new_nodes() > 0 && auto_declump) {
declump(); declump();
} }
refresh(); refresh();
@ -489,7 +447,7 @@ function viz_callback() {
var refresh_running = false; var refresh_running = false;
function refresh() { function refresh() {
if(refresh_running) { if (refresh_running) {
return; return;
} }
refresh_running = true; refresh_running = true;
@ -499,7 +457,7 @@ function refresh() {
// refresh nodes // refresh nodes
nh = ""; nh = "";
for (var n in nodes) { for (var n in nodes) {
if(nodes[n].isDead()) { if (nodes[n].isDead()) {
nodes[n].cleanup(); nodes[n].cleanup();
delete nodes[n]; delete nodes[n];
} }
@ -507,13 +465,13 @@ function refresh() {
nh += nodes[n].getHTML(); nh += nodes[n].getHTML();
} }
} }
nodediv.innerHTML = nh; nodeDiv.innerHTML = nh;
// refresh edges // refresh edges
nh = ""; nh = "";
for (var e in edges) { for (var e in edges) {
if(edges[e].isDead()) { if (edges[e].isDead()) {
edges[e].cleanup(); edges[e].cleanup();
delete edges[e]; delete edges[e];
} }
@ -521,20 +479,18 @@ function refresh() {
nh += edges[e].getHTML(); nh += edges[e].getHTML();
} }
} }
edgediv.innerHTML = nh; edgeDiv.innerHTML = nh;
refresh_running = false; refresh_running = false;
} }
function set_showdesc(doit) function set_showdesc(doit) {
{
showdesc = doit; showdesc = doit;
if(!noupdate) refresh(); if (!noupdate) refresh();
} }
function set_autodeclump(doit) function set_autodeclump(doit) {
{
auto_declump = doit; auto_declump = doit;
if(doit) { if (doit) {
declump(); declump();
} }
else { else {
@ -542,36 +498,34 @@ function set_autodeclump(doit)
} }
} }
function set_scale(inscale,noupdate) function set_scale(inscale, noupdate) {
{ if (!inscale) {
if(!inscale) { inscale = parseFloat(zoomInput.value / 2);
inscale = parseFloat(document.getElementById("zoom").value/2);
} }
scale = Math.round(inscale*100)/100; scale = Math.round(inscale * 100) / 100;
if(!scale || scale<0.1) { if (!scale || scale < 0.1) {
scale = 0.1; scale = 0.1;
} }
document.getElementById("zoom").value = scale*2; zoomInput.value = scale * 2;
if(!noupdate) refresh(); if (!noupdate) refresh();
} }
function set_maxmetric(inmetric,noupdate,noconfirm) function set_maxmetric(inmetric, noupdate, noconfirm) {
{
inmetric = parseInt(inmetric); inmetric = parseInt(inmetric);
if(inmetric > 0 || !noconfirm || confirm("warning. setting the maximum metric to zero can lead to expensive calculations if you are connected to a network with many nodes. do you want to proceed?")) { if (inmetric > 0 || !noconfirm || confirm("warning. setting the maximum metric to zero can lead to expensive calculations if you are connected to a network with many nodes. do you want to proceed?")) {
maxmetric = inmetric; maxmetric = inmetric;
} }
document.getElementById("maxmetric").value = maxmetric; maxmetricInput.value = maxmetric;
if(!noupdate) refresh(); if (!noupdate) refresh();
} }
// k = area / nodes // k = area / nodes
function fr(x) { function fr(x) {
return Math.pow((iel*iel)/x,2); return Math.pow((iel * iel) / x, 2);
} }
function fa(x) { function fa(x) {
return Math.pow((x*x)/iel,2); return Math.pow((x * x) / iel, 2);
} }
var dclTimer = 0; var dclTimer = 0;
@ -582,10 +536,10 @@ function declump(t) {
var d; var d;
// clear declump timer // clear declump timer
if(dclTimer) { if (dclTimer) {
clearTimeout(dclTimer); clearTimeout(dclTimer);
} }
if(declump_running) { if (declump_running) {
return; return;
} }
declump_running = true; declump_running = true;
@ -593,16 +547,16 @@ function declump(t) {
// nodes // nodes
var nc = 0; var nc = 0;
for (var ip1 in nodes) { for (var ip1 in nodes) {
nodes[ip1].fr_x=0; nodes[ip1].fr_x = 0;
nodes[ip1].fr_y=0; nodes[ip1].fr_y = 0;
nodes[ip1].fa_x=0; nodes[ip1].fa_x = 0;
nodes[ip1].fa_y=0; nodes[ip1].fa_y = 0;
nodes[ip1].x_next = nodes[ip1].x; nodes[ip1].x_next = nodes[ip1].x;
nodes[ip1].y_next = nodes[ip1].y; nodes[ip1].y_next = nodes[ip1].y;
nodes[ip1].randdisplace = 0; nodes[ip1].randdisplace = 0;
} }
for (var ip1 in nodes) { for (var ip1 in nodes) {
if(nodes[ip1].metric > maxmetric || nodes[ip1].pinned) { if (nodes[ip1].metric > maxmetric || nodes[ip1].pinned) {
continue; continue;
} }
for (var ip2 in nodes) { for (var ip2 in nodes) {
@ -611,17 +565,17 @@ function declump(t) {
} }
dx = (nodes[ip1].x_next - nodes[ip2].x_next); dx = (nodes[ip1].x_next - nodes[ip2].x_next);
dy = (nodes[ip1].y_next - nodes[ip2].y_next); dy = (nodes[ip1].y_next - nodes[ip2].y_next);
d = Math.sqrt(dx*dx+dy*dy); d = Math.sqrt(dx * dx + dy * dy);
d = Math.max(d-optsize,(d+optsize)/optsize); d = Math.max(d - optsize, (d + optsize) / optsize);
nodes[ip1].fr_x += (dx/d) * fr(d); nodes[ip1].fr_x += (dx / d) * fr(d);
nodes[ip1].fr_y += (dy/d) * fr(d); nodes[ip1].fr_y += (dy / d) * fr(d);
} }
dx = nodes[ip1].fr_x; dx = nodes[ip1].fr_x;
dy = nodes[ip1].fr_y; dy = nodes[ip1].fr_y;
d = Math.sqrt(dx*dx+dy*dy); d = Math.sqrt(dx * dx + dy * dy);
var md = Math.min(d,iel/nodes[ip1].weight); var md = Math.min(d, iel / nodes[ip1].weight);
nodes[ip1].x_next += (dx / d) * md; nodes[ip1].x_next += (dx / d) * md;
nodes[ip1].y_next += (dy / d) * md; nodes[ip1].y_next += (dy / d) * md;
nc++; nc++;
@ -636,59 +590,59 @@ function declump(t) {
} }
dx = (edges[e].n1.x_next - edges[e].n2.x_next); dx = (edges[e].n1.x_next - edges[e].n2.x_next);
dy = (edges[e].n1.y_next - edges[e].n2.y_next); dy = (edges[e].n1.y_next - edges[e].n2.y_next);
d = Math.sqrt(dx*dx+dy*dy); d = Math.sqrt(dx * dx + dy * dy);
// d = Math.max(d-optsize,(d+optsize)/optsize); // d = Math.max(d-optsize,(d+optsize)/optsize);
edges[e].n1.fa_x -= (dx/d) * fa(d); edges[e].n1.fa_x -= (dx / d) * fa(d);
edges[e].n1.fa_y -= (dy/d) * fa(d); edges[e].n1.fa_y -= (dy / d) * fa(d);
edges[e].n2.fa_x += (dx/d) * fa(d); edges[e].n2.fa_x += (dx / d) * fa(d);
edges[e].n2.fa_y += (dy/d) * fa(d); edges[e].n2.fa_y += (dy / d) * fa(d);
ec++; ec++;
} }
// displacement // displacement
var xmin=-20; var xmin = -20;
var ymin=-20; var ymin = -20;
var xmax=20; var xmax = 20;
var ymax=20; var ymax = 20;
var dsum=0; var dsum = 0;
for (var ip in nodes) { for (var ip in nodes) {
if(nodes[ip].metric > maxmetric || nodes[ip].pinned) { if (nodes[ip].metric > maxmetric || nodes[ip].pinned) {
continue; continue;
} }
dx = nodes[ip].fa_x; dx = nodes[ip].fa_x;
dy = nodes[ip].fa_y; dy = nodes[ip].fa_y;
d = Math.sqrt(dx*dx+dy*dy); d = Math.sqrt(dx * dx + dy * dy);
dx = (dx / d) * Math.min(d,iel/nodes[ip].weight) * 0.75 + nodes[ip].dx_last * 0.25; dx = (dx / d) * Math.min(d, iel / nodes[ip].weight) * 0.75 + nodes[ip].dx_last * 0.25;
dy = (dy / d) * Math.min(d,iel/nodes[ip].weight) * 0.75 + nodes[ip].dy_last * 0.25; dy = (dy / d) * Math.min(d, iel / nodes[ip].weight) * 0.75 + nodes[ip].dy_last * 0.25;
nodes[ip].dx_last = dx; nodes[ip].dx_last = dx;
nodes[ip].dy_last = dy; nodes[ip].dy_last = dy;
nodes[ip].x_next += dx; nodes[ip].x_next += dx;
nodes[ip].y_next += dy; nodes[ip].y_next += dy;
if(!nodes[ip].x_next || !nodes[ip].y_next) { if (!nodes[ip].x_next || !nodes[ip].y_next) {
continue; continue;
} }
dx = (nodes[ip].x - nodes[ip].x_next); dx = (nodes[ip].x - nodes[ip].x_next);
dy = (nodes[ip].y - nodes[ip].y_next); dy = (nodes[ip].y - nodes[ip].y_next);
dsum += Math.sqrt(dx*dx+dy*dy); dsum += Math.sqrt(dx * dx + dy * dy);
nodes[ip].x = nodes[ip].x_next; nodes[ip].x = nodes[ip].x_next;
nodes[ip].y = nodes[ip].y_next; nodes[ip].y = nodes[ip].y_next;
xmin = Math.min(xmin,nodes[ip].x); xmin = Math.min(xmin, nodes[ip].x);
xmax = Math.max(xmax,nodes[ip].x); xmax = Math.max(xmax, nodes[ip].x);
ymin = Math.min(ymin,nodes[ip].y); ymin = Math.min(ymin, nodes[ip].y);
ymax = Math.max(ymax,nodes[ip].y); ymax = Math.max(ymax, nodes[ip].y);
} }
vwidth=(xmax-xmin); vwidth = (xmax - xmin);
vheight=(ymax-ymin); vheight = (ymax - ymin);
xoff=-xmin; xoff = -xmin;
yoff=-ymin; yoff = -ymin;
/* /*
document.getElementById('debug').innerHTML = "<br />" + document.getElementById('debug').innerHTML = "<br />" +
"offset: " + xoff + "x" + yoff + " dsum: " + dsum + "<br />" + "offset: " + xoff + "x" + yoff + " dsum: " + dsum + "<br />" +
@ -696,8 +650,8 @@ function declump(t) {
"optsize: " + optsize + "<br />"; "optsize: " + optsize + "<br />";
*/ */
refresh(); refresh();
if(auto_declump) { if (auto_declump) {
dclTimer = setTimeout("declump()", dsum>ncount ? dcl_timeout : dcllow_timeout ); dclTimer = setTimeout("declump()", dsum > ncount ? dcl_timeout : dcllow_timeout);
} }
declump_running = false; declump_running = false;
} }
@ -728,7 +682,7 @@ function dragstart(element) {
dragy = posy - element.offsetTop; dragy = posy - element.offsetTop;
var n = nodes[dragip]; var n = nodes[dragip];
if(n) { if (n) {
n.pinned = true; n.pinned = true;
} }
} }
@ -738,11 +692,11 @@ function dragstop() {
//Wird aufgerufen, wenn ein Objekt nicht mehr bewegt werden soll. //Wird aufgerufen, wenn ein Objekt nicht mehr bewegt werden soll.
var n = nodes[dragip]; var n = nodes[dragip];
if(n) { if (n) {
n.pinned = false; n.pinned = false;
} }
refresh(); refresh();
dragip=null; dragip = null;
} }
@ -751,21 +705,20 @@ function drag(ereignis) {
posx = document.all ? window.event.clientX : ereignis.pageX; posx = document.all ? window.event.clientX : ereignis.pageX;
posy = document.all ? window.event.clientY : ereignis.pageY; posy = document.all ? window.event.clientY : ereignis.pageY;
if(dragip != null) { if (dragip != null) {
var n = nodes[dragip]; var n = nodes[dragip];
if(n) { if (n) {
n.x = (posx - dragx)/scale - xoff; n.x = (posx - dragx) / scale - xoff;
n.y = (posy - dragy)/scale - yoff; n.y = (posy - dragy) / scale - yoff;
} }
var e = document.getElementById('node_'+dragip); var e = document.getElementById('node_' + dragip);
e.style.left = parseInt((n.x+xoff)*scale) + "px"; e.style.left = parseInt((n.x + xoff) * scale) + "px";
e.style.top = parseInt((n.y+yoff)*scale) + "px"; e.style.top = parseInt((n.y + yoff) * scale) + "px";
} }
} }
function debug_writeln(line) function debug_writeln(line) {
{ debugSpan.innerHTML = line + "<br />" + debugSpan.innerHTML;
document.getElementById('debug').innerHTML = line + "<br />" + document.getElementById('debug').innerHTML;
} }
/** /**
@ -782,7 +735,7 @@ function debug_writeln(line)
*/ */
function setCookie(name, value, expires, path, domain, secure) { function setCookie(name, value, expires, path, domain, secure) {
document.cookie= name + "=" + escape(value) + document.cookie = name + "=" + escape(value) +
((expires) ? "; expires=" + expires.toGMTString() : "") + ((expires) ? "; expires=" + expires.toGMTString() : "") +
((path) ? "; path=" + path : "") + ((path) ? "; path=" + path : "") +
((domain) ? "; domain=" + domain : "") + ((domain) ? "; domain=" + domain : "") +
@ -798,9 +751,8 @@ function setCookie(name, value, expires, path, domain, secure) {
* or null if cookie does not exist. * or null if cookie does not exist.
*/ */
function getCookie(name) function getCookie(name) {
{ var results = document.cookie.match(name + '=(.*?)(;|$)');
var results = document.cookie.match ( name + '=(.*?)(;|$)' );
if (results) { if (results) {
return unescape(results[1]); return unescape(results[1]);
} }
@ -826,7 +778,7 @@ function deleteCookie(name, path, domain) {
function deleteAllCookies() { function deleteAllCookies() {
var cookies = document.cookie.split("; "); var cookies = document.cookie.split("; ");
for(var i=0;i<cookies.length;i++) { for (var i = 0; i < cookies.length; i++) {
deleteCookie(cookies[i].split("=")[0]); deleteCookie(cookies[i].split("=")[0]);
} }
} }

166
applications/luci-app-olsr-viz/htdocs/luci-static/resources/view/olsr-viz/olsr-viz-view.js Normal file
View file

@ -0,0 +1,166 @@
'use strict';
'require uci';
'require view';
'require poll';
'require ui';
'require rpc';
return view.extend({
callGetOlsrVizData: rpc.declare({
object: 'olsrvizinfo',
method: 'getolsrvizdata'
}),
fetch_jsoninfo: function () {
var jsonreq4 = '';
var json;
var data;
var self = this;
return new Promise(function (resolve, reject) {
L.resolveDefault(self.callGetOlsrVizData(), {})
.then(function (res) {
json = res;
data = json.jsonreq4;
resolve([data]);
})
.catch(function (err) {
console.error(err);
reject([null]);
});
});
},
action_olsr_viz: function () {
var self = this;
return new Promise(function (resolve, reject) {
self
.fetch_jsoninfo()
.then(function ([data]) {
var result = { viz_data: data };
resolve(result);
})
.catch(function (err) {
reject(err);
});
});
},
load: function () {
var self = this;
document.querySelector('head').appendChild(E('style', { 'type': 'text/css' }, [
'.label {color:black;background-color:white}',
'.olsr_viz_main {width: 100%; height: 93%; border: 1px solid #ccc; margin-left:auto; margin-right:auto; text-align:center; overflow: scroll}'
]));
return new Promise(function (resolve, reject) {
var script = E('script', { 'type': 'text/javascript' });
script.onload = resolve;
script.onerror = reject;
script.src = L.resource('olsr-viz.js');
document.querySelector('head').appendChild(script);
});
},
render: function () {
var viz_res;
var self = this;
return this.action_olsr_viz()
.then(function (result) {
viz_res = result.viz_data;
var nodeDiv = E('div', { 'id': 'nodes', 'style': 'width: 1px; height: 1px; position: relative; z-index:4' });
var edgeDiv = E('div', { 'id': 'edges', 'style': 'width: 1px; height: 1px; position: relative; z-index:2' });
var mainDiv = E('div', {
'id': 'main',
'class': 'olsr_viz_main'
}, [nodeDiv, edgeDiv]);
var zoomInput = E('input', {
'id': 'zoom',
'name': 'zoom',
'type': 'text',
'value': '2.0',
'size': '5',
'style': 'min-width: unset !important;',
'onchange': 'set_scale()'
});
var metricInput = E('input', {
'id': 'maxmetric',
'name': 'maxmetric',
'type': 'text',
'value': '3',
'size': '4',
'style': 'min-width: unset !important;',
'change': (ev)=>set_maxmetric(ev.target.value)
});
var autoOptimizationCheckbox = E('input', {
'id': 'auto_declump',
'name': 'auto_declump',
'type': 'checkbox',
'change': (ev) => set_autodeclump(ev.target.checked),
'checked': 'checked'
});
var hostnamesCheckbox = E('input', {
'id': 'show_hostnames',
'name': 'show_hostnames',
'type': 'checkbox',
'change': (ev) => set_showdesc(ev.target.checked),
'checked': 'checked'
});
var form = E('form', { 'action': '' }, [
E('p', {}, [
E('b', { 'title': 'Bestimmt die Vergrößerungsstufe.' }, 'Zoom '),
E('a', { 'href': '#', 'click': () =>set_scale(scale+0.1) }, '+ '),
E('a', { 'href': '#', 'click': () =>set_scale(scale-0.1) }, '\u2212 '),
zoomInput,
E('b', { 'title': 'Beschränkt die Anzeige auf eine maximale Hop-Entfernung.' }, '&nbsp;&nbsp;Metrik'),
E('a', { 'href': '#', 'click': () => set_maxmetric(maxmetric+1) }, '+ '),
E('a', { 'href': '#', 'click': () => set_maxmetric(Math.max(maxmetric, 1) - 1) }, '\u2212'),
metricInput,
E('b', { 'title': 'Schaltet die automatischen Layout-Optimierung ein.' }, '&nbsp;&nbsp;Optimierung'),
autoOptimizationCheckbox,
E('b', { 'title': 'Zeige Hostnamen an.' }, ' | Hostnamen'),
hostnamesCheckbox,
E('a', { 'href': '#', 'click': viz_save, 'title': 'Speichert die aktuellen Einstellungen in einem Cookie.', 'style': 'font-weight:700;' }, '&nbsp;|&nbsp;&nbsp;Speichern'),
E('a', { 'href': '#', 'click': viz_reset, 'title': 'Startet das Viz-Skriptprogramm neu.', 'style': 'font-weight:700;' }, '&nbsp;|&nbsp;&nbsp;Zur&uuml;cksetzen')
])
]);
var debugSpan = E('span', { 'id': 'debug', 'style': 'visibility:hidden;' });
var vizDiv = E('div', { 'id': 'RSIFrame', 'name': 'RSIFrame', 'style': 'border:0px; width:0px; height:0px; visibility:hidden;' });
viz_setup(vizDiv, mainDiv, nodeDiv, edgeDiv, debugSpan, zoomInput, metricInput); viz_update();
function setInnerHTML(elm, html) {
elm.innerHTML = html;
Array.from(elm.querySelectorAll("script"))
.forEach(oldScriptEl => {
const newScriptEl = document.createElement("script");
Array.from(oldScriptEl.attributes).forEach(attr => {
newScriptEl.setAttribute(attr.name, attr.value)
});
const scriptText = document.createTextNode(oldScriptEl.innerHTML);
newScriptEl.appendChild(scriptText);
oldScriptEl.parentNode.replaceChild(newScriptEl, oldScriptEl);
});
};
setInnerHTML(vizDiv, viz_res);
var renderDiv = E('div', { 'style': 'width:100%; height:640px; border:none', 'scrolling': 'no' }, [mainDiv]);
var result = E([], {}, [form, debugSpan, renderDiv, vizDiv]);
return result;
})
.catch(function (error) {
console.error(error);
});
},
handleSaveApply: null,
handleSave: null,
handleReset: null,
});

10
applications/luci-app-olsr-viz/luasrc/view/olsr-viz/olsr-viz.htm
View file

@ -1,10 +0,0 @@
<%+header%>
<noscript>
<div class="warning">
<%:You need to allow javascript in your browser to show this page.%>
</div>
</noscript>
<iframe style="width:100%; height:640px; border:none" scrolling="no" src="/cgi-bin/olsr-viz.sh"></iframe>
<%+footer%>

59
applications/luci-app-olsr-viz/root/usr/libexec/rpcd/olsrvizinfo Normal file
View file

@ -0,0 +1,59 @@
#!/bin/sh
. /usr/share/libubox/jshn.sh
case "$1" in
list)
json_init
json_add_object "getolsrvizdata"
json_close_object
json_dump
;;
call)
case "$2" in
getolsrvizdata)
jsonreq4=$(
cat <<EOF
<script language='JavaScript1.2' type='text/javascript'>
EOF
# sed + txtinfo plugin
re_ip='[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}'
re_sep='[[:space:]]\{1,\}'
re_nosep='[^[:space:]]\{1,\}'
wget http://127.0.0.1:2006/all -qO - | sed -n "
/^Table: Links$/,/^$/ {
s# # - #g
s#\($re_ip\)$re_sep\($re_ip\)\($re_sep$re_nosep\)\{3\}$re_sep\($re_nosep\)#touch_edge(touch_node('\1').set_metric(1).update(),touch_node('\2').set_metric(1).update(),'\4');#p
}
/^Table: Topology$/,/^$/ {
s#\($re_ip\)$re_sep\($re_ip\)\($re_sep$re_nosep\)\{2\}$re_sep\($re_nosep\)#touch_edge(touch_node('\1').update(),touch_node('\2').update(),'\4');#p
}
/^Table: HNA$/,/^$/ {
s#\($re_ip\)/\([0-9]\{1,\}\)$re_sep\($re_ip\)#touch_hna(touch_node('\3'),'\1','\2');#p
}
/^Table: Routes$/,/^$/ {
s#\($re_ip\)/32$re_sep$re_nosep$re_sep\($re_nosep\).*#touch_node('\1').set_metric('\2').update();#p
}
"
hosts=$(uci show olsrd | grep hosts_file | cut -d "=" -f 2)
if [ -n $hosts ]; then
sed -n "
s#\($re_ip\)$re_sep\($re_nosep\)$re_sep.*#touch_node('\1').set_desc('\2');#p
" <$hosts
fi
cat <<EOF
viz_callback();
</script>
EOF
)
json_init
json_add_string "jsonreq4" "$jsonreq4"
json_dump
;;
esac
;;
esac

12
applications/luci-app-olsr-viz/root/usr/share/luci/menu.d/luci-app-olsr-viz.json
View file

@ -1,10 +1,12 @@
{ {
"admin/status/olsr/olsr-viz": {
"title": "OLSR-Viz", "olsr/olsr-viz": {
"order": 90, "title": "OLSR Visualization",
"order": 100,
"action": { "action": {
"type": "template", "type": "view",
"path": "olsr-viz/olsr-viz" "path": "olsr-viz/olsr-viz-view"
} }
} }
} }

12
applications/luci-app-olsr-viz/root/usr/share/rpcd/acl.d/luci-app-olsr-viz-unauthenticated.json Normal file
View file

@ -0,0 +1,12 @@
{
"unauthenticated": {
"description": "Grant read access for luci-app-olsr-viz",
"read": {
"ubus": {
"olsrvizinfo": [
"getolsrvizdata"
]
}
}
}
}