Merge pull request #1565 in SNORT/snort3 from ~MIALTIZE/snort3:policy_true_false...

Squashed commit of the following:

commit 4bd25a96d51859bfb7cda72561fce93869f82dcd
Author: Michael Altizer <mialtize@cisco.com>
Date:   Sat Mar 30 16:39:30 2019 -0400

    policy: Rename TRUE/FALSE to ENABLE/DISABLED

    Works around awkward C-style usage situations where TRUE/FALSE are
    defined and used.

diff --git a/src/detection/rules.cc b/src/detection/rules.cc
index 241e031ccfbe21be16b49a4f4d9117ca63bb166d..f77f27efdecd3c3d20d882625beacdee56d60ca4 100644 (file)
--- a/src/detection/rules.cc
+++ b/src/detection/rules.cc
@@ -164,8 +164,8 @@ void RuleStateEnable::update_rtn(RuleTreeNode* rtn)
 {
     switch( enable )
     {
-        case IpsPolicy::FALSE: rtn->clear_enabled(); break;
-        case IpsPolicy::TRUE: rtn->set_enabled(); break;
+        case IpsPolicy::DISABLED: rtn->clear_enabled(); break;
+        case IpsPolicy::ENABLED: rtn->set_enabled(); break;
         case IpsPolicy::INHERIT_ENABLE: break;
     }
 }

diff --git a/src/main/policy.h b/src/main/policy.h
index ec67d24644a7c371dff48d41c91dc61f0b64da68..8a6b59a40441d4f47c58664b528909a3ebbc6923 100644 (file)
--- a/src/main/policy.h
+++ b/src/main/policy.h
@@ -137,7 +137,7 @@ struct IpsPolicy
 {
 public:
     enum Action : uint8_t { LOG, PASS, ALERT, DROP, BLOCK, RESET, INHERIT_ACTION };
-    enum Enable : uint8_t { FALSE, TRUE, INHERIT_ENABLE };
+    enum Enable : uint8_t { DISABLED, ENABLED, INHERIT_ENABLE };
 
     IpsPolicy(PolicyId = 0);
     ~IpsPolicy();

diff --git a/src/main/snort_config.h b/src/main/snort_config.h
index 3bae004fc88ae9b966005342d50a094220262755..86df3ef33f6b221022a7bffddd2ca02ac4dd556f 100644 (file)
--- a/src/main/snort_config.h
+++ b/src/main/snort_config.h
@@ -507,10 +507,10 @@ public:
             case IpsPolicy::INHERIT_ENABLE:
                 return get_conf()->global_default_rule_state;
 
-            case IpsPolicy::TRUE:
+            case IpsPolicy::ENABLED:
                 return true;
 
-            case IpsPolicy::FALSE:
+            case IpsPolicy::DISABLED:
                 return false;
         }
         return true;