flow: remove unused prune-flows option

diff --git a/src/flow.c b/src/flow.c
index 6e0c16be876fc597b1a3c87eb71cee84f59d2d6d..5242d2f2d76f2af424f588da6bda02b36f5db4ac 100644 (file)
--- a/src/flow.c
+++ b/src/flow.c
@@ -62,7 +62,6 @@
 #include "app-layer-parser.h"
 
 #define FLOW_DEFAULT_EMERGENCY_RECOVERY 30
-#define FLOW_DEFAULT_FLOW_PRUNE 5
 
 //#define FLOW_DEFAULT_HASHSIZE    262144
 #define FLOW_DEFAULT_HASHSIZE    65536
@@ -351,13 +350,6 @@ void FlowInitConfig(char quiet)
         flow_config.emergency_recovery = FLOW_DEFAULT_EMERGENCY_RECOVERY;
     }
 
-    if (ConfGetInt("flow.prune-flows", &val) == 1) {
-            flow_config.flow_try_release = (uint8_t)val;
-    } else {
-        SCLogDebug("flow.flow.prune-flows, using default value");
-        flow_config.flow_try_release = FLOW_DEFAULT_FLOW_PRUNE;
-    }
-
     /* Check if we have memcap and hash_size defined at config */
     char *conf_val;
     uint32_t configval = 0;

diff --git a/src/flow.h b/src/flow.h
index 34f4e84e1d01e94ae9f3b6b8dcaabe8b7298c6ae..70e5b026a84f813f8922074285020b1d54918dd7 100644 (file)
--- a/src/flow.h
+++ b/src/flow.h
@@ -219,7 +219,6 @@ typedef struct FlowCnf_
 
     uint32_t emerg_timeout_new;
     uint32_t emerg_timeout_est;
-    uint32_t flow_try_release;
     uint32_t emergency_recovery;
 
 } FlowConfig;

diff --git a/suricata.yaml.in b/suricata.yaml.in
index 6085cab8e934fc8979bdd4992d94171236915a22..18fd3154981b7751dc501555daeb3c77e9358e74 100644 (file)
--- a/suricata.yaml.in
+++ b/suricata.yaml.in
@@ -443,7 +443,7 @@ defrag:
 # prune before unsetting the emergency state. The emergency state is activated
 # when the memcap limit is reached, allowing to create new flows, but
 # prunning them with the emergency timeouts (they are defined below).
-# If the memcap is reached, the engine will try to prune prune-flows
+# If the memcap is reached, the engine will try to prune flows
 # with the default timeouts. If it doens't find a flow to prune, it will set
 # the emergency bit and it will try again with more agressive timeouts.
 # If that doesn't work, then it will try to kill the last time seen flows
@@ -456,7 +456,6 @@ flow:
   hash-size: 65536
   prealloc: 10000
   emergency-recovery: 30
-  prune-flows: 5
 
 # Specific timeouts for flows. Here you can specify the timeouts that the
 # active flows will wait to transit from the current state to another, on each