From: Giuseppe Longo <giuseppelng@gmail.com>
Date: Sun, 1 Dec 2013 16:46:31 +0000 (+0100)
Subject: Adds a defrag configuration example in suricata.yaml
X-Git-Tag: suricata-2.0beta2~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae9393987e4ea6ea89f1d0d765971011d8e5b30d;p=thirdparty%2Fsuricata.git

Adds a defrag configuration example in suricata.yaml
---

diff --git a/src/defrag-config.c b/src/defrag-config.c
index 4ae272f26b..69553a0d0c 100644
--- a/src/defrag-config.c
+++ b/src/defrag-config.c
@@ -20,29 +20,6 @@
  *
  * \author Giuseppe Longo <giuseppelng@gmail.com>
  *
- * Example config:
- * defrag:
- *    memcap: 32mb
- *    hash-size: 65536
- *    trackers: 65535
- *    max-frags: 65535
- *    prealloc: yes
- *
- *    default-config:
- *       timeout: 40
- *
- *    host-config:
- *
- *      - dmz:
- *          timeout: 30
- *          address: [192.168.1.0/24, 127.0.0.0/8, 1.1.1.0/24, 2.2.2.0/24, "1.1.1.1", "2.2.2.2", "::1"]
- *
- *      - lan:
- *          timeout: 45
- *          address:
- *            - 192.168.0.0/24
- *            - 192.168.10.0/24
- *            - 172.16.14.0/24
  */
 
 #include "suricata-common.h"
diff --git a/suricata.yaml.in b/suricata.yaml.in
index dbbffb6cb5..4df61d493e 100644
--- a/suricata.yaml.in
+++ b/suricata.yaml.in
@@ -528,6 +528,20 @@ defrag:
   prealloc: yes
   timeout: 60
 
+# Enable defrag per host settings
+#  host-config:
+#
+#    - dmz:
+#        timeout: 30
+#        address: [192.168.1.0/24, 127.0.0.0/8, 1.1.1.0/24, 2.2.2.0/24, "1.1.1.1", "2.2.2.2", "::1"]
+#
+#    - lan:
+#        timeout: 45
+#        address:
+#          - 192.168.0.0/24
+#          - 192.168.10.0/24
+#          - 172.16.14.0/24
+
 # Flow settings:
 # By default, the reserved memory (memcap) for flows is 32MB. This is the limit
 # for flow allocation inside the engine. You can change this value to allow