From 0de617a7fb9f5c340ce1555fc3116cc0ceccd50f Mon Sep 17 00:00:00 2001 From: VadimZy Date: Wed, 10 Aug 2022 20:11:51 -0700 Subject: [PATCH] remove sinsp.h public dependencies Signed-off-by: VadimZy --- userspace/engine/filter_evttype_resolver.cpp | 7 +++++++ userspace/engine/filter_evttype_resolver.h | 15 ++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/userspace/engine/filter_evttype_resolver.cpp b/userspace/engine/filter_evttype_resolver.cpp index fa0c0b70..8b8a54c9 100644 --- a/userspace/engine/filter_evttype_resolver.cpp +++ b/userspace/engine/filter_evttype_resolver.cpp @@ -27,6 +27,13 @@ static bool is_evttype_operator(const string& op) return op == "==" || op == "=" || op == "!=" || op == "in"; } + +size_t falco_event_types::get_ppm_event_max() +{ + return PPM_EVENT_MAX; +} + + void filter_evttype_resolver::visitor::inversion(falco_event_types& types) { falco_event_types all_types; diff --git a/userspace/engine/filter_evttype_resolver.h b/userspace/engine/filter_evttype_resolver.h index a99e8bc3..3af67855 100644 --- a/userspace/engine/filter_evttype_resolver.h +++ b/userspace/engine/filter_evttype_resolver.h @@ -16,8 +16,6 @@ limitations under the License. #pragma once -#include - #include #include #include @@ -32,7 +30,8 @@ private: static inline void check_range(uint16_t e) { - if(e > PPM_EVENT_MAX) + static const auto enum_max = get_ppm_event_max(); + if(e > enum_max) { throw std::range_error("invalid event type"); } @@ -44,8 +43,10 @@ public: falco_event_types& operator=(falco_event_types&&) = default; falco_event_types& operator=(const falco_event_types&) = default; + static size_t get_ppm_event_max(); + inline falco_event_types(): - m_types(PPM_EVENT_MAX + 1, 0) + m_types(get_ppm_event_max() + 1, 0) { } @@ -57,7 +58,7 @@ public: void merge(const falco_event_types& other) { - for(int i = 0; i <= PPM_EVENT_MAX; ++i) + for(size_t i = 0; i <= get_ppm_event_max(); ++i) { m_types[i] |= other.m_types[i]; } @@ -93,7 +94,7 @@ public: falco_event_types diff(const falco_event_types& other) { falco_event_types ret; - for(size_t i = 0; i <= PPM_EVENT_MAX; ++i) + for(size_t i = 0; i <= get_ppm_event_max(); ++i) { if(m_types[i] == 1 && other.m_types[i] == 0) { @@ -106,7 +107,7 @@ public: falco_event_types intersect(const falco_event_types& other) { falco_event_types ret; - for(size_t i = 0; i <= PPM_EVENT_MAX; ++i) + for(size_t i = 0; i <= get_ppm_event_max(); ++i) { if(m_types[i] == 1 && other.m_types[i] == 1) {