diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b298abd..fbb0b8d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -12,7 +12,7 @@ LINK_DIRECTORIES(/opt/MESA/lib /usr/lib64) add_definitions(-D_GNU_SOURCE) add_definitions(-fPIC) set(MAAT_SRC alignment.c json2iris.c maat_api.c rcu_hash.c maat_garbage_collection.c maat_config_monitor.c - maat_rule.c maat_kv.c maat_ex_data.c maat_utils.c maat_command.c maat_redis_monitor.c maat_table.c + maat_core.c maat_kv.c maat_ex_data.c maat_utils.c maat_command.c maat_redis_monitor.c maat_table.c maat_compile.c maat_group.c maat_ip.c maat_flag.c maat_interval.c maat_expr.c maat_plugin.c maat_ip_plugin.c maat_ipport_plugin.c maat_bool_plugin.c maat_fqdn_plugin.c maat_virtual.c maat_stat.c) diff --git a/src/inc_internal/maat_compile.h b/src/inc_internal/maat_compile.h index d4d5c51..e370eb8 100644 --- a/src/inc_internal/maat_compile.h +++ b/src/inc_internal/maat_compile.h @@ -20,7 +20,7 @@ extern "C" #include "rcu_hash.h" #include "maat.h" #include "maat_kv.h" -#include "maat_rule.h" +#include "maat_core.h" struct compile_schema; struct compile_runtime; diff --git a/src/inc_internal/maat_rule.h b/src/inc_internal/maat_core.h similarity index 99% rename from src/inc_internal/maat_rule.h rename to src/inc_internal/maat_core.h index a2c1404..bdd42f7 100644 --- a/src/inc_internal/maat_rule.h +++ b/src/inc_internal/maat_core.h @@ -1,6 +1,6 @@ /* ********************************************************************************************** -* File: maat_rule.h +* File: maat_core.h * Description: maat rule entry * Authors: Liu WenTan * Date: 2022-10-31 diff --git a/src/inc_internal/maat_expr.h b/src/inc_internal/maat_expr.h index 383f350..df68ed8 100644 --- a/src/inc_internal/maat_expr.h +++ b/src/inc_internal/maat_expr.h @@ -16,7 +16,7 @@ extern "C" { #endif -#include "maat_rule.h" +#include "maat_core.h" #include "maat_table.h" #include "cJSON/cJSON.h" diff --git a/src/inc_internal/maat_flag.h b/src/inc_internal/maat_flag.h index 9b64064..e600db3 100644 --- a/src/inc_internal/maat_flag.h +++ b/src/inc_internal/maat_flag.h @@ -18,7 +18,7 @@ extern "C" #include -#include "maat_rule.h" +#include "maat_core.h" #include "cJSON/cJSON.h" #include "maat_table.h" diff --git a/src/inc_internal/maat_stat.h b/src/inc_internal/maat_stat.h index 733cdc0..12964ea 100644 --- a/src/inc_internal/maat_stat.h +++ b/src/inc_internal/maat_stat.h @@ -16,7 +16,7 @@ extern "C" { #endif -#include "maat_rule.h" +#include "maat_core.h" struct maat_stat *maat_stat_new(const char *stat_file, size_t max_thread_num, struct log_handle *logger); diff --git a/src/json2iris.c b/src/json2iris.c index f711c1d..d52b123 100644 --- a/src/json2iris.c +++ b/src/json2iris.c @@ -19,7 +19,7 @@ #include "cJSON/cJSON.h" #include "maat_kv.h" #include "maat_utils.h" -#include "maat_rule.h" +#include "maat_core.h" #include "uthash/uthash.h" #include "maat_redis_monitor.h" diff --git a/src/maat_api.c b/src/maat_api.c index b6b7ba0..7131359 100644 --- a/src/maat_api.c +++ b/src/maat_api.c @@ -17,7 +17,7 @@ #include "maat_utils.h" #include "json2iris.h" #include "maat.h" -#include "maat_rule.h" +#include "maat_core.h" #include "maat_kv.h" #include "maat_command.h" #include "maat_ex_data.h" diff --git a/src/maat_bool_plugin.c b/src/maat_bool_plugin.c index 6249b96..91efbf9 100644 --- a/src/maat_bool_plugin.c +++ b/src/maat_bool_plugin.c @@ -14,7 +14,7 @@ #include "maat_bool_plugin.h" #include "bool_matcher.h" #include "maat_utils.h" -#include "maat_rule.h" +#include "maat_core.h" #include "maat_garbage_collection.h" #define MODULE_BOOL_PLUGIN module_name_str("maat.bool_plugin") diff --git a/src/maat_command.c b/src/maat_command.c index c962dcc..ec6a588 100644 --- a/src/maat_command.c +++ b/src/maat_command.c @@ -15,7 +15,7 @@ #include "maat_utils.h" #include "maat_command.h" -#include "maat_rule.h" +#include "maat_core.h" #include "hiredis/hiredis.h" #include "maat_config_monitor.h" #include "maat_redis_monitor.h" diff --git a/src/maat_config_monitor.c b/src/maat_config_monitor.c index 2e83b83..4c6154c 100644 --- a/src/maat_config_monitor.c +++ b/src/maat_config_monitor.c @@ -17,7 +17,7 @@ #include #include "maat_utils.h" -#include "maat_rule.h" +#include "maat_core.h" #include "json2iris.h" #include "maat_config_monitor.h" diff --git a/src/maat_rule.c b/src/maat_core.c similarity index 99% rename from src/maat_rule.c rename to src/maat_core.c index d87c5e6..61ba777 100644 --- a/src/maat_rule.c +++ b/src/maat_core.c @@ -1,5 +1,5 @@ /********************************************************************************************** -* File: maat_rule.c +* File: maat_core.c * Description: * Authors: Liu WenTan * Date: 2022-10-31 @@ -19,7 +19,7 @@ #include "json2iris.h" #include "log/log.h" #include "maat_utils.h" -#include "maat_rule.h" +#include "maat_core.h" #include "maat_config_monitor.h" #include "maat_redis_monitor.h" #include "maat_table.h" diff --git a/src/maat_expr.c b/src/maat_expr.c index 486cb82..af761d3 100644 --- a/src/maat_expr.c +++ b/src/maat_expr.c @@ -19,7 +19,7 @@ #include "maat_limits.h" #include "rcu_hash.h" #include "maat.h" -#include "maat_rule.h" +#include "maat_core.h" #include "maat_compile.h" #include "maat_group.h" #include "alignment.h" diff --git a/src/maat_flag.c b/src/maat_flag.c index 0781bdd..9707e09 100644 --- a/src/maat_flag.c +++ b/src/maat_flag.c @@ -13,7 +13,7 @@ #include "maat_flag.h" #include "flag_matcher.h" #include "maat_utils.h" -#include "maat_rule.h" +#include "maat_core.h" #include "log/log.h" #include "uthash/uthash.h" #include "rcu_hash.h" diff --git a/src/maat_fqdn_plugin.c b/src/maat_fqdn_plugin.c index d4e00a6..f5295c2 100644 --- a/src/maat_fqdn_plugin.c +++ b/src/maat_fqdn_plugin.c @@ -14,7 +14,7 @@ #include "maat_fqdn_plugin.h" #include "maat_utils.h" #include "maat_table.h" -#include "maat_rule.h" +#include "maat_core.h" #include "maat_garbage_collection.h" #define MODULE_FQDN_PLUGIN module_name_str("maat.bool_plugin") diff --git a/src/maat_interval.c b/src/maat_interval.c index b34a37a..afcfa7c 100644 --- a/src/maat_interval.c +++ b/src/maat_interval.c @@ -10,7 +10,7 @@ #include -#include "maat_rule.h" +#include "maat_core.h" #include "maat_utils.h" #include "rcu_hash.h" #include "alignment.h" diff --git a/src/maat_ip.c b/src/maat_ip.c index f9f993a..ad214e7 100644 --- a/src/maat_ip.c +++ b/src/maat_ip.c @@ -16,7 +16,7 @@ #include "maat_ex_data.h" #include "ip_matcher.h" #include "maat_ip.h" -#include "maat_rule.h" +#include "maat_core.h" #include "maat_compile.h" #include "alignment.h" #include "maat_garbage_collection.h" diff --git a/src/maat_ip_plugin.c b/src/maat_ip_plugin.c index 463b2bc..f38d6dd 100644 --- a/src/maat_ip_plugin.c +++ b/src/maat_ip_plugin.c @@ -15,7 +15,7 @@ #include "maat_utils.h" #include "maat_ip_plugin.h" #include "ip_matcher.h" -#include "maat_rule.h" +#include "maat_core.h" #include "maat_garbage_collection.h" #define MODULE_IP_PLUGIN module_name_str("maat.ip_plugin") diff --git a/src/maat_ipport_plugin.c b/src/maat_ipport_plugin.c index b953369..78eac34 100644 --- a/src/maat_ipport_plugin.c +++ b/src/maat_ipport_plugin.c @@ -17,7 +17,7 @@ #include "maat_ipport_plugin.h" #include "ipport_matcher.h" #include "interval_matcher.h" -#include "maat_rule.h" +#include "maat_core.h" #include "maat_garbage_collection.h" #define MODULE_IPPORT_PLUGIN module_name_str("maat.ipport_plugin") diff --git a/src/maat_plugin.c b/src/maat_plugin.c index 2f0d964..442dede 100644 --- a/src/maat_plugin.c +++ b/src/maat_plugin.c @@ -14,7 +14,7 @@ #include "log/log.h" #include "maat_utils.h" -#include "maat_rule.h" +#include "maat_core.h" #include "maat_plugin.h" #include "maat_limits.h" #include "maat_table.h" diff --git a/src/maat_redis_monitor.c b/src/maat_redis_monitor.c index 2f4a921..03cff77 100644 --- a/src/maat_redis_monitor.c +++ b/src/maat_redis_monitor.c @@ -16,7 +16,7 @@ #include "maat.h" #include "log/log.h" #include "maat_utils.h" -#include "maat_rule.h" +#include "maat_core.h" #include "maat_command.h" #include "hiredis/hiredis.h" #include "maat_config_monitor.h" diff --git a/src/maat_table.c b/src/maat_table.c index a8295c4..d907e6d 100644 --- a/src/maat_table.c +++ b/src/maat_table.c @@ -14,7 +14,7 @@ #include "log/log.h" #include "maat_utils.h" #include "maat_table.h" -#include "maat_rule.h" +#include "maat_core.h" #include "maat_kv.h" #include "maat_expr.h" #include "maat_ip.h" diff --git a/src/maat_virtual.c b/src/maat_virtual.c index b56ff97..e28525f 100644 --- a/src/maat_virtual.c +++ b/src/maat_virtual.c @@ -14,7 +14,7 @@ #include "maat_utils.h" #include "log/log.h" #include "alignment.h" -#include "maat_rule.h" +#include "maat_core.h" #include "maat_table.h" #define MODULE_VIRTUAL module_name_str("maat.virtual") diff --git a/test/benchmark/benchmark_gtest.cpp b/test/benchmark/benchmark_gtest.cpp index c216a5a..0beb692 100644 --- a/test/benchmark/benchmark_gtest.cpp +++ b/test/benchmark/benchmark_gtest.cpp @@ -1,7 +1,7 @@ #include "maat.h" #include "log/log.h" #include "maat_utils.h" -#include "maat_rule.h" +#include "maat_core.h" #include "json2iris.h" #include "ip_matcher.h" #include "maat_table.h" diff --git a/test/group_nesting/group_nesting_gtest.cpp b/test/group_nesting/group_nesting_gtest.cpp index 4c53f05..be19bd2 100644 --- a/test/group_nesting/group_nesting_gtest.cpp +++ b/test/group_nesting/group_nesting_gtest.cpp @@ -1,7 +1,7 @@ #include "maat.h" #include "log/log.h" #include "cJSON/cJSON.h" -#include "maat_rule.h" +#include "maat_core.h" #include "uthash/utarray.h" #include "maat_utils.h" #include "maat_command.h" diff --git a/test/ipport_plugin/ipport_plugin_gtest.cpp b/test/ipport_plugin/ipport_plugin_gtest.cpp index f367401..f3138da 100644 --- a/test/ipport_plugin/ipport_plugin_gtest.cpp +++ b/test/ipport_plugin/ipport_plugin_gtest.cpp @@ -1,7 +1,7 @@ #include "maat.h" #include "log/log.h" #include "cJSON/cJSON.h" -#include "maat_rule.h" +#include "maat_core.h" #include "maat_utils.h" #include "log/log.h" #include "../test_utils.h" diff --git a/test/maat_framework_gtest.cpp b/test/maat_framework_gtest.cpp index 3401865..f666972 100644 --- a/test/maat_framework_gtest.cpp +++ b/test/maat_framework_gtest.cpp @@ -4,7 +4,7 @@ #include "test_utils.h" #include "maat.h" -#include "maat_rule.h" +#include "maat_core.h" #include "maat_utils.h" #include "maat_command.h" #include "ip_matcher.h" diff --git a/test/maat_framework_perf_gtest.cpp b/test/maat_framework_perf_gtest.cpp index 01ec464..fee8c9e 100644 --- a/test/maat_framework_perf_gtest.cpp +++ b/test/maat_framework_perf_gtest.cpp @@ -3,7 +3,7 @@ #include "test_utils.h" #include "log/log.h" #include "maat.h" -#include "maat_rule.h" +#include "maat_core.h" #include "maat_utils.h" #include "ip_matcher.h" #include "maat_command.h" diff --git a/test/maat_input_mode_gtest.cpp b/test/maat_input_mode_gtest.cpp index b6977ba..f9a1be9 100644 --- a/test/maat_input_mode_gtest.cpp +++ b/test/maat_input_mode_gtest.cpp @@ -1,6 +1,6 @@ #include "maat.h" #include "maat_utils.h" -#include "maat_rule.h" +#include "maat_core.h" #include "json2iris.h" #include "test_utils.h" #include "maat_table.h" diff --git a/test/test_utils.cpp b/test/test_utils.cpp index 06224cf..7619566 100644 --- a/test/test_utils.cpp +++ b/test/test_utils.cpp @@ -2,7 +2,7 @@ #include "maat_redis_monitor.h" #include "maat_utils.h" #include "maat_table.h" -#include "maat_rule.h" +#include "maat_core.h" #include "maat_config_monitor.h" #include "json2iris.h" diff --git a/tools/maat_redis_tool.cpp b/tools/maat_redis_tool.cpp index 116aa80..f18c151 100644 --- a/tools/maat_redis_tool.cpp +++ b/tools/maat_redis_tool.cpp @@ -5,7 +5,7 @@ #include #include -#include "maat_rule.h" +#include "maat_core.h" #include "maat_utils.h" #include "maat_command.h" #include "cJSON/cJSON.h"