Commit wireless frontend code

5 files changed, 40 insertions, 0 deletions

diff --git a/usr/local/www/status_rrd_graph.php b/usr/local/www/status_rrd_graph.php
index 9d5428a..2203a74 100755
--- a/usr/local/www/status_rrd_graph.php
+++ b/usr/local/www/status_rrd_graph.php
@@ -71,6 +71,7 @@ rsort($databases);
 /* these boilerplate databases are required for the other menu choices */
 $dbheader = array("allgraphs-traffic.rrd",
 		"allgraphs-quality.rrd",
+		"allgraphs-wireless.rrd",
 		"allgraphs-packets.rrd",
 		"system-allgraphs.rrd",
 		"system-throughput.rrd",
@@ -111,6 +112,8 @@ include("head.inc");
 			        $tab_array[] = array("Quality", $tabactive, "status_rrd_graph.php?cat=quality");
 				if($curcat == "queues") { $tabactive = True; } else { $tabactive = False; }
 			        $tab_array[] = array("Queues", $tabactive, "status_rrd_graph.php?cat=queues");
+				if($curcat == "wireless") { $tabactive = True; } else { $tabactive = False; }
+			        $tab_array[] = array("Wireless", $tabactive, "status_rrd_graph.php?cat=wireless");
 				if($curcat == "settings") { $tabactive = True; } else { $tabactive = False; }
 			        $tab_array[] = array("Settings", $tabactive, "status_rrd_graph_settings.php");
 			        display_top_tabs($tab_array);
diff --git a/usr/local/www/status_rrd_graph_img.php b/usr/local/www/status_rrd_graph_img.php
index 7a604cf..8104a64 100644
--- a/usr/local/www/status_rrd_graph_img.php
+++ b/usr/local/www/status_rrd_graph_img.php
@@ -133,6 +133,7 @@ if(file_exists($rrdcolors)) {
 	$colorqueuesdropdown = array('000000','7B7B7B','999999','BBBBBB','CCCCCC','D9D9D9','EEEEEE','FFFFFF','CCCCCC');
 	$colorqualityrtt = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
 	$colorqualityloss = "ee0000";
+	$colorwireless = array('990000','a83c3c','b36666');
 	$colorspamdtime = array('DDDDFF', 'AAAAFF', 'DDDDFF', '000066'); 
 	$colorspamdconn = array('00AA00BB', 'FFFFFFFF', '00660088', 'FFFFFF88', '006600');
 }
@@ -335,6 +336,39 @@ elseif((strstr($curdatabase, "-packets.rrd")) && (file_exists("$rrddbpath$curdat
         	COMMENT:\"\\n\"\\
 		COMMENT:\"\t\t\t\t\t\t\t\t\t\t\t\t\t`date +\"%b %d %H\:%M\:%S %Y\"`\"";
 	}
+elseif((strstr($curdatabase, "-wireless.rrd")) && (file_exists("$rrddbpath$curdatabase"))) {
+	/* define graphcmd for packets stats */
+	$graphcmd = "$rrdtool graph $rrdtmppath$curdatabase-$interval.png \\
+		--start -$seconds -e -$average \\
+		--vertical-label \"snr/channel/rate\" \\
+		--color SHADEA#eeeeee --color SHADEB#eeeeee \\
+		--title \"`hostname` - $prettydb - $hperiod - $havg average\" \\
+		--height 200 --width 620 -x \"$scale\" \\
+		DEF:$curif-snr=$rrddbpath$curdatabase:snr:AVERAGE \\
+		DEF:$curif-rate=$rrddbpath$curdatabase:rate:AVERAGE \\
+		DEF:$curif-channel=$rrddbpath$curdatabase:channel:AVERAGE \\
+		LINE1:$curif-snr#{$colorwireless[0]}:$curif-snr \\
+		LINE1:$curif-rate#{$colorwireless[1]}:$curif-rate \\
+		LINE1:$curif-channel#{$colorwireless[2]}:$curif-channel \\
+		COMMENT:\"\\n\"\\
+		COMMENT:\"\t\t  maximum       average       current        period\\n\"\\
+		COMMENT:\"SNR\t\"\\
+		GPRINT:$curif-snr:MAX:'%7.2lf %s pps'\\
+		GPRINT:$curif-snr:AVERAGE:'%7.2lf %S pps'\\
+		GPRINT:$curif-snr:LAST:'%7.2lf %S pps'\\
+		COMMENT:\"\\n\"\\
+		COMMENT:\"RATE\t\"\\
+		GPRINT:$curif-rate:MAX:'%7.2lf %s pps'\\
+		GPRINT:$curif-rate:AVERAGE:'%7.2lf %S pps'\\
+		GPRINT:$curif-rate:LAST:'%7.2lf %S pps'\\
+		COMMENT:\"\\n\"\\
+		COMMENT:\"Channel\"\\
+		GPRINT:$curif-channel:MAX:'%7.2lf %s pps'\\
+		GPRINT:$curif-channel:AVERAGE:'%7.2lf %s pps'\\
+		GPRINT:$curif-channel:LAST:'%7.2lf %s pps'\\
+        	COMMENT:\"\\n\"\\
+		COMMENT:\"\t\t\t\t\t\t\t\t\t\t\t\t\t`date +\"%b %d %H\:%M\:%S %Y\"`\"";
+	}
 elseif((strstr($curdatabase, "-states.rrd")) && (file_exists("$rrddbpath$curdatabase"))) {
 	/* define graphcmd for states stats */
 	$graphcmd = "$rrdtool graph $rrdtmppath$curdatabase-$interval.png \\
diff --git a/usr/local/www/themes/nervecenter/rrdcolors.inc.php b/usr/local/www/themes/nervecenter/rrdcolors.inc.php
index 3901acb..490319f 100644
--- a/usr/local/www/themes/nervecenter/rrdcolors.inc.php
+++ b/usr/local/www/themes/nervecenter/rrdcolors.inc.php
@@ -42,6 +42,7 @@ $colorqueuesdropup = array('000000','7B0000','990000','BB0000','CC0000','D90000'
 $colorqueuesdropdown = array('000000','7B7B7B','999999','BBBBBB','CCCCCC','D9D9D9','EEEEEE','FFFFFF','CCCCCC');
 $colorqualityrtt = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
 $colorqualityloss = "ee0000";
+$colorwireless = array('990000','a83c3c','b36666');
 $colorspamdtime = array('DDDDFF', 'AAAAFF', 'DDDDFF', '000066');
 $colorspamdconn = array('00AA00BB', 'FFFFFFFF', '00660088', 'FFFFFF88', '006600');
 
diff --git a/usr/local/www/themes/pfsense-dropdown/rrdcolors.inc.php b/usr/local/www/themes/pfsense-dropdown/rrdcolors.inc.php
index 3901acb..490319f 100644
--- a/usr/local/www/themes/pfsense-dropdown/rrdcolors.inc.php
+++ b/usr/local/www/themes/pfsense-dropdown/rrdcolors.inc.php
@@ -42,6 +42,7 @@ $colorqueuesdropup = array('000000','7B0000','990000','BB0000','CC0000','D90000'
 $colorqueuesdropdown = array('000000','7B7B7B','999999','BBBBBB','CCCCCC','D9D9D9','EEEEEE','FFFFFF','CCCCCC');
 $colorqualityrtt = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
 $colorqualityloss = "ee0000";
+$colorwireless = array('990000','a83c3c','b36666');
 $colorspamdtime = array('DDDDFF', 'AAAAFF', 'DDDDFF', '000066');
 $colorspamdconn = array('00AA00BB', 'FFFFFFFF', '00660088', 'FFFFFF88', '006600');
 
diff --git a/usr/local/www/themes/pfsense/rrdcolors.inc.php b/usr/local/www/themes/pfsense/rrdcolors.inc.php
index 3901acb..490319f 100644
--- a/usr/local/www/themes/pfsense/rrdcolors.inc.php
+++ b/usr/local/www/themes/pfsense/rrdcolors.inc.php
@@ -42,6 +42,7 @@ $colorqueuesdropup = array('000000','7B0000','990000','BB0000','CC0000','D90000'
 $colorqueuesdropdown = array('000000','7B7B7B','999999','BBBBBB','CCCCCC','D9D9D9','EEEEEE','FFFFFF','CCCCCC');
 $colorqualityrtt = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
 $colorqualityloss = "ee0000";
+$colorwireless = array('990000','a83c3c','b36666');
 $colorspamdtime = array('DDDDFF', 'AAAAFF', 'DDDDFF', '000066');
 $colorspamdconn = array('00AA00BB', 'FFFFFFFF', '00660088', 'FFFFFF88', '006600');