From 744306c6bd08b506c22d16214b6e479936b4857c Mon Sep 17 00:00:00 2001 From: jim-p Date: Tue, 4 Sep 2012 11:58:38 -0400 Subject: Fix up tcpdump for pflog stop/start a little, consolodate code, and restart tcpdump for pflog when saving log settings. --- usr/local/www/diag_logs_settings.php | 2 ++ usr/local/www/system.php | 9 +-------- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'usr/local/www') diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php index fe4dd69..23c4754 100755 --- a/usr/local/www/diag_logs_settings.php +++ b/usr/local/www/diag_logs_settings.php @@ -129,6 +129,8 @@ if ($_POST) { if ($oldnologdefaultblock !== isset($config['syslog']['nologdefaultblock'])) $retval |= filter_configure(); + filter_pflog_start(true); + $savemsg = get_std_save_message($retval); } } diff --git a/usr/local/www/system.php b/usr/local/www/system.php index 644a87c..10606c7 100755 --- a/usr/local/www/system.php +++ b/usr/local/www/system.php @@ -80,14 +80,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 -v -l -n -e -ttt -i pflog0" | awk '{ print $2 }'`; - if($pid) { - mwexec("/bin/kill $pid"); - usleep(1000); - } - filter_pflog_start(); + filter_pflog_start(true); } exec('/usr/bin/tar -tzf /usr/share/zoneinfo.tgz', $timezonelist); -- cgit v1.1