Refactoring on Transaction class: adding comments and renaming variables

src/actions/audit_log.cc

@@ -24,7 +24,7 @@ namespace modsecurity {
 namespace actions {
 
 bool AuditLog::evaluate(Rule *rule, Transaction *transaction) {
-    transaction->save_in_auditlog = true;
+    transaction->m_toBeSavedInAuditlogs = true;
     return true;
 }
 

src/actions/block.cc

@@ -38,7 +38,7 @@ bool Block::evaluate(Rule *rule, Transaction *transaction) {
 #endif
     for (Action *a : rule->actions_runtime_pos) {
         if (a->isDisruptive() == true) {
-            transaction->actions.push_back(a);
+            transaction->m_actions.push_back(a);
         }
     }
     return true;

src/actions/ctl_audit_log_parts.cc

@@ -36,7 +36,7 @@ CtlAuditLogParts::CtlAuditLogParts(std::string action)
 }
 
 bool CtlAuditLogParts::evaluate(Rule *rule, Transaction *transaction) {
-    transaction->auditLogModifier.push_back(
+    transaction->m_auditLogModifier.push_back(
         std::make_pair(mPartsAction, mParts));
     return true;
 }

src/actions/deny.cc

@@ -34,7 +34,7 @@ bool Deny::evaluate(Rule *rule, Transaction *transaction) {
 #ifndef NO_LOGS
     transaction->debug(8, "Running action deny");
 #endif
-    transaction->actions.push_back(this);
+    transaction->m_actions.push_back(this);
     return true;
 }
 

src/actions/log.cc

@@ -24,7 +24,7 @@ namespace modsecurity {
 namespace actions {
 
 bool Log::evaluate(Rule *rule, Transaction *transaction) {
-    transaction->save_in_auditlog = true;
+    transaction->m_toBeSavedInAuditlogs = true;
     /* FIXME: transaction->serverLog("Something...."); */
     transaction->debug(9, "Saving transaction to logs");
     return true;

src/actions/log_data.cc

@@ -39,7 +39,7 @@ bool LogData::evaluate(Rule *rule, Transaction *transaction) {
 #ifndef NO_LOGS
     transaction->debug(9, "Saving msg: " + msg);
 #endif
-    transaction->rulesMessages.push_back(msg);
+    transaction->m_rulesMessages.push_back(msg);
     transaction->serverLog(msg);
     return true;
 }

src/actions/msg.cc

@@ -39,7 +39,7 @@ bool Msg::evaluate(Rule *rule, Transaction *transaction) {
 #ifndef NO_LOGS
     transaction->debug(9, "Saving msg: " + msg);
 #endif
-    transaction->rulesMessages.push_back(msg);
+    transaction->m_rulesMessages.push_back(msg);
     transaction->serverLog(msg);
     return true;
 }

src/actions/no_audit_log.cc

@@ -24,7 +24,7 @@ namespace modsecurity {
 namespace actions {
 
 bool NoAuditLog::evaluate(Rule *rule, Transaction *transaction) {
-    transaction->do_not_save_in_auditlog = true;
+    transaction->m_toNotBeSavedInAuditLogs = true;
     return true;
 }
 

src/actions/pass.cc

@@ -32,7 +32,7 @@ Pass::Pass(std::string action)
 
 
 bool Pass::evaluate(Rule *rule, Transaction *transaction) {
-    transaction->actions.clear();
+    transaction->m_actions.clear();
     return true;
 }
 

src/actions/redirect.cc

@@ -43,7 +43,7 @@ Redirect::Redirect(const std::string& action)
 
 bool Redirect::evaluate(Rule *rule, Transaction *transaction) {
     m_urlExpanded = MacroExpansion::expand(m_url, transaction);
-    transaction->actions.push_back(this);
+    transaction->m_actions.push_back(this);
     return true;
 }
 

src/actions/severity.cc

@@ -54,11 +54,11 @@ bool Severity::evaluate(Rule *rule, Transaction *transaction) {
 #ifndef NO_LOGS
     transaction->debug(9, "This rule severity is: " + \
         std::to_string(this->m_severity) + " current transaction is: " + \
-        std::to_string(transaction->highest_severity));
+        std::to_string(transaction->m_highestSeverityAction));
 #endif
 
-    if (transaction->highest_severity > this->m_severity) {
-        transaction->highest_severity = this->m_severity;
+    if (transaction->m_highestSeverityAction > this->m_severity) {
+        transaction->m_highestSeverityAction = this->m_severity;
     }
     return true;
 }

src/actions/status.cc

@@ -34,7 +34,7 @@ Status::Status(std::string action)
 
 
 bool Status::evaluate(Rule *rule, Transaction *transaction) {
-    transaction->actions.push_back(this);
+    transaction->m_actions.push_back(this);
     return true;
 }
 

src/actions/tag.cc

@@ -39,7 +39,7 @@ bool Tag::evaluate(Rule *rule, Transaction *transaction) {
 #ifndef NO_LOGS
     transaction->debug(9, "Rule tag: " + tag);
 #endif
-    transaction->ruleTags.push_back(tag);
+    transaction->m_ruleTags.push_back(tag);
     return true;
 }