Refactoring: Renames Rules to RulesSet

RulesSet does not only contain rules but alse properties

src/actions/block.cc

@@ -19,9 +19,9 @@
 #include <string>
 #include <memory>
 
+#include "modsecurity/rules_set.h"
 #include "modsecurity/transaction.h"
 #include "modsecurity/rule.h"
-#include "modsecurity/rules.h"
 #include "modsecurity/intervention.h"
 #include "src/actions/data/status.h"
 

src/actions/ctl/rule_engine.cc

@@ -18,8 +18,8 @@
 #include <iostream>
 #include <string>
 
+#include "modsecurity/rules_set.h"
 #include "modsecurity/rules_properties.h"
-#include "modsecurity/rules.h"
 #include "modsecurity/transaction.h"
 
 namespace modsecurity {

src/actions/disruptive/allow.cc

@@ -18,9 +18,9 @@
 #include <iostream>
 #include <string>
 
+#include "modsecurity/rules_set.h"
 #include "modsecurity/transaction.h"
 #include "modsecurity/rule.h"
-#include "modsecurity/rules.h"
 #include "src/utils/string.h"
 #include "modsecurity/modsecurity.h"
 

src/actions/disruptive/deny.h

@@ -16,9 +16,9 @@
 #include <string>
 #include <memory>
 
+#include "modsecurity/rules_set.h"
 #include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
-#include "modsecurity/rules.h"
 #include "modsecurity/rule_message.h"
 
 #ifndef SRC_ACTIONS_DISRUPTIVE_DENY_H_

src/actions/disruptive/drop.cc

@@ -21,7 +21,11 @@
 #include <cstring>
 #include <memory>
 
+#include "modsecurity/rules_set.h"
 #include "modsecurity/transaction.h"
+#include "modsecurity/rule.h"
+#include "src/utils/string.h"
+#include "modsecurity/modsecurity.h"
 
 namespace modsecurity {
 namespace actions {

src/actions/disruptive/drop.h

@@ -18,7 +18,6 @@
 
 #include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
-#include "modsecurity/rules.h"
 #include "modsecurity/rule_message.h"
 
 #ifndef SRC_ACTIONS_DISRUPTIVE_DROP_H_

src/actions/disruptive/pass.cc

@@ -19,9 +19,9 @@
 #include <string>
 #include <memory>
 
+#include "modsecurity/rules_set.h"
 #include "modsecurity/transaction.h"
 #include "modsecurity/rule.h"
-#include "modsecurity/rules.h"
 #include "modsecurity/rule_message.h"
 
 namespace modsecurity {

src/actions/exec.cc

@@ -18,10 +18,10 @@
 #include <iostream>
 #include <string>
 
+#include "modsecurity/rules_set.h"
 #include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
 #include "modsecurity/rule.h"
-#include "modsecurity/rules.h"
 #include "src/utils/system.h"
 #include "src/engine/lua.h"
 

src/actions/set_var.cc

@@ -19,8 +19,8 @@
 #include <string>
 #include <memory>
 
+#include "modsecurity/rules_set.h"
 #include "modsecurity/transaction.h"
-#include "modsecurity/rules.h"
 #include "modsecurity/rule.h"
 #include "src/utils/string.h"
 #include "src/variables/global.h"

src/actions/severity.cc

@@ -19,10 +19,10 @@
 #include <string>
 #include <memory>
 
+#include "modsecurity/rules_set.h"
 #include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
 #include "modsecurity/rule.h"
-#include "modsecurity/rules.h"
 #include "src/utils/string.h"
 #include "modsecurity/rule_message.h"
 

src/actions/skip.cc

@@ -18,9 +18,9 @@
 #include <iostream>
 #include <string>
 
+#include "modsecurity/rules_set.h"
 #include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
-#include "modsecurity/rules.h"
 
 namespace modsecurity {
 namespace actions {

src/actions/skip_after.cc

@@ -18,9 +18,9 @@
 #include <iostream>
 #include <string>
 
+#include "modsecurity/rules_set.h"
 #include "modsecurity/actions/action.h"
 #include "modsecurity/transaction.h"
-#include "modsecurity/rules.h"
 
 
 namespace modsecurity {

src/actions/transformations/url_decode_uni.cc

@@ -25,11 +25,11 @@
 #include <locale>
 #include <cstring>
 
+#include "modsecurity/rules_set.h"
 #include "modsecurity/transaction.h"
 #include "src/actions/transformations/transformation.h"
 #include "src/utils/string.h"
 #include "src/utils/system.h"
-#include "modsecurity/rules.h"
 #include "modsecurity/rules_properties.h"
 
 
@@ -108,7 +108,7 @@ int UrlDecodeUni::inplace(unsigned char *input, uint64_t input_len,
                             }
 
                             if (Code >= 0 && Code <= 65535)  {
-                                Rules *r = t->m_rules;
+                                RulesSet *r = t->m_rules;
                                 hmap = r->m_unicodeMapTable.m_unicodeMapTable->at(Code);
                             }
                         }