github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 05:45:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Renames rules to m_rules in RulesProperties

Browse Source
This commit is contained in:
Felipe Zimmerle 2017-01-05 14:40:29 -03:00 committed by Felipe Zimmerle
parent 5086fef492
commit 7927ddda91
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
headers/modsecurity/rules_properties.h
View File

@ -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<actions::Action *> defaultActions[8];
std::vector<modsecurity::Rule *> rules[8];
std::vector<modsecurity::Rule *> m_rules[8];
};
#endif

8
src/parser/driver.cc
View File

@ -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<Rule *> rules = this->rules[i];
std::vector<Rule *> 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;
}

6
src/rules.cc
View File

@ -85,7 +85,7 @@ Rules::~Rules() {
/** Cleanup the rules */
for (int i = 0; i < modsecurity::Phases::NUMBER_OF_PHASES; i++) {
std::vector<Rule *> rules = this->rules[i];
std::vector<Rule *> 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<Rule *> rules = this->rules[phase];
std::vector<Rule *> 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<Rule *> rules = this->rules[i];
std::vector<Rule *> rules = m_rules[i];
std::cout << "Phase: " << std::to_string(i);
std::cout << " (" << std::to_string(rules.size());
std::cout << " rules)" << std::endl;

2
test/optimization/optimization.cc
View File

@ -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<Rule *> rules = modsecRules->rules[i];
std::vector<Rule *> rules = modsecRules->m_rules[i];
if (rules.size() == 0) {
continue;
}