summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/inc/filter.inc6
-rwxr-xr-xusr/local/www/diag_logs_filter.php2
-rwxr-xr-xusr/local/www/system.php2
3 files changed, 6 insertions, 4 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 25d4a64..39fab02 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -55,9 +55,9 @@ function filter_pflog_start() {
mute_kernel_msgs();
- $pid = `ps awwwux | grep -v "grep" | grep "tcpdump -vv -l -n -e -ttt -i pflog0" | awk '{ print $2 }'`;
+ $pid = `ps awwwux | grep -v "grep" | grep "tcpdump -v -l -n -e -ttt -i pflog0" | awk '{ print $2 }'`;
if(!$pid)
- mwexec_bg("/usr/sbin/tcpdump -vv -l -n -e -ttt -i pflog0 | logger -t pf -p local0.info");
+ mwexec_bg("/usr/sbin/tcpdump -v -l -n -e -ttt -i pflog0 | logger -t pf -p local0.info");
unmute_kernel_msgs();
@@ -3394,4 +3394,4 @@ function return_vpn_subnet($adr) {
}
-?> \ No newline at end of file
+?>
diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php
index ff41233..f72e9c7 100755
--- a/usr/local/www/diag_logs_filter.php
+++ b/usr/local/www/diag_logs_filter.php
@@ -109,6 +109,8 @@ function conv_clog($logfile, $tail = 50) {
$flent['proto'] = "IGMP";
else if(stristr(strtoupper($logent), "CARP") == true)
$flent['proto'] = "CARP";
+ else if(stristr(strtoupper($logent), "VRRP") == true)
+ $flent['proto'] = "VRRP";
else if(stristr(strtoupper($logent), "PFSYNC") == true)
$flent['proto'] = "PFSYNC";
else if(stristr($logent, "sack") == true)
diff --git a/usr/local/www/system.php b/usr/local/www/system.php
index 5f5613e..da935f0 100755
--- a/usr/local/www/system.php
+++ b/usr/local/www/system.php
@@ -62,7 +62,7 @@ function is_timezone($elt) {
if($pconfig['timezone'] <> $_POST['timezone']) {
/* restart firewall log dumper helper */
require_once("functions.inc");
- $pid = `ps awwwux | grep -v "grep" | grep "tcpdump -vv -l -n -e -ttt -i pflog0" | awk '{ print $2 }'`;
+ $pid = `ps awwwux | grep -v "grep" | grep "tcpdump -v -l -n -e -ttt -i pflog0" | awk '{ print $2 }'`;
if($pid) {
mwexec("kill $pid");
usleep(1000);
OpenPOWER on IntegriCloud