aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

detect: rename groupings vars

Browse Source
pull/1978/head
Victor Julien 10 years ago
parent 1f70ccfc23
commit 2ee9bf2aef
3 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File

76
src/detect-engine.c
Unescape Escape View File

@ -1022,8 +1022,8 @@ static uint8_t DetectEngineCtxLoadConf(DetectEngineCtx *de_ctx)
uint8_t profile = ENGINE_PROFILE_UNKNOWN; uint8_t profile = ENGINE_PROFILE_UNKNOWN;
char *de_ctx_profile = NULL; char *de_ctx_profile = NULL;
const char *max_uniq_toclient_dp_groups_str = NULL; const char *max_uniq_toclient_groups_str = NULL;
const char *max_uniq_toserver_dp_groups_str = NULL; const char *max_uniq_toserver_groups_str = NULL;
char *sgh_mpm_context = NULL; char *sgh_mpm_context = NULL;
@ -1103,49 +1103,49 @@ static uint8_t DetectEngineCtxLoadConf(DetectEngineCtx *de_ctx)
opt = NULL; opt = NULL;
switch (profile) { switch (profile) {
case ENGINE_PROFILE_LOW: case ENGINE_PROFILE_LOW:
de_ctx->max_uniq_toclient_dp_groups = 3; de_ctx->max_uniq_toclient_groups = 3;
de_ctx->max_uniq_toserver_dp_groups = 3; de_ctx->max_uniq_toserver_groups = 3;
break; break;
case ENGINE_PROFILE_HIGH: case ENGINE_PROFILE_HIGH:
de_ctx->max_uniq_toclient_dp_groups = 20; de_ctx->max_uniq_toclient_groups = 20;
de_ctx->max_uniq_toserver_dp_groups = 40; de_ctx->max_uniq_toserver_groups = 40;
break; break;
case ENGINE_PROFILE_CUSTOM: case ENGINE_PROFILE_CUSTOM:
TAILQ_FOREACH(opt, &de_ctx_custom->head, next) { TAILQ_FOREACH(opt, &de_ctx_custom->head, next) {
if (strcmp(opt->val, "custom-values") == 0) { if (strcmp(opt->val, "custom-values") == 0) {
max_uniq_toclient_dp_groups_str = ConfNodeLookupChildValue max_uniq_toclient_groups_str = ConfNodeLookupChildValue
(opt->head.tqh_first, "toclient-dp-groups"); (opt->head.tqh_first, "toclient-groups");
max_uniq_toserver_dp_groups_str = ConfNodeLookupChildValue max_uniq_toserver_groups_str = ConfNodeLookupChildValue
(opt->head.tqh_first, "toserver-dp-groups"); (opt->head.tqh_first, "toserver-groups");
} }
} }
if (max_uniq_toclient_dp_groups_str != NULL) { if (max_uniq_toclient_groups_str != NULL) {
if (ByteExtractStringUint16(&de_ctx->max_uniq_toclient_dp_groups, 10, if (ByteExtractStringUint16(&de_ctx->max_uniq_toclient_groups, 10,
strlen(max_uniq_toclient_dp_groups_str), strlen(max_uniq_toclient_groups_str),
(const char *)max_uniq_toclient_dp_groups_str) <= 0) { (const char *)max_uniq_toclient_groups_str) <= 0) {
de_ctx->max_uniq_toclient_dp_groups = 6; de_ctx->max_uniq_toclient_groups = 6;
SCLogWarning(SC_ERR_SIZE_PARSE, "parsing '%s' for " SCLogWarning(SC_ERR_SIZE_PARSE, "parsing '%s' for "
"toclient-dp-groups failed, using %u", "toclient-groups failed, using %u",
max_uniq_toclient_dp_groups_str, max_uniq_toclient_groups_str,
de_ctx->max_uniq_toclient_dp_groups); de_ctx->max_uniq_toclient_groups);
} }
} else { } else {
de_ctx->max_uniq_toclient_dp_groups = 6; de_ctx->max_uniq_toclient_groups = 6;
} }
if (max_uniq_toserver_dp_groups_str != NULL) { if (max_uniq_toserver_groups_str != NULL) {
if (ByteExtractStringUint16(&de_ctx->max_uniq_toserver_dp_groups, 10, if (ByteExtractStringUint16(&de_ctx->max_uniq_toserver_groups, 10,
strlen(max_uniq_toserver_dp_groups_str), strlen(max_uniq_toserver_groups_str),
(const char *)max_uniq_toserver_dp_groups_str) <= 0) { (const char *)max_uniq_toserver_groups_str) <= 0) {
de_ctx->max_uniq_toserver_dp_groups = 30; de_ctx->max_uniq_toserver_groups = 30;
SCLogWarning(SC_ERR_SIZE_PARSE, "parsing '%s' for " SCLogWarning(SC_ERR_SIZE_PARSE, "parsing '%s' for "
"toserver-dp-groups failed, using %u", "toserver-groups failed, using %u",
max_uniq_toserver_dp_groups_str, max_uniq_toserver_groups_str,
de_ctx->max_uniq_toserver_dp_groups); de_ctx->max_uniq_toserver_groups);
} }
} else { } else {
de_ctx->max_uniq_toserver_dp_groups = 30; de_ctx->max_uniq_toserver_groups = 30;
} }
break; break;
@ -1153,8 +1153,8 @@ static uint8_t DetectEngineCtxLoadConf(DetectEngineCtx *de_ctx)
case ENGINE_PROFILE_MEDIUM: case ENGINE_PROFILE_MEDIUM:
case ENGINE_PROFILE_UNKNOWN: case ENGINE_PROFILE_UNKNOWN:
default: default:
de_ctx->max_uniq_toclient_dp_groups = 6; de_ctx->max_uniq_toclient_groups = 6;
de_ctx->max_uniq_toserver_dp_groups = 30; de_ctx->max_uniq_toserver_groups = 30;
break; break;
} }
@ -3136,8 +3136,8 @@ static int DetectEngineTest08(void)
"detect-engine:\n" "detect-engine:\n"
" - profile: custom\n" " - profile: custom\n"
" - custom-values:\n" " - custom-values:\n"
" toclient-dp-groups: 23\n" " toclient-groups: 23\n"
" toserver-dp-groups: 27\n"; " toserver-groups: 27\n";
DetectEngineCtx *de_ctx = NULL; DetectEngineCtx *de_ctx = NULL;
int result = 0; int result = 0;
@ -3148,8 +3148,8 @@ static int DetectEngineTest08(void)
if (de_ctx == NULL) if (de_ctx == NULL)
goto end; goto end;
if (de_ctx->max_uniq_toclient_dp_groups == 23 && if (de_ctx->max_uniq_toclient_groups == 23 &&
de_ctx->max_uniq_toserver_dp_groups == 27) de_ctx->max_uniq_toserver_groups == 27)
result = 1; result = 1;
end: end:
@ -3170,8 +3170,8 @@ static int DetectEngineTest09(void)
"detect-engine:\n" "detect-engine:\n"
" - profile: custom\n" " - profile: custom\n"
" - custom-values:\n" " - custom-values:\n"
" toclient-dp-groups: BA\n" " toclient-groups: BA\n"
" toserver-dp-groups: BA\n" " toserver-groups: BA\n"
" - inspection-recursion-limit: 10\n"; " - inspection-recursion-limit: 10\n";
DetectEngineCtx *de_ctx = NULL; DetectEngineCtx *de_ctx = NULL;
@ -3183,8 +3183,8 @@ static int DetectEngineTest09(void)
if (de_ctx == NULL) if (de_ctx == NULL)
goto end; goto end;
if (de_ctx->max_uniq_toclient_dp_groups == 6 && if (de_ctx->max_uniq_toclient_groups == 6 &&
de_ctx->max_uniq_toserver_dp_groups == 30) de_ctx->max_uniq_toserver_groups == 30)
result = 1; result = 1;
end: end:

