From f9abf279e2410c8c423b7578253ef7c5a27416e9 Mon Sep 17 00:00:00 2001 From: Felipe Zimmerle Date: Thu, 28 Dec 2017 23:09:10 -0300 Subject: [PATCH] Revert "support macro expansion in @rx" This reverts commit a76030256ea914ca7bedf1a6636b4a3e3afa8713. --- src/operators/rx.cc | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/operators/rx.cc b/src/operators/rx.cc index ff84d95d..8be06a39 100644 --- a/src/operators/rx.cc +++ b/src/operators/rx.cc @@ -33,19 +33,12 @@ bool Rx::evaluate(Transaction *transaction, Rule *rule, const std::string& input, std::shared_ptr ruleMessage) { SMatch match; std::list matches; - Regex * re = m_re; if (m_param.empty()) { return true; } - std::string eparam = MacroExpansion::expand(m_param, transaction); - - if (eparam != m_param) { - re = new Regex(eparam); - } - - matches = re->searchAll(input); + matches = m_re->searchAll(input); if (rule && rule->getActionsByName("capture").size() > 0 && transaction) { int i = 0; matches.reverse(); @@ -65,10 +58,6 @@ bool Rx::evaluate(Transaction *transaction, Rule *rule, logOffset(ruleMessage, i.m_offset, i.m_length); } - if (re != m_re) { - delete re; - } - if (matches.size() > 0) { return true; }