diff options
| author | bmeeks8 <bmeeks8@bellsouth.net> | 2014-09-20 12:47:02 -0400 |
|---|---|---|
| committer | bmeeks8 <bmeeks8@bellsouth.net> | 2014-09-20 12:47:02 -0400 |
| commit | 211ec39d280dcefd1a24fa875c587ed2301dadd5 (patch) | |
| tree | b3549e06fd887223d9fe4d69055a649da948ca92 /config | |
| parent | 3d935979946e45393230c4adf6ee1835d7cceaba (diff) | |
| download | pfsense-packages-211ec39d280dcefd1a24fa875c587ed2301dadd5.tar.gz pfsense-packages-211ec39d280dcefd1a24fa875c587ed2301dadd5.tar.bz2 pfsense-packages-211ec39d280dcefd1a24fa875c587ed2301dadd5.zip | |
Remove unneeded code from snort and barnyard start functions.
Diffstat (limited to 'config')
| -rwxr-xr-x | config/snort/snort.inc | 35 |
1 files changed, 11 insertions, 24 deletions
diff --git a/config/snort/snort.inc b/config/snort/snort.inc index 75153efb..7ff69396 100755 --- a/config/snort/snort.inc +++ b/config/snort/snort.inc @@ -576,16 +576,11 @@ function snort_barnyard_start($snortcfg, $if_real, $background=FALSE) { $snort_uuid = $snortcfg['uuid']; if ($snortcfg['barnyard_enable'] == 'on') { - if (isvalidpid("{$g['varrun_path']}/barnyard2_{$if_real}{$snort_uuid}.pid")) { - snort_barnyard_reload_config($snortcfg, "HUP"); - } - else { - log_error("[Snort] Barnyard2 START for " . convert_real_interface_to_friendly_descr($if_real) . "({$if_real})..."); - if ($background) - mwexec_bg("/usr/local/bin/barnyard2 -r {$snort_uuid} -f \"snort_{$snort_uuid}_{$if_real}.u2\" --pid-path {$g['varrun_path']} --nolock-pidfile -c {$snortdir}/snort_{$snort_uuid}_{$if_real}/barnyard2.conf -d {$snortlogdir}/snort_{$if_real}{$snort_uuid} -D -q"); - else - mwexec("/usr/local/bin/barnyard2 -r {$snort_uuid} -f \"snort_{$snort_uuid}_{$if_real}.u2\" --pid-path {$g['varrun_path']} --nolock-pidfile -c {$snortdir}/snort_{$snort_uuid}_{$if_real}/barnyard2.conf -d {$snortlogdir}/snort_{$if_real}{$snort_uuid} -D -q"); - } + log_error("[Snort] Barnyard2 START for " . convert_real_interface_to_friendly_descr($if_real) . "({$if_real})..."); + if ($background) + mwexec_bg("/usr/local/bin/barnyard2 -r {$snort_uuid} -f \"snort_{$snort_uuid}_{$if_real}.u2\" --pid-path {$g['varrun_path']} --nolock-pidfile -c {$snortdir}/snort_{$snort_uuid}_{$if_real}/barnyard2.conf -d {$snortlogdir}/snort_{$if_real}{$snort_uuid} -D -q"); + else + mwexec("/usr/local/bin/barnyard2 -r {$snort_uuid} -f \"snort_{$snort_uuid}_{$if_real}.u2\" --pid-path {$g['varrun_path']} --nolock-pidfile -c {$snortdir}/snort_{$snort_uuid}_{$if_real}/barnyard2.conf -d {$snortlogdir}/snort_{$if_real}{$snort_uuid} -D -q"); } } @@ -597,21 +592,13 @@ function snort_start($snortcfg, $if_real, $background=FALSE) { $snort_uuid = $snortcfg['uuid']; if ($snortcfg['enable'] == 'on') { - if (isvalidpid("{$g['varrun_path']}/snort_{$if_real}{$snort_uuid}.pid")) { - snort_reload_config($snortcfg, "SIGHUP"); - snort_barnyard_start($snortcfg, $if_real, $background); - } - else { - log_error("[Snort] Snort START for " . convert_real_interface_to_friendly_descr($if_real) . "({$if_real})..."); - if ($background) - mwexec_bg("/usr/local/bin/snort -R {$snort_uuid} -D -q -l {$snortlogdir}/snort_{$if_real}{$snort_uuid} --pid-path {$g['varrun_path']} --nolock-pidfile -G {$snort_uuid} -c {$snortdir}/snort_{$snort_uuid}_{$if_real}/snort.conf -i {$if_real}"); - else - mwexec("/usr/local/bin/snort -R {$snort_uuid} -D -q -l {$snortlogdir}/snort_{$if_real}{$snort_uuid} --pid-path {$g['varrun_path']} --nolock-pidfile -G {$snort_uuid} -c {$snortdir}/snort_{$snort_uuid}_{$if_real}/snort.conf -i {$if_real}"); - snort_barnyard_start($snortcfg, $if_real, $background); - } + log_error("[Snort] Snort START for " . convert_real_interface_to_friendly_descr($if_real) . "({$if_real})..."); + if ($background) + mwexec_bg("/usr/local/bin/snort -R {$snort_uuid} -D -q -l {$snortlogdir}/snort_{$if_real}{$snort_uuid} --pid-path {$g['varrun_path']} --nolock-pidfile -G {$snort_uuid} -c {$snortdir}/snort_{$snort_uuid}_{$if_real}/snort.conf -i {$if_real}"); + else + mwexec("/usr/local/bin/snort -R {$snort_uuid} -D -q -l {$snortlogdir}/snort_{$if_real}{$snort_uuid} --pid-path {$g['varrun_path']} --nolock-pidfile -G {$snort_uuid} -c {$snortdir}/snort_{$snort_uuid}_{$if_real}/snort.conf -i {$if_real}"); + snort_barnyard_start($snortcfg, $if_real, $background); } - else - return; } function snort_start_all_interfaces($background=FALSE) { |