diff options
author | jim-p <jimp@pfsense.org> | 2011-09-30 19:57:03 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2011-09-30 19:57:43 -0400 |
commit | 689eaa4dc63b7c4a7201d807eca4e838624f1ff3 (patch) | |
tree | c9409fd375f4473b0e78d94f37991da63ac1ecd1 | |
parent | a36a239ac801859c7bf4d50e1b704322ff34c4ce (diff) | |
download | pfsense-689eaa4dc63b7c4a7201d807eca4e838624f1ff3.zip pfsense-689eaa4dc63b7c4a7201d807eca4e838624f1ff3.tar.gz |
Move hostapd to its own log and tab, so it stops spamming the system log.
-rw-r--r-- | etc/inc/system.inc | 4 | ||||
-rwxr-xr-x | etc/rc | 3 | ||||
-rwxr-xr-x | usr/local/www/diag_logs.php | 1 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_auth.php | 1 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_dhcp.php | 1 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_filter.php | 1 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_filter_dynamic.php | 1 | ||||
-rw-r--r-- | usr/local/www/diag_logs_filter_summary.php | 1 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_ipsec.php | 1 | ||||
-rw-r--r-- | usr/local/www/diag_logs_ntpd.php | 1 | ||||
-rw-r--r-- | usr/local/www/diag_logs_openvpn.php | 1 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_ppp.php | 1 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_relayd.php | 1 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_settings.php | 1 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_vpn.php | 1 | ||||
-rw-r--r-- | usr/local/www/diag_logs_wireless.php | 101 |
16 files changed, 120 insertions, 1 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 25565ef..a92ec52 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -504,7 +504,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']) { @@ -563,6 +563,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 .= <<<EOD @@ -263,6 +263,7 @@ if [ "$DISABLESYSLOGCLOG" -gt "0" ]; then /usr/bin/touch /var/log/ipsec.log /usr/bin/touch /var/log/ppp.log /usr/bin/touch /var/log/relayd.log + /usr/bin/touch /var/log/wireless.log /usr/bin/touch /var/log/lighttpd.log /usr/bin/touch /var/log/ntpd.log /usr/bin/touch /var/log/apinger.log @@ -282,6 +283,7 @@ else /usr/sbin/fifolog_create -s 50688 /var/log/ipsec.log /usr/sbin/fifolog_create -s 50688 /var/log/ppp.log /usr/sbin/fifolog_create -s 50688 /var/log/relayd.log + /usr/sbin/fifolog_create -s 50688 /var/log/wireless.log /usr/sbin/fifolog_create -s 50688 /var/log/lighttpd.log /usr/sbin/fifolog_create -s 50688 /var/log/ntpd.log /usr/sbin/fifolog_create -s 50688 /var/log/apinger.log @@ -301,6 +303,7 @@ else /usr/sbin/clog -i -s 65535 /var/log/lighttpd.log /usr/sbin/clog -i -s 65535 /var/log/ntpd.log /usr/sbin/clog -i -s 65535 /var/log/relayd.log + /usr/sbin/clog -i -s 65535 /var/log/wireles.log /usr/sbin/clog -i -s 65535 /var/log/apinger.log fi fi diff --git a/usr/local/www/diag_logs.php b/usr/local/www/diag_logs.php index 35b6231..2b80d6d 100755 --- a/usr/local/www/diag_logs.php +++ b/usr/local/www/diag_logs.php @@ -84,6 +84,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_auth.php b/usr/local/www/diag_logs_auth.php index a6e9730..e8f1ba9 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 438f7bb..5eb44cc 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 a35e3c6..2c71a21 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 82cf179..3b6b671 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 96a2ecd..2d060ee 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 9ed65a5..6ef2b4c 100755 --- a/usr/local/www/diag_logs_ipsec.php +++ b/usr/local/www/diag_logs_ipsec.php @@ -109,6 +109,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 35d578c..42dd7a2 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 dd57b9d..6f2c55c 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 c58b589..6459f44 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 3aac431..e18000a 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 9d854cb..77e1b91 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 658b5bb..f511ef0 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 0000000..dc27e69 --- /dev/null +++ b/usr/local/www/diag_logs_wireless.php @@ -0,0 +1,101 @@ +<?php +/* $Id$ */ +/* + diag_logs_wireless.php + part of pfSense + + Copyright (C) 2008 Bill Marquette <bill.marquette@gmail.com>. + Copyright (C) 2008 Seth Mos <seth.mos@dds.nl>. + Copyright (C) 2011 Jim Pingle <jimp@pfsense.org>. + 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"); + +?> + +<body link="#0000CC" vlink="#0000CC" alink="#0000CC"> +<?php include("fbegin.inc"); ?> +<table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr><td> +<?php + $tab_array = array(); + $tab_array[] = array(gettext("System"), false, "diag_logs.php"); + $tab_array[] = array(gettext("Firewall"), false, "diag_logs_filter.php"); + $tab_array[] = array(gettext("DHCP"), false, "diag_logs_dhcp.php"); + $tab_array[] = array(gettext("Portal Auth"), false, "diag_logs_auth.php"); + $tab_array[] = array(gettext("IPsec"), false, "diag_logs_ipsec.php"); + $tab_array[] = array(gettext("PPP"), false, "diag_logs_ppp.php"); + $tab_array[] = array(gettext("VPN"), false, "diag_logs_vpn.php"); + $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"), true, "diag_logs_wireless.php"); + $tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); + display_top_tabs($tab_array); +?> + </td></tr> + <tr> + <td> + <div id="mainarea"> + <table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0"> + <tr> + <td colspan="2" class="listtopic"> + <?php printf(gettext("Wireless (hostapd) log entries"),$nentries);?></td> + </tr> + <?php dump_clog($wireless_logfile, $nentries); ?> + <tr><td><br><form action="diag_logs_wireless.php" method="post"> +<input name="clear" type="submit" class="formbtn" value="<?=gettext("Clear log"); ?>"></td></tr> + </table> + </div> +</form> + </td> + </tr> +</table> +<?php include("fend.inc"); ?> +</body> +</html> |