4
src/detect.c
Unescape Escape View File

@ -3046,8 +3046,8 @@ static DetectPort *RulesGroupByPorts(DetectEngineCtx *de_ctx, int ipproto, uint3
SCLogDebug("rules analyzed"); SCLogDebug("rules analyzed");
DetectPort *newlist = NULL; DetectPort *newlist = NULL;
uint16_t groupmax = (direction == SIG_FLAG_TOCLIENT) ? de_ctx->max_uniq_toclient_dp_groups : uint16_t groupmax = (direction == SIG_FLAG_TOCLIENT) ? de_ctx->max_uniq_toclient_groups :
de_ctx->max_uniq_toserver_dp_groups; de_ctx->max_uniq_toserver_groups;
CreateGroupedPortList(de_ctx, list, &newlist, groupmax, CreateGroupedPortListCmpCnt, max_idx); CreateGroupedPortList(de_ctx, list, &newlist, groupmax, CreateGroupedPortListCmpCnt, max_idx);
list = newlist; list = newlist;

5
src/detect.h
Unescape Escape View File

@ -630,9 +630,8 @@ typedef struct DetectEngineCtx_ {
/* Config options */ /* Config options */
uint16_t max_uniq_toclient_dp_groups; uint16_t max_uniq_toclient_groups;
uint16_t max_uniq_toserver_groups;
uint16_t max_uniq_toserver_dp_groups;
/* specify the configuration for mpm context factory */ /* specify the configuration for mpm context factory */
uint8_t sgh_mpm_context; uint8_t sgh_mpm_context;

Write Preview
Loading…
Cancel
Save