From: Victor Julien Date: Wed, 12 Mar 2014 14:08:27 +0000 (+0100) Subject: detect state: fix indent X-Git-Tag: suricata-2.0.1rc1~91 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F906%2Fhead;p=thirdparty%2Fsuricata.git detect state: fix indent AMATCH block was indented too far. --- diff --git a/src/detect-engine-state.c b/src/detect-engine-state.c index 0f757f3043..499e6c0dd4 100644 --- a/src/detect-engine-state.c +++ b/src/detect-engine-state.c @@ -627,29 +627,29 @@ void DeStateDetectContinueDetection(ThreadVars *tv, DetectEngineCtx *de_ctx, KEYWORD_PROFILING_SET_LIST(det_ctx, DETECT_SM_LIST_AMATCH); for (sm = item->nm; sm != NULL; sm = sm->next) { if (sigmatch_table[sm->type].AppLayerMatch != NULL) - { - if (alproto == ALPROTO_SMB || alproto == ALPROTO_SMB2) { - smb_state = (SMBState *)alstate; - if (smb_state->dcerpc_present) { - KEYWORD_PROFILING_START; - match = sigmatch_table[sm->type]. - AppLayerMatch(tv, det_ctx, f, flags, &smb_state->dcerpc, s, sm); - KEYWORD_PROFILING_END(det_ctx, sm->type, (match > 0)); - } - } else { + { + if (alproto == ALPROTO_SMB || alproto == ALPROTO_SMB2) { + smb_state = (SMBState *)alstate; + if (smb_state->dcerpc_present) { KEYWORD_PROFILING_START; match = sigmatch_table[sm->type]. - AppLayerMatch(tv, det_ctx, f, flags, alstate, s, sm); + AppLayerMatch(tv, det_ctx, f, flags, &smb_state->dcerpc, s, sm); KEYWORD_PROFILING_END(det_ctx, sm->type, (match > 0)); } - - if (match == 0) - break; - else if (match == 2) - inspect_flags |= DE_STATE_FLAG_SIG_CANT_MATCH; - else if (match == 1) - total_matches++; + } else { + KEYWORD_PROFILING_START; + match = sigmatch_table[sm->type]. + AppLayerMatch(tv, det_ctx, f, flags, alstate, s, sm); + KEYWORD_PROFILING_END(det_ctx, sm->type, (match > 0)); } + + if (match == 0) + break; + else if (match == 2) + inspect_flags |= DE_STATE_FLAG_SIG_CANT_MATCH; + else if (match == 1) + total_matches++; + } } RULE_PROFILING_END(det_ctx, s, match, p);