From 44b3a75c0e80aa160c07cd527a04bf22ce3bb092 Mon Sep 17 00:00:00 2001 From: jim-p Date: Fri, 30 Sep 2011 19:57:03 -0400 Subject: [PATCH] Move hostapd to its own log and tab, so it stops spamming the system log. --- etc/inc/system.inc | 4 +- etc/rc | 3 + usr/local/www/diag_logs.php | 1 + usr/local/www/diag_logs_auth.php | 1 + usr/local/www/diag_logs_dhcp.php | 1 + usr/local/www/diag_logs_filter.php | 1 + usr/local/www/diag_logs_filter_dynamic.php | 1 + usr/local/www/diag_logs_filter_summary.php | 1 + usr/local/www/diag_logs_ipsec.php | 1 + usr/local/www/diag_logs_ntpd.php | 1 + usr/local/www/diag_logs_openvpn.php | 1 + usr/local/www/diag_logs_ppp.php | 1 + usr/local/www/diag_logs_relayd.php | 1 + usr/local/www/diag_logs_settings.php | 1 + usr/local/www/diag_logs_vpn.php | 1 + usr/local/www/diag_logs_wireless.php | 101 +++++++++++++++++++++ 16 files changed, 120 insertions(+), 1 deletion(-) create mode 100644 usr/local/www/diag_logs_wireless.php diff --git a/etc/inc/system.inc b/etc/inc/system.inc index a6b96680f1..93dfd29ca5 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -450,7 +450,7 @@ function system_syslogd_start() { } if (isset($syslogcfg)) { - $separatelogfacilities = array('ntpd','racoon','openvpn','pptps','poes','l2tps','relayd'); + $separatelogfacilities = array('ntpd','racoon','openvpn','pptps','poes','l2tps','relayd','hostapd'); if($config['installedpackages']['package']) { foreach($config['installedpackages']['package'] as $package) { if($package['logging']) { @@ -509,6 +509,8 @@ function system_syslogd_start() { $syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/apinger.log\n"; $syslogconf .= "!relayd\n"; $syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/relayd.log\n"; + $syslogconf .= "!hostapd\n"; + $syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/wireless.log\n"; $syslogconf .= "!-{$facilitylist}\n"; if (!isset($syslogcfg['disablelocallogging'])) $syslogconf .= << diff --git a/usr/local/www/diag_logs_auth.php b/usr/local/www/diag_logs_auth.php index a6e97305be..e8f1ba9017 100755 --- a/usr/local/www/diag_logs_auth.php +++ b/usr/local/www/diag_logs_auth.php @@ -72,6 +72,7 @@ include("head.inc"); $tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php"); $tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php"); $tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php"); + $tab_array[] = array(gettext("Wireless"), false, "diag_logs_wireless.php"); $tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/diag_logs_dhcp.php b/usr/local/www/diag_logs_dhcp.php index 438f7bbf36..5eb44ccf89 100755 --- a/usr/local/www/diag_logs_dhcp.php +++ b/usr/local/www/diag_logs_dhcp.php @@ -77,6 +77,7 @@ include("head.inc"); $tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php"); $tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php"); $tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php"); + $tab_array[] = array(gettext("Wireless"), false, "diag_logs_wireless.php"); $tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php index 5fb94cff68..3240ea7244 100755 --- a/usr/local/www/diag_logs_filter.php +++ b/usr/local/www/diag_logs_filter.php @@ -108,6 +108,7 @@ include("head.inc"); $tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php"); $tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php"); $tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php"); + $tab_array[] = array(gettext("Wireless"), false, "diag_logs_wireless.php"); $tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/diag_logs_filter_dynamic.php b/usr/local/www/diag_logs_filter_dynamic.php index 82cf17948c..3b6b671e1f 100755 --- a/usr/local/www/diag_logs_filter_dynamic.php +++ b/usr/local/www/diag_logs_filter_dynamic.php @@ -107,6 +107,7 @@ include("head.inc"); $tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php"); $tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php"); $tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php"); + $tab_array[] = array(gettext("Wireless"), false, "diag_logs_wireless.php"); $tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/diag_logs_filter_summary.php b/usr/local/www/diag_logs_filter_summary.php index 96a2ecdbc2..2d060eee0d 100644 --- a/usr/local/www/diag_logs_filter_summary.php +++ b/usr/local/www/diag_logs_filter_summary.php @@ -191,6 +191,7 @@ include("head.inc"); ?> $tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php"); $tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php"); $tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php"); + $tab_array[] = array(gettext("Wireless"), false, "diag_logs_wireless.php"); $tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/diag_logs_ipsec.php b/usr/local/www/diag_logs_ipsec.php index 87e1e50e88..95da1b6131 100755 --- a/usr/local/www/diag_logs_ipsec.php +++ b/usr/local/www/diag_logs_ipsec.php @@ -110,6 +110,7 @@ include("head.inc"); $tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php"); $tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php"); $tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php"); + $tab_array[] = array(gettext("Wireless"), false, "diag_logs_wireless.php"); $tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/diag_logs_ntpd.php b/usr/local/www/diag_logs_ntpd.php index 35d578c7ca..42dd7a233a 100644 --- a/usr/local/www/diag_logs_ntpd.php +++ b/usr/local/www/diag_logs_ntpd.php @@ -72,6 +72,7 @@ include("head.inc"); $tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php"); $tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php"); $tab_array[] = array(gettext("OpenNTPD"), true, "diag_logs_ntpd.php"); + $tab_array[] = array(gettext("Wireless"), false, "diag_logs_wireless.php"); $tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/diag_logs_openvpn.php b/usr/local/www/diag_logs_openvpn.php index dd57b9daf3..6f2c55c99d 100644 --- a/usr/local/www/diag_logs_openvpn.php +++ b/usr/local/www/diag_logs_openvpn.php @@ -76,6 +76,7 @@ include("head.inc"); $tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php"); $tab_array[] = array(gettext("OpenVPN"), true, "diag_logs_openvpn.php"); $tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php"); + $tab_array[] = array(gettext("Wireless"), false, "diag_logs_wireless.php"); $tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/diag_logs_ppp.php b/usr/local/www/diag_logs_ppp.php index 9609132863..027e1ef9d0 100755 --- a/usr/local/www/diag_logs_ppp.php +++ b/usr/local/www/diag_logs_ppp.php @@ -77,6 +77,7 @@ include("head.inc"); $tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php"); $tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php"); $tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php"); + $tab_array[] = array(gettext("Wireless"), false, "diag_logs_wireless.php"); $tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/diag_logs_relayd.php b/usr/local/www/diag_logs_relayd.php index 3aac43170f..e18000af69 100755 --- a/usr/local/www/diag_logs_relayd.php +++ b/usr/local/www/diag_logs_relayd.php @@ -73,6 +73,7 @@ include("head.inc"); $tab_array[] = array(gettext("Load Balancer"), true, "diag_logs_relayd.php"); $tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php"); $tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php"); + $tab_array[] = array(gettext("Wireless"), false, "diag_logs_wireless.php"); $tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php index 9d854cb622..77e1b911ff 100755 --- a/usr/local/www/diag_logs_settings.php +++ b/usr/local/www/diag_logs_settings.php @@ -176,6 +176,7 @@ function enable_change(enable_over) { $tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php"); $tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php"); $tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php"); + $tab_array[] = array(gettext("Wireless"), false, "diag_logs_wireless.php"); $tab_array[] = array(gettext("Settings"), true, "diag_logs_settings.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php index 658b5bb4fe..f511ef00ca 100755 --- a/usr/local/www/diag_logs_vpn.php +++ b/usr/local/www/diag_logs_vpn.php @@ -133,6 +133,7 @@ include("head.inc"); $tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php"); $tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php"); $tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php"); + $tab_array[] = array(gettext("Wireless"), false, "diag_logs_wireless.php"); $tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); display_top_tabs($tab_array); ?> diff --git a/usr/local/www/diag_logs_wireless.php b/usr/local/www/diag_logs_wireless.php new file mode 100644 index 0000000000..dc27e69408 --- /dev/null +++ b/usr/local/www/diag_logs_wireless.php @@ -0,0 +1,101 @@ +. + Copyright (C) 2008 Seth Mos . + Copyright (C) 2011 Jim Pingle . + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. +*/ + +/* + pfSense_MODULE: routing +*/ + +##|+PRIV +##|*IDENT=page-status-systemlogs-wireless +##|*NAME=Status: System logs: Wireless page +##|*DESCR=Allow access to the 'Status: System logs: Wireless' page. +##|*MATCH=diag_logs_wireless.php* +##|-PRIV + +require("guiconfig.inc"); + +$wireless_logfile = "{$g['varlog_path']}/wireless.log"; + +$nentries = $config['syslog']['nentries']; +if (!$nentries) + $nentries = 50; + +if ($_POST['clear']) + clear_log_file($wireless_logfile); + +$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("Wireless")); +include("head.inc"); + +?> + + + + + + + + +
+ +
+
+ + + + + + +
+

+">
+
+ +
+ + +