From: drowe67 Date: Tue, 7 Dec 2010 03:41:03 +0000 (+0000) Subject: added some support for signal strength X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=f446b0d9648666dd16a5922ef151527c70d572e4;p=freetel-svn-tracking.git added some support for signal strength git-svn-id: https://svn.code.sf.net/p/freetel/code@258 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/dilimesh/README.txt b/dilimesh/README.txt index 7d0fd4c2..8c1e91b5 100644 --- a/dilimesh/README.txt +++ b/dilimesh/README.txt @@ -85,7 +85,8 @@ Directories sigstr.sh - script that runs on MP as a telnet daemon to return signal strength of each node to getsig.cgi. Experimental. - + S99sigstr - /etc/init.d Mesh Potato start upscript for sigstr.sh telnet + daemon Software -------- @@ -149,6 +150,22 @@ Installation # ps | grep batman 552 root 1564 S batmand -s 10.130.1.1 ath0 +4/ (Optional) Signal strength daemon: + + Copy these scripts to each MP in your mesh that you wish to read sis + strength from: + + $ cd dilimesh/script + $ scp sigstr.sh root@10.130.1.36:/usr/sbin + $ scp S99sigstr root@10.130.1.36:/etc/rc.d + + Now start daemon on remote machine: + + $ ssh root@10.130.1.36 '/etc/rc.d/S99sigstr' + + Test if deamon is running + + $ telnet 10.130.1.36 4950 Tests ----- @@ -196,6 +213,15 @@ Tests $ cat /var/www/dilimesh/nodes.txt (empty file) +7/ Test signal strength daemon: + + $ telnet 10.130.1.1 4950 + Trying 10.130.1.36... + Connected to 10.130.1.36. + Escape character is '^]'. + + 10.130.1.1 10.130.1.56 10.130.1.14 + -64 -90 -75 Using Dilimesh -------------- diff --git a/dilimesh/dilimesh/dilimesh.html b/dilimesh/dilimesh/dilimesh.html index d4ca6cbf..793800ff 100644 --- a/dilimesh/dilimesh/dilimesh.html +++ b/dilimesh/dilimesh/dilimesh.html @@ -49,11 +49,17 @@ var drag_packet_loss; var drag_in_progress; + // pathes, vis server data, node list + var pathes = []; // array of lines, used to delete them var vis = []; // array of vis server information var nodes = []; // database of nodes we keep in memory // mirrors nodes.txt but also store marker locations + // states for polling sig strength + + var sigstr_node_index = 0; + // Called when we load page function initialize() { @@ -262,6 +268,16 @@ document.getElementById('ping_nodes').innerHTML = html; } + // fire off next sig strength + + if (nodes[sigstr_node_index] != undefined) { + downloadUrl("/cgi-bin/getsig.cgi?ip=" + nodes[sigstr_node_index].ip, processgetSig); + document.getElementById('sigstr_current_node').innerHTML = nodes[sigstr_node_index].ip; + } + + sigstr_node_index++; + if (sigstr_node_index >= nodes.length) + sigstr_node_index = 0; } @@ -342,7 +358,13 @@ var packet_loss_formatted = Math.round(nodes[j].packet_loss*100); nodes[j].marker.setTitle(nodes[j].ip + ' Packet Loss: ' + packet_loss_formatted + '%'); - nodes[j].infowindow.setContent(nodes[j].ip + '
Packet Loss: ' + packet_loss_formatted + '%'); + var html = nodes[j].ip + '
Packet Loss: ' + packet_loss_formatted + '%'; + if (nodes[j].neighbour_ips != undefined) { + for(var i=0; i'; + if (text_line == 3) { - if (text_line == 3) { - for(var i=0; iContol Panel
- @@ -812,8 +826,27 @@ -
Visualisation Server IPDebug Messages
+
+ +

Signal Strength

+ + + + + + + + + + + + + + + + +
Currently Polling
Last Node that
Responded
Results
diff --git a/dilimesh/scripts/S99sigstr b/dilimesh/scripts/S99sigstr new file mode 100755 index 00000000..a33f8162 --- /dev/null +++ b/dilimesh/scripts/S99sigstr @@ -0,0 +1,2 @@ +#!/bin/sh +telnetd -l /usr/sbin/sigstr.sh -p 4950