Refactoring: Renames Rules to RulesSet

RulesSet does not only contain rules but alse properties

headers/modsecurity/rules.h

@@ -13,101 +13,5 @@
  *
  */
 
-#include <stdio.h>
-#include <string.h>
+#include <modsecurity/rules_set.h>
 
-#ifdef __cplusplus
-#include <ctime>
-#include <iostream>
-#include <string>
-#include <vector>
-#include <list>
-#endif
-
-
-#ifndef HEADERS_MODSECURITY_RULES_H_
-#define HEADERS_MODSECURITY_RULES_H_
-
-#include "modsecurity/rules_properties.h"
-#include "modsecurity/modsecurity.h"
-#include "modsecurity/transaction.h"
-
-#ifdef __cplusplus
-
-namespace modsecurity {
-class Rule;
-namespace Parser {
-class Driver;
-}
-
-
-/** @ingroup ModSecurity_CPP_API */
-class Rules : public RulesProperties {
- public:
-    Rules()
-        : RulesProperties(new DebugLog()),
-        unicode_codepage(0),
-#ifndef NO_LOGS
-        m_secmarker_skipped(0),
-#endif
-        m_referenceCount(0) { }
-
-    explicit Rules(DebugLog *customLog)
-        : RulesProperties(customLog),
-        unicode_codepage(0),
-#ifndef NO_LOGS
-        m_secmarker_skipped(0),
-#endif
-        m_referenceCount(0) { }
-
-    ~Rules() { }
-
-    void incrementReferenceCount(void);
-    void decrementReferenceCount(void);
-
-    int loadFromUri(const char *uri);
-    int loadRemote(const char *key, const char *uri);
-    int load(const char *rules);
-    int load(const char *rules, const std::string &ref);
-
-    void dump() const;
-
-    int merge(Parser::Driver *driver);
-    int merge(Rules *rules);
-
-    int evaluate(int phase, Transaction *transaction);
-    std::string getParserError();
-
-    void debug(int level, const std::string &id, const std::string &uri,
-        const std::string &msg);
-
-    int64_t unicode_codepage;
-
- private:
-#ifndef NO_LOGS
-    uint8_t m_secmarker_skipped;
-#endif
-    int m_referenceCount;
-};
-
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-Rules *msc_create_rules_set(void);
-void msc_rules_dump(Rules *rules);
-int msc_rules_merge(Rules *rules_dst, Rules *rules_from, const char **error);
-int msc_rules_add_remote(Rules *rules, const char *key, const char *uri,
-    const char **error);
-int msc_rules_add_file(Rules *rules, const char *file, const char **error);
-int msc_rules_add(Rules *rules, const char *plain_rules, const char **error);
-int msc_rules_cleanup(Rules *rules);
-
-#ifdef __cplusplus
-}
-}  // namespace modsecurity
-#endif
-
-#endif  // HEADERS_MODSECURITY_RULES_H_

headers/modsecurity/rules_set.h

@@ -0,0 +1,109 @@
+/*
+ * ModSecurity, http://www.modsecurity.org/
+ * Copyright (c) 2015 Trustwave Holdings, Inc. (http://www.trustwave.com/)
+ *
+ * You may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * If any of the files related to licensing are missing or if you have any
+ * other questions related to licensing please contact Trustwave Holdings, Inc.
+ * directly using the email address security@modsecurity.org.
+ *
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#ifdef __cplusplus
+#include <ctime>
+#include <iostream>
+#include <string>
+#include <vector>
+#include <list>
+#endif
+
+
+#ifndef HEADERS_MODSECURITY_RULES_H_
+#define HEADERS_MODSECURITY_RULES_H_
+
+#include "modsecurity/rules_properties.h"
+#include "modsecurity/modsecurity.h"
+#include "modsecurity/transaction.h"
+
+#ifdef __cplusplus
+
+namespace modsecurity {
+class Rule;
+namespace Parser {
+class Driver;
+}
+
+
+/** @ingroup ModSecurity_CPP_API */
+class RulesSet : public RulesProperties {
+ public:
+    RulesSet()
+        : RulesProperties(new DebugLog()),
+        unicode_codepage(0),
+#ifndef NO_LOGS
+        ,m_secmarker_skipped(0)
+#endif
+        { }
+
+    explicit RulesSet(DebugLog *customLog)
+        : RulesProperties(customLog),
+        unicode_codepage(0)
+#ifndef NO_LOGS
+        ,m_secmarker_skipped(0)
+#endif
+        { }
+
+    ~RulesSet() { }
+
+    int loadFromUri(const char *uri);
+    int loadRemote(const char *key, const char *uri);
+    int load(const char *rules);
+    int load(const char *rules, const std::string &ref);
+
+    void dump() const;
+
+    int merge(Parser::Driver *driver);
+    int merge(RulesSet *rules);
+
+    int evaluate(int phase, Transaction *transaction);
+    std::string getParserError();
+
+    void debug(int level, const std::string &id, const std::string &uri,
+        const std::string &msg);
+
+    int64_t unicode_codepage;
+
+ private:
+#ifndef NO_LOGS
+    uint8_t m_secmarker_skipped;
+#endif
+};
+
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+RulesSet *msc_create_rules_set(void);
+void msc_rules_dump(RulesSet *rules);
+int msc_rules_merge(RulesSet *rules_dst, RulesSet *rules_from, const char **error);
+int msc_rules_add_remote(RulesSet *rules, const char *key, const char *uri,
+    const char **error);
+int msc_rules_add_file(RulesSet *rules, const char *file, const char **error);
+int msc_rules_add(RulesSet *rules, const char *plain_rules, const char **error);
+int msc_rules_cleanup(RulesSet *rules);
+
+#ifdef __cplusplus
+}
+}  // namespace modsecurity
+#endif
+
+#endif  // HEADERS_MODSECURITY_RULES_H_

headers/modsecurity/transaction.h

@@ -37,7 +37,7 @@
 #ifndef __cplusplus
 typedef struct ModSecurity_t ModSecurity;
 typedef struct Transaction_t Transaction;
-typedef struct Rules_t Rules;
+typedef struct Rules_t RulesSet;
 #endif
 
 #include "modsecurity/anchored_set_variable.h"
@@ -98,7 +98,7 @@ namespace modsecurity {
 
 class ModSecurity;
 class Transaction;
-class Rules;
+class RulesSet;
 class RuleMessage;
 namespace actions {
 class Action;
@@ -288,8 +288,8 @@ class TransactionAnchoredVariables {
 /** @ingroup ModSecurity_CPP_API */
 class Transaction : public TransactionAnchoredVariables {
  public:
-    Transaction(ModSecurity *transaction, Rules *rules, void *logCbData);
-    Transaction(ModSecurity *transaction, Rules *rules, char *id,
+    Transaction(ModSecurity *transaction, RulesSet *rules, void *logCbData);
+    Transaction(ModSecurity *transaction, RulesSet *rules, char *id,
         void *logCbData);
     ~Transaction();
 
@@ -459,7 +459,7 @@ class Transaction : public TransactionAnchoredVariables {
     /**
      * Rules object utilized during this specific transaction.
      */
-    Rules *m_rules;
+    RulesSet *m_rules;
 
     /**
      *
@@ -604,11 +604,11 @@ extern "C" {
 
 /** @ingroup ModSecurity_C_API */
 Transaction *msc_new_transaction(ModSecurity *ms,
-    Rules *rules, void *logCbData);
+    RulesSet *rules, void *logCbData);
 
 /** @ingroup ModSecurity_C_API */
 Transaction *msc_new_transaction_with_id(ModSecurity *ms,
-    Rules *rules, char *id, void *logCbData);
+    RulesSet *rules, char *id, void *logCbData);
 
 /** @ingroup ModSecurity_C_API */
 int msc_process_connection(Transaction *transaction,