demo5HEADmaster

4 files changed, 180 insertions, 4 deletions

diff --git a/demo4/maat_json_cb.json b/demo4/maat_json_cb.json
index 3ada0cd..8e087b1 100644
--- a/demo4/maat_json_cb.json
+++ b/demo4/maat_json_cb.json
@@ -29,8 +29,8 @@
         {
             "table_name": "WANNAT_COMPILE",
             "table_content": [
-                "301\t0\t1\t0\t2\t{}\t{\"ip_object_ids\":[203,204], \"translate_type\":\"never\", \"time_interval\":123, \"connection_count\":1243}\t1\t1\t0",
-                "302\t0\t2\t0\t2\t{}\t{\"ue_object_ids\":[102], \"failover\":\"drop\"}\t2\t1\t0"
+                "301\t0\t1\t0\t2\t{}\t{\"ip_object_ids\":[203,204],\"translate_type\":\"never\",\"time_interval\":123,\"connection_count\":1243}\t1\t1\t0",
+                "302\t0\t2\t0\t2\t{}\t{\"ue_object_ids\":[102],\"failover\":\"drop\"}\t2\t1\t0"
             ]
         }
     ]
diff --git a/demo4/maat_json_cb.json_iris_tmp/WANNAT_COMPILE.local b/demo4/maat_json_cb.json_iris_tmp/WANNAT_COMPILE.local
index 117ea92..724b4b4 100644
--- a/demo4/maat_json_cb.json_iris_tmp/WANNAT_COMPILE.local
+++ b/demo4/maat_json_cb.json_iris_tmp/WANNAT_COMPILE.local
@@ -1,3 +1,3 @@
 0000000002
-301	0	1	0	2	{}	{"ip_object_ids":[203,204], "translate_type":"never", "time_interval":123, "connection_count":1243}	1	1	0
-302	0	2	0	2	{}	{"ue_object_ids":[102], "failover":"drop"}	2	1	0
+301	0	1	0	2	{}	{"ip_object_ids":[203,204],"translate_type":"never","time_interval":123,"connection_count":1243}	1	1	0
+302	0	2	0	2	{}	{"ue_object_ids":[102],"failover":"drop"}	2	1	0
diff --git a/demo4/main.c b/demo4/main.c
index 2eb3e51..12d4aaf 100644
--- a/demo4/main.c
+++ b/demo4/main.c
@@ -53,6 +53,51 @@ void ip_plugin_ex_dup_cb(int table_id, void **to, void **from, long argl, void *
     *to = ud;
 }
 
+struct wannat_compile
+{
+    int compile_id;
+    int service;
+    int action;
+    int do_blacklist;
+    int do_log;
+    char user_region[8192];
+    int group_num;
+    int is_valid;
+};
+
+void wannat_compile_ex_new_cb(const char *table_name, int table_id, const char *key, const char *table_line, void **ad,
+                         long argl, void *argp)
+{
+    int *counter = (int *)argp;
+    char effective_range[20] = {0};
+    char op_time[20] = {0};
+
+    struct wannat_compile *ud = ALLOC(struct wannat_compile, 1);
+
+    int ret = sscanf(table_line, "%d\t%d\t%d\t%d\t%d\t%10s\t%8192s\t%d\t%d\t%20s", &(ud->compile_id), &(ud->service),
+                     &(ud->action), &(ud->do_blacklist), &(ud->do_log), effective_range, ud->user_region,
+                     &(ud->group_num), &(ud->is_valid), &op_time);
+
+    *ad = ud;
+    (*counter)++;
+}
+
+void wannat_compile_ex_free_cb(int table_id, void **ad, long argl, void *argp)
+{
+    struct wannat_compile *ud = (struct wannat_compile *)(*ad);
+
+    memset(ud, 0, sizeof(struct wannat_compile));
+    free(ud);
+    *ad = NULL;
+}
+
+void wannat_compile_ex_dup_cb(int table_id, void **to, void **from, long argl, void *argp)
+{
+    struct wannat_compile *ud = (struct wannat_compile *)(*from);
+
+    *to = ud;
+}
+
 int main()
 {
     /* initialize maat options which will be used by maat_new() */
@@ -87,6 +132,25 @@ int main()
     assert(ud != NULL);
     assert(ud->id == 1);
 
+    plugin_ex_data_counter = 0;
+    const char *table_name2 = "WANNAT_COMPILE";
+    table_id = maat_get_table_id(maat_instance, table_name2);
+    assert(table_id == 3); /* defined in table_info.conf */
+
+    ret = maat_plugin_table_ex_schema_register(maat_instance, table_name2, wannat_compile_ex_new_cb, wannat_compile_ex_free_cb,
+                                                   wannat_compile_ex_dup_cb, 0, &plugin_ex_data_counter);
+    assert(ret == 0);
+    assert(plugin_ex_data_counter == 2);
+
+    struct wannat_compile *ud2 = NULL;
+    int key = 301;
+    ud2 = (struct wannat_compile *)maat_plugin_table_get_ex_data(maat_instance, table_id, (char *)&key, sizeof(int));
+
+    assert(ud2 != NULL);
+    assert(ud2->compile_id == 301);
+    assert(ud2->action == 1);
+
+
     // struct ip_addr ipv4;
     // ipv4.ip_type = IPv4;
     // ret = inet_pton(AF_INET, "192.168.30.100", &ipv4.ipv4);
diff --git a/demo4/sample_test.log.2024-04-25 b/demo4/sample_test.log.2024-04-25
index f3eec23..cc8de63 100644
--- a/demo4/sample_test.log.2024-04-25
+++ b/demo4/sample_test.log.2024-04-25
@@ -29,3 +29,115 @@ Thu Apr 25 09:13:31 2024, INFO, maat.rule(7824), table:<WANNAT_COMPILE> rule_cou
 Thu Apr 25 09:13:31 2024, INFO, maat.rule(7824), Full config version 1 load 10 entries complete
 Thu Apr 25 09:13:40 2024, INFO, maat.plugin(7824), table[WANNAT_DYN_UE_ID_IP] commit 2 plugin rules, version:0
 Thu Apr 25 09:13:40 2024, INFO, maat.rule(7854), rule_monitor_loop thread still alive.........
+Thu Apr 25 10:19:58 2024, INFO, maat.table(8974), successfully register physical table[WANNAT_DYN_UE_ID_IP]->table_id:0
+Thu Apr 25 10:19:58 2024, INFO, maat.table(8974), successfully register physical table[WANNAT_OBJ_UE_ID]->table_id:1
+Thu Apr 25 10:19:58 2024, INFO, maat.table(8974), successfully register physical table[WANNAT_OBJ_IP_ADDR]->table_id:2
+Thu Apr 25 10:19:58 2024, INFO, maat.table(8974), successfully register physical table[WANNAT_COMPILE]->table_id:3
+Thu Apr 25 10:19:58 2024, INFO, maat.table(8974), default compile table id: -1
+Thu Apr 25 10:19:58 2024, INFO, maat.table(8974), group2group table id: -1
+Thu Apr 25 10:19:58 2024, INFO, maat.config_monitor(8974), Maat initial with JSON file /root/Git/demo/demo4/maat_json_cb.json, formating...
+Thu Apr 25 10:19:58 2024, INFO, maat.config_monitor(8974), JSON file /root/Git/demo/demo4/maat_json_cb.json md5: 99c4c248f18e587bd8de8312bd51826c, generate index file /root/Git/demo/demo4/maat_json_cb.json_iris_tmp/index OK
+Thu Apr 25 10:19:58 2024, INFO, maat.config_monitor(8974), load /root/Git/demo/demo4/maat_json_cb.json_iris_tmp/index/full_config_index.0000000001
+Thu Apr 25 10:19:58 2024, INFO, maat.rule(8974), table:<WANNAT_DYN_UE_ID_IP> rule_count:2
+Thu Apr 25 10:19:58 2024, INFO, maat.rule(8974), table:<WANNAT_OBJ_UE_ID> rule_count:2
+Thu Apr 25 10:19:58 2024, INFO, maat.rule(8974), table:<WANNAT_OBJ_IP_ADDR> rule_count:4
+Thu Apr 25 10:19:58 2024, INFO, maat.rule(8974), table:<WANNAT_COMPILE> rule_count:2
+Thu Apr 25 10:19:58 2024, INFO, maat.rule(8974), Full config version 1 load 10 entries complete
+Thu Apr 25 10:20:00 2024, INFO, maat.rule(8980), rule_monitor_loop thread still alive.........
+Thu Apr 25 10:20:06 2024, INFO, maat.plugin(8974), table[WANNAT_DYN_UE_ID_IP] commit 2 plugin rules, version:0
+Thu Apr 25 10:20:39 2024, INFO, maat.table(9194), successfully register physical table[WANNAT_DYN_UE_ID_IP]->table_id:0
+Thu Apr 25 10:20:39 2024, INFO, maat.table(9194), successfully register physical table[WANNAT_OBJ_UE_ID]->table_id:1
+Thu Apr 25 10:20:39 2024, INFO, maat.table(9194), successfully register physical table[WANNAT_OBJ_IP_ADDR]->table_id:2
+Thu Apr 25 10:20:39 2024, INFO, maat.table(9194), successfully register physical table[WANNAT_COMPILE]->table_id:3
+Thu Apr 25 10:20:39 2024, INFO, maat.table(9194), default compile table id: -1
+Thu Apr 25 10:20:39 2024, INFO, maat.table(9194), group2group table id: -1
+Thu Apr 25 10:20:39 2024, INFO, maat.config_monitor(9194), Maat initial with JSON file /root/Git/demo/demo4/maat_json_cb.json, formating...
+Thu Apr 25 10:20:39 2024, INFO, maat.config_monitor(9194), JSON file /root/Git/demo/demo4/maat_json_cb.json md5: 99c4c248f18e587bd8de8312bd51826c, generate index file /root/Git/demo/demo4/maat_json_cb.json_iris_tmp/index OK
+Thu Apr 25 10:20:39 2024, INFO, maat.config_monitor(9194), load /root/Git/demo/demo4/maat_json_cb.json_iris_tmp/index/full_config_index.0000000001
+Thu Apr 25 10:20:39 2024, INFO, maat.rule(9194), table:<WANNAT_DYN_UE_ID_IP> rule_count:2
+Thu Apr 25 10:20:39 2024, INFO, maat.rule(9194), table:<WANNAT_OBJ_UE_ID> rule_count:2
+Thu Apr 25 10:20:39 2024, INFO, maat.rule(9194), table:<WANNAT_OBJ_IP_ADDR> rule_count:4
+Thu Apr 25 10:20:39 2024, INFO, maat.rule(9194), table:<WANNAT_COMPILE> rule_count:2
+Thu Apr 25 10:20:39 2024, INFO, maat.rule(9194), Full config version 1 load 10 entries complete
+Thu Apr 25 10:20:43 2024, INFO, maat.plugin(9194), table[WANNAT_DYN_UE_ID_IP] commit 2 plugin rules, version:0
+Thu Apr 25 10:20:46 2024, INFO, maat.plugin(9194), table[WANNAT_COMPILE] commit 2 plugin rules, version:0
+Thu Apr 25 10:21:28 2024, INFO, maat.table(9437), successfully register physical table[WANNAT_DYN_UE_ID_IP]->table_id:0
+Thu Apr 25 10:21:28 2024, INFO, maat.table(9437), successfully register physical table[WANNAT_OBJ_UE_ID]->table_id:1
+Thu Apr 25 10:21:28 2024, INFO, maat.table(9437), successfully register physical table[WANNAT_OBJ_IP_ADDR]->table_id:2
+Thu Apr 25 10:21:28 2024, INFO, maat.table(9437), successfully register physical table[WANNAT_COMPILE]->table_id:3
+Thu Apr 25 10:21:28 2024, INFO, maat.table(9437), default compile table id: -1
+Thu Apr 25 10:21:28 2024, INFO, maat.table(9437), group2group table id: -1
+Thu Apr 25 10:21:28 2024, INFO, maat.config_monitor(9437), Maat initial with JSON file /root/Git/demo/demo4/maat_json_cb.json, formating...
+Thu Apr 25 10:21:28 2024, INFO, maat.config_monitor(9437), JSON file /root/Git/demo/demo4/maat_json_cb.json md5: 99c4c248f18e587bd8de8312bd51826c, generate index file /root/Git/demo/demo4/maat_json_cb.json_iris_tmp/index OK
+Thu Apr 25 10:21:28 2024, INFO, maat.config_monitor(9437), load /root/Git/demo/demo4/maat_json_cb.json_iris_tmp/index/full_config_index.0000000001
+Thu Apr 25 10:21:28 2024, INFO, maat.rule(9437), table:<WANNAT_DYN_UE_ID_IP> rule_count:2
+Thu Apr 25 10:21:28 2024, INFO, maat.rule(9437), table:<WANNAT_OBJ_UE_ID> rule_count:2
+Thu Apr 25 10:21:28 2024, INFO, maat.rule(9437), table:<WANNAT_OBJ_IP_ADDR> rule_count:4
+Thu Apr 25 10:21:28 2024, INFO, maat.rule(9437), table:<WANNAT_COMPILE> rule_count:2
+Thu Apr 25 10:21:28 2024, INFO, maat.rule(9437), Full config version 1 load 10 entries complete
+Thu Apr 25 10:21:31 2024, INFO, maat.plugin(9437), table[WANNAT_DYN_UE_ID_IP] commit 2 plugin rules, version:0
+Thu Apr 25 10:21:33 2024, INFO, maat.plugin(9437), table[WANNAT_COMPILE] commit 2 plugin rules, version:0
+Thu Apr 25 11:21:22 2024, INFO, maat.table(10132), successfully register physical table[WANNAT_DYN_UE_ID_IP]->table_id:0
+Thu Apr 25 11:21:22 2024, INFO, maat.table(10132), successfully register physical table[WANNAT_OBJ_UE_ID]->table_id:1
+Thu Apr 25 11:21:22 2024, INFO, maat.table(10132), successfully register physical table[WANNAT_OBJ_IP_ADDR]->table_id:2
+Thu Apr 25 11:21:22 2024, INFO, maat.table(10132), successfully register physical table[WANNAT_COMPILE]->table_id:3
+Thu Apr 25 11:21:22 2024, INFO, maat.table(10132), default compile table id: -1
+Thu Apr 25 11:21:22 2024, INFO, maat.table(10132), group2group table id: -1
+Thu Apr 25 11:21:22 2024, INFO, maat.config_monitor(10132), Maat initial with JSON file /root/Git/demo/demo4/maat_json_cb.json, formating...
+Thu Apr 25 11:21:22 2024, INFO, maat.config_monitor(10132), JSON file /root/Git/demo/demo4/maat_json_cb.json md5: 99c4c248f18e587bd8de8312bd51826c, generate index file /root/Git/demo/demo4/maat_json_cb.json_iris_tmp/index OK
+Thu Apr 25 11:21:22 2024, INFO, maat.config_monitor(10132), load /root/Git/demo/demo4/maat_json_cb.json_iris_tmp/index/full_config_index.0000000001
+Thu Apr 25 11:21:22 2024, INFO, maat.rule(10132), table:<WANNAT_DYN_UE_ID_IP> rule_count:2
+Thu Apr 25 11:21:22 2024, INFO, maat.rule(10132), table:<WANNAT_OBJ_UE_ID> rule_count:2
+Thu Apr 25 11:21:22 2024, INFO, maat.rule(10132), table:<WANNAT_OBJ_IP_ADDR> rule_count:4
+Thu Apr 25 11:21:22 2024, INFO, maat.rule(10132), table:<WANNAT_COMPILE> rule_count:2
+Thu Apr 25 11:21:22 2024, INFO, maat.rule(10132), Full config version 1 load 10 entries complete
+Thu Apr 25 11:21:27 2024, INFO, maat.plugin(10132), table[WANNAT_DYN_UE_ID_IP] commit 2 plugin rules, version:0
+Thu Apr 25 11:21:34 2024, INFO, maat.plugin(10132), table[WANNAT_COMPILE] commit 2 plugin rules, version:0
+Thu Apr 25 11:23:58 2024, INFO, maat.table(10290), successfully register physical table[WANNAT_DYN_UE_ID_IP]->table_id:0
+Thu Apr 25 11:23:58 2024, INFO, maat.table(10290), successfully register physical table[WANNAT_OBJ_UE_ID]->table_id:1
+Thu Apr 25 11:23:58 2024, INFO, maat.table(10290), successfully register physical table[WANNAT_OBJ_IP_ADDR]->table_id:2
+Thu Apr 25 11:23:58 2024, INFO, maat.table(10290), successfully register physical table[WANNAT_COMPILE]->table_id:3
+Thu Apr 25 11:23:58 2024, INFO, maat.table(10290), default compile table id: -1
+Thu Apr 25 11:23:58 2024, INFO, maat.table(10290), group2group table id: -1
+Thu Apr 25 11:23:58 2024, INFO, maat.config_monitor(10290), Maat initial with JSON file /root/Git/demo/demo4/maat_json_cb.json, formating...
+Thu Apr 25 11:23:58 2024, INFO, maat.config_monitor(10290), JSON file /root/Git/demo/demo4/maat_json_cb.json md5: 99c4c248f18e587bd8de8312bd51826c, generate index file /root/Git/demo/demo4/maat_json_cb.json_iris_tmp/index OK
+Thu Apr 25 11:23:58 2024, INFO, maat.config_monitor(10290), load /root/Git/demo/demo4/maat_json_cb.json_iris_tmp/index/full_config_index.0000000001
+Thu Apr 25 11:23:58 2024, INFO, maat.rule(10290), table:<WANNAT_DYN_UE_ID_IP> rule_count:2
+Thu Apr 25 11:23:58 2024, INFO, maat.rule(10290), table:<WANNAT_OBJ_UE_ID> rule_count:2
+Thu Apr 25 11:23:58 2024, INFO, maat.rule(10290), table:<WANNAT_OBJ_IP_ADDR> rule_count:4
+Thu Apr 25 11:23:58 2024, INFO, maat.rule(10290), table:<WANNAT_COMPILE> rule_count:2
+Thu Apr 25 11:23:58 2024, INFO, maat.rule(10290), Full config version 1 load 10 entries complete
+Thu Apr 25 11:24:05 2024, INFO, maat.plugin(10290), table[WANNAT_DYN_UE_ID_IP] commit 2 plugin rules, version:0
+Thu Apr 25 11:28:37 2024, INFO, maat.table(11407), successfully register physical table[WANNAT_DYN_UE_ID_IP]->table_id:0
+Thu Apr 25 11:28:37 2024, INFO, maat.table(11407), successfully register physical table[WANNAT_OBJ_UE_ID]->table_id:1
+Thu Apr 25 11:28:37 2024, INFO, maat.table(11407), successfully register physical table[WANNAT_OBJ_IP_ADDR]->table_id:2
+Thu Apr 25 11:28:37 2024, INFO, maat.table(11407), successfully register physical table[WANNAT_COMPILE]->table_id:3
+Thu Apr 25 11:28:37 2024, INFO, maat.table(11407), default compile table id: -1
+Thu Apr 25 11:28:37 2024, INFO, maat.table(11407), group2group table id: -1
+Thu Apr 25 11:28:37 2024, INFO, maat.config_monitor(11407), Maat initial with JSON file /root/Git/demo/demo4/maat_json_cb.json, formating...
+Thu Apr 25 11:28:37 2024, INFO, maat.config_monitor(11407), JSON file /root/Git/demo/demo4/maat_json_cb.json md5: 58dbe07962c97a9617a4e4b4246f68b3, generate index file /root/Git/demo/demo4/maat_json_cb.json_iris_tmp/index OK
+Thu Apr 25 11:28:37 2024, INFO, maat.config_monitor(11407), load /root/Git/demo/demo4/maat_json_cb.json_iris_tmp/index/full_config_index.0000000001
+Thu Apr 25 11:28:37 2024, INFO, maat.rule(11407), table:<WANNAT_DYN_UE_ID_IP> rule_count:2
+Thu Apr 25 11:28:37 2024, INFO, maat.rule(11407), table:<WANNAT_OBJ_UE_ID> rule_count:2
+Thu Apr 25 11:28:37 2024, INFO, maat.rule(11407), table:<WANNAT_OBJ_IP_ADDR> rule_count:4
+Thu Apr 25 11:28:37 2024, INFO, maat.rule(11407), table:<WANNAT_COMPILE> rule_count:2
+Thu Apr 25 11:28:37 2024, INFO, maat.rule(11407), Full config version 1 load 10 entries complete
+Thu Apr 25 11:28:40 2024, INFO, maat.plugin(11407), table[WANNAT_DYN_UE_ID_IP] commit 2 plugin rules, version:0
+Thu Apr 25 11:28:40 2024, INFO, maat.rule(11413), rule_monitor_loop thread still alive.........
+Thu Apr 25 11:29:15 2024, INFO, maat.plugin(11407), table[WANNAT_COMPILE] commit 2 plugin rules, version:0
+Thu Apr 25 11:49:40 2024, INFO, maat.table(11745), successfully register physical table[WANNAT_DYN_UE_ID_IP]->table_id:0
+Thu Apr 25 11:49:40 2024, INFO, maat.table(11745), successfully register physical table[WANNAT_OBJ_UE_ID]->table_id:1
+Thu Apr 25 11:49:40 2024, INFO, maat.table(11745), successfully register physical table[WANNAT_OBJ_IP_ADDR]->table_id:2
+Thu Apr 25 11:49:40 2024, INFO, maat.table(11745), successfully register physical table[WANNAT_COMPILE]->table_id:3
+Thu Apr 25 11:49:40 2024, INFO, maat.table(11745), default compile table id: -1
+Thu Apr 25 11:49:40 2024, INFO, maat.table(11745), group2group table id: -1
+Thu Apr 25 11:49:40 2024, INFO, maat.config_monitor(11745), Maat initial with JSON file /root/Git/demo/demo4/maat_json_cb.json, formating...
+Thu Apr 25 11:49:40 2024, INFO, maat.config_monitor(11745), JSON file /root/Git/demo/demo4/maat_json_cb.json md5: 79515826b6e691f52394f32c90bd2690, generate index file /root/Git/demo/demo4/maat_json_cb.json_iris_tmp/index OK
+Thu Apr 25 11:49:40 2024, INFO, maat.config_monitor(11745), load /root/Git/demo/demo4/maat_json_cb.json_iris_tmp/index/full_config_index.0000000001
+Thu Apr 25 11:49:40 2024, INFO, maat.rule(11745), table:<WANNAT_DYN_UE_ID_IP> rule_count:2
+Thu Apr 25 11:49:40 2024, INFO, maat.rule(11745), table:<WANNAT_OBJ_UE_ID> rule_count:2
+Thu Apr 25 11:49:40 2024, INFO, maat.rule(11745), table:<WANNAT_OBJ_IP_ADDR> rule_count:4
+Thu Apr 25 11:49:40 2024, INFO, maat.rule(11745), table:<WANNAT_COMPILE> rule_count:2
+Thu Apr 25 11:49:40 2024, INFO, maat.rule(11745), Full config version 1 load 10 entries complete
+Thu Apr 25 11:49:42 2024, INFO, maat.plugin(11745), table[WANNAT_DYN_UE_ID_IP] commit 2 plugin rules, version:0
+Thu Apr 25 11:49:42 2024, INFO, maat.plugin(11745), table[WANNAT_COMPILE] commit 2 plugin rules, version:0