diff options
author | jim-p <jimp@pfsense.org> | 2012-09-04 11:58:38 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2012-09-04 11:58:38 -0400 |
commit | 744306c6bd08b506c22d16214b6e479936b4857c (patch) | |
tree | b51f44c05bd3a30719ffd38b00e5aebaee1c1a15 /usr | |
parent | daa06fb79f82e95d3d53106f2f56f20505e5e9e6 (diff) | |
download | pfsense-744306c6bd08b506c22d16214b6e479936b4857c.zip pfsense-744306c6bd08b506c22d16214b6e479936b4857c.tar.gz |
Fix up tcpdump for pflog stop/start a little, consolodate code, and restart tcpdump for pflog when saving log settings.
Diffstat (limited to 'usr')
-rwxr-xr-x | usr/local/www/diag_logs_settings.php | 2 | ||||
-rwxr-xr-x | usr/local/www/system.php | 9 |
2 files changed, 3 insertions, 8 deletions
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); |