[patch]keep maat23.05 compatibility

1 files changed, 7 insertions, 69 deletions

diff --git a/test/maat_framework_gtest.cpp b/test/maat_framework_gtest.cpp
index fd31e11..81bcd42 100644
--- a/test/maat_framework_gtest.cpp
+++ b/test/maat_framework_gtest.cpp
@@ -2594,7 +2594,7 @@ TEST_F(PluginTable, EX_DATA) {
     const char *key1 = "HeBei";
     struct plugin_ud *ud = NULL;
     ud = (struct plugin_ud *)maat_plugin_table_get_ex_data(maat_instance, table_id,
-                                                           key1, strlen(key1));
+                                                           key1);
     ASSERT_TRUE(ud != NULL);
     EXPECT_STREQ(ud->value, "Shijiazhuang");
     EXPECT_EQ(ud->id, 1);
@@ -2602,7 +2602,7 @@ TEST_F(PluginTable, EX_DATA) {
 
     const char *key2 = "ShanDong";
     ud = (struct plugin_ud *)maat_plugin_table_get_ex_data(maat_instance, table_id,
-                                                           key2, strlen(key2));
+                                                           key2);
     ASSERT_TRUE(ud != NULL);
     EXPECT_STREQ(ud->value, "Jinan");
     EXPECT_EQ(ud->id, 3);
@@ -2628,7 +2628,7 @@ TEST_F(PluginTable, KEY_TYPE) {
     long long key1 = 11111111;
     struct plugin_ud *ud = NULL;
     ud = (struct plugin_ud *)maat_plugin_table_get_ex_data(maat_instance, table_id,
-                                                           (char *)&key1, sizeof(long long));
+                                                           (char *)&key1);
     ASSERT_TRUE(ud != NULL);
     EXPECT_STREQ(ud->value, "Shijiazhuang");
     EXPECT_EQ(ud->id, 1);
@@ -2636,75 +2636,13 @@ TEST_F(PluginTable, KEY_TYPE) {
 
     long long key2 = 33333333;
     ud = (struct plugin_ud *)maat_plugin_table_get_ex_data(maat_instance, table_id,
-                                                           (char *)&key2, sizeof(long long));
+                                                           (char *)&key2);
     ASSERT_TRUE(ud != NULL);
     EXPECT_STREQ(ud->value, "Jinan");
     EXPECT_EQ(ud->id, 3);
     plugin_EX_free_cb(table_id, (void **)&ud, 0, NULL);
 }
 
-TEST_F(PluginTable, IP_KEY_TYPE) {
-    const char *table_name = "TEST_PLUGIN_IP_KEY_TYPE_TABLE";
-    struct maat *maat_instance = PluginTable::_shared_maat_instance;
-
-    int table_id = maat_get_table_id(maat_instance, table_name);
-    ASSERT_GT(table_id, 0);
-
-    int plugin_ex_data_counter = 0;
-    int ret = maat_plugin_table_ex_schema_register(maat_instance, table_name,
-                                                   plugin_EX_new_cb,
-                                                   plugin_EX_free_cb,
-                                                   plugin_EX_dup_cb,
-                                                   0, &plugin_ex_data_counter);
-    EXPECT_EQ(ret, 0);
-    EXPECT_EQ(plugin_ex_data_counter, 4);
-
-    uint32_t ipv4_addr1;
-    ret = inet_pton(AF_INET, "100.64.1.1", &ipv4_addr1);
-    EXPECT_EQ(ret, 1);
-
-    struct plugin_ud *ud = NULL;
-    ud = (struct plugin_ud *)maat_plugin_table_get_ex_data(maat_instance, table_id,
-                                                           (char *)&ipv4_addr1, sizeof(ipv4_addr1));
-    ASSERT_TRUE(ud != NULL);
-    EXPECT_STREQ(ud->value, "XiZang");
-    EXPECT_EQ(ud->id, 4);
-    plugin_EX_free_cb(table_id, (void **)&ud, 0, NULL);
-
-    uint32_t ipv4_addr2;
-    ret = inet_pton(AF_INET, "100.64.1.2", &ipv4_addr2);
-    EXPECT_EQ(ret, 1);
-
-    ud = (struct plugin_ud *)maat_plugin_table_get_ex_data(maat_instance, table_id,
-                                                           (char *)&ipv4_addr2, sizeof(ipv4_addr2));
-    ASSERT_TRUE(ud != NULL);
-    EXPECT_STREQ(ud->value, "XinJiang");
-    EXPECT_EQ(ud->id, 4);
-    plugin_EX_free_cb(table_id, (void **)&ud, 0, NULL);
-
-    uint8_t ipv6_addr1[16];
-    ret = inet_pton(AF_INET6, "2001:da8:205:1::101", ipv6_addr1);
-    EXPECT_EQ(ret, 1);
-
-    ud = (struct plugin_ud *)maat_plugin_table_get_ex_data(maat_instance, table_id,
-                                                           (char *)ipv6_addr1, sizeof(ipv6_addr1));
-    ASSERT_TRUE(ud != NULL);
-    EXPECT_STREQ(ud->value, "GuiZhou");
-    EXPECT_EQ(ud->id, 6);
-    plugin_EX_free_cb(table_id, (void **)&ud, 0, NULL);
-
-    uint8_t ipv6_addr2[16];
-    ret = inet_pton(AF_INET6, "1001:da8:205:1::101", ipv6_addr2);
-    EXPECT_EQ(ret, 1);
-
-    ud = (struct plugin_ud *)maat_plugin_table_get_ex_data(maat_instance, table_id,
-                                                           (char *)ipv6_addr2, sizeof(ipv6_addr2));
-    ASSERT_TRUE(ud != NULL);
-    EXPECT_STREQ(ud->value, "SiChuan");
-    EXPECT_EQ(ud->id, 6);
-    plugin_EX_free_cb(table_id, (void **)&ud, 0, NULL);
-}
-
 class IPPluginTable : public testing::Test
 {
 protected:
@@ -3505,7 +3443,7 @@ TEST_F(Policy, CompileEXData) {
     EXPECT_EQ(results[0], 198);
 
     void *ex_data = maat_plugin_table_get_ex_data(maat_instance, compile_table_id, 
-                                                 (char *)&results[0], sizeof(long long));
+                                                 (char *)&results[0]);
     ASSERT_TRUE(ex_data!=NULL);
     struct rule_ex_param *param = (struct rule_ex_param *)ex_data;
 	EXPECT_EQ(param->id, 7799);
@@ -4960,7 +4898,7 @@ TEST_F(MaatCmdTest, PluginEXData) {
 	struct user_info *uinfo = NULL;
     const char *key1 = "192.168.0.2";
 	uinfo = (struct user_info *)maat_plugin_table_get_ex_data(maat_instance, table_id,
-                                                              key1, strlen(key1));
+                                                              key1);
 	ASSERT_TRUE(uinfo != NULL);
 	EXPECT_EQ(0, strcmp(uinfo->name, "liuqiangdong"));
 	EXPECT_EQ(uinfo->id, 2);
@@ -4978,7 +4916,7 @@ TEST_F(MaatCmdTest, PluginEXData) {
 	sleep(WAIT_FOR_EFFECTIVE_S);
     const char *key2 = "192.168.0.2";
 	uinfo = (struct user_info *)maat_plugin_table_get_ex_data(maat_instance, table_id,
-                                                              key2, strlen(key2));
+                                                              key2);
 	ASSERT_TRUE(uinfo == NULL);
 }