flow: remove unused prune-flows option

remotes/origin/HEAD
Victor Julien 13 years ago
parent bf6cd48259
commit a5587fec2e

@ -62,7 +62,6 @@
#include "app-layer-parser.h" #include "app-layer-parser.h"
#define FLOW_DEFAULT_EMERGENCY_RECOVERY 30 #define FLOW_DEFAULT_EMERGENCY_RECOVERY 30
#define FLOW_DEFAULT_FLOW_PRUNE 5
//#define FLOW_DEFAULT_HASHSIZE 262144 //#define FLOW_DEFAULT_HASHSIZE 262144
#define FLOW_DEFAULT_HASHSIZE 65536 #define FLOW_DEFAULT_HASHSIZE 65536
@ -351,13 +350,6 @@ void FlowInitConfig(char quiet)
flow_config.emergency_recovery = FLOW_DEFAULT_EMERGENCY_RECOVERY; 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 */ /* Check if we have memcap and hash_size defined at config */
char *conf_val; char *conf_val;
uint32_t configval = 0; uint32_t configval = 0;

@ -219,7 +219,6 @@ typedef struct FlowCnf_
uint32_t emerg_timeout_new; uint32_t emerg_timeout_new;
uint32_t emerg_timeout_est; uint32_t emerg_timeout_est;
uint32_t flow_try_release;
uint32_t emergency_recovery; uint32_t emergency_recovery;
} FlowConfig; } FlowConfig;

@ -443,7 +443,7 @@ defrag:
# prune before unsetting the emergency state. The emergency state is activated # prune before unsetting the emergency state. The emergency state is activated
# when the memcap limit is reached, allowing to create new flows, but # when the memcap limit is reached, allowing to create new flows, but
# prunning them with the emergency timeouts (they are defined below). # 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 # 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. # 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 # If that doesn't work, then it will try to kill the last time seen flows
@ -456,7 +456,6 @@ flow:
hash-size: 65536 hash-size: 65536
prealloc: 10000 prealloc: 10000
emergency-recovery: 30 emergency-recovery: 30
prune-flows: 5
# Specific timeouts for flows. Here you can specify the timeouts that the # 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 # active flows will wait to transit from the current state to another, on each

Loading…
Cancel
Save