diff --git a/headers/modsecurity/anchored_set_variable.h b/headers/modsecurity/anchored_set_variable.h index 582ddc82..f2020494 100644 --- a/headers/modsecurity/anchored_set_variable.h +++ b/headers/modsecurity/anchored_set_variable.h @@ -41,7 +41,7 @@ class Transaction; namespace Utils { class Regex; } -namespace Variables { +namespace variables { class KeyExclusions; } @@ -86,7 +86,7 @@ class AnchoredSetVariable : public std::unordered_multimap *l); void resolve(std::vector *l, - Variables::KeyExclusions &ke); + variables::KeyExclusions &ke); void resolve(const std::string &key, std::vector *l); @@ -96,7 +96,7 @@ class AnchoredSetVariable : public std::unordered_multimap *l, - Variables::KeyExclusions &ke); + variables::KeyExclusions &ke); std::unique_ptr resolveFirst(const std::string &key); diff --git a/headers/modsecurity/collection/collection.h b/headers/modsecurity/collection/collection.h index fa28bbc7..4c93495c 100644 --- a/headers/modsecurity/collection/collection.h +++ b/headers/modsecurity/collection/collection.h @@ -37,7 +37,7 @@ typedef struct Variable_t Variables; #ifdef __cplusplus namespace modsecurity { -namespace Variables { +namespace variables { class KeyExclusions; } namespace collection { @@ -63,10 +63,10 @@ class Collection { std::vector *l) = 0; virtual void resolveMultiMatches(const std::string& var, std::vector *l, - Variables::KeyExclusions &ke) = 0; + variables::KeyExclusions &ke) = 0; virtual void resolveRegularExpression(const std::string& var, std::vector *l, - Variables::KeyExclusions &ke) = 0; + variables::KeyExclusions &ke) = 0; /* store */ @@ -163,7 +163,7 @@ class Collection { /* resolveMultiMatches */ virtual void resolveMultiMatches(const std::string& var, std::string compartment, std::vector *l, - Variables::KeyExclusions &ke) { + variables::KeyExclusions &ke) { std::string nkey = compartment + "::" + var; resolveMultiMatches(nkey, l, ke); } @@ -172,7 +172,7 @@ class Collection { virtual void resolveMultiMatches(const std::string& var, std::string compartment, std::string compartment2, std::vector *l, - Variables::KeyExclusions &ke) { + variables::KeyExclusions &ke) { std::string nkey = compartment + "::" + compartment2 + "::" + var; resolveMultiMatches(nkey, l, ke); } @@ -181,7 +181,7 @@ class Collection { /* resolveRegularExpression */ virtual void resolveRegularExpression(const std::string& var, std::string compartment, std::vector *l, - Variables::KeyExclusions &ke) { + variables::KeyExclusions &ke) { std::string nkey = compartment + "::" + var; resolveRegularExpression(nkey, l, ke); } @@ -189,7 +189,7 @@ class Collection { virtual void resolveRegularExpression(const std::string& var, std::string compartment, std::string compartment2, - std::vector *l, Variables::KeyExclusions &ke) { + std::vector *l, variables::KeyExclusions &ke) { std::string nkey = compartment + "::" + compartment2 + "::" + var; resolveRegularExpression(nkey, l, ke); } diff --git a/headers/modsecurity/rule.h b/headers/modsecurity/rule.h index 5403bb32..0660c626 100644 --- a/headers/modsecurity/rule.h +++ b/headers/modsecurity/rule.h @@ -32,7 +32,7 @@ #ifdef __cplusplus namespace modsecurity { -namespace Variables { +namespace variables { class Variable; class Variables; } @@ -52,7 +52,7 @@ class Operator; class Rule { public: Rule(operators::Operator *_op, - Variables::Variables *_variables, + variables::Variables *_variables, std::vector *_actions, std::string fileName, int lineNumber); @@ -77,9 +77,9 @@ class Rule { int *nth); void getVariablesExceptions(Transaction *t, - Variables::Variables *exclusion, Variables::Variables *addition); - inline void getFinalVars(Variables::Variables *vars, - Variables::Variables *eclusion, Transaction *trans); + variables::Variables *exclusion, variables::Variables *addition); + inline void getFinalVars(variables::Variables *vars, + variables::Variables *eclusion, Transaction *trans); void executeActionsAfterFullMatch(Transaction *trasn, bool containsDisruptive, std::shared_ptr ruleMessage); @@ -138,7 +138,7 @@ class Rule { int m_lineNumber; int m_maturity; int m_phase; - modsecurity::Variables::Variables *m_variables; + modsecurity::variables::Variables *m_variables; operators::Operator *m_op; Rule *m_chainedRuleChild; Rule *m_chainedRuleParent; diff --git a/headers/modsecurity/rules_exceptions.h b/headers/modsecurity/rules_exceptions.h index 4dadfec7..2df2fef3 100644 --- a/headers/modsecurity/rules_exceptions.h +++ b/headers/modsecurity/rules_exceptions.h @@ -38,7 +38,7 @@ namespace modsecurity { namespace actions { class Action; } -namespace Variables { +namespace variables { class Variable; } @@ -57,15 +57,15 @@ class RulesExceptions { bool loadRemoveRuleByTag(const std::string &msg, std::string *error); bool loadUpdateTargetByMsg(const std::string &msg, - std::unique_ptr > > v, + std::unique_ptr > > v, std::string *error); bool loadUpdateTargetByTag(const std::string &tag, - std::unique_ptr > > v, + std::unique_ptr > > v, std::string *error); bool loadUpdateTargetById(double id, - std::unique_ptr > > v, + std::unique_ptr > > v, std::string *error); bool loadUpdateActionById(double id, @@ -73,11 +73,11 @@ class RulesExceptions { std::string *error); std::unordered_multimap, - std::shared_ptr> m_variable_update_target_by_tag; + std::shared_ptr> m_variable_update_target_by_tag; std::unordered_multimap, - std::shared_ptr> m_variable_update_target_by_msg; + std::shared_ptr> m_variable_update_target_by_msg; std::unordered_multimap> m_variable_update_target_by_id; + std::shared_ptr> m_variable_update_target_by_id; std::unordered_multimap> m_action_pre_update_target_by_id; std::unordered_multimap l; auto *v = m_variable.get(); - Variables::Tx_DynamicElement *tx = dynamic_cast< - Variables::Tx_DynamicElement *> (v); - Variables::Session_DynamicElement *session = dynamic_cast< - Variables::Session_DynamicElement *> (v); - Variables::Ip_DynamicElement *ip = dynamic_cast< - Variables::Ip_DynamicElement *> (v); - Variables::Resource_DynamicElement *resource = dynamic_cast< - Variables::Resource_DynamicElement *> (v); - Variables::Global_DynamicElement *global = dynamic_cast< - Variables::Global_DynamicElement *> (v); - Variables::User_DynamicElement *user = dynamic_cast< - Variables::User_DynamicElement *> (v); + variables::Tx_DynamicElement *tx = dynamic_cast< + variables::Tx_DynamicElement *> (v); + variables::Session_DynamicElement *session = dynamic_cast< + variables::Session_DynamicElement *> (v); + variables::Ip_DynamicElement *ip = dynamic_cast< + variables::Ip_DynamicElement *> (v); + variables::Resource_DynamicElement *resource = dynamic_cast< + variables::Resource_DynamicElement *> (v); + variables::Global_DynamicElement *global = dynamic_cast< + variables::Global_DynamicElement *> (v); + variables::User_DynamicElement *user = dynamic_cast< + variables::User_DynamicElement *> (v); if (tx) { m_variableNameExpanded = tx->m_string->evaluate(t, rule); } else if (session) { diff --git a/src/actions/set_var.h b/src/actions/set_var.h index b399f720..fe123cc1 100644 --- a/src/actions/set_var.h +++ b/src/actions/set_var.h @@ -45,7 +45,7 @@ enum SetVarOperation { class SetVar : public Action { public: SetVar(SetVarOperation operation, - std::unique_ptr variable, + std::unique_ptr variable, std::unique_ptr predicate) : Action("setvar"), m_operation(operation), @@ -53,7 +53,7 @@ class SetVar : public Action { m_string(std::move(predicate)) { } SetVar(SetVarOperation operation, - std::unique_ptr variable) + std::unique_ptr variable) : Action("setvar"), m_operation(operation), m_variable(std::move(variable)) { } @@ -63,7 +63,7 @@ class SetVar : public Action { private: SetVarOperation m_operation; - std::unique_ptr m_variable; + std::unique_ptr m_variable; std::unique_ptr m_string; }; diff --git a/src/anchored_set_variable.cc b/src/anchored_set_variable.cc index faf3c744..2ff10e8a 100644 --- a/src/anchored_set_variable.cc +++ b/src/anchored_set_variable.cc @@ -91,7 +91,7 @@ void AnchoredSetVariable::resolve( void AnchoredSetVariable::resolve( std::vector *l, - Variables::KeyExclusions &ke) { + variables::KeyExclusions &ke) { for (const auto& x : *this) { if (!ke.toOmit(x.first)) { l->insert(l->begin(), new VariableValue(x.second)); @@ -138,7 +138,7 @@ void AnchoredSetVariable::resolveRegularExpression(Utils::Regex *r, void AnchoredSetVariable::resolveRegularExpression(Utils::Regex *r, std::vector *l, - Variables::KeyExclusions &ke) { + variables::KeyExclusions &ke) { for (const auto& x : *this) { int ret = Utils::regex_search(x.first, *r); if (ret <= 0) { diff --git a/src/collection/backend/in_memory-per_process.cc b/src/collection/backend/in_memory-per_process.cc index 9f13fa58..a3796486 100644 --- a/src/collection/backend/in_memory-per_process.cc +++ b/src/collection/backend/in_memory-per_process.cc @@ -96,7 +96,7 @@ void InMemoryPerProcess::resolveSingleMatch(const std::string& var, void InMemoryPerProcess::resolveMultiMatches(const std::string& var, - std::vector *l, Variables::KeyExclusions &ke) { + std::vector *l, variables::KeyExclusions &ke) { size_t keySize = var.size(); l->reserve(15); @@ -122,7 +122,7 @@ void InMemoryPerProcess::resolveMultiMatches(const std::string& var, void InMemoryPerProcess::resolveRegularExpression(const std::string& var, - std::vector *l, Variables::KeyExclusions &ke) { + std::vector *l, variables::KeyExclusions &ke) { //if (var.find(":") == std::string::npos) { // return; diff --git a/src/collection/backend/in_memory-per_process.h b/src/collection/backend/in_memory-per_process.h index c6c3bf76..98b6f7b9 100644 --- a/src/collection/backend/in_memory-per_process.h +++ b/src/collection/backend/in_memory-per_process.h @@ -90,10 +90,10 @@ class InMemoryPerProcess : std::vector *l) override; void resolveMultiMatches(const std::string& var, std::vector *l, - Variables::KeyExclusions &ke) override; + variables::KeyExclusions &ke) override; void resolveRegularExpression(const std::string& var, std::vector *l, - Variables::KeyExclusions &ke) override; + variables::KeyExclusions &ke) override; private: pthread_mutex_t m_lock; diff --git a/src/collection/backend/lmdb.cc b/src/collection/backend/lmdb.cc index 2b8724c7..2ad25a22 100644 --- a/src/collection/backend/lmdb.cc +++ b/src/collection/backend/lmdb.cc @@ -467,7 +467,7 @@ end_txn: void LMDB::resolveMultiMatches(const std::string& var, std::vector *l, - Variables::KeyExclusions &ke) { + variables::KeyExclusions &ke) { MDB_val key, data; MDB_txn *txn = NULL; MDB_dbi dbi; @@ -529,7 +529,7 @@ end_txn: void LMDB::resolveRegularExpression(const std::string& var, std::vector *l, - Variables::KeyExclusions &ke) { + variables::KeyExclusions &ke) { MDB_val key, data; MDB_txn *txn = NULL; MDB_dbi dbi; diff --git a/src/collection/backend/lmdb.h b/src/collection/backend/lmdb.h index 51c91895..60b8ff07 100644 --- a/src/collection/backend/lmdb.h +++ b/src/collection/backend/lmdb.h @@ -69,10 +69,10 @@ class LMDB : std::vector *l) override; void resolveMultiMatches(const std::string& var, std::vector *l, - Variables::KeyExclusions &ke) override; + variables::KeyExclusions &ke) override; void resolveRegularExpression(const std::string& var, std::vector *l, - Variables::KeyExclusions &ke) override; + variables::KeyExclusions &ke) override; private: void string2val(const std::string& str, MDB_val *val); diff --git a/src/engine/lua.cc b/src/engine/lua.cc index f33a674a..abc7e682 100644 --- a/src/engine/lua.cc +++ b/src/engine/lua.cc @@ -258,7 +258,7 @@ int Lua::getvar(lua_State *L) { z = const_cast(lua_topointer(L, -1)); t = reinterpret_cast(z); - std::string var = Variables::Variable::stringMatchResolve(t, varname); + std::string var = variables::Variable::stringMatchResolve(t, varname); var = applyTransformations(L, t, 2, var); if (var.size() == 0) { @@ -286,7 +286,7 @@ int Lua::getvars(lua_State *L) { z = const_cast(lua_topointer(L, -1)); t = reinterpret_cast(z); - Variables::Variable::stringMatchResolveMulti(t, varname, &l); + variables::Variable::stringMatchResolveMulti(t, varname, &l); lua_newtable(L); for (auto i : l) { diff --git a/src/parser/seclang-parser.cc b/src/parser/seclang-parser.cc index 7c1619b7..e0b7714d 100644 --- a/src/parser/seclang-parser.cc +++ b/src/parser/seclang-parser.cc @@ -2038,7 +2038,7 @@ namespace yy { for (auto &i : *yystack_[0].value.as< std::unique_ptr > > > ().get()) { a->push_back(i.release()); } - Variables::Variables *v = new Variables::Variables(); + variables::Variables *v = new variables::Variables(); for (auto &i : *yystack_[2].value.as< std::unique_ptr > > > ().get()) { v->push_back(i.release()); } @@ -2063,7 +2063,7 @@ namespace yy { case 74: #line 1086 "seclang-parser.yy" // lalr1.cc:906 { - Variables::Variables *v = new Variables::Variables(); + variables::Variables *v = new variables::Variables(); for (auto &i : *yystack_[1].value.as< std::unique_ptr > > > ().get()) { v->push_back(i.release()); } @@ -3092,7 +3092,7 @@ namespace yy { case 160: #line 1831 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Args_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Args_DictElement(yystack_[0].value.as< std::string > ())); } #line 3098 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3100,7 +3100,7 @@ namespace yy { case 161: #line 1835 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Args_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Args_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3106 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3108,7 +3108,7 @@ namespace yy { case 162: #line 1839 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Args_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Args_NoDictElement()); } #line 3114 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3116,7 +3116,7 @@ namespace yy { case 163: #line 1843 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsPost_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ArgsPost_DictElement(yystack_[0].value.as< std::string > ())); } #line 3122 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3124,7 +3124,7 @@ namespace yy { case 164: #line 1847 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsPost_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ArgsPost_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3130 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3132,7 +3132,7 @@ namespace yy { case 165: #line 1851 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsPost_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ArgsPost_NoDictElement()); } #line 3138 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3140,7 +3140,7 @@ namespace yy { case 166: #line 1855 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsGet_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ArgsGet_DictElement(yystack_[0].value.as< std::string > ())); } #line 3146 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3148,7 +3148,7 @@ namespace yy { case 167: #line 1859 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsGet_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ArgsGet_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3154 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3156,7 +3156,7 @@ namespace yy { case 168: #line 1863 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsGet_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ArgsGet_NoDictElement()); } #line 3162 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3164,7 +3164,7 @@ namespace yy { case 169: #line 1867 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FilesSizes_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::FilesSizes_DictElement(yystack_[0].value.as< std::string > ())); } #line 3170 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3172,7 +3172,7 @@ namespace yy { case 170: #line 1871 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FilesSizes_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::FilesSizes_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3178 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3180,7 +3180,7 @@ namespace yy { case 171: #line 1875 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FilesSizes_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::FilesSizes_NoDictElement()); } #line 3186 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3188,7 +3188,7 @@ namespace yy { case 172: #line 1879 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FilesNames_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::FilesNames_DictElement(yystack_[0].value.as< std::string > ())); } #line 3194 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3196,7 +3196,7 @@ namespace yy { case 173: #line 1883 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FilesNames_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::FilesNames_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3202 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3204,7 +3204,7 @@ namespace yy { case 174: #line 1887 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FilesNames_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::FilesNames_NoDictElement()); } #line 3210 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3212,7 +3212,7 @@ namespace yy { case 175: #line 1891 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FilesTmpContent_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::FilesTmpContent_DictElement(yystack_[0].value.as< std::string > ())); } #line 3218 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3220,7 +3220,7 @@ namespace yy { case 176: #line 1895 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FilesTmpContent_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::FilesTmpContent_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3226 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3228,7 +3228,7 @@ namespace yy { case 177: #line 1899 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FilesTmpContent_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::FilesTmpContent_NoDictElement()); } #line 3234 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3236,7 +3236,7 @@ namespace yy { case 178: #line 1903 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultiPartFileName_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MultiPartFileName_DictElement(yystack_[0].value.as< std::string > ())); } #line 3242 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3244,7 +3244,7 @@ namespace yy { case 179: #line 1907 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultiPartFileName_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MultiPartFileName_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3250 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3252,7 +3252,7 @@ namespace yy { case 180: #line 1911 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultiPartFileName_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MultiPartFileName_NoDictElement()); } #line 3258 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3260,7 +3260,7 @@ namespace yy { case 181: #line 1915 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultiPartName_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MultiPartName_DictElement(yystack_[0].value.as< std::string > ())); } #line 3266 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3268,7 +3268,7 @@ namespace yy { case 182: #line 1919 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultiPartName_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MultiPartName_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3274 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3276,7 +3276,7 @@ namespace yy { case 183: #line 1923 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultiPartName_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MultiPartName_NoDictElement()); } #line 3282 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3284,7 +3284,7 @@ namespace yy { case 184: #line 1927 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MatchedVarsNames_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MatchedVarsNames_DictElement(yystack_[0].value.as< std::string > ())); } #line 3290 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3292,7 +3292,7 @@ namespace yy { case 185: #line 1931 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MatchedVarsNames_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MatchedVarsNames_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3298 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3300,7 +3300,7 @@ namespace yy { case 186: #line 1935 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MatchedVarsNames_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MatchedVarsNames_NoDictElement()); } #line 3306 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3308,7 +3308,7 @@ namespace yy { case 187: #line 1939 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MatchedVars_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MatchedVars_DictElement(yystack_[0].value.as< std::string > ())); } #line 3314 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3316,7 +3316,7 @@ namespace yy { case 188: #line 1943 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MatchedVars_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MatchedVars_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3322 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3324,7 +3324,7 @@ namespace yy { case 189: #line 1947 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MatchedVars_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MatchedVars_NoDictElement()); } #line 3330 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3332,7 +3332,7 @@ namespace yy { case 190: #line 1951 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Files_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Files_DictElement(yystack_[0].value.as< std::string > ())); } #line 3338 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3340,7 +3340,7 @@ namespace yy { case 191: #line 1955 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Files_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Files_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3346 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3348,7 +3348,7 @@ namespace yy { case 192: #line 1959 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Files_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Files_NoDictElement()); } #line 3354 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3356,7 +3356,7 @@ namespace yy { case 193: #line 1963 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestCookies_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::RequestCookies_DictElement(yystack_[0].value.as< std::string > ())); } #line 3362 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3364,7 +3364,7 @@ namespace yy { case 194: #line 1967 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestCookies_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::RequestCookies_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3370 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3372,7 +3372,7 @@ namespace yy { case 195: #line 1971 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestCookies_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::RequestCookies_NoDictElement()); } #line 3378 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3380,7 +3380,7 @@ namespace yy { case 196: #line 1975 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestHeaders_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::RequestHeaders_DictElement(yystack_[0].value.as< std::string > ())); } #line 3386 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3388,7 +3388,7 @@ namespace yy { case 197: #line 1979 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestHeaders_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::RequestHeaders_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3394 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3396,7 +3396,7 @@ namespace yy { case 198: #line 1983 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestHeaders_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::RequestHeaders_NoDictElement()); } #line 3402 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3404,7 +3404,7 @@ namespace yy { case 199: #line 1987 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ResponseHeaders_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ResponseHeaders_DictElement(yystack_[0].value.as< std::string > ())); } #line 3410 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3412,7 +3412,7 @@ namespace yy { case 200: #line 1991 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ResponseHeaders_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ResponseHeaders_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3418 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3420,7 +3420,7 @@ namespace yy { case 201: #line 1995 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ResponseHeaders_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ResponseHeaders_NoDictElement()); } #line 3426 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3428,7 +3428,7 @@ namespace yy { case 202: #line 1999 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Geo_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Geo_DictElement(yystack_[0].value.as< std::string > ())); } #line 3434 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3436,7 +3436,7 @@ namespace yy { case 203: #line 2003 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Geo_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Geo_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3442 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3444,7 +3444,7 @@ namespace yy { case 204: #line 2007 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Geo_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Geo_NoDictElement()); } #line 3450 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3452,7 +3452,7 @@ namespace yy { case 205: #line 2011 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestCookiesNames_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::RequestCookiesNames_DictElement(yystack_[0].value.as< std::string > ())); } #line 3458 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3460,7 +3460,7 @@ namespace yy { case 206: #line 2015 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestCookiesNames_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::RequestCookiesNames_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3466 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3468,7 +3468,7 @@ namespace yy { case 207: #line 2019 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestCookiesNames_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::RequestCookiesNames_NoDictElement()); } #line 3474 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3476,7 +3476,7 @@ namespace yy { case 208: #line 2023 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Rule_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Rule_DictElement(yystack_[0].value.as< std::string > ())); } #line 3482 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3484,7 +3484,7 @@ namespace yy { case 209: #line 2027 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Rule_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Rule_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3490 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3492,7 +3492,7 @@ namespace yy { case 210: #line 2031 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Rule_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Rule_NoDictElement()); } #line 3498 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3500,7 +3500,7 @@ namespace yy { case 211: #line 2035 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Env("ENV:" + yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Env("ENV:" + yystack_[0].value.as< std::string > ())); } #line 3506 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3508,7 +3508,7 @@ namespace yy { case 212: #line 2039 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Env("ENV:" + yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Env("ENV:" + yystack_[0].value.as< std::string > ())); } #line 3514 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3516,7 +3516,7 @@ namespace yy { case 213: #line 2043 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Env("ENV")); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Env("ENV")); } #line 3522 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3524,7 +3524,7 @@ namespace yy { case 214: #line 2047 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::XML("XML:" + yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::XML("XML:" + yystack_[0].value.as< std::string > ())); } #line 3530 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3532,7 +3532,7 @@ namespace yy { case 215: #line 2051 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::XML("XML:" + yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::XML("XML:" + yystack_[0].value.as< std::string > ())); } #line 3538 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3540,7 +3540,7 @@ namespace yy { case 216: #line 2055 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::XML_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::XML_NoDictElement()); } #line 3546 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3548,7 +3548,7 @@ namespace yy { case 217: #line 2059 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FilesTmpNames_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::FilesTmpNames_DictElement(yystack_[0].value.as< std::string > ())); } #line 3554 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3556,7 +3556,7 @@ namespace yy { case 218: #line 2063 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FilesTmpNames_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::FilesTmpNames_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3562 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3564,7 +3564,7 @@ namespace yy { case 219: #line 2067 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FilesTmpNames_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::FilesTmpNames_NoDictElement()); } #line 3570 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3572,7 +3572,7 @@ namespace yy { case 220: #line 2071 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Resource_DynamicElement(std::move(yystack_[0].value.as< std::unique_ptr > ()))); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Resource_DynamicElement(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } #line 3578 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3580,7 +3580,7 @@ namespace yy { case 221: #line 2075 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Resource_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Resource_DictElement(yystack_[0].value.as< std::string > ())); } #line 3586 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3588,7 +3588,7 @@ namespace yy { case 222: #line 2079 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Resource_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Resource_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3594 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3596,7 +3596,7 @@ namespace yy { case 223: #line 2083 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Resource_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Resource_NoDictElement()); } #line 3602 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3604,7 +3604,7 @@ namespace yy { case 224: #line 2087 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Ip_DynamicElement(std::move(yystack_[0].value.as< std::unique_ptr > ()))); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Ip_DynamicElement(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } #line 3610 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3612,7 +3612,7 @@ namespace yy { case 225: #line 2091 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Ip_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Ip_DictElement(yystack_[0].value.as< std::string > ())); } #line 3618 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3620,7 +3620,7 @@ namespace yy { case 226: #line 2095 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Ip_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Ip_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3626 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3628,7 +3628,7 @@ namespace yy { case 227: #line 2099 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Ip_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Ip_NoDictElement()); } #line 3634 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3636,7 +3636,7 @@ namespace yy { case 228: #line 2103 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Global_DynamicElement(std::move(yystack_[0].value.as< std::unique_ptr > ()))); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Global_DynamicElement(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } #line 3642 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3644,7 +3644,7 @@ namespace yy { case 229: #line 2107 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Global_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Global_DictElement(yystack_[0].value.as< std::string > ())); } #line 3650 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3652,7 +3652,7 @@ namespace yy { case 230: #line 2111 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Global_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Global_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3658 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3660,7 +3660,7 @@ namespace yy { case 231: #line 2115 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Global_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Global_NoDictElement()); } #line 3666 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3668,7 +3668,7 @@ namespace yy { case 232: #line 2119 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::User_DynamicElement(std::move(yystack_[0].value.as< std::unique_ptr > ()))); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::User_DynamicElement(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } #line 3674 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3676,7 +3676,7 @@ namespace yy { case 233: #line 2123 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::User_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::User_DictElement(yystack_[0].value.as< std::string > ())); } #line 3682 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3684,7 +3684,7 @@ namespace yy { case 234: #line 2127 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::User_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::User_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3690 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3692,7 +3692,7 @@ namespace yy { case 235: #line 2131 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::User_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::User_NoDictElement()); } #line 3698 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3700,7 +3700,7 @@ namespace yy { case 236: #line 2135 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Tx_DynamicElement(std::move(yystack_[0].value.as< std::unique_ptr > ()))); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Tx_DynamicElement(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } #line 3706 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3708,7 +3708,7 @@ namespace yy { case 237: #line 2139 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Tx_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Tx_DictElement(yystack_[0].value.as< std::string > ())); } #line 3714 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3716,7 +3716,7 @@ namespace yy { case 238: #line 2143 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Tx_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Tx_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3722 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3724,7 +3724,7 @@ namespace yy { case 239: #line 2147 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Tx_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Tx_NoDictElement()); } #line 3730 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3732,7 +3732,7 @@ namespace yy { case 240: #line 2151 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Session_DynamicElement(std::move(yystack_[0].value.as< std::unique_ptr > ()))); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Session_DynamicElement(std::move(yystack_[0].value.as< std::unique_ptr > ()))); } #line 3738 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3740,7 +3740,7 @@ namespace yy { case 241: #line 2155 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Session_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Session_DictElement(yystack_[0].value.as< std::string > ())); } #line 3746 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3748,7 +3748,7 @@ namespace yy { case 242: #line 2159 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Session_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Session_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3754 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3756,7 +3756,7 @@ namespace yy { case 243: #line 2163 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Session_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Session_NoDictElement()); } #line 3762 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3764,7 +3764,7 @@ namespace yy { case 244: #line 2167 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsNames_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ArgsNames_DictElement(yystack_[0].value.as< std::string > ())); } #line 3770 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3772,7 +3772,7 @@ namespace yy { case 245: #line 2171 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsNames_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ArgsNames_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3778 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3780,7 +3780,7 @@ namespace yy { case 246: #line 2175 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsNames_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ArgsNames_NoDictElement()); } #line 3786 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3788,7 +3788,7 @@ namespace yy { case 247: #line 2179 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsGetNames_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ArgsGetNames_DictElement(yystack_[0].value.as< std::string > ())); } #line 3794 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3796,7 +3796,7 @@ namespace yy { case 248: #line 2183 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsGetNames_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ArgsGetNames_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3802 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3804,7 +3804,7 @@ namespace yy { case 249: #line 2187 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsGetNames_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ArgsGetNames_NoDictElement()); } #line 3810 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3812,7 +3812,7 @@ namespace yy { case 250: #line 2192 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsPostNames_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ArgsPostNames_DictElement(yystack_[0].value.as< std::string > ())); } #line 3818 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3820,7 +3820,7 @@ namespace yy { case 251: #line 2196 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsPostNames_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ArgsPostNames_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3826 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3828,7 +3828,7 @@ namespace yy { case 252: #line 2200 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsPostNames_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ArgsPostNames_NoDictElement()); } #line 3834 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3836,7 +3836,7 @@ namespace yy { case 253: #line 2205 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestHeadersNames_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::RequestHeadersNames_DictElement(yystack_[0].value.as< std::string > ())); } #line 3842 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3844,7 +3844,7 @@ namespace yy { case 254: #line 2209 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestHeadersNames_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::RequestHeadersNames_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3850 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3852,7 +3852,7 @@ namespace yy { case 255: #line 2213 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestHeadersNames_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::RequestHeadersNames_NoDictElement()); } #line 3858 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3860,7 +3860,7 @@ namespace yy { case 256: #line 2218 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ResponseContentType()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ResponseContentType()); } #line 3866 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3868,7 +3868,7 @@ namespace yy { case 257: #line 2223 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ResponseHeadersNames_DictElement(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ResponseHeadersNames_DictElement(yystack_[0].value.as< std::string > ())); } #line 3874 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3876,7 +3876,7 @@ namespace yy { case 258: #line 2227 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ResponseHeadersNames_DictElementRegexp(yystack_[0].value.as< std::string > ())); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ResponseHeadersNames_DictElementRegexp(yystack_[0].value.as< std::string > ())); } #line 3882 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3884,7 +3884,7 @@ namespace yy { case 259: #line 2231 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ResponseHeadersNames_NoDictElement()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ResponseHeadersNames_NoDictElement()); } #line 3890 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3892,7 +3892,7 @@ namespace yy { case 260: #line 2235 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ArgsCombinedSize()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ArgsCombinedSize()); } #line 3898 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3900,7 +3900,7 @@ namespace yy { case 261: #line 2239 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::AuthType()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::AuthType()); } #line 3906 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3908,7 +3908,7 @@ namespace yy { case 262: #line 2243 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FilesCombinedSize()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::FilesCombinedSize()); } #line 3914 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3916,7 +3916,7 @@ namespace yy { case 263: #line 2247 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FullRequest()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::FullRequest()); } #line 3922 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3924,7 +3924,7 @@ namespace yy { case 264: #line 2251 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::FullRequestLength()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::FullRequestLength()); } #line 3930 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3932,7 +3932,7 @@ namespace yy { case 265: #line 2255 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::InboundDataError()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::InboundDataError()); } #line 3938 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3940,7 +3940,7 @@ namespace yy { case 266: #line 2259 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MatchedVar()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MatchedVar()); } #line 3946 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3948,7 +3948,7 @@ namespace yy { case 267: #line 2263 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MatchedVarName()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MatchedVarName()); } #line 3954 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3956,7 +3956,7 @@ namespace yy { case 268: #line 2267 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartBoundaryQuoted()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MultipartBoundaryQuoted()); } #line 3962 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3964,7 +3964,7 @@ namespace yy { case 269: #line 2271 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartBoundaryWhiteSpace()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MultipartBoundaryWhiteSpace()); } #line 3970 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3972,7 +3972,7 @@ namespace yy { case 270: #line 2275 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartCrlfLFLines()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MultipartCrlfLFLines()); } #line 3978 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3980,7 +3980,7 @@ namespace yy { case 271: #line 2279 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartDateAfter()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MultipartDateAfter()); } #line 3986 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3988,7 +3988,7 @@ namespace yy { case 272: #line 2283 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartDateBefore()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MultipartDateBefore()); } #line 3994 "seclang-parser.cc" // lalr1.cc:906 break; @@ -3996,7 +3996,7 @@ namespace yy { case 273: #line 2287 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartFileLimitExceeded()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MultipartFileLimitExceeded()); } #line 4002 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4004,7 +4004,7 @@ namespace yy { case 274: #line 2291 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartHeaderFolding()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MultipartHeaderFolding()); } #line 4010 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4012,7 +4012,7 @@ namespace yy { case 275: #line 2295 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartInvalidHeaderFolding()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MultipartInvalidHeaderFolding()); } #line 4018 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4020,7 +4020,7 @@ namespace yy { case 276: #line 2299 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartInvalidPart()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MultipartInvalidPart()); } #line 4026 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4028,7 +4028,7 @@ namespace yy { case 277: #line 2303 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartInvalidQuoting()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MultipartInvalidQuoting()); } #line 4034 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4036,7 +4036,7 @@ namespace yy { case 278: #line 2307 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartLFLine()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MultipartLFLine()); } #line 4042 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4044,7 +4044,7 @@ namespace yy { case 279: #line 2311 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartMissingSemicolon()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MultipartMissingSemicolon()); } #line 4050 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4052,7 +4052,7 @@ namespace yy { case 280: #line 2315 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartMissingSemicolon()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MultipartMissingSemicolon()); } #line 4058 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4060,7 +4060,7 @@ namespace yy { case 281: #line 2319 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartStrictError()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MultipartStrictError()); } #line 4066 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4068,7 +4068,7 @@ namespace yy { case 282: #line 2323 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::MultipartUnmatchedBoundary()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::MultipartUnmatchedBoundary()); } #line 4074 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4076,7 +4076,7 @@ namespace yy { case 283: #line 2327 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::OutboundDataError()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::OutboundDataError()); } #line 4082 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4084,7 +4084,7 @@ namespace yy { case 284: #line 2331 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::PathInfo()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::PathInfo()); } #line 4090 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4092,7 +4092,7 @@ namespace yy { case 285: #line 2335 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::QueryString()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::QueryString()); } #line 4098 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4100,7 +4100,7 @@ namespace yy { case 286: #line 2339 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RemoteAddr()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::RemoteAddr()); } #line 4106 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4108,7 +4108,7 @@ namespace yy { case 287: #line 2343 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RemoteHost()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::RemoteHost()); } #line 4114 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4116,7 +4116,7 @@ namespace yy { case 288: #line 2347 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RemotePort()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::RemotePort()); } #line 4122 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4124,7 +4124,7 @@ namespace yy { case 289: #line 2351 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ReqbodyError()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ReqbodyError()); } #line 4130 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4132,7 +4132,7 @@ namespace yy { case 290: #line 2355 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ReqbodyErrorMsg()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ReqbodyErrorMsg()); } #line 4138 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4140,7 +4140,7 @@ namespace yy { case 291: #line 2359 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ReqbodyProcessor()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ReqbodyProcessor()); } #line 4146 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4148,7 +4148,7 @@ namespace yy { case 292: #line 2363 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ReqbodyProcessorError()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ReqbodyProcessorError()); } #line 4154 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4156,7 +4156,7 @@ namespace yy { case 293: #line 2367 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ReqbodyProcessorErrorMsg()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ReqbodyProcessorErrorMsg()); } #line 4162 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4164,7 +4164,7 @@ namespace yy { case 294: #line 2371 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestBasename()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::RequestBasename()); } #line 4170 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4172,7 +4172,7 @@ namespace yy { case 295: #line 2375 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestBody()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::RequestBody()); } #line 4178 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4180,7 +4180,7 @@ namespace yy { case 296: #line 2379 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestBodyLength()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::RequestBodyLength()); } #line 4186 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4188,7 +4188,7 @@ namespace yy { case 297: #line 2383 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestFilename()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::RequestFilename()); } #line 4194 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4196,7 +4196,7 @@ namespace yy { case 298: #line 2387 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestLine()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::RequestLine()); } #line 4202 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4204,7 +4204,7 @@ namespace yy { case 299: #line 2391 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestMethod()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::RequestMethod()); } #line 4210 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4212,7 +4212,7 @@ namespace yy { case 300: #line 2395 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestProtocol()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::RequestProtocol()); } #line 4218 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4220,7 +4220,7 @@ namespace yy { case 301: #line 2399 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestURI()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::RequestURI()); } #line 4226 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4228,7 +4228,7 @@ namespace yy { case 302: #line 2403 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::RequestURIRaw()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::RequestURIRaw()); } #line 4234 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4236,7 +4236,7 @@ namespace yy { case 303: #line 2407 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ResponseBody()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ResponseBody()); } #line 4242 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4244,7 +4244,7 @@ namespace yy { case 304: #line 2411 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ResponseContentLength()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ResponseContentLength()); } #line 4250 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4252,7 +4252,7 @@ namespace yy { case 305: #line 2415 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ResponseProtocol()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ResponseProtocol()); } #line 4258 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4260,7 +4260,7 @@ namespace yy { case 306: #line 2419 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ResponseStatus()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ResponseStatus()); } #line 4266 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4268,7 +4268,7 @@ namespace yy { case 307: #line 2423 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ServerAddr()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ServerAddr()); } #line 4274 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4276,7 +4276,7 @@ namespace yy { case 308: #line 2427 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ServerName()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ServerName()); } #line 4282 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4284,7 +4284,7 @@ namespace yy { case 309: #line 2431 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::ServerPort()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::ServerPort()); } #line 4290 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4292,7 +4292,7 @@ namespace yy { case 310: #line 2435 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::SessionID()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::SessionID()); } #line 4298 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4300,7 +4300,7 @@ namespace yy { case 311: #line 2439 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::UniqueID()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::UniqueID()); } #line 4306 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4308,7 +4308,7 @@ namespace yy { case 312: #line 2443 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::UrlEncodedError()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::UrlEncodedError()); } #line 4314 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4316,7 +4316,7 @@ namespace yy { case 313: #line 2447 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::UserID()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::UserID()); } #line 4322 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4324,7 +4324,7 @@ namespace yy { case 314: #line 2451 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Status()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Status()); } #line 4330 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4332,7 +4332,7 @@ namespace yy { case 315: #line 2455 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::Status()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::Status()); } #line 4338 "seclang-parser.cc" // lalr1.cc:906 break; @@ -4340,7 +4340,7 @@ namespace yy { case 316: #line 2459 "seclang-parser.yy" // lalr1.cc:906 { - VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new Variables::WebAppId()); + VARIABLE_CONTAINER(yylhs.value.as< std::unique_ptr > (), new variables::WebAppId()); } #line 4346 "seclang-parser.cc" // lalr1.cc:906 break; diff --git a/src/parser/seclang-parser.hh b/src/parser/seclang-parser.hh index 453fe2cb..0c0795c0 100644 --- a/src/parser/seclang-parser.hh +++ b/src/parser/seclang-parser.hh @@ -296,7 +296,7 @@ class Driver; using namespace modsecurity; -using namespace modsecurity::Variables; +using namespace modsecurity::variables; using namespace modsecurity::Utils; using namespace modsecurity::operators; diff --git a/src/parser/seclang-parser.yy b/src/parser/seclang-parser.yy index 99d0b972..369b3ed8 100644 --- a/src/parser/seclang-parser.yy +++ b/src/parser/seclang-parser.yy @@ -258,7 +258,7 @@ class Driver; using namespace modsecurity; -using namespace modsecurity::Variables; +using namespace modsecurity::variables; using namespace modsecurity::Utils; using namespace modsecurity::operators; @@ -1063,7 +1063,7 @@ expression: for (auto &i : *$4.get()) { a->push_back(i.release()); } - Variables::Variables *v = new Variables::Variables(); + variables::Variables *v = new variables::Variables(); for (auto &i : *$2.get()) { v->push_back(i.release()); } @@ -1084,7 +1084,7 @@ expression: } | DIRECTIVE variables op { - Variables::Variables *v = new Variables::Variables(); + variables::Variables *v = new variables::Variables(); for (auto &i : *$2.get()) { v->push_back(i.release()); } @@ -1829,635 +1829,635 @@ variables_may_be_quoted: var: VARIABLE_ARGS DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::Args_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::Args_DictElement($2)); } | VARIABLE_ARGS DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::Args_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::Args_DictElementRegexp($2)); } | VARIABLE_ARGS { - VARIABLE_CONTAINER($$, new Variables::Args_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::Args_NoDictElement()); } | VARIABLE_ARGS_POST DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::ArgsPost_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::ArgsPost_DictElement($2)); } | VARIABLE_ARGS_POST DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::ArgsPost_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::ArgsPost_DictElementRegexp($2)); } | VARIABLE_ARGS_POST { - VARIABLE_CONTAINER($$, new Variables::ArgsPost_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::ArgsPost_NoDictElement()); } | VARIABLE_ARGS_GET DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::ArgsGet_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::ArgsGet_DictElement($2)); } | VARIABLE_ARGS_GET DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::ArgsGet_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::ArgsGet_DictElementRegexp($2)); } | VARIABLE_ARGS_GET { - VARIABLE_CONTAINER($$, new Variables::ArgsGet_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::ArgsGet_NoDictElement()); } | VARIABLE_FILES_SIZES DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::FilesSizes_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::FilesSizes_DictElement($2)); } | VARIABLE_FILES_SIZES DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::FilesSizes_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::FilesSizes_DictElementRegexp($2)); } | VARIABLE_FILES_SIZES { - VARIABLE_CONTAINER($$, new Variables::FilesSizes_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::FilesSizes_NoDictElement()); } | VARIABLE_FILES_NAMES DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::FilesNames_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::FilesNames_DictElement($2)); } | VARIABLE_FILES_NAMES DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::FilesNames_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::FilesNames_DictElementRegexp($2)); } | VARIABLE_FILES_NAMES { - VARIABLE_CONTAINER($$, new Variables::FilesNames_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::FilesNames_NoDictElement()); } | VARIABLE_FILES_TMP_CONTENT DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::FilesTmpContent_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::FilesTmpContent_DictElement($2)); } | VARIABLE_FILES_TMP_CONTENT DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::FilesTmpContent_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::FilesTmpContent_DictElementRegexp($2)); } | VARIABLE_FILES_TMP_CONTENT { - VARIABLE_CONTAINER($$, new Variables::FilesTmpContent_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::FilesTmpContent_NoDictElement()); } | VARIABLE_MULTIPART_FILENAME DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::MultiPartFileName_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::MultiPartFileName_DictElement($2)); } | VARIABLE_MULTIPART_FILENAME DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::MultiPartFileName_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::MultiPartFileName_DictElementRegexp($2)); } | VARIABLE_MULTIPART_FILENAME { - VARIABLE_CONTAINER($$, new Variables::MultiPartFileName_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::MultiPartFileName_NoDictElement()); } | VARIABLE_MULTIPART_NAME DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::MultiPartName_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::MultiPartName_DictElement($2)); } | VARIABLE_MULTIPART_NAME DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::MultiPartName_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::MultiPartName_DictElementRegexp($2)); } | VARIABLE_MULTIPART_NAME { - VARIABLE_CONTAINER($$, new Variables::MultiPartName_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::MultiPartName_NoDictElement()); } | VARIABLE_MATCHED_VARS_NAMES DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::MatchedVarsNames_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::MatchedVarsNames_DictElement($2)); } | VARIABLE_MATCHED_VARS_NAMES DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::MatchedVarsNames_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::MatchedVarsNames_DictElementRegexp($2)); } | VARIABLE_MATCHED_VARS_NAMES { - VARIABLE_CONTAINER($$, new Variables::MatchedVarsNames_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::MatchedVarsNames_NoDictElement()); } | VARIABLE_MATCHED_VARS DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::MatchedVars_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::MatchedVars_DictElement($2)); } | VARIABLE_MATCHED_VARS DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::MatchedVars_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::MatchedVars_DictElementRegexp($2)); } | VARIABLE_MATCHED_VARS { - VARIABLE_CONTAINER($$, new Variables::MatchedVars_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::MatchedVars_NoDictElement()); } | VARIABLE_FILES DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::Files_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::Files_DictElement($2)); } | VARIABLE_FILES DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::Files_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::Files_DictElementRegexp($2)); } | VARIABLE_FILES { - VARIABLE_CONTAINER($$, new Variables::Files_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::Files_NoDictElement()); } | VARIABLE_REQUEST_COOKIES DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::RequestCookies_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::RequestCookies_DictElement($2)); } | VARIABLE_REQUEST_COOKIES DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::RequestCookies_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::RequestCookies_DictElementRegexp($2)); } | VARIABLE_REQUEST_COOKIES { - VARIABLE_CONTAINER($$, new Variables::RequestCookies_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::RequestCookies_NoDictElement()); } | VARIABLE_REQUEST_HEADERS DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::RequestHeaders_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::RequestHeaders_DictElement($2)); } | VARIABLE_REQUEST_HEADERS DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::RequestHeaders_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::RequestHeaders_DictElementRegexp($2)); } | VARIABLE_REQUEST_HEADERS { - VARIABLE_CONTAINER($$, new Variables::RequestHeaders_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::RequestHeaders_NoDictElement()); } | VARIABLE_RESPONSE_HEADERS DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::ResponseHeaders_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::ResponseHeaders_DictElement($2)); } | VARIABLE_RESPONSE_HEADERS DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::ResponseHeaders_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::ResponseHeaders_DictElementRegexp($2)); } | VARIABLE_RESPONSE_HEADERS { - VARIABLE_CONTAINER($$, new Variables::ResponseHeaders_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::ResponseHeaders_NoDictElement()); } | VARIABLE_GEO DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::Geo_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::Geo_DictElement($2)); } | VARIABLE_GEO DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::Geo_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::Geo_DictElementRegexp($2)); } | VARIABLE_GEO { - VARIABLE_CONTAINER($$, new Variables::Geo_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::Geo_NoDictElement()); } | VARIABLE_REQUEST_COOKIES_NAMES DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::RequestCookiesNames_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::RequestCookiesNames_DictElement($2)); } | VARIABLE_REQUEST_COOKIES_NAMES DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::RequestCookiesNames_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::RequestCookiesNames_DictElementRegexp($2)); } | VARIABLE_REQUEST_COOKIES_NAMES { - VARIABLE_CONTAINER($$, new Variables::RequestCookiesNames_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::RequestCookiesNames_NoDictElement()); } | VARIABLE_RULE DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::Rule_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::Rule_DictElement($2)); } | VARIABLE_RULE DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::Rule_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::Rule_DictElementRegexp($2)); } | VARIABLE_RULE { - VARIABLE_CONTAINER($$, new Variables::Rule_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::Rule_NoDictElement()); } | RUN_TIME_VAR_ENV DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::Env("ENV:" + $2)); + VARIABLE_CONTAINER($$, new variables::Env("ENV:" + $2)); } | RUN_TIME_VAR_ENV DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::Env("ENV:" + $2)); + VARIABLE_CONTAINER($$, new variables::Env("ENV:" + $2)); } | RUN_TIME_VAR_ENV { - VARIABLE_CONTAINER($$, new Variables::Env("ENV")); + VARIABLE_CONTAINER($$, new variables::Env("ENV")); } | RUN_TIME_VAR_XML DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::XML("XML:" + $2)); + VARIABLE_CONTAINER($$, new variables::XML("XML:" + $2)); } | RUN_TIME_VAR_XML DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::XML("XML:" + $2)); + VARIABLE_CONTAINER($$, new variables::XML("XML:" + $2)); } | RUN_TIME_VAR_XML { - VARIABLE_CONTAINER($$, new Variables::XML_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::XML_NoDictElement()); } | VARIABLE_FILES_TMP_NAMES DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::FilesTmpNames_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::FilesTmpNames_DictElement($2)); } | VARIABLE_FILES_TMP_NAMES DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::FilesTmpNames_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::FilesTmpNames_DictElementRegexp($2)); } | VARIABLE_FILES_TMP_NAMES { - VARIABLE_CONTAINER($$, new Variables::FilesTmpNames_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::FilesTmpNames_NoDictElement()); } | VARIABLE_RESOURCE run_time_string { - VARIABLE_CONTAINER($$, new Variables::Resource_DynamicElement(std::move($2))); + VARIABLE_CONTAINER($$, new variables::Resource_DynamicElement(std::move($2))); } | VARIABLE_RESOURCE DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::Resource_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::Resource_DictElement($2)); } | VARIABLE_RESOURCE DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::Resource_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::Resource_DictElementRegexp($2)); } | VARIABLE_RESOURCE { - VARIABLE_CONTAINER($$, new Variables::Resource_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::Resource_NoDictElement()); } | VARIABLE_IP run_time_string { - VARIABLE_CONTAINER($$, new Variables::Ip_DynamicElement(std::move($2))); + VARIABLE_CONTAINER($$, new variables::Ip_DynamicElement(std::move($2))); } | VARIABLE_IP DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::Ip_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::Ip_DictElement($2)); } | VARIABLE_IP DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::Ip_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::Ip_DictElementRegexp($2)); } | VARIABLE_IP { - VARIABLE_CONTAINER($$, new Variables::Ip_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::Ip_NoDictElement()); } | VARIABLE_GLOBAL run_time_string { - VARIABLE_CONTAINER($$, new Variables::Global_DynamicElement(std::move($2))); + VARIABLE_CONTAINER($$, new variables::Global_DynamicElement(std::move($2))); } | VARIABLE_GLOBAL DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::Global_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::Global_DictElement($2)); } | VARIABLE_GLOBAL DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::Global_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::Global_DictElementRegexp($2)); } | VARIABLE_GLOBAL { - VARIABLE_CONTAINER($$, new Variables::Global_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::Global_NoDictElement()); } | VARIABLE_USER run_time_string { - VARIABLE_CONTAINER($$, new Variables::User_DynamicElement(std::move($2))); + VARIABLE_CONTAINER($$, new variables::User_DynamicElement(std::move($2))); } | VARIABLE_USER DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::User_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::User_DictElement($2)); } | VARIABLE_USER DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::User_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::User_DictElementRegexp($2)); } | VARIABLE_USER { - VARIABLE_CONTAINER($$, new Variables::User_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::User_NoDictElement()); } | VARIABLE_TX run_time_string { - VARIABLE_CONTAINER($$, new Variables::Tx_DynamicElement(std::move($2))); + VARIABLE_CONTAINER($$, new variables::Tx_DynamicElement(std::move($2))); } | VARIABLE_TX DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::Tx_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::Tx_DictElement($2)); } | VARIABLE_TX DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::Tx_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::Tx_DictElementRegexp($2)); } | VARIABLE_TX { - VARIABLE_CONTAINER($$, new Variables::Tx_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::Tx_NoDictElement()); } | VARIABLE_SESSION run_time_string { - VARIABLE_CONTAINER($$, new Variables::Session_DynamicElement(std::move($2))); + VARIABLE_CONTAINER($$, new variables::Session_DynamicElement(std::move($2))); } | VARIABLE_SESSION DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::Session_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::Session_DictElement($2)); } | VARIABLE_SESSION DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::Session_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::Session_DictElementRegexp($2)); } | VARIABLE_SESSION { - VARIABLE_CONTAINER($$, new Variables::Session_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::Session_NoDictElement()); } | VARIABLE_ARGS_NAMES DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::ArgsNames_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::ArgsNames_DictElement($2)); } | VARIABLE_ARGS_NAMES DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::ArgsNames_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::ArgsNames_DictElementRegexp($2)); } | VARIABLE_ARGS_NAMES { - VARIABLE_CONTAINER($$, new Variables::ArgsNames_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::ArgsNames_NoDictElement()); } | VARIABLE_ARGS_GET_NAMES DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::ArgsGetNames_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::ArgsGetNames_DictElement($2)); } | VARIABLE_ARGS_GET_NAMES DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::ArgsGetNames_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::ArgsGetNames_DictElementRegexp($2)); } | VARIABLE_ARGS_GET_NAMES { - VARIABLE_CONTAINER($$, new Variables::ArgsGetNames_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::ArgsGetNames_NoDictElement()); } | VARIABLE_ARGS_POST_NAMES DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::ArgsPostNames_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::ArgsPostNames_DictElement($2)); } | VARIABLE_ARGS_POST_NAMES DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::ArgsPostNames_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::ArgsPostNames_DictElementRegexp($2)); } | VARIABLE_ARGS_POST_NAMES { - VARIABLE_CONTAINER($$, new Variables::ArgsPostNames_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::ArgsPostNames_NoDictElement()); } | VARIABLE_REQUEST_HEADERS_NAMES DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::RequestHeadersNames_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::RequestHeadersNames_DictElement($2)); } | VARIABLE_REQUEST_HEADERS_NAMES DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::RequestHeadersNames_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::RequestHeadersNames_DictElementRegexp($2)); } | VARIABLE_REQUEST_HEADERS_NAMES { - VARIABLE_CONTAINER($$, new Variables::RequestHeadersNames_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::RequestHeadersNames_NoDictElement()); } | VARIABLE_RESPONSE_CONTENT_TYPE { - VARIABLE_CONTAINER($$, new Variables::ResponseContentType()); + VARIABLE_CONTAINER($$, new variables::ResponseContentType()); } | VARIABLE_RESPONSE_HEADERS_NAMES DICT_ELEMENT { - VARIABLE_CONTAINER($$, new Variables::ResponseHeadersNames_DictElement($2)); + VARIABLE_CONTAINER($$, new variables::ResponseHeadersNames_DictElement($2)); } | VARIABLE_RESPONSE_HEADERS_NAMES DICT_ELEMENT_REGEXP { - VARIABLE_CONTAINER($$, new Variables::ResponseHeadersNames_DictElementRegexp($2)); + VARIABLE_CONTAINER($$, new variables::ResponseHeadersNames_DictElementRegexp($2)); } | VARIABLE_RESPONSE_HEADERS_NAMES { - VARIABLE_CONTAINER($$, new Variables::ResponseHeadersNames_NoDictElement()); + VARIABLE_CONTAINER($$, new variables::ResponseHeadersNames_NoDictElement()); } | VARIABLE_ARGS_COMBINED_SIZE { - VARIABLE_CONTAINER($$, new Variables::ArgsCombinedSize()); + VARIABLE_CONTAINER($$, new variables::ArgsCombinedSize()); } | VARIABLE_AUTH_TYPE { - VARIABLE_CONTAINER($$, new Variables::AuthType()); + VARIABLE_CONTAINER($$, new variables::AuthType()); } | VARIABLE_FILES_COMBINED_SIZE { - VARIABLE_CONTAINER($$, new Variables::FilesCombinedSize()); + VARIABLE_CONTAINER($$, new variables::FilesCombinedSize()); } | VARIABLE_FULL_REQUEST { - VARIABLE_CONTAINER($$, new Variables::FullRequest()); + VARIABLE_CONTAINER($$, new variables::FullRequest()); } | VARIABLE_FULL_REQUEST_LENGTH { - VARIABLE_CONTAINER($$, new Variables::FullRequestLength()); + VARIABLE_CONTAINER($$, new variables::FullRequestLength()); } | VARIABLE_INBOUND_DATA_ERROR { - VARIABLE_CONTAINER($$, new Variables::InboundDataError()); + VARIABLE_CONTAINER($$, new variables::InboundDataError()); } | VARIABLE_MATCHED_VAR { - VARIABLE_CONTAINER($$, new Variables::MatchedVar()); + VARIABLE_CONTAINER($$, new variables::MatchedVar()); } | VARIABLE_MATCHED_VAR_NAME { - VARIABLE_CONTAINER($$, new Variables::MatchedVarName()); + VARIABLE_CONTAINER($$, new variables::MatchedVarName()); } | VARIABLE_MULTIPART_BOUNDARY_QUOTED { - VARIABLE_CONTAINER($$, new Variables::MultipartBoundaryQuoted()); + VARIABLE_CONTAINER($$, new variables::MultipartBoundaryQuoted()); } | VARIABLE_MULTIPART_BOUNDARY_WHITESPACE { - VARIABLE_CONTAINER($$, new Variables::MultipartBoundaryWhiteSpace()); + VARIABLE_CONTAINER($$, new variables::MultipartBoundaryWhiteSpace()); } | VARIABLE_MULTIPART_CRLF_LF_LINES { - VARIABLE_CONTAINER($$, new Variables::MultipartCrlfLFLines()); + VARIABLE_CONTAINER($$, new variables::MultipartCrlfLFLines()); } | VARIABLE_MULTIPART_DATA_AFTER { - VARIABLE_CONTAINER($$, new Variables::MultipartDateAfter()); + VARIABLE_CONTAINER($$, new variables::MultipartDateAfter()); } | VARIABLE_MULTIPART_DATA_BEFORE { - VARIABLE_CONTAINER($$, new Variables::MultipartDateBefore()); + VARIABLE_CONTAINER($$, new variables::MultipartDateBefore()); } | VARIABLE_MULTIPART_FILE_LIMIT_EXCEEDED { - VARIABLE_CONTAINER($$, new Variables::MultipartFileLimitExceeded()); + VARIABLE_CONTAINER($$, new variables::MultipartFileLimitExceeded()); } | VARIABLE_MULTIPART_HEADER_FOLDING { - VARIABLE_CONTAINER($$, new Variables::MultipartHeaderFolding()); + VARIABLE_CONTAINER($$, new variables::MultipartHeaderFolding()); } | VARIABLE_MULTIPART_INVALID_HEADER_FOLDING { - VARIABLE_CONTAINER($$, new Variables::MultipartInvalidHeaderFolding()); + VARIABLE_CONTAINER($$, new variables::MultipartInvalidHeaderFolding()); } | VARIABLE_MULTIPART_INVALID_PART { - VARIABLE_CONTAINER($$, new Variables::MultipartInvalidPart()); + VARIABLE_CONTAINER($$, new variables::MultipartInvalidPart()); } | VARIABLE_MULTIPART_INVALID_QUOTING { - VARIABLE_CONTAINER($$, new Variables::MultipartInvalidQuoting()); + VARIABLE_CONTAINER($$, new variables::MultipartInvalidQuoting()); } | VARIABLE_MULTIPART_LF_LINE { - VARIABLE_CONTAINER($$, new Variables::MultipartLFLine()); + VARIABLE_CONTAINER($$, new variables::MultipartLFLine()); } | VARIABLE_MULTIPART_MISSING_SEMICOLON { - VARIABLE_CONTAINER($$, new Variables::MultipartMissingSemicolon()); + VARIABLE_CONTAINER($$, new variables::MultipartMissingSemicolon()); } | VARIABLE_MULTIPART_SEMICOLON_MISSING { - VARIABLE_CONTAINER($$, new Variables::MultipartMissingSemicolon()); + VARIABLE_CONTAINER($$, new variables::MultipartMissingSemicolon()); } | VARIABLE_MULTIPART_STRICT_ERROR { - VARIABLE_CONTAINER($$, new Variables::MultipartStrictError()); + VARIABLE_CONTAINER($$, new variables::MultipartStrictError()); } | VARIABLE_MULTIPART_UNMATCHED_BOUNDARY { - VARIABLE_CONTAINER($$, new Variables::MultipartUnmatchedBoundary()); + VARIABLE_CONTAINER($$, new variables::MultipartUnmatchedBoundary()); } | VARIABLE_OUTBOUND_DATA_ERROR { - VARIABLE_CONTAINER($$, new Variables::OutboundDataError()); + VARIABLE_CONTAINER($$, new variables::OutboundDataError()); } | VARIABLE_PATH_INFO { - VARIABLE_CONTAINER($$, new Variables::PathInfo()); + VARIABLE_CONTAINER($$, new variables::PathInfo()); } | VARIABLE_QUERY_STRING { - VARIABLE_CONTAINER($$, new Variables::QueryString()); + VARIABLE_CONTAINER($$, new variables::QueryString()); } | VARIABLE_REMOTE_ADDR { - VARIABLE_CONTAINER($$, new Variables::RemoteAddr()); + VARIABLE_CONTAINER($$, new variables::RemoteAddr()); } | VARIABLE_REMOTE_HOST { - VARIABLE_CONTAINER($$, new Variables::RemoteHost()); + VARIABLE_CONTAINER($$, new variables::RemoteHost()); } | VARIABLE_REMOTE_PORT { - VARIABLE_CONTAINER($$, new Variables::RemotePort()); + VARIABLE_CONTAINER($$, new variables::RemotePort()); } | VARIABLE_REQBODY_ERROR { - VARIABLE_CONTAINER($$, new Variables::ReqbodyError()); + VARIABLE_CONTAINER($$, new variables::ReqbodyError()); } | VARIABLE_REQBODY_ERROR_MSG { - VARIABLE_CONTAINER($$, new Variables::ReqbodyErrorMsg()); + VARIABLE_CONTAINER($$, new variables::ReqbodyErrorMsg()); } | VARIABLE_REQBODY_PROCESSOR { - VARIABLE_CONTAINER($$, new Variables::ReqbodyProcessor()); + VARIABLE_CONTAINER($$, new variables::ReqbodyProcessor()); } | VARIABLE_REQBODY_PROCESSOR_ERROR { - VARIABLE_CONTAINER($$, new Variables::ReqbodyProcessorError()); + VARIABLE_CONTAINER($$, new variables::ReqbodyProcessorError()); } | VARIABLE_REQBODY_PROCESSOR_ERROR_MSG { - VARIABLE_CONTAINER($$, new Variables::ReqbodyProcessorErrorMsg()); + VARIABLE_CONTAINER($$, new variables::ReqbodyProcessorErrorMsg()); } | VARIABLE_REQUEST_BASENAME { - VARIABLE_CONTAINER($$, new Variables::RequestBasename()); + VARIABLE_CONTAINER($$, new variables::RequestBasename()); } | VARIABLE_REQUEST_BODY { - VARIABLE_CONTAINER($$, new Variables::RequestBody()); + VARIABLE_CONTAINER($$, new variables::RequestBody()); } | VARIABLE_REQUEST_BODY_LENGTH { - VARIABLE_CONTAINER($$, new Variables::RequestBodyLength()); + VARIABLE_CONTAINER($$, new variables::RequestBodyLength()); } | VARIABLE_REQUEST_FILE_NAME { - VARIABLE_CONTAINER($$, new Variables::RequestFilename()); + VARIABLE_CONTAINER($$, new variables::RequestFilename()); } | VARIABLE_REQUEST_LINE { - VARIABLE_CONTAINER($$, new Variables::RequestLine()); + VARIABLE_CONTAINER($$, new variables::RequestLine()); } | VARIABLE_REQUEST_METHOD { - VARIABLE_CONTAINER($$, new Variables::RequestMethod()); + VARIABLE_CONTAINER($$, new variables::RequestMethod()); } | VARIABLE_REQUEST_PROTOCOL { - VARIABLE_CONTAINER($$, new Variables::RequestProtocol()); + VARIABLE_CONTAINER($$, new variables::RequestProtocol()); } | VARIABLE_REQUEST_URI { - VARIABLE_CONTAINER($$, new Variables::RequestURI()); + VARIABLE_CONTAINER($$, new variables::RequestURI()); } | VARIABLE_REQUEST_URI_RAW { - VARIABLE_CONTAINER($$, new Variables::RequestURIRaw()); + VARIABLE_CONTAINER($$, new variables::RequestURIRaw()); } | VARIABLE_RESPONSE_BODY { - VARIABLE_CONTAINER($$, new Variables::ResponseBody()); + VARIABLE_CONTAINER($$, new variables::ResponseBody()); } | VARIABLE_RESPONSE_CONTENT_LENGTH { - VARIABLE_CONTAINER($$, new Variables::ResponseContentLength()); + VARIABLE_CONTAINER($$, new variables::ResponseContentLength()); } | VARIABLE_RESPONSE_PROTOCOL { - VARIABLE_CONTAINER($$, new Variables::ResponseProtocol()); + VARIABLE_CONTAINER($$, new variables::ResponseProtocol()); } | VARIABLE_RESPONSE_STATUS { - VARIABLE_CONTAINER($$, new Variables::ResponseStatus()); + VARIABLE_CONTAINER($$, new variables::ResponseStatus()); } | VARIABLE_SERVER_ADDR { - VARIABLE_CONTAINER($$, new Variables::ServerAddr()); + VARIABLE_CONTAINER($$, new variables::ServerAddr()); } | VARIABLE_SERVER_NAME { - VARIABLE_CONTAINER($$, new Variables::ServerName()); + VARIABLE_CONTAINER($$, new variables::ServerName()); } | VARIABLE_SERVER_PORT { - VARIABLE_CONTAINER($$, new Variables::ServerPort()); + VARIABLE_CONTAINER($$, new variables::ServerPort()); } | VARIABLE_SESSION_ID { - VARIABLE_CONTAINER($$, new Variables::SessionID()); + VARIABLE_CONTAINER($$, new variables::SessionID()); } | VARIABLE_UNIQUE_ID { - VARIABLE_CONTAINER($$, new Variables::UniqueID()); + VARIABLE_CONTAINER($$, new variables::UniqueID()); } | VARIABLE_URL_ENCODED_ERROR { - VARIABLE_CONTAINER($$, new Variables::UrlEncodedError()); + VARIABLE_CONTAINER($$, new variables::UrlEncodedError()); } | VARIABLE_USER_ID { - VARIABLE_CONTAINER($$, new Variables::UserID()); + VARIABLE_CONTAINER($$, new variables::UserID()); } | VARIABLE_STATUS { - VARIABLE_CONTAINER($$, new Variables::Status()); + VARIABLE_CONTAINER($$, new variables::Status()); } | VARIABLE_STATUS_LINE { - VARIABLE_CONTAINER($$, new Variables::Status()); + VARIABLE_CONTAINER($$, new variables::Status()); } | VARIABLE_WEB_APP_ID { - VARIABLE_CONTAINER($$, new Variables::WebAppId()); + VARIABLE_CONTAINER($$, new variables::WebAppId()); } | RUN_TIME_VAR_DUR { diff --git a/src/rule.cc b/src/rule.cc index 70f281e0..136faeac 100644 --- a/src/rule.cc +++ b/src/rule.cc @@ -47,7 +47,7 @@ namespace modsecurity { using operators::Operator; using actions::Action; -using Variables::Variable; +using variables::Variable; using actions::transformations::None; @@ -82,7 +82,7 @@ Rule::Rule(std::string marker) Rule::Rule(Operator *_op, - Variables::Variables *_variables, + variables::Variables *_variables, std::vector *actions, std::string fileName, int lineNumber) @@ -459,15 +459,15 @@ std::list, void Rule::getVariablesExceptions(Transaction *t, - Variables::Variables *exclusion, Variables::Variables *addition) { + variables::Variables *exclusion, variables::Variables *addition) { for (auto &a : t->m_rules->m_exceptions.m_variable_update_target_by_tag) { if (containsTag(*a.first.get(), t) == false) { continue; } Variable *b = a.second.get(); - if (dynamic_cast(b)) { + if (dynamic_cast(b)) { exclusion->push_back( - dynamic_cast( + dynamic_cast( b)->m_base.get()); } else { addition->push_back(b); @@ -479,9 +479,9 @@ void Rule::getVariablesExceptions(Transaction *t, continue; } Variable *b = a.second.get(); - if (dynamic_cast(b)) { + if (dynamic_cast(b)) { exclusion->push_back( - dynamic_cast( + dynamic_cast( b)->m_base.get()); } else { addition->push_back(b); @@ -493,9 +493,9 @@ void Rule::getVariablesExceptions(Transaction *t, continue; } Variable *b = a.second.get(); - if (dynamic_cast(b)) { + if (dynamic_cast(b)) { exclusion->push_back( - dynamic_cast( + dynamic_cast( b)->m_base.get()); } else { addition->push_back(b); @@ -504,9 +504,9 @@ void Rule::getVariablesExceptions(Transaction *t, } -inline void Rule::getFinalVars(Variables::Variables *vars, - Variables::Variables *exclusion, Transaction *trans) { - Variables::Variables addition; +inline void Rule::getFinalVars(variables::Variables *vars, + variables::Variables *exclusion, Transaction *trans) { + variables::Variables addition; getVariablesExceptions(trans, exclusion, &addition); @@ -620,14 +620,14 @@ void Rule::executeActionsAfterFullMatch(Transaction *trans, bool Rule::evaluate(Transaction *trans, std::shared_ptr ruleMessage) { bool globalRet = false; - Variables::Variables *variables = this->m_variables; + variables::Variables *variables = this->m_variables; bool recursiveGlobalRet; bool containsBlock = m_containsStaticBlockAction; std::vector> finalVars; std::string eparam; - Variables::Variables vars; + variables::Variables vars; vars.reserve(4); - Variables::Variables exclusion; + variables::Variables exclusion; if (ruleMessage == NULL) { ruleMessage = std::shared_ptr( diff --git a/src/rules_exceptions.cc b/src/rules_exceptions.cc index 4ac0c93e..dd057402 100644 --- a/src/rules_exceptions.cc +++ b/src/rules_exceptions.cc @@ -74,12 +74,12 @@ bool RulesExceptions::loadRemoveRuleByTag(const std::string &msg, bool RulesExceptions::loadUpdateTargetByMsg(const std::string &msg, - std::unique_ptr > > var, + std::unique_ptr > > var, std::string *error) { for (auto &i : *var) { m_variable_update_target_by_msg.emplace( std::pair, - std::unique_ptr>( + std::unique_ptr>( std::make_shared(msg), std::move(i))); } @@ -89,13 +89,13 @@ bool RulesExceptions::loadUpdateTargetByMsg(const std::string &msg, bool RulesExceptions::loadUpdateTargetByTag(const std::string &tag, - std::unique_ptr > > var, + std::unique_ptr > > var, std::string *error) { for (auto &i : *var) { m_variable_update_target_by_tag.emplace( std::pair, - std::unique_ptr>( + std::unique_ptr>( std::make_shared(tag), std::move(i))); } @@ -105,13 +105,13 @@ bool RulesExceptions::loadUpdateTargetByTag(const std::string &tag, bool RulesExceptions::loadUpdateTargetById(double id, - std::unique_ptr > > var, + std::unique_ptr > > var, std::string *error) { for (auto &i : *var) { m_variable_update_target_by_id.emplace( std::pair>(id, + std::unique_ptr>(id, std::move(i))); } @@ -222,21 +222,21 @@ bool RulesExceptions::merge(RulesExceptions *from) { for (auto &p : from->m_variable_update_target_by_tag) { m_variable_update_target_by_tag.emplace( std::pair, - std::shared_ptr>(p.first, + std::shared_ptr>(p.first, p.second)); } for (auto &p : from->m_variable_update_target_by_msg) { m_variable_update_target_by_msg.emplace( std::pair, - std::shared_ptr>(p.first, + std::shared_ptr>(p.first, p.second)); } for (auto &p : from->m_variable_update_target_by_id) { m_variable_update_target_by_id.emplace( std::pair>(p.first, + std::shared_ptr>(p.first, p.second)); } diff --git a/src/run_time_string.cc b/src/run_time_string.cc index ee02541a..dc816750 100644 --- a/src/run_time_string.cc +++ b/src/run_time_string.cc @@ -38,7 +38,7 @@ void RunTimeString::appendText(std::string text) { void RunTimeString::appendVar( - std::unique_ptr var) { + std::unique_ptr var) { std::unique_ptr r(new RunTimeElementHolder); r->m_var = std::move(var); m_elements.push_back(std::move(r)); diff --git a/src/run_time_string.h b/src/run_time_string.h index 582fd4c6..20535c9a 100644 --- a/src/run_time_string.h +++ b/src/run_time_string.h @@ -38,7 +38,7 @@ class RunTimeElementHolder { m_string("") { m_var.reset(NULL); } - std::unique_ptr m_var; + std::unique_ptr m_var; std::string m_string; }; @@ -47,7 +47,7 @@ class RunTimeString { RunTimeString() : m_containsMacro(false) { } void appendText(std::string text); - void appendVar(std::unique_ptr var); + void appendVar(std::unique_ptr var); std::string evaluate(Transaction *t); std::string evaluate(Transaction *t, Rule *r); std::string evaluate() { diff --git a/src/transaction.cc b/src/transaction.cc index 693bed6b..be50538a 100644 --- a/src/transaction.cc +++ b/src/transaction.cc @@ -1359,7 +1359,7 @@ std::string Transaction::toOldAuditLogFormatIndex(const std::string &filename, << " "; ss << utils::string::dash_if_empty(this->m_clientIpAddress.c_str()) << " "; /** TODO: Check variable */ - Variables::RemoteUser *r = new Variables::RemoteUser("REMOTE_USER"); + variables::RemoteUser *r = new variables::RemoteUser("REMOTE_USER"); std::vector l; r->evaluate(this, NULL, &l); delete r; diff --git a/src/variables/args.h b/src/variables/args.h index 20067909..524afb85 100644 --- a/src/variables/args.h +++ b/src/variables/args.h @@ -27,12 +27,12 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE_DICT(Args, ARGS, m_variableArgs) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_ARGS_H_ diff --git a/src/variables/args_combined_size.h b/src/variables/args_combined_size.h index 9fce1795..c8d1ffbc 100644 --- a/src/variables/args_combined_size.h +++ b/src/variables/args_combined_size.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(ArgsCombinedSize, ARGS_COMBINED_SIZE, m_variableARGScombinedSize) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_ARGS_COMBINED_SIZE_H_ diff --git a/src/variables/args_get.h b/src/variables/args_get.h index 2b5973a2..253ac81c 100644 --- a/src/variables/args_get.h +++ b/src/variables/args_get.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE_DICT(ArgsGet, ARGS_GET, m_variableArgsGet) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_ARGS_GET_H_ diff --git a/src/variables/args_get_names.h b/src/variables/args_get_names.h index e3cc0245..aad21bac 100644 --- a/src/variables/args_get_names.h +++ b/src/variables/args_get_names.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE_DICT(ArgsGetNames, ARGS_GET_NAMES, m_variableArgsGetNames) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_ARGS_GET_NAMES_H_ diff --git a/src/variables/args_names.h b/src/variables/args_names.h index d9dc6add..2cd21210 100644 --- a/src/variables/args_names.h +++ b/src/variables/args_names.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE_DICT(ArgsNames, ARGS_NAMES, m_variableArgsNames) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_ARGS_NAMES_H_ diff --git a/src/variables/args_post.h b/src/variables/args_post.h index 8731e50e..9f14df5f 100644 --- a/src/variables/args_post.h +++ b/src/variables/args_post.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE_DICT(ArgsPost, ARGS_POST, m_variableArgsPost) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_ARGS_POST_H_ diff --git a/src/variables/args_post_names.h b/src/variables/args_post_names.h index 1e64191e..0035291e 100644 --- a/src/variables/args_post_names.h +++ b/src/variables/args_post_names.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE_DICT(ArgsPostNames, ARGS_POST_NAMES, m_variableArgsPostNames) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_ARGS_POST_NAMES_H_ diff --git a/src/variables/auth_type.h b/src/variables/auth_type.h index 431ff6f9..59b7d13c 100644 --- a/src/variables/auth_type.h +++ b/src/variables/auth_type.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(AuthType, AUTH_TYPE, m_variableAuthType) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_AUTH_TYPE_H_ diff --git a/src/variables/duration.cc b/src/variables/duration.cc index 0b3deb5f..18fa7e5d 100644 --- a/src/variables/duration.cc +++ b/src/variables/duration.cc @@ -25,7 +25,7 @@ #include "src/utils/system.h" namespace modsecurity { -namespace Variables { +namespace variables { void Duration::evaluate(Transaction *transaction, Rule *rule, @@ -39,5 +39,5 @@ void Duration::evaluate(Transaction *transaction, } -} // namespace Variables +} // namespace variables } // namespace modsecurity diff --git a/src/variables/duration.h b/src/variables/duration.h index 5ca8ba06..e9a51a0b 100644 --- a/src/variables/duration.h +++ b/src/variables/duration.h @@ -26,7 +26,7 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { class Duration : public Variable { public: @@ -41,7 +41,7 @@ class Duration : public Variable { }; -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_DURATION_H_ diff --git a/src/variables/env.cc b/src/variables/env.cc index 286e78bd..b08a7904 100644 --- a/src/variables/env.cc +++ b/src/variables/env.cc @@ -30,7 +30,7 @@ extern char **environ; namespace modsecurity { -namespace Variables { +namespace variables { void Env::evaluate(Transaction *transaction, Rule *rule, @@ -59,5 +59,5 @@ void Env::evaluate(Transaction *transaction, } -} // namespace Variables +} // namespace variables } // namespace modsecurity diff --git a/src/variables/env.h b/src/variables/env.h index 56070b3e..2e97c93f 100644 --- a/src/variables/env.h +++ b/src/variables/env.h @@ -26,7 +26,7 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { class Env : public Variable { public: @@ -38,7 +38,7 @@ class Env : public Variable { std::vector *l) override; }; -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_ENV_H_ diff --git a/src/variables/files.h b/src/variables/files.h index e98eadf5..4db985b3 100644 --- a/src/variables/files.h +++ b/src/variables/files.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE_DICT(Files, FILES, m_variableFiles) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_FILES_H_ diff --git a/src/variables/files_combined_size.h b/src/variables/files_combined_size.h index 024ab1ef..d3e240ca 100644 --- a/src/variables/files_combined_size.h +++ b/src/variables/files_combined_size.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(FilesCombinedSize, FILES_COMBINED_SIZE, m_variableFilesCombinedSize) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_FILES_COMBINED_SIZE_H_ diff --git a/src/variables/files_names.h b/src/variables/files_names.h index c489286a..dc0b3099 100644 --- a/src/variables/files_names.h +++ b/src/variables/files_names.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE_DICT(FilesNames, FILES_NAMES, m_variableFilesNames) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_FILES_NAMES_H_ diff --git a/src/variables/files_sizes.h b/src/variables/files_sizes.h index f954fb86..7498f052 100644 --- a/src/variables/files_sizes.h +++ b/src/variables/files_sizes.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE_DICT(FilesSizes, FILES_SIZES, m_variableFilesSizes) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_FILES_SIZES_H_ diff --git a/src/variables/files_tmp_content.h b/src/variables/files_tmp_content.h index c26edf9b..79c62003 100644 --- a/src/variables/files_tmp_content.h +++ b/src/variables/files_tmp_content.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE_DICT(FilesTmpContent, FILES_TMP_CONTENT, m_variableFilesTmpContent) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_FILES_TMP_CONTENT_H_ diff --git a/src/variables/files_tmp_names.h b/src/variables/files_tmp_names.h index 3ef85197..ce4860c0 100644 --- a/src/variables/files_tmp_names.h +++ b/src/variables/files_tmp_names.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE_DICT(FilesTmpNames, FILES_TMPNAMES, m_variableFilesTmpNames) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_FILES_TMP_NAMES_H_ diff --git a/src/variables/full_request.h b/src/variables/full_request.h index b452b980..4c11a7c8 100644 --- a/src/variables/full_request.h +++ b/src/variables/full_request.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(FullRequest, FULL_REQUEST, m_variableFullRequest) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_FULL_REQUEST_H_ diff --git a/src/variables/full_request_length.h b/src/variables/full_request_length.h index 634e567d..92578ff1 100644 --- a/src/variables/full_request_length.h +++ b/src/variables/full_request_length.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(FullRequestLength, FULL_REQUEST_LENGTH, m_variableFullRequestLength) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_FULL_REQUEST_LENGTH_H_ diff --git a/src/variables/geo.h b/src/variables/geo.h index c15a1c3c..5a6c16f2 100644 --- a/src/variables/geo.h +++ b/src/variables/geo.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE_DICT(Geo, GEO, m_variableGeo) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_GEO_H_ diff --git a/src/variables/global.h b/src/variables/global.h index d2fc2cda..dac0432b 100644 --- a/src/variables/global.h +++ b/src/variables/global.h @@ -29,7 +29,7 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { class Global_DictElement : public Variable { @@ -118,7 +118,7 @@ class Global_DynamicElement : public Variable { }; -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_GLOBAL_H_ diff --git a/src/variables/highest_severity.cc b/src/variables/highest_severity.cc index cf4f7a90..eb28fd86 100644 --- a/src/variables/highest_severity.cc +++ b/src/variables/highest_severity.cc @@ -24,7 +24,7 @@ #include "modsecurity/transaction.h" namespace modsecurity { -namespace Variables { +namespace variables { void HighestSeverity::evaluate(Transaction *transaction, Rule *rule, @@ -36,5 +36,5 @@ void HighestSeverity::evaluate(Transaction *transaction, } -} // namespace Variables +} // namespace variables } // namespace modsecurity diff --git a/src/variables/highest_severity.h b/src/variables/highest_severity.h index 630eb7ea..986fdca6 100644 --- a/src/variables/highest_severity.h +++ b/src/variables/highest_severity.h @@ -26,7 +26,7 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { class HighestSeverity : public Variable { public: @@ -41,7 +41,7 @@ class HighestSeverity : public Variable { }; -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_HIGHEST_SEVERITY_H_ diff --git a/src/variables/inbound_data_error.h b/src/variables/inbound_data_error.h index 2944a17d..a63512e4 100644 --- a/src/variables/inbound_data_error.h +++ b/src/variables/inbound_data_error.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(InboundDataError, INBOUND_DATA_ERROR, m_variableInboundDataError) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_INBOUND_DATA_ERROR_H_ diff --git a/src/variables/ip.h b/src/variables/ip.h index 96200d8e..40f43ac4 100644 --- a/src/variables/ip.h +++ b/src/variables/ip.h @@ -29,7 +29,7 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { class Ip_DictElement : public Variable { @@ -117,7 +117,7 @@ class Ip_DynamicElement : public Variable { }; -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_IP_H_ diff --git a/src/variables/matched_var.h b/src/variables/matched_var.h index 274e995a..81fb6fbe 100644 --- a/src/variables/matched_var.h +++ b/src/variables/matched_var.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(MatchedVar, MATCHED_VAR, m_variableMatchedVar) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_MATCHED_VAR_H_ diff --git a/src/variables/matched_var_name.h b/src/variables/matched_var_name.h index d13c07fc..0953b8cc 100644 --- a/src/variables/matched_var_name.h +++ b/src/variables/matched_var_name.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(MatchedVarName, MATCHED_VAR_NAME, m_variableMatchedVarName) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_MATCHED_VAR_NAME_H_ diff --git a/src/variables/matched_vars.h b/src/variables/matched_vars.h index 185eb376..28dbe625 100644 --- a/src/variables/matched_vars.h +++ b/src/variables/matched_vars.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE_DICT(MatchedVars, MATCHED_VARS, m_variableMatchedVars) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_MATCHED_VARS_H_ diff --git a/src/variables/matched_vars_names.h b/src/variables/matched_vars_names.h index 0100c42d..44afb0b5 100644 --- a/src/variables/matched_vars_names.h +++ b/src/variables/matched_vars_names.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE_DICT(MatchedVarsNames, MATCHED_VARS_NAMES, m_variableMatchedVarsNames) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_MATCHED_VARS_NAMES_H_ diff --git a/src/variables/modsec_build.cc b/src/variables/modsec_build.cc index ae7ac4da..f7124321 100644 --- a/src/variables/modsec_build.cc +++ b/src/variables/modsec_build.cc @@ -22,7 +22,7 @@ #include "modsecurity/transaction.h" namespace modsecurity { -namespace Variables { +namespace variables { void ModsecBuild::evaluate(Transaction *transaction, Rule *rule, @@ -32,5 +32,5 @@ void ModsecBuild::evaluate(Transaction *transaction, } -} // namespace Variables +} // namespace variables } // namespace modsecurity diff --git a/src/variables/modsec_build.h b/src/variables/modsec_build.h index f5f90de4..556cc413 100644 --- a/src/variables/modsec_build.h +++ b/src/variables/modsec_build.h @@ -28,7 +28,7 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { class ModsecBuild : public Variable { public: @@ -52,7 +52,7 @@ class ModsecBuild : public Variable { }; -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_MODSEC_BUILD_H_ diff --git a/src/variables/multipart_boundary_quoted.h b/src/variables/multipart_boundary_quoted.h index b0531713..1ad985f4 100644 --- a/src/variables/multipart_boundary_quoted.h +++ b/src/variables/multipart_boundary_quoted.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(MultipartBoundaryQuoted, MULTIPART_BOUNDARY_QUOTED, m_variableMultipartBoundaryQuoted) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_MULTIPART_BOUNDARY_QUOTED_H_ diff --git a/src/variables/multipart_boundary_whitespace.h b/src/variables/multipart_boundary_whitespace.h index b0bdc714..a52a5d2d 100644 --- a/src/variables/multipart_boundary_whitespace.h +++ b/src/variables/multipart_boundary_whitespace.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(MultipartBoundaryWhiteSpace, MULTIPART_BOUNDARY_WHITESPACE, m_variableMultipartBoundaryWhiteSpace) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_MULTIPART_BOUNDARY_WHITESPACE_H_ diff --git a/src/variables/multipart_crlf_lf_lines.h b/src/variables/multipart_crlf_lf_lines.h index 3d7bee17..ac6817d0 100644 --- a/src/variables/multipart_crlf_lf_lines.h +++ b/src/variables/multipart_crlf_lf_lines.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(MultipartCrlfLFLines, MULTIPART_CRLF_LF_LINES, m_variableMultipartCrlfLFLines) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_MULTIPART_CRLF_LF_LINES_H_ diff --git a/src/variables/multipart_data_after.h b/src/variables/multipart_data_after.h index ca88d0fd..f3e64c30 100644 --- a/src/variables/multipart_data_after.h +++ b/src/variables/multipart_data_after.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(MultipartDateAfter, MULTIPART_DATA_AFTER, m_variableMultipartDataAfter) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_MULTIPART_DATA_AFTER_H_ diff --git a/src/variables/multipart_data_before.h b/src/variables/multipart_data_before.h index 734eddbe..8540a38c 100644 --- a/src/variables/multipart_data_before.h +++ b/src/variables/multipart_data_before.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(MultipartDateBefore, MULTIPART_DATA_BEFORE, m_variableMultipartDataBefore) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_MULTIPART_DATA_BEFORE_H_ diff --git a/src/variables/multipart_file_limit_exceeded.h b/src/variables/multipart_file_limit_exceeded.h index 8803b406..13a34660 100644 --- a/src/variables/multipart_file_limit_exceeded.h +++ b/src/variables/multipart_file_limit_exceeded.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(MultipartFileLimitExceeded, MULTIPART_FILE_LIMIT_EXCEEDED, m_variableMultipartFileLimitExceeded) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_MULTIPART_FILE_LIMIT_EXCEEDED_H_ diff --git a/src/variables/multipart_file_name.h b/src/variables/multipart_file_name.h index f220b760..185ec172 100644 --- a/src/variables/multipart_file_name.h +++ b/src/variables/multipart_file_name.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE_DICT(MultiPartFileName, MULTIPART_FILENAME, m_variableMultipartFileName) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_MULTIPART_FILE_NAME_H_ diff --git a/src/variables/multipart_header_folding.h b/src/variables/multipart_header_folding.h index dbc02989..817885d7 100644 --- a/src/variables/multipart_header_folding.h +++ b/src/variables/multipart_header_folding.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(MultipartHeaderFolding, MULTIPART_HEADER_FOLDING, m_variableMultipartHeaderFolding) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_MULTIPART_HEADER_FOLDING_H_ diff --git a/src/variables/multipart_invalid_header_folding.h b/src/variables/multipart_invalid_header_folding.h index 260e5a7b..331bdebe 100644 --- a/src/variables/multipart_invalid_header_folding.h +++ b/src/variables/multipart_invalid_header_folding.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(MultipartInvalidHeaderFolding, MULTIPART_INVALID_HEADER_FOLDING, m_variableMultipartInvalidHeaderFolding) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_MULTIPART_INVALID_HEADER_FOLDING_H_ diff --git a/src/variables/multipart_invalid_part.h b/src/variables/multipart_invalid_part.h index 392d50bb..51d49866 100644 --- a/src/variables/multipart_invalid_part.h +++ b/src/variables/multipart_invalid_part.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(MultipartInvalidPart, MULTIPART_INVALID_PART, m_variableMultipartInvalidHeaderFolding) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_MULTIPART_INVALID_PART_H_ diff --git a/src/variables/multipart_invalid_quoting.h b/src/variables/multipart_invalid_quoting.h index 514810aa..1ac10bff 100644 --- a/src/variables/multipart_invalid_quoting.h +++ b/src/variables/multipart_invalid_quoting.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(MultipartInvalidQuoting, MULTIPART_INVALID_QUOTING, m_variableMultipartInvalidQuoting) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_MULTIPART_INVALID_QUOTING_H_ diff --git a/src/variables/multipart_lf_line.h b/src/variables/multipart_lf_line.h index 20beb5f5..8dc8e354 100644 --- a/src/variables/multipart_lf_line.h +++ b/src/variables/multipart_lf_line.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(MultipartLFLine, MULTIPART_LF_LINE, m_variableMultipartLFLine) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_MULTIPART_LF_LINE_H_ diff --git a/src/variables/multipart_missing_semicolon.h b/src/variables/multipart_missing_semicolon.h index 7082c0c3..14c28803 100644 --- a/src/variables/multipart_missing_semicolon.h +++ b/src/variables/multipart_missing_semicolon.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(MultipartMissingSemicolon, MULTIPART_MISSING_SEMICOLON, m_variableMultipartMissingSemicolon) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_MULTIPART_MISSING_SEMICOLON_H_ diff --git a/src/variables/multipart_name.h b/src/variables/multipart_name.h index af399e0a..ee4e4145 100644 --- a/src/variables/multipart_name.h +++ b/src/variables/multipart_name.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE_DICT(MultiPartName, MULTIPART_NAME, m_variableMultipartName) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_MULTIPART_NAME_H_ diff --git a/src/variables/multipart_strict_error.h b/src/variables/multipart_strict_error.h index 41667cad..f7c0d0a4 100644 --- a/src/variables/multipart_strict_error.h +++ b/src/variables/multipart_strict_error.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(MultipartStrictError, MULTIPART_STRICT_ERROR, m_variableMultipartStrictError) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_MULTIPART_STRICT_ERROR_H_ diff --git a/src/variables/multipart_unmatched_boundary.h b/src/variables/multipart_unmatched_boundary.h index 84ff75cb..1769f884 100644 --- a/src/variables/multipart_unmatched_boundary.h +++ b/src/variables/multipart_unmatched_boundary.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(MultipartUnmatchedBoundary, MULTIPART_UNMATCHED_BOUNDARY, m_variableMultipartUnmatchedBoundary) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_MULTIPART_UNMATCHED_BOUNDARY_H_ diff --git a/src/variables/outbound_data_error.h b/src/variables/outbound_data_error.h index 6762acb1..db869b9d 100644 --- a/src/variables/outbound_data_error.h +++ b/src/variables/outbound_data_error.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(OutboundDataError, OUTBOUND_DATA_ERROR, m_variableOutboundDataError) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_OUTBOUND_DATA_ERROR_H_ diff --git a/src/variables/path_info.h b/src/variables/path_info.h index 64ddbb23..f8821918 100644 --- a/src/variables/path_info.h +++ b/src/variables/path_info.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(PathInfo, PATH_INFO, m_variablePathInfo) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_PATH_INFO_H_ diff --git a/src/variables/query_string.h b/src/variables/query_string.h index bbdc7ef6..f225c718 100644 --- a/src/variables/query_string.h +++ b/src/variables/query_string.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(QueryString, QUERY_STRING, m_variableQueryString) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_QUERY_STRING_H_ diff --git a/src/variables/remote_addr.h b/src/variables/remote_addr.h index 7bf48923..deb98586 100644 --- a/src/variables/remote_addr.h +++ b/src/variables/remote_addr.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(RemoteAddr, REMOTE_ADDR, m_variableRemoteAddr) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_REMOTE_ADDR_H_ diff --git a/src/variables/remote_host.h b/src/variables/remote_host.h index b4b8c642..75ab2785 100644 --- a/src/variables/remote_host.h +++ b/src/variables/remote_host.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(RemoteHost, REMOTE_HOST, m_variableRemoteHost) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_REMOTE_HOST_H_ diff --git a/src/variables/remote_port.h b/src/variables/remote_port.h index f846be61..f661d97b 100644 --- a/src/variables/remote_port.h +++ b/src/variables/remote_port.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(RemotePort, REMOTE_PORT, m_variableRemotePort) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_REMOTE_PORT_H_ diff --git a/src/variables/remote_user.cc b/src/variables/remote_user.cc index da0a8506..ea8fae4e 100644 --- a/src/variables/remote_user.cc +++ b/src/variables/remote_user.cc @@ -33,7 +33,7 @@ #include "src/utils/base64.h" namespace modsecurity { -namespace Variables { +namespace variables { void RemoteUser::evaluate(Transaction *transaction, @@ -86,5 +86,5 @@ clear: } -} // namespace Variables +} // namespace variables } // namespace modsecurity diff --git a/src/variables/remote_user.h b/src/variables/remote_user.h index 7106fc48..226f776c 100644 --- a/src/variables/remote_user.h +++ b/src/variables/remote_user.h @@ -27,7 +27,7 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { class RemoteUser : public Variable { @@ -43,7 +43,7 @@ class RemoteUser : public Variable { }; -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_REMOTE_USER_H_ diff --git a/src/variables/reqbody_error.h b/src/variables/reqbody_error.h index e7be1c80..7bff88ac 100644 --- a/src/variables/reqbody_error.h +++ b/src/variables/reqbody_error.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(ReqbodyError, REQBODY_ERROR, m_variableReqbodyError) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_REQBODY_ERROR_H_ diff --git a/src/variables/reqbody_error_msg.h b/src/variables/reqbody_error_msg.h index a218d90a..d74c4e23 100644 --- a/src/variables/reqbody_error_msg.h +++ b/src/variables/reqbody_error_msg.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(ReqbodyErrorMsg, REQBODY_ERROR_MSG, m_variableReqbodyErrorMsg) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_REQBODY_ERROR_MSG_H_ diff --git a/src/variables/reqbody_processor.h b/src/variables/reqbody_processor.h index b957b85e..6425fe83 100644 --- a/src/variables/reqbody_processor.h +++ b/src/variables/reqbody_processor.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(ReqbodyProcessor, REQBODY_PROCESSOR, m_variableReqbodyProcessor) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_REQBODY_PROCESSOR_H_ diff --git a/src/variables/reqbody_processor_error.h b/src/variables/reqbody_processor_error.h index 9ec057b1..7a64a82f 100644 --- a/src/variables/reqbody_processor_error.h +++ b/src/variables/reqbody_processor_error.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(ReqbodyProcessorError, REQBODY_PROCESSOR_ERROR, m_variableReqbodyProcessorError) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_REQBODY_PROCESSOR_ERROR_H_ diff --git a/src/variables/reqbody_processor_error_msg.h b/src/variables/reqbody_processor_error_msg.h index babd4143..cf7a0ec8 100644 --- a/src/variables/reqbody_processor_error_msg.h +++ b/src/variables/reqbody_processor_error_msg.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(ReqbodyProcessorErrorMsg, PROCESSOR_ERROR_MSG, m_variableReqbodyProcessorErrorMsg) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_REQBODY_PROCESSOR_ERROR_MSG_H_ diff --git a/src/variables/request_base_name.h b/src/variables/request_base_name.h index 22dd3e43..4b7ab580 100644 --- a/src/variables/request_base_name.h +++ b/src/variables/request_base_name.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(RequestBasename, REQUEST_BASENAME, m_variableRequestBasename) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_REQUEST_BASE_NAME_H_ diff --git a/src/variables/request_body.h b/src/variables/request_body.h index 1a623dd1..65fbd588 100644 --- a/src/variables/request_body.h +++ b/src/variables/request_body.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(RequestBody, REQUEST_BODY, m_variableRequestBody) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_REQUEST_BODY_H_ diff --git a/src/variables/request_body_length.h b/src/variables/request_body_length.h index af980119..9737caab 100644 --- a/src/variables/request_body_length.h +++ b/src/variables/request_body_length.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(RequestBodyLength, REQUEST_BODY_LENGTH, m_variableRequestBodyLength) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_REQUEST_BODY_LENGTH_H_ diff --git a/src/variables/request_cookies.h b/src/variables/request_cookies.h index a509246e..fbdf3662 100644 --- a/src/variables/request_cookies.h +++ b/src/variables/request_cookies.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE_DICT(RequestCookies, REQUEST_COOKIES, m_variableRequestCookies) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_REQUEST_COOKIES_H_ diff --git a/src/variables/request_cookies_names.h b/src/variables/request_cookies_names.h index e44ae0ea..fb27ad6a 100644 --- a/src/variables/request_cookies_names.h +++ b/src/variables/request_cookies_names.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE_DICT(RequestCookiesNames, REQUEST_COOKIES_NAMES, m_variableRequestCookiesNames) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_REQUEST_COOKIES_NAMES_H_ diff --git a/src/variables/request_file_name.h b/src/variables/request_file_name.h index 17c3b41b..974dde00 100644 --- a/src/variables/request_file_name.h +++ b/src/variables/request_file_name.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(RequestFilename, REQUEST_FILENAME, m_variableRequestFilename) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_REQUEST_FILE_NAME_H_ diff --git a/src/variables/request_headers.h b/src/variables/request_headers.h index d0f94673..8271720e 100644 --- a/src/variables/request_headers.h +++ b/src/variables/request_headers.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE_DICT(RequestHeaders, REQUEST_HEADERS, m_variableRequestHeaders) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_REQUEST_HEADERS_H_ diff --git a/src/variables/request_headers_names.h b/src/variables/request_headers_names.h index 024fe176..68838182 100644 --- a/src/variables/request_headers_names.h +++ b/src/variables/request_headers_names.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE_DICT(RequestHeadersNames, REQUEST_HEADERS_NAMES, m_variableRequestHeadersNames) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_REQUEST_HEADERS_NAMES_H_ diff --git a/src/variables/request_line.h b/src/variables/request_line.h index 2f585e12..3d7db981 100644 --- a/src/variables/request_line.h +++ b/src/variables/request_line.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(RequestLine, REQUEST_LINE, m_variableRequestLine) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_REQUEST_LINE_H_ diff --git a/src/variables/request_method.h b/src/variables/request_method.h index 94e7a19f..1606f256 100644 --- a/src/variables/request_method.h +++ b/src/variables/request_method.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(RequestMethod, REQUEST_METHOD, m_variableRequestMethod) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_REQUEST_METHOD_H_ diff --git a/src/variables/request_protocol.h b/src/variables/request_protocol.h index 71c796a2..947af7cb 100644 --- a/src/variables/request_protocol.h +++ b/src/variables/request_protocol.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(RequestProtocol, REQUEST_PROTOCOL, m_variableRequestProtocol) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_REQUEST_PROTOCOL_H_ diff --git a/src/variables/request_uri.h b/src/variables/request_uri.h index e6c0e154..331b8227 100644 --- a/src/variables/request_uri.h +++ b/src/variables/request_uri.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(RequestURI, REQUEST_URI, m_variableRequestURI) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_REQUEST_URI_H_ diff --git a/src/variables/request_uri_raw.h b/src/variables/request_uri_raw.h index 8b6df7bb..f0c35216 100644 --- a/src/variables/request_uri_raw.h +++ b/src/variables/request_uri_raw.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(RequestURIRaw, REQUEST_URI_RAW, m_variableRequestURIRaw) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_REQUEST_URI_RAW_H_ diff --git a/src/variables/resource.h b/src/variables/resource.h index e9d8f1a7..14fc5e98 100644 --- a/src/variables/resource.h +++ b/src/variables/resource.h @@ -29,7 +29,7 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { class Resource_DictElement : public Variable { @@ -116,7 +116,7 @@ class Resource_DynamicElement : public Variable { }; -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_RESOURCE_H_ diff --git a/src/variables/response_body.h b/src/variables/response_body.h index 3ac0fd79..70730ee2 100644 --- a/src/variables/response_body.h +++ b/src/variables/response_body.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(ResponseBody, RESPONSE_BODY, m_variableResponseBody) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_RESPONSE_BODY_H_ diff --git a/src/variables/response_content_length.h b/src/variables/response_content_length.h index f7547310..e4c07176 100644 --- a/src/variables/response_content_length.h +++ b/src/variables/response_content_length.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(ResponseContentLength, RESPONSE_CONTENT_LENGTH, m_variableResponseContentLength) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_RESPONSE_CONTENT_LENGTH_H_ diff --git a/src/variables/response_content_type.h b/src/variables/response_content_type.h index 1b647902..4e5c20de 100644 --- a/src/variables/response_content_type.h +++ b/src/variables/response_content_type.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(ResponseContentType, RESPONSE_CONTENT_TYPE, m_variableResponseContentType) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_RESPONSE_CONTENT_TYPE_H_ diff --git a/src/variables/response_headers.h b/src/variables/response_headers.h index 99707486..44c444a1 100644 --- a/src/variables/response_headers.h +++ b/src/variables/response_headers.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE_DICT(ResponseHeaders, RESPONSE_HEADERS, m_variableResponseHeaders) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_RESPONSE_HEADERS_H_ diff --git a/src/variables/response_headers_names.h b/src/variables/response_headers_names.h index e87a9710..167b1bec 100644 --- a/src/variables/response_headers_names.h +++ b/src/variables/response_headers_names.h @@ -27,14 +27,14 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE_DICT(ResponseHeadersNames, RESPONSE_HEADERS_NAMES, m_variableResponseHeadersNames) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_RESPONSE_HEADERS_NAMES_H_ diff --git a/src/variables/response_protocol.h b/src/variables/response_protocol.h index 7e2a6543..5080db45 100644 --- a/src/variables/response_protocol.h +++ b/src/variables/response_protocol.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(ResponseProtocol, RESPONSE_PROTOCOL, m_variableResponseProtocol) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_RESPONSE_PROTOCOL_H_ diff --git a/src/variables/response_status.h b/src/variables/response_status.h index 779415b8..27971aaa 100644 --- a/src/variables/response_status.h +++ b/src/variables/response_status.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(ResponseStatus, RESPONSE_STATUS, m_variableResponseStatus) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_RESPONSE_STATUS_H_ diff --git a/src/variables/rule.h b/src/variables/rule.h index 4947a190..d51dc6b0 100644 --- a/src/variables/rule.h +++ b/src/variables/rule.h @@ -29,7 +29,7 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { class Rule_DictElement : public VariableDictElement { \ @@ -241,7 +241,7 @@ class Rule_NoDictElement : public Variable { // DEFINE_VARIABLE_DICT(Rule, RULE, m_variableRule) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_RULE_H_ diff --git a/src/variables/server_addr.h b/src/variables/server_addr.h index e4b58924..02a3c5fd 100644 --- a/src/variables/server_addr.h +++ b/src/variables/server_addr.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(ServerAddr, SERVER_ADDR, m_variableServerAddr) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_SERVER_ADDR_H_ diff --git a/src/variables/server_name.h b/src/variables/server_name.h index f4ae173d..03527d05 100644 --- a/src/variables/server_name.h +++ b/src/variables/server_name.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(ServerName, SERVER_NAME, m_variableServerName) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_SERVER_NAME_H_ diff --git a/src/variables/server_port.h b/src/variables/server_port.h index fabdaada..e209d624 100644 --- a/src/variables/server_port.h +++ b/src/variables/server_port.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(ServerPort, SERVER_PORT, m_variableServerPort) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_SERVER_PORT_H_ diff --git a/src/variables/session.h b/src/variables/session.h index 352232c4..a0257d62 100644 --- a/src/variables/session.h +++ b/src/variables/session.h @@ -29,7 +29,7 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { class Session_DictElement : public Variable { @@ -117,7 +117,7 @@ class Session_DynamicElement : public Variable { }; -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_SESSION_H_ diff --git a/src/variables/session_id.h b/src/variables/session_id.h index 1cee9c7f..508095b1 100644 --- a/src/variables/session_id.h +++ b/src/variables/session_id.h @@ -27,12 +27,12 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(SessionID, SESSIONID, m_variableSessionID) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_SESSION_ID_H_ diff --git a/src/variables/status.h b/src/variables/status.h index 60b4225d..7013eec3 100644 --- a/src/variables/status.h +++ b/src/variables/status.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(Status, STATUS, m_variableResponseStatus) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_STATUS_H_ diff --git a/src/variables/time.cc b/src/variables/time.cc index 5aeed2c4..d7cfbf22 100644 --- a/src/variables/time.cc +++ b/src/variables/time.cc @@ -31,7 +31,7 @@ #include "modsecurity/transaction.h" namespace modsecurity { -namespace Variables { +namespace variables { void Time::evaluate(Transaction *transaction, Rule *rule, @@ -53,5 +53,5 @@ void Time::evaluate(Transaction *transaction, } -} // namespace Variables +} // namespace variables } // namespace modsecurity diff --git a/src/variables/time.h b/src/variables/time.h index 3a7cbe0c..60f4eb03 100644 --- a/src/variables/time.h +++ b/src/variables/time.h @@ -27,7 +27,7 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { class Time : public Variable { public: @@ -41,7 +41,7 @@ class Time : public Variable { std::string m_retName; }; -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_TIME_H_ diff --git a/src/variables/time_day.cc b/src/variables/time_day.cc index f019903f..b409f77f 100644 --- a/src/variables/time_day.cc +++ b/src/variables/time_day.cc @@ -31,7 +31,7 @@ #include "modsecurity/transaction.h" namespace modsecurity { -namespace Variables { +namespace variables { void TimeDay::evaluate(Transaction *transaction, Rule *rule, @@ -53,5 +53,5 @@ void TimeDay::evaluate(Transaction *transaction, } -} // namespace Variables +} // namespace variables } // namespace modsecurity diff --git a/src/variables/time_day.h b/src/variables/time_day.h index c00e2721..9d9205b0 100644 --- a/src/variables/time_day.h +++ b/src/variables/time_day.h @@ -26,7 +26,7 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { class TimeDay : public Variable { public: @@ -40,7 +40,7 @@ class TimeDay : public Variable { std::string m_retName; }; -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_TIME_DAY_H_ diff --git a/src/variables/time_epoch.cc b/src/variables/time_epoch.cc index 49f3e52d..d6b66786 100644 --- a/src/variables/time_epoch.cc +++ b/src/variables/time_epoch.cc @@ -31,7 +31,7 @@ #include "modsecurity/transaction.h" namespace modsecurity { -namespace Variables { +namespace variables { void TimeEpoch::evaluate(Transaction *transaction, Rule *rule, @@ -43,5 +43,5 @@ void TimeEpoch::evaluate(Transaction *transaction, } -} // namespace Variables +} // namespace variables } // namespace modsecurity diff --git a/src/variables/time_epoch.h b/src/variables/time_epoch.h index e30808f4..7937d1a2 100644 --- a/src/variables/time_epoch.h +++ b/src/variables/time_epoch.h @@ -26,7 +26,7 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { class TimeEpoch : public Variable { public: @@ -40,7 +40,7 @@ class TimeEpoch : public Variable { std::string m_retName; }; -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_TIME_EPOCH_H_ diff --git a/src/variables/time_hour.cc b/src/variables/time_hour.cc index 9674d1ce..ade77946 100644 --- a/src/variables/time_hour.cc +++ b/src/variables/time_hour.cc @@ -31,7 +31,7 @@ #include "modsecurity/transaction.h" namespace modsecurity { -namespace Variables { +namespace variables { void TimeHour::evaluate(Transaction *transaction, Rule *rule, @@ -53,5 +53,5 @@ void TimeHour::evaluate(Transaction *transaction, } -} // namespace Variables +} // namespace variables } // namespace modsecurity diff --git a/src/variables/time_hour.h b/src/variables/time_hour.h index 97bbdeba..91d97bd4 100644 --- a/src/variables/time_hour.h +++ b/src/variables/time_hour.h @@ -26,7 +26,7 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { class TimeHour : public Variable { public: @@ -40,7 +40,7 @@ class TimeHour : public Variable { std::string m_retName; }; -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_TIME_HOUR_H_ diff --git a/src/variables/time_min.cc b/src/variables/time_min.cc index a6dbb7ac..4cbd6b9e 100644 --- a/src/variables/time_min.cc +++ b/src/variables/time_min.cc @@ -31,7 +31,7 @@ #include "modsecurity/transaction.h" namespace modsecurity { -namespace Variables { +namespace variables { void TimeMin::evaluate(Transaction *transaction, Rule *rule, @@ -53,5 +53,5 @@ void TimeMin::evaluate(Transaction *transaction, } -} // namespace Variables +} // namespace variables } // namespace modsecurity diff --git a/src/variables/time_min.h b/src/variables/time_min.h index 8d1d21cc..d608303e 100644 --- a/src/variables/time_min.h +++ b/src/variables/time_min.h @@ -26,7 +26,7 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { class TimeMin : public Variable { public: @@ -40,7 +40,7 @@ class TimeMin : public Variable { std::string m_retName; }; -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_TIME_MIN_H_ diff --git a/src/variables/time_mon.cc b/src/variables/time_mon.cc index 689cfe26..8b93b62e 100644 --- a/src/variables/time_mon.cc +++ b/src/variables/time_mon.cc @@ -31,7 +31,7 @@ #include "modsecurity/transaction.h" namespace modsecurity { -namespace Variables { +namespace variables { void TimeMon::evaluate(Transaction *transaction, Rule *rule, @@ -55,5 +55,5 @@ void TimeMon::evaluate(Transaction *transaction, } -} // namespace Variables +} // namespace variables } // namespace modsecurity diff --git a/src/variables/time_mon.h b/src/variables/time_mon.h index 22284452..13f26ed0 100644 --- a/src/variables/time_mon.h +++ b/src/variables/time_mon.h @@ -26,7 +26,7 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { class TimeMon : public Variable { public: @@ -40,7 +40,7 @@ class TimeMon : public Variable { std::string m_retName; }; -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_TIME_MON_H_ diff --git a/src/variables/time_sec.cc b/src/variables/time_sec.cc index c8e3b4b0..41269fff 100644 --- a/src/variables/time_sec.cc +++ b/src/variables/time_sec.cc @@ -31,7 +31,7 @@ #include "modsecurity/transaction.h" namespace modsecurity { -namespace Variables { +namespace variables { void TimeSec::evaluate(Transaction *transaction, Rule *rule, @@ -53,5 +53,5 @@ void TimeSec::evaluate(Transaction *transaction, } -} // namespace Variables +} // namespace variables } // namespace modsecurity diff --git a/src/variables/time_sec.h b/src/variables/time_sec.h index 944987b9..898c9732 100644 --- a/src/variables/time_sec.h +++ b/src/variables/time_sec.h @@ -26,7 +26,7 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { class TimeSec : public Variable { public: @@ -40,7 +40,7 @@ class TimeSec : public Variable { std::string m_retName; }; -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_TIME_SEC_H_ diff --git a/src/variables/time_wday.cc b/src/variables/time_wday.cc index ef8db612..99a3901f 100644 --- a/src/variables/time_wday.cc +++ b/src/variables/time_wday.cc @@ -31,7 +31,7 @@ #include "modsecurity/transaction.h" namespace modsecurity { -namespace Variables { +namespace variables { void TimeWDay::evaluate(Transaction *transaction, Rule *rule, @@ -53,5 +53,5 @@ void TimeWDay::evaluate(Transaction *transaction, } -} // namespace Variables +} // namespace variables } // namespace modsecurity diff --git a/src/variables/time_wday.h b/src/variables/time_wday.h index ff84e12e..1ca5fc4f 100644 --- a/src/variables/time_wday.h +++ b/src/variables/time_wday.h @@ -26,7 +26,7 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { class TimeWDay : public Variable { public: @@ -40,7 +40,7 @@ class TimeWDay : public Variable { std::string m_retName; }; -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_TIME_WDAY_H_ diff --git a/src/variables/time_year.cc b/src/variables/time_year.cc index 29493c2d..3312bba4 100644 --- a/src/variables/time_year.cc +++ b/src/variables/time_year.cc @@ -31,7 +31,7 @@ #include "modsecurity/transaction.h" namespace modsecurity { -namespace Variables { +namespace variables { void TimeYear::evaluate(Transaction *transaction, Rule *rule, @@ -53,5 +53,5 @@ void TimeYear::evaluate(Transaction *transaction, } -} // namespace Variables +} // namespace variables } // namespace modsecurity diff --git a/src/variables/time_year.h b/src/variables/time_year.h index 1d5b2c3d..57f9e379 100644 --- a/src/variables/time_year.h +++ b/src/variables/time_year.h @@ -26,7 +26,7 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { class TimeYear : public Variable { public: @@ -40,7 +40,7 @@ class TimeYear : public Variable { std::string m_retName; }; -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_TIME_YEAR_H_ diff --git a/src/variables/tx.cc b/src/variables/tx.cc index f773412a..3d28d81b 100644 --- a/src/variables/tx.cc +++ b/src/variables/tx.cc @@ -31,9 +31,9 @@ #include "modsecurity/transaction.h" namespace modsecurity { -namespace Variables { +namespace variables { -} // namespace Variables +} // namespace variables } // namespace modsecurity diff --git a/src/variables/tx.h b/src/variables/tx.h index f7d39fe1..ac7f3005 100644 --- a/src/variables/tx.h +++ b/src/variables/tx.h @@ -29,7 +29,7 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { class Tx_DictElement : public Variable { @@ -107,7 +107,7 @@ class Tx_DynamicElement : public Variable { }; -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_TX_H_ diff --git a/src/variables/unique_id.h b/src/variables/unique_id.h index 1fe3d0e2..ef27acdc 100644 --- a/src/variables/unique_id.h +++ b/src/variables/unique_id.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(UniqueID, UNIQUEID, m_variableUniqueID) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_UNIQUE_ID_H_ diff --git a/src/variables/url_encoded_error.h b/src/variables/url_encoded_error.h index e7ad1c0f..377baf76 100644 --- a/src/variables/url_encoded_error.h +++ b/src/variables/url_encoded_error.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(UrlEncodedError, URLENCODED_ERROR, m_variableUrlEncodedError) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_URL_ENCODED_ERROR_H_ diff --git a/src/variables/user.h b/src/variables/user.h index c802d95c..b6d1a99c 100644 --- a/src/variables/user.h +++ b/src/variables/user.h @@ -29,7 +29,7 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { class User_DictElement : public Variable { @@ -117,7 +117,7 @@ class User_DynamicElement : public Variable { }; -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_USER_H_ diff --git a/src/variables/user_id.h b/src/variables/user_id.h index ade04855..acf5f741 100644 --- a/src/variables/user_id.h +++ b/src/variables/user_id.h @@ -27,13 +27,13 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { DEFINE_VARIABLE(UserID, USERID, m_variableUserID) -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_USER_ID_H_ diff --git a/src/variables/variable.cc b/src/variables/variable.cc index 6114d17f..d674e971 100644 --- a/src/variables/variable.cc +++ b/src/variables/variable.cc @@ -25,7 +25,7 @@ namespace modsecurity { -namespace Variables { +namespace variables { Variable::Variable(std::string name) @@ -95,5 +95,5 @@ std::string operator+(std::string a, Variables *v) { } -} // namespace Variables +} // namespace variables } // namespace modsecurity diff --git a/src/variables/variable.h b/src/variables/variable.h index 7a63391f..26a3bb3c 100644 --- a/src/variables/variable.h +++ b/src/variables/variable.h @@ -102,7 +102,7 @@ class n : public Variable { \ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { class KeyExclusion { public: @@ -665,11 +665,11 @@ class VariableModificatorCount : public Variable { }; -std::string operator+(std::string a, modsecurity::Variables::Variable *v); -std::string operator+(std::string a, modsecurity::Variables::Variables *v); +std::string operator+(std::string a, modsecurity::variables::Variable *v); +std::string operator+(std::string a, modsecurity::variables::Variables *v); -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_VARIABLE_H_ diff --git a/src/variables/web_app_id.h b/src/variables/web_app_id.h index 41e91c95..036701c2 100644 --- a/src/variables/web_app_id.h +++ b/src/variables/web_app_id.h @@ -28,7 +28,7 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { class WebAppId : public Variable { public: @@ -44,7 +44,7 @@ class WebAppId : public Variable { } }; -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_WEB_APP_ID_H_ diff --git a/src/variables/xml.cc b/src/variables/xml.cc index 7fe47157..c83bc0ed 100644 --- a/src/variables/xml.cc +++ b/src/variables/xml.cc @@ -44,7 +44,7 @@ #include "src/actions/xmlns.h" namespace modsecurity { -namespace Variables { +namespace variables { #ifndef WITH_LIBXML2 void XML::evaluate(Transaction *t, @@ -140,5 +140,5 @@ void XML::evaluate(Transaction *t, #endif -} // namespace Variables +} // namespace variables } // namespace modsecurity diff --git a/src/variables/xml.h b/src/variables/xml.h index d852bdd2..1ffae96f 100644 --- a/src/variables/xml.h +++ b/src/variables/xml.h @@ -28,7 +28,7 @@ namespace modsecurity { class Transaction; -namespace Variables { +namespace variables { /* Invocation without an XPath expression makes sense @@ -64,7 +64,7 @@ class XML : public Variable { }; -} // namespace Variables +} // namespace variables } // namespace modsecurity #endif // SRC_VARIABLES_XML_H_