Ticket #1456 - drop one level of verbosity in tcpdump. Some protocols

will still decode to multi-line message - not an easy fix.  Doesn't
appear to break non-raw log display

Add VRRP as a protocol type in the decode

2 files changed, 3 insertions, 1 deletions

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);