Mirrors
/
aredn
mirror of https://github.com/aredn/aredn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of ssh://git.aredn.org/aredn_ar71xx into develop 

* 'develop' of ssh://git.aredn.org/aredn_ar71xx:
  feature: TxMbps--Added Mesh Status Help Section and minor code enhancements
  bugfix: snrlog better handle neighbor references from mac to ip to hostname
  hardware: Add testing support for AirRouter HP
This commit is contained in:
Darryl Quinn 2016-01-04 22:42:34 -06:00
parent a1bc4fa35b 3c235a0c62
commit 16b4e8c798
5 changed files with 115 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/etc/crontabs/root
View File

@ -1,4 +1,4 @@
*/5 * * * * /usr/local/bin/fccid
*/1 * * * * /usr/local/bin/rssi_monitor
* * * * * /usr/local/bin/rssi_monitor
* * * * * /usr/local/bin/snrlog

32
files/usr/local/bin/snrlog
View File

@ -62,19 +62,29 @@ if (! -e $tmpdir ) { system("mkdir $tmpdir > /dev/null"); }
$d = sprintf ("%02d/%02d %02d:%02d:%02d",$mon+1, $mday,$hour, $min, $sec);
chomp ($now=`cat /proc/uptime | cut -f1 -d" "`);
foreach $sigmac ( `ls $sigdir` )
foreach $sigmac ( glob "$sigdir/*" )
{
$sigmac =~ s/^.*\///;
chomp $sigmac;
$isFile = "";
$hnamef = "";
$ipsig = "";
$macfname = "";
$macfname = `ls $tmpdir/$sigmac*` ;
$macfname =~ /^.*\/([^-]*)-(.*)$/;
$isFile = $1;
$hnamef = $2;
chomp ($ipsig = `cat /proc/net/arp | grep $sigmac | cut -f1 -d\" "`);
@maclist = glob "$tmpdir/$sigmac*";
if (@maclist) { $macfname = $maclist[-1]; }
else { $macfname = ""; }
if ($macfname)
{
$macfname =~ /^.*\/([^-]*)-(.*)$/ ;
$isFile=$1;
$hnamef=$2;
}
else
{
$macfname = "";
$isFile = "";
$hnamef = "";
}
$ipsig = "";
chomp ($ipsig = `cat /proc/net/arp | grep $sigmac | grep 'wlan0' | cut -f1 -d\" "`);
$hname="";
foreach(`nslookup $ipsig`)
{
@ -83,7 +93,7 @@ foreach $sigmac ( `ls $sigdir` )
break;
}
if (($hnamef and $hnamef eq $hname ) or ($hname and ! $isFile ))
if (($hnamef and $hnamef eq $hname ) or ($hname and $isFile eq "" ))
{
$sigdat = "$sigmac-$hname";
}

22
files/www/cgi-bin/mesh
View File

@ -81,34 +81,38 @@ foreach(`echo /all | nc 127.0.0.1 2006 2>$tmperr`)
$links{$ip}{lq} = $lq;
$links{$ip}{nlq} = $nlq;
$mac = `grep $ip /proc/net/arp | head -1`;
$mac = `grep $ip /proc/net/arp | grep wlan0 | grep -v "00:00:00:00:00:00" | head -1`;
$mac =~ s/^.*(\w\w:\w\w:\w\w:\w\w:\w\w:\w\w).*$/$1/;
chomp $mac;
if (! $mac or ! -e "/sys/kernel/debug/ieee80211/phy0/netdev:wlan0/stations/$mac" )
{
$links{$ip}{mbps} = "";
$mbps = "";
}
else
{
#802.11n
$mbps = `egrep 'HT(4|2)0\\\/\(L|S\)GI[ \t]+(A|T)' /sys/kernel/debug/ieee80211/phy0/netdev\:wlan0/stations/$mac/rc_stats`;
if ($mbps) { $mbps =~ s/HT(4|2)0\/(L|S)GI[[ \tTtPABCD]+MCS\d+[ \t]*([\d\.]+).*$/$3/ ; }
if ($mbps) { $mbps =~ s/HT(4|2)0\/(L|S)GI[[ \tTtPABCD]+MCS[0-9]+[ \t]*([0-9\.]+).*$/$3/ ; }
else
{
#802.11a/g
$mbps = `egrep \"^A\" /sys/kernel/debug/ieee80211/phy0/netdev\:wlan0/stations/$mac/rc_stats`;
if ($mbps) { $mbps =~ s/^A[ \tBCDP]+[\d\.]+[ \t]+([\d\.]+).*$/$1/ ; }
$mbps = `egrep \"^A[BCDP \t]+[0-9\.]+\" /sys/kernel/debug/ieee80211/phy0/netdev\:wlan0/stations/$mac/rc_stats`;
if ($mbps) { $mbps =~ s/^A[ \tBCDP]+[0-9\.]+[ \t]+([0-9\.]+).*$/$1/ ; }
else
{
#802.11b
$mbps = `egrep \"CCK\/LP[ \t]*T\" /sys/kernel/debug/ieee80211/phy0/netdev\:wlan0/stations/$mac/rc_stats`;
if ($mbps) { $mbps =~ s/CCK\/LP[ \tTtP]+[\d\.]+M[ \t]*([\d\.]+).*$/$1/ ; }
else { $mbps = "0"; }
if ($mbps) { $mbps =~ s/CCK\/LP[ \tTtP]+[0-9\.]+M[ \t]*([0-9\.]+).*$/$1/ ; }
else { $mbps = ""; }
}
}
$mbps /= $chanbw;
$links{$ip}{mbps} = sprintf "%.1f",$mbps;
if ( ! $mbps eq "" )
{
$mbps /= $chanbw;
$links{$ip}{mbps} = sprintf "%.1f",$mbps;
}
else { $links{$ip}{mbps} = ""; }
}
}
elsif($table eq "Neighbors")

9
files/www/cgi-bin/perlfunc.pm
View File

@ -1227,6 +1227,15 @@ sub hardware_info
'usechains' => 0,
'rfband' => '2400',
},
'0xe4b2' => {
'name' => 'AirRouter HP',
'comment' => 'AirRouter HP in testing',
'supported' => '-2',
'maxpower' => '19',
'pwroffset' => '9',
'usechains' => 0,
'rfband' => '2400',
},
'0xe4e5' => {
'name' => 'NanoBeam M5 International',
'comment' => 'NanoBeam M5 International XW series unsuported at this time',

71
files/www/help.html
View File

@ -137,6 +137,77 @@ filesystem in RAM that stores the current state information and various
temporary files. Memory is the amount of RAM available for running processes.
</p>
<br><br><hr>
<a name=setup><h2>Mesh Status</h2></a>
<p>
The Mesh Status page lists AREDN Mesh Nodes, link quality information, and the services advertised on the Mesh. There are 3 sections:
</p>
<ul>
<li><strong>Local Host</strong> is the AREDN Mesh Node showing status and the advertised Services assocated with this Node.<br><br></li>
<li><strong>Current Neighbors</strong> is a list of direct Neighbor Mesh Nodes (1 hop). This may be via RF, DTDLink (a cat5 cable), or a Tunnel (over Internet connection). Quality of the link is shown (described below) and advertised Services hosted on the Node or attached to the LAN of the Node are listed.<br><br></li>
<li><strong>Remote Nodes</strong> is a list of indirect Mesh Nodes (2 or more hops). Advertised Services hosted on the Node or attached to the LAN of the Node are listed. Remote Nodes are sorted by ETX, referred to as "link cost".</li>
</ul>
<p>
<br>
<strong>LQ</strong>
</p>
<p>
Link Quality (LQ) is the % of packets received from the Neighbor in the OLSR mesh routing protocol from the perspective of the Local Host. OLSR packets are exchanging routing, advertised services, and other information and include a sequence number with each packet to determine missing packets to characterize the quality of the link.
</p>
<p>
<br>
<strong>NLQ</strong>
</p>
<p>
Neighbor Link Quality (NLQ) is the % of packets the Neighbor received from the perspective of the Local Host in the OLSR mesh routing protocol. The NLQ is the LQ from the Neighbor's perspective.
</p>
<p>
<br>
<strong>ETX</strong>
</p>
<p>
Expected Transmissions (ETX) is a Bernoulli statistic of how many packets must be transmitted to successfully receive the round trip acknowledgement between Neighbor nodes and is calculated with this formula: ETX = 1/(LQ*NLQ). Between multiple hop nodes, this is calculated by adding up the ETX for each single hop. "1" is a perfect RF link between Neighbors. A DtDLink is fixed at ETX="0.1" for packets over a cat5 cable. OLSR on a Mesh Node selects the Neighbor to send traffic to based on the lowest cost ETX path towards the final destination Node.
</p>
<p>
ETX should be interpreted with care. From a quality perspective, the ETX for Remote Nodes is not an end-to-end metric in the same way as adjacent neighbors. For example, 2 nodes that are 5 hops apart with zero packet loss between them is characterized with an ETX=5. A single hop with ETX=5 (LQ and NLQ is ~45%) will stream poor quality video, if usable at all, given the packet loss. A 5 hop route between nodes with ETX=5 will deliver smooth streaming quality video.
</p>
<p>
<br>
<strong>TxMbps</strong>
</p>
<p>
Transmitted Mbps (TxMbps) is the measured transmitted throughput, at the packet level, after accounting for packet loss. The 802.11 driver bases the selection, to each Neighbor, of modulation scheme and number of antennas (multiple polarized spatial streams of data) on the combination that achieves the highest throughput. If no traffic is being sent to this Neighbor, then the value may be '0' until data is available to measure and determine the optimal settings. For further details: <a href='http://wireless.wiki.kernel.org/en/developers/documentation/mac80211/ratecontrol/minstrel'>Rate Control Algorithm</a>
</p>
<p>
<br>
<strong>(wan)</strong>
</p>
<p>
"(wan)" next to a Mesh Node indicates the node is an Advertised Gateway. Typically this is to the internet, but may also be an isolated network.
</p>
<p>
<br>
<strong>(dtd)</strong>
</p>
<p>
"(dtd)" next to a Mesh Node indicates the path to a Neighbor is a cat5 cable. The Neighbor may be listed twice if both an RF and DtDLink path exists. The DtDLink path is always assigned an ETX of "0.1".
</p>
<br><br><hr>
<a name=setup><h2>Basic Setup</h2></a>
<p>