smtp: use rule_id mpm support instead of pattern id

pull/1980/head
Victor Julien 10 years ago
parent b2fcb17859
commit cd8283bb72

@ -925,7 +925,7 @@ static int SMTPProcessReply(SMTPState *state, Flow *f,
state->current_line[0], state->current_line[1], state->current_line[2]); state->current_line[0], state->current_line[1], state->current_line[2]);
SCReturnInt(-1); SCReturnInt(-1);
} }
reply_code = smtp_reply_map[pmq->pattern_id_array[0]].enum_value; reply_code = smtp_reply_map[pmq->rule_id_array[0]].enum_value;
if (state->cmds_idx == state->cmds_cnt) { if (state->cmds_idx == state->cmds_cnt) {
if (!(state->parser_state & SMTP_PARSER_STATE_FIRST_REPLY_SEEN)) { if (!(state->parser_state & SMTP_PARSER_STATE_FIRST_REPLY_SEEN)) {
@ -1445,7 +1445,7 @@ static void SMTPSetMpmState(void)
/* The third argument is 3, because reply code is always 3 bytes. */ /* The third argument is 3, because reply code is always 3 bytes. */
MpmAddPatternCI(smtp_mpm_ctx, (uint8_t *)map->enum_name, 3, MpmAddPatternCI(smtp_mpm_ctx, (uint8_t *)map->enum_name, 3,
0 /* defunct */, 0 /* defunct */, 0 /* defunct */, 0 /* defunct */,
i /* pattern id */, 0, 0 /* no flags */); i /* pattern id */, i /* rule id */ , 0 /* no flags */);
} }
mpm_table[SMTP_MPM].Prepare(smtp_mpm_ctx); mpm_table[SMTP_MPM].Prepare(smtp_mpm_ctx);

Loading…
Cancel
Save