Merge remote-tracking branch 'maniacikarus/ids'

Conflicts:
	suricata/suricata.nm

diff --git a/suricata/suricata.conf b/suricata/suricata.conf
index d1d5a257947270e224c1cdc2ceb753106c9ac780..8c2b1ed7bd0073e5ed01bf633c379aa753fe64df 100644 (file)
--- a/suricata/suricata.conf
+++ b/suricata/suricata.conf
@@ -255,6 +255,7 @@ flow-timeouts:
 stream:
   memcap: 33554432
   checksum_validation: yes
+  inline: yes
   reassembly:
     memcap: 67108864
     depth: 1048576
@@ -295,6 +296,15 @@ logging:
       enabled: no
       facility: local5
       format: "[%i] <%d> -- "
+  - drop:
+      enabled: yes
+      filename: drop.log
+      append: yes
+
+nfq:
+      mode: repeat
+      repeat_mark: 1
+      repeat_mask: 1
 
 # PF_RING configuration. for use with native PF_RING support
 # for more info see http://www.ntop.org/PF_RING.html

diff --git a/suricata/suricata.nm b/suricata/suricata.nm
index 7c4cec5afadd675a04b9eafbcf148c8d46ed0ae4..d1e67e2375ac6f021fac65524403ba73ad3de056 100644 (file)
--- a/suricata/suricata.nm
+++ b/suricata/suricata.nm
@@ -5,7 +5,7 @@
 
 name       = suricata
 version    = 1.1
-release    = 1
+release    = 2
 
 groups     = Networking/IDS
 url        = http://www.openinfosecfoundation.org/

diff --git a/suricata/systemd/suricata.service b/suricata/systemd/suricata.service
index 4e0b6894169c578350d2ac23440d42e5d37519a2..24cfa98cc4370eedf519d0f6101d92ac492be54f 100644 (file)
--- a/suricata/systemd/suricata.service
+++ b/suricata/systemd/suricata.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
 [Service]
 Type=forking
 ExecStart=/usr/bin/suricata -c /etc/suricata/suricata.conf -q 0 -q 1 -D
-ExecStartPost=/sbin/iptables -I INPUT -j NFQUEUE -–queue-balance 0:1
+ExecStartPost=/sbin/iptables -I INPUT -mark ! --mark 1/1 -j NFQUEUE -–queue-balance 0:1
 ExecReload=/bin/kill -HUP $MAINPID
 ExecStop=/sbin/iptables -D INPUT -j NFQUEUE -–queue-balance 0:1
 ExecStopPost=/bin/kill $MAINPID