aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfig/snort/snort.inc32
-rw-r--r--config/snort/snort.xml2
-rwxr-xr-xpkg_config.7.xml2
3 files changed, 19 insertions, 17 deletions
diff --git a/config/snort/snort.inc b/config/snort/snort.inc
index ccd80759..977ae761 100755
--- a/config/snort/snort.inc
+++ b/config/snort/snort.inc
@@ -119,15 +119,15 @@ function sync_package_snort()
//print_r($snortInterfaces);
/* create log directory */
- $start = "/bin/mkdir -p /var/log/snort";
+ $start = "/bin/mkdir -p /var/log/snort\n";
/* snort advanced features - bpf tuning */
if($bpfbufsize)
- $start .= ";sysctl net.bpf.bufsize={$bpfbufsize}";
+ $start .= "sysctl net.bpf.bufsize={$bpfbufsize}\n";
if($bpfmaxbufsize)
- $start .= ";sysctl net.bpf.maxbufsize={$bpfmaxbufsize}";
+ $start .= "sysctl net.bpf.maxbufsize={$bpfmaxbufsize}\n";
if($bpfmaxinsns)
- $start .= ";sysctl net.bpf.maxinsns={$bpfmaxinsns}";
+ $start .= "sysctl net.bpf.maxinsns={$bpfmaxinsns}\n";
/* go ahead and issue bpf changes */
if($bpfbufsize)
@@ -138,20 +138,22 @@ function sync_package_snort()
mwexec_bg("sysctl net.bpf.maxinsns={$bpfmaxinsns}");
/* always stop snort2c before starting snort -gtm */
- $start .= ";/usr/bin/killall snort2c";
-
- /* start a snort process for each interface -gtm */
- /* Note the sleep delay. Seems to help getting mult interfaces to start -gtm */
- /* snort start options are; config file, log file, demon, interface, packet flow, alert type, quiet */
- /* TODO; get snort to start under nologin shell */
- foreach($snortInterfaces as $snortIf)
- {
- $start .= ";sleep 8;snort -c /usr/local/etc/snort/snort.conf -l /var/log/snort -D -i {$snortIf} -q";
- }
+ $start .= "/usr/bin/killall snort2c\n";
+
+ /* start a snort process for each interface -gtm */
+ /* Note the sleep delay. Seems to help getting mult interfaces to start -gtm */
+ /* snort start options are; config file, log file, demon, interface, packet flow, alert type, quiet */
+ /* TODO; get snort to start under nologin shell */
+ foreach($snortInterfaces as $snortIf)
+ {
+ $start .= "sleep 8\n";
+ $start .= "snort -c /usr/local/etc/snort/snort.conf -l /var/log/snort -D -i {$snortIf} -q\n";
+ }
/* if block offenders is checked, start snort2c */
if($_POST['blockoffenders'])
- $start .= "\nsleep 8;snort2c -w /var/db/whitelist -a /var/log/snort/alert";
+ $start .= "\nsleep 8\n";
+ $start .= "snort2c -w /var/db/whitelist -a /var/log/snort/alert\n";
$sample_before = "\nBEFORE_MEM=`top | grep Free | grep Wired | awk '{print \$10}'`\n";
$sample_after = "\nAFTER_MEM=`top | grep Free | grep Wired | awk '{print \$10}'`\n";
diff --git a/config/snort/snort.xml b/config/snort/snort.xml
index 7cfd6a4f..a6064a04 100644
--- a/config/snort/snort.xml
+++ b/config/snort/snort.xml
@@ -47,7 +47,7 @@
<faq>Currently there are no FAQ items provided.</faq>
<name>Snort</name>
<version>2.8.4.1</version>
- <title>Services: Snort 2.8.4.1 pkg v. 1.4</title>
+ <title>Services: Snort 2.8.4.1 pkg v. 1.5</title>
<include_file>/usr/local/pkg/snort.inc</include_file>
<menu>
<name>Snort</name>
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index c78ab6fb..0020d659 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -240,7 +240,7 @@
<depends_on_package>mysql-client-5.1.34.tbz</depends_on_package>
<depends_on_package>snort-2.8.4.1.tbz</depends_on_package>
<config_file>http://www.pfsense.com/packages/config/snort/snort.xml</config_file>
- <version>2.8.4.1</version>
+ <version>2.8.4.1_1</version>
<required_version>1.2.2</required_version>
<status>Stable</status>
<configurationfile>snort.xml</configurationfile>