Add rule data get method

Change-Id: I5022f87162e85eff80f503c6c3f95551251e4207
Signed-off-by: seolheui kim <s414.kim@samsung.com>

diff --git a/lib/rule/rule.cpp b/lib/rule/rule.cpp
index b90f229a020271a7bbc600d31671789cde7a51b2..a95523e7dd417efdeea7801988836e30e9dcf53b 100644 (file)
--- a/lib/rule/rule.cpp
+++ b/lib/rule/rule.cpp
@@ -40,6 +40,16 @@ Rule::~Rule()
 {
 }
 
+std::vector<char> Rule::data() const
+{
+       std::vector<char> ret(buf);
+       for (auto &c : conditions) {
+               if (c.second)
+                       c.second->emit(ret);
+       }
+       return ret;
+}
+
 void Rule::setTag(const std::string &tag)
 {
        //[TODO]: save tags
@@ -137,10 +147,3 @@ void Rule::setComponents(const std::vector<char> &rule)
                }
        }
 }
-
-void Rule::updateConditions()
-{
-       for (auto &c : conditions) {
-               c.second->emit(buf);
-       }
-}

diff --git a/lib/rule/rule.h b/lib/rule/rule.h
index 065ebc422b1b518380f1c7f981c4954c9637ffa4..28a30a4d9239269b1eb0da323cefff9e62341b48 100644 (file)
--- a/lib/rule/rule.h
+++ b/lib/rule/rule.h
@@ -17,7 +17,7 @@
 #ifndef __AUDIT_RULE_H__
 #define __AUDIT_RULE_H__
 
-#include <unordered_map>
+#include <map>
 #include <memory>
 
 #include <linux/audit.h>
@@ -67,7 +67,7 @@ public:
 
        bool operator == (const Rule &rule)
        {
-               return buf == rule.buf;
+               return (data() == rule.data());
        }
 
        RuleType type() const
@@ -75,6 +75,8 @@ public:
                return _type;
        }
 
+       std::vector<char> data() const;
+
        void set(RuleType type)
        {
                _type = type;
@@ -111,11 +113,10 @@ private:
 
        bool isStringField(unsigned int type) const;
        void setComponents(const std::vector<char> &rule);
-       void updateConditions();
 private:
        RuleType _type;
        std::vector<char> buf;
-       std::unordered_map<unsigned int, std::shared_ptr<FieldBase>> conditions;
+       std::map<unsigned int, std::shared_ptr<FieldBase>> conditions;
 };
 
 template <typename T>