Places the classes related to audit log into a separate namespace

This commit is contained in:
Felipe Zimmerle
2016-01-14 14:25:33 -03:00
parent 2830525f89
commit b06eaadac7
14 changed files with 97 additions and 74 deletions

View File

@@ -16,9 +16,9 @@
#include "parser/driver.h"
#include "parser/seclang-parser.hh"
#include "src/audit_log.h"
#include "audit_log/audit_log.h"
using modsecurity::AuditLog;
using modsecurity::audit_log::AuditLog;
using modsecurity::Rule;
namespace modsecurity {
@@ -27,7 +27,7 @@ namespace Parser {
Driver::Driver()
: trace_scanning(false),
trace_parsing(false) {
audit_log = new AuditLog();
audit_log = new audit_log::AuditLog();
audit_log->refCountIncrease();
}

View File

@@ -27,7 +27,7 @@
#include "modsecurity/modsecurity.h"
#include "modsecurity/rules.h"
#include "modsecurity/rules_properties.h"
#include "src/audit_log.h"
#include "audit_log/audit_log.h"
#include "parser/seclang-parser.hh"

View File

@@ -37,7 +37,7 @@ class Driver;
#include "operators/operator.h"
#include "modsecurity/rule.h"
#include "utils/geo_lookup.h"
#include "audit_log.h"
#include "audit_log/audit_log.h"
#include "utils.h"
#include "variables/variations/count.h"
@@ -295,15 +295,15 @@ audit_log:
/* SecAuditEngine */
| CONFIG_DIR_AUDIT_ENG CONFIG_VALUE_RELEVANT_ONLY
{
driver.audit_log->setStatus(modsecurity::AuditLog::RelevantOnlyAuditLogStatus);
driver.audit_log->setStatus(modsecurity::audit_log::AuditLog::RelevantOnlyAuditLogStatus);
}
| CONFIG_DIR_AUDIT_ENG CONFIG_VALUE_OFF
{
driver.audit_log->setStatus(modsecurity::AuditLog::OffAuditLogStatus);
driver.audit_log->setStatus(modsecurity::audit_log::AuditLog::OffAuditLogStatus);
}
| CONFIG_DIR_AUDIT_ENG CONFIG_VALUE_ON
{
driver.audit_log->setStatus(modsecurity::AuditLog::OnAuditLogStatus);
driver.audit_log->setStatus(modsecurity::audit_log::AuditLog::OnAuditLogStatus);
}
/* SecAuditLogFileMode */
@@ -342,11 +342,11 @@ audit_log:
/* SecAuditLogType */
| CONFIG_DIR_AUDIT_TPE CONFIG_VALUE_SERIAL
{
driver.audit_log->setType(modsecurity::AuditLog::SerialAuditLogType);
driver.audit_log->setType(modsecurity::audit_log::AuditLog::SerialAuditLogType);
}
| CONFIG_DIR_AUDIT_TPE CONFIG_VALUE_PARALLEL
{
driver.audit_log->setType(modsecurity::AuditLog::ParallelAuditLogType);
driver.audit_log->setType(modsecurity::audit_log::AuditLog::ParallelAuditLogType);
}
;