Also exclude grep from running processes when grepping for a running packet capture. Also, fix other test to match the recent changes made.

1 files changed, 2 insertions, 2 deletions

diff --git a/usr/local/www/diag_packet_capture.php b/usr/local/www/diag_packet_capture.php
index b35cc1b..684011c 100644
--- a/usr/local/www/diag_packet_capture.php
+++ b/usr/local/www/diag_packet_capture.php
@@ -72,7 +72,7 @@ if ($_POST) {
 
 	} elseif ($_POST['stopbtn']!= "") {
 		$action = gettext("Stop");
-		$processes_running = trim(shell_exec('/bin/ps axw -O pid= | /usr/bin/grep tcpdump | /usr/bin/grep '.$fn.' | /usr/bin/grep -v pflog'));
+		$processes_running = trim(shell_exec("/bin/ps axw -O pid= | /usr/bin/grep tcpdump | /usr/bin/grep {$fn} | /usr/bin/egrep -v '(pflog|grep)'"));
 
 		//explode processes into an array, (delimiter is new line)
 		$processes_running_array = explode("\n", $processes_running);
@@ -194,7 +194,7 @@ include("fbegin.inc");
 <?php
 
                     /* check to see if packet capture tcpdump is already running */
-					$processcheck = (trim(shell_exec("/bin/ps axw -O pid= | /usr/bin/grep tcpdump | /usr/bin/grep {$fn} | /usr/bin/grep -v pflog")));
+					$processcheck = (trim(shell_exec("/bin/ps axw -O pid= | /usr/bin/grep tcpdump | /usr/bin/grep {$fn} | /usr/bin/egrep -v '(pflog|grep)'")));
 					
 					if ($processcheck != "")
 						$processisrunning = true;