diff options
| -rw-r--r-- | etc/inc/system.inc | 8 | ||||
| -rwxr-xr-x | etc/rc | 2 | ||||
| -rwxr-xr-x | usr/local/www/diag_logs.php | 1 | ||||
| -rwxr-xr-x | usr/local/www/diag_logs_gateways.php | 1 | ||||
| -rwxr-xr-x | usr/local/www/diag_logs_resolver.php | 1 | ||||
| -rw-r--r-- | usr/local/www/diag_logs_routing.php | 110 | ||||
| -rw-r--r-- | usr/local/www/diag_logs_wireless.php | 1 |
7 files changed, 121 insertions, 3 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index cfcb20c..a1517ed 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -543,7 +543,7 @@ function system_syslogd_start() { } if (isset($syslogcfg)) { - $separatelogfacilities = array('ntpd','ntpdate','racoon','openvpn','pptps','poes','l2tps','relayd','hostapd','dnsmasq','unbound','dhcpd','dhcrelay','apinger'); + $separatelogfacilities = array('ntp','ntpd','ntpdate','racoon','openvpn','pptps','poes','l2tps','relayd','hostapd','dnsmasq','unbound','dhcpd','dhcrelay','apinger','radvd','routed','olsrd','zebra','ospfd','bgpd'); if($config['installedpackages']['package']) { foreach($config['installedpackages']['package'] as $package) { if($package['logging']) { @@ -560,7 +560,11 @@ function system_syslogd_start() { printf(gettext("Error: cannot open syslog.conf in system_syslogd_start().%s"), "\n"); return 1; } - $syslogconf .= "!ntpdate,ntp,ntpd\n"; + $syslogconf .= "!radvd,routed,olsrd,zebra,ospfd,bgpd\n"; + if (!isset($syslogcfg['disablelocallogging'])) + $syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/routing.log\n"; + + $syslogconf .= "!ntp,ntpd,ntpdate\n"; if (!isset($syslogcfg['disablelocallogging'])) $syslogconf .= "*.* {$log_directive}{$g['varlog_path']}/ntpd.log\n"; @@ -262,7 +262,7 @@ fi echo -n "." DISABLESYSLOGCLOG=`/usr/bin/grep -c disablesyslogclog /cf/conf/config.xml` ENABLEFIFOLOG=`/usr/bin/grep -c usefifolog /cf/conf/config.xml` -LOG_FILES="system filter dhcpd vpn pptps poes l2tps openvpn portalauth ipsec ppp relayd wireless lighttpd ntpd gateways resolver" +LOG_FILES="system filter dhcpd vpn pptps poes l2tps openvpn portalauth ipsec ppp relayd wireless lighttpd ntpd gateways resolver routing" for logfile in $LOG_FILES; do if [ "$DISABLESYSLOGCLOG" -gt "0" ]; then /usr/bin/touch /var/log/$logfile.log diff --git a/usr/local/www/diag_logs.php b/usr/local/www/diag_logs.php index cff1a03..25f46df 100755 --- a/usr/local/www/diag_logs.php +++ b/usr/local/www/diag_logs.php @@ -94,6 +94,7 @@ include("head.inc"); $tab_array = array(); $tab_array[] = array(gettext("General"), true, "/diag_logs.php"); $tab_array[] = array(gettext("Gateways"), false, "/diag_logs_gateways.php"); + $tab_array[] = array(gettext("Routing"), false, "/diag_logs_routing.php"); $tab_array[] = array(gettext("Resolver"), false, "/diag_logs_resolver.php"); $tab_array[] = array(gettext("Wireless"), false, "/diag_logs_wireless.php"); display_top_tabs($tab_array); diff --git a/usr/local/www/diag_logs_gateways.php b/usr/local/www/diag_logs_gateways.php index fe2e74b..16bf14e 100755 --- a/usr/local/www/diag_logs_gateways.php +++ b/usr/local/www/diag_logs_gateways.php @@ -95,6 +95,7 @@ include("head.inc"); $tab_array = array(); $tab_array[] = array(gettext("General"), false, "/diag_logs.php"); $tab_array[] = array(gettext("Gateways"), true, "/diag_logs_gateways.php"); + $tab_array[] = array(gettext("Routing"), false, "/diag_logs_routing.php"); $tab_array[] = array(gettext("Resolver"), false, "/diag_logs_resolver.php"); $tab_array[] = array(gettext("Wireless"), false, "/diag_logs_wireless.php"); display_top_tabs($tab_array); diff --git a/usr/local/www/diag_logs_resolver.php b/usr/local/www/diag_logs_resolver.php index cc69052..57f6875 100755 --- a/usr/local/www/diag_logs_resolver.php +++ b/usr/local/www/diag_logs_resolver.php @@ -95,6 +95,7 @@ include("head.inc"); $tab_array = array(); $tab_array[] = array(gettext("General"), false, "/diag_logs.php"); $tab_array[] = array(gettext("Gateways"), false, "/diag_logs_gateways.php"); + $tab_array[] = array(gettext("Routing"), false, "/diag_logs_routing.php"); $tab_array[] = array(gettext("Resolver"), true, "/diag_logs_resolver.php"); $tab_array[] = array(gettext("Wireless"), false, "/diag_logs_wireless.php"); display_top_tabs($tab_array); diff --git a/usr/local/www/diag_logs_routing.php b/usr/local/www/diag_logs_routing.php new file mode 100644 index 0000000..6d9dba5 --- /dev/null +++ b/usr/local/www/diag_logs_routing.php @@ -0,0 +1,110 @@ +<?php +/* $Id$ */ +/* + diag_logs_routing.php + part of pfSense + + Copyright (C) 2012 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-routing +##|*NAME=Status: System logs: Routing page +##|*DESCR=Allow access to the 'Status: System logs: System: Routing' page. +##|*MATCH=diag_logs_routing.php* +##|-PRIV + +require("guiconfig.inc"); + +$routing_logfile = "{$g['varlog_path']}/routing.log"; + +$nentries = $config['syslog']['nentries']; +if (!$nentries) + $nentries = 50; + +if ($_POST['clear']) + clear_log_file($routing_logfile); + +$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("Routing")); +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"), true, "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("Settings"), false, "diag_logs_settings.php"); + display_top_tabs($tab_array); +?> + </td></tr> + <tr><td class="tabnavtbl"> +<?php + $tab_array = array(); + $tab_array[] = array(gettext("General"), false, "/diag_logs.php"); + $tab_array[] = array(gettext("Gateways"), false, "/diag_logs_gateways.php"); + $tab_array[] = array(gettext("Routing"), true, "/diag_logs_routing.php"); + $tab_array[] = array(gettext("Resolver"), false, "/diag_logs_resolver.php"); + $tab_array[] = array(gettext("Wireless"), false, "/diag_logs_wireless.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("Routing daemon log entries"),$nentries);?></td> + </tr> + <?php dump_clog($routing_logfile, $nentries); ?> + <tr><td><br><form action="diag_logs_routing.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> diff --git a/usr/local/www/diag_logs_wireless.php b/usr/local/www/diag_logs_wireless.php index 6545d57..d8caff1 100644 --- a/usr/local/www/diag_logs_wireless.php +++ b/usr/local/www/diag_logs_wireless.php @@ -83,6 +83,7 @@ include("head.inc"); $tab_array = array(); $tab_array[] = array(gettext("General"), false, "/diag_logs.php"); $tab_array[] = array(gettext("Gateways"), false, "/diag_logs_gateways.php"); + $tab_array[] = array(gettext("Routing"), false, "/diag_logs_routing.php"); $tab_array[] = array(gettext("Resolver"), false, "/diag_logs_resolver.php"); $tab_array[] = array(gettext("Wireless"), true, "/diag_logs_wireless.php"); display_top_tabs($tab_array); |
