From 963d5343ba78c339d8e3a64209255d39880b7725 Mon Sep 17 00:00:00 2001 From: Bill Marquette Date: Mon, 4 Apr 2005 00:33:49 +0000 Subject: Cleanup paths Standardize settings (262144 file lengths) Move IPSEC VPN next to PPTP VPN style cleanup various other minor cleanups --- usr/local/www/diag_logs.php | 14 ++++++++------ usr/local/www/diag_logs_auth.php | 14 ++++++++------ usr/local/www/diag_logs_dhcp.php | 14 ++++++++------ usr/local/www/diag_logs_filter.php | 21 +++++++++++---------- usr/local/www/diag_logs_ipsec.php | 16 +++++++++------- usr/local/www/diag_logs_settings.php | 6 +++--- usr/local/www/diag_logs_vpn.php | 16 +++++++++------- 7 files changed, 56 insertions(+), 45 deletions(-) diff --git a/usr/local/www/diag_logs.php b/usr/local/www/diag_logs.php index 14fc6c1..f2fbfa4 100755 --- a/usr/local/www/diag_logs.php +++ b/usr/local/www/diag_logs.php @@ -34,12 +34,14 @@ require("guiconfig.inc"); +$system_logfile = "{$g['varlog_path']}/system.log"; + $nentries = $config['syslog']['nentries']; if (!$nentries) $nentries = 50; if ($_POST['clear']) { - exec("/usr/sbin/clog -i -s 262144 {$g['varlog_path']}/system.log"); + exec("/usr/sbin/clog -i -s 262144 {$system_logfile}"); } function dump_clog($logfile, $tail, $withorig = true) { @@ -47,7 +49,7 @@ function dump_clog($logfile, $tail, $withorig = true) { $sor = isset($config['syslog']['reverse']) ? "-r" : ""; - exec("/usr/sbin/clog " . $logfile . " | grep -v racoon | /usr/bin/tail {$sor} -n " . $tail, $logarr); + exec("/usr/sbin/clog {$logfile} | /usr/bin/grep -v racoon | /usr/bin/tail {$sor} -n {$tail}", $logarr); foreach ($logarr as $logent) { $logent = preg_split("/\s+/", $logent, 6); @@ -67,22 +69,22 @@ function dump_clog($logfile, $tail, $withorig = true) { -<?=gentitle("Diagnostics: System logs");?> +<?=gentitle("Diagnostics: System logs: System");?> -

Diagnostics: System logs

+

Diagnostics: System logs: System

- +
@@ -94,7 +96,7 @@ function dump_clog($logfile, $tail, $withorig = true) { Last system log entries

diff --git a/usr/local/www/diag_logs_auth.php b/usr/local/www/diag_logs_auth.php index 5f87a8b..c3865f0 100755 --- a/usr/local/www/diag_logs_auth.php +++ b/usr/local/www/diag_logs_auth.php @@ -32,12 +32,14 @@ require("guiconfig.inc"); +$portal_logfile = "{$g['varlog_path']}/portalauth.log"; + $nentries = $config['syslog']['nentries']; if (!$nentries) $nentries = 50; if ($_POST['clear']) { - exec("/usr/sbin/clog -i -s 32768 /var/log/portalauth.log"); + exec("/usr/sbin/clog -i -s 262144 {$portal_logfile}"); } function dump_clog($logfile, $tail, $withorig = true) { @@ -45,7 +47,7 @@ function dump_clog($logfile, $tail, $withorig = true) { $sor = isset($config['syslog']['reverse']) ? "-r" : ""; - exec("/usr/sbin/clog " . $logfile . " | tail {$sor} -n " . $tail, $logarr); + exec("/usr/sbin/clog {$logfile} | tail {$sor} -n {$tail}", $logarr); foreach ($logarr as $logent) { $logent = preg_split("/\s+/", $logent, 6); @@ -65,22 +67,22 @@ function dump_clog($logfile, $tail, $withorig = true) { -<?=gentitle("Diagnostics: System logs");?> +<?=gentitle("Diagnostics: System logs: Portal Auth");?> -

Diagnostics: Portal Auth Logs

+

Diagnostics: System logs: Portal Auth

- +
@@ -92,7 +94,7 @@ function dump_clog($logfile, $tail, $withorig = true) { Last Portal Auth log entries

diff --git a/usr/local/www/diag_logs_dhcp.php b/usr/local/www/diag_logs_dhcp.php index 9e20785..01f7864 100755 --- a/usr/local/www/diag_logs_dhcp.php +++ b/usr/local/www/diag_logs_dhcp.php @@ -34,12 +34,14 @@ require("guiconfig.inc"); +$dhcpd_logfile = "{$g['varlog_path']}/dhcpd.log"; + $nentries = $config['syslog']['nentries']; if (!$nentries) $nentries = 50; if ($_POST['clear']) { - exec("/usr/sbin/clog -i -s 32768 {$g['varlog_path']}/dhcpd.log"); + exec("/usr/sbin/clog -i -s 262144 {$dhcpd_logfile}"); } function dump_clog($logfile, $tail, $withorig = true) { @@ -47,7 +49,7 @@ function dump_clog($logfile, $tail, $withorig = true) { $sor = isset($config['syslog']['reverse']) ? "-r" : ""; - exec("/usr/sbin/clog " . $logfile . " | tail {$sor} -n " . $tail, $logarr); + exec("/usr/sbin/clog {$logfile} | tail {$sor} -n {$tail}", $logarr); foreach ($logarr as $logent) { $logent = preg_split("/\s+/", $logent, 6); @@ -67,22 +69,22 @@ function dump_clog($logfile, $tail, $withorig = true) { -<?=gentitle("Diagnostics: System logs");?> +<?=gentitle("Diagnostics: System logs: DHCP");?> -

Diagnostics: System logs

+

Diagnostics: System logs: DHCP

- +
@@ -94,7 +96,7 @@ function dump_clog($logfile, $tail, $withorig = true) { Last DHCP service log entries

diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php index 9e87e74..f839486 100755 --- a/usr/local/www/diag_logs_filter.php +++ b/usr/local/www/diag_logs_filter.php @@ -33,15 +33,15 @@ require("guiconfig.inc"); -exec("/usr/sbin/tcpdump -n -e -ttt -r /var/log/pflog | logger -t pf -p local0.info "); +$filter_logfile = "{$g['varlog_path']}/filter.log"; +exec("/usr/sbin/tcpdump -n -e -ttt -r {$g['varlog_path']}/pflog | logger -t pf -p local0.info "); $nentries = $config['syslog']['nentries']; if (!$nentries) $nentries = 50; if ($_POST['clear']) { - exec("/usr/sbin/clog " . $logfile . " | tail {$sor} -n " . $tail, $logarr); - exec("/usr/sbin/clog -i -s 262144 /var/log/filter.log"); + exec("/usr/sbin/clog -i -s 262144 {$filter_logfile}"); } function dump_clog($logfile, $tail, $withorig = true) { @@ -49,7 +49,7 @@ function dump_clog($logfile, $tail, $withorig = true) { $sor = isset($config['syslog']['reverse']) ? "-r" : ""; - exec("/usr/sbin/clog " . $logfile . " | tail {$sor} -n " . "15000", $logarr); + exec("/usr/sbin/clog {$logfile} | tail {$sor} -n {$tail}", $logarr); foreach ($logarr as $logent) { $logent = preg_split("/\s+/", $logent, 6); @@ -65,6 +65,7 @@ function dump_clog($logfile, $tail, $withorig = true) { } } +/* format filter logs */ function conv_clog($logfile, $tail) { global $g, $config; @@ -81,7 +82,7 @@ function conv_clog($logfile, $tail) { $sor = isset($config['syslog']['reverse']) ? "-r" : ""; - exec("/usr/sbin/clog " . $logfile . " | tail {$sor} -n 250000", $logarr); + exec("/usr/sbin/clog {$filter_logfile} | tail {$sor} -n {$tail}", $logarr); $filterlog = array(); @@ -157,22 +158,22 @@ function format_ipf_ip($ipfip) { -<?=gentitle("Diagnostics: System logs");?> +<?=gentitle("Diagnostics: System logs: Firewall");?> -

Diagnostics: System logs

+

Diagnostics: System logs: Firewall

@@ -180,7 +181,7 @@ function format_ipf_ip($ipfip) {
- +
@@ -216,7 +217,7 @@ function format_ipf_ip($ipfip) { Last firewall log entries

diff --git a/usr/local/www/diag_logs_ipsec.php b/usr/local/www/diag_logs_ipsec.php index 7ca67a8..75eadcf 100755 --- a/usr/local/www/diag_logs_ipsec.php +++ b/usr/local/www/diag_logs_ipsec.php @@ -34,12 +34,14 @@ require("guiconfig.inc"); +$ipsec_logfile = "{$g['varlog_path']}/system.log"; + $nentries = $config['syslog']['nentries']; if (!$nentries) $nentries = 50; if ($_POST['clear']) { - exec("/usr/sbin/clog -i -s 262144 {$g['varlog_path']}/system.log"); + exec("/usr/sbin/clog -i -s 262144 {$ipsec_logfile}"); } function dump_clog($logfile, $tail, $withorig = true) { @@ -47,7 +49,7 @@ function dump_clog($logfile, $tail, $withorig = true) { $sor = isset($config['syslog']['reverse']) ? "-r" : ""; - exec("/usr/sbin/clog " . $logfile . " | grep racoon | /usr/bin/tail {$sor} -n " . $tail, $logarr); + exec("/usr/sbin/clog {$logfile} | /usr/bin/grep racoon | /usr/bin/tail {$sor} -n {$tail}", $logarr); foreach ($logarr as $logent) { $logent = preg_split("/\s+/", $logent, 6); @@ -67,22 +69,22 @@ function dump_clog($logfile, $tail, $withorig = true) { -<?=gentitle("Diagnostics: System logs");?> +<?=gentitle("Diagnostics: System logs: IPSEC VPN");?> -

Diagnostics: System logs

+

Diagnostics: System logs: IPSEC VPN

@@ -92,9 +94,9 @@ function dump_clog($logfile, $tail, $withorig = true) { + Last IPSEC log entries - +
- Last system log entries

diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php index 56537e4..2896a31 100755 --- a/usr/local/www/diag_logs_settings.php +++ b/usr/local/www/diag_logs_settings.php @@ -94,7 +94,7 @@ if ($_POST) { -<?=gentitle("Diagnostics: System logs");?> +<?=gentitle("Diagnostics: System logs: Settings");?>