diff --git a/headers/modsecurity/rules_properties.h b/headers/modsecurity/rules_properties.h index ce91cc40..2efea9ab 100644 --- a/headers/modsecurity/rules_properties.h +++ b/headers/modsecurity/rules_properties.h @@ -234,7 +234,7 @@ class RulesProperties { std::ostringstream *err) { int amount_of_rules = 0; - amount_of_rules = appendRules(from->rules, to->rules, err); + amount_of_rules = appendRules(from->m_rules, to->m_rules, err); if (amount_of_rules < 0) { return amount_of_rules; } @@ -391,7 +391,7 @@ class RulesProperties { if (phase >= modsecurity::Phases::NUMBER_OF_PHASES) { return NULL; } - return &rules[phase]; + return &m_rules[phase]; } @@ -420,7 +420,7 @@ class RulesProperties { ConfigString m_uploadDirectory; ConfigString m_uploadTmpDirectory; std::vector defaultActions[8]; - std::vector rules[8]; + std::vector m_rules[8]; }; #endif diff --git a/src/parser/driver.cc b/src/parser/driver.cc index 08672aba..7ef8b9c5 100644 --- a/src/parser/driver.cc +++ b/src/parser/driver.cc @@ -47,7 +47,7 @@ int Driver::addSecMarker(std::string marker) { for (int i = 0; i < modsecurity::Phases::NUMBER_OF_PHASES; i++) { Rule *rule = new Rule(marker); rule->phase = i; - rules[i].push_back(rule); + m_rules[i].push_back(rule); } return 0; } @@ -60,7 +60,7 @@ int Driver::addSecAction(Rule *rule) { return false; } - rules[rule->phase].push_back(rule); + m_rules[rule->phase].push_back(rule); return true; } @@ -100,7 +100,7 @@ int Driver::addSecRule(Rule *rule) { return false; } for (int i = 0; i < modsecurity::Phases::NUMBER_OF_PHASES; i++) { - std::vector rules = this->rules[i]; + std::vector rules = m_rules[i]; for (int j = 0; j < rules.size(); j++) { if (rules[j]->rule_id == rule->rule_id) { m_parserError << "Rule id: " << std::to_string(rule->rule_id) \ @@ -111,7 +111,7 @@ int Driver::addSecRule(Rule *rule) { } lastRule = rule; - rules[rule->phase].push_back(rule); + m_rules[rule->phase].push_back(rule); return true; } diff --git a/src/rules.cc b/src/rules.cc index bc04bf94..05f33679 100644 --- a/src/rules.cc +++ b/src/rules.cc @@ -85,7 +85,7 @@ Rules::~Rules() { /** Cleanup the rules */ for (int i = 0; i < modsecurity::Phases::NUMBER_OF_PHASES; i++) { - std::vector rules = this->rules[i]; + std::vector rules = m_rules[i]; while (rules.empty() == false) { Rule *rule = rules.back(); rule->refCountDecreaseAndCheck(); @@ -181,7 +181,7 @@ int Rules::evaluate(int phase, Transaction *transaction) { return 0; } - std::vector rules = this->rules[phase]; + std::vector rules = m_rules[phase]; debug(9, "This phase consists of " + std::to_string(rules.size()) + \ " rule(s)."); @@ -273,7 +273,7 @@ void Rules::debug(int level, std::string message) { void Rules::dump() { std::cout << "Rules: " << std::endl; for (int i = 0; i <= modsecurity::Phases::NUMBER_OF_PHASES; i++) { - std::vector rules = this->rules[i]; + std::vector rules = m_rules[i]; std::cout << "Phase: " << std::to_string(i); std::cout << " (" << std::to_string(rules.size()); std::cout << " rules)" << std::endl; diff --git a/test/optimization/optimization.cc b/test/optimization/optimization.cc index 4116d445..0dd5b14c 100644 --- a/test/optimization/optimization.cc +++ b/test/optimization/optimization.cc @@ -68,7 +68,7 @@ int main(int argc, char **argv) { int nphases = modsecurity::Phases::NUMBER_OF_PHASES; for (int i = 0; i < nphases; i++) { - std::vector rules = modsecRules->rules[i]; + std::vector rules = modsecRules->m_rules[i]; if (rules.size() == 0) { continue; }