diff options
| author | fengweihao <[email protected]> | 2023-10-30 15:19:02 +0800 |
|---|---|---|
| committer | fengweihao <[email protected]> | 2023-10-30 15:19:02 +0800 |
| commit | 0f97e1209c6dc5dca38551dee9c6b1950539be6b (patch) | |
| tree | 4702121319f2574b2a907c2bd2c0492b9037a719 | |
| parent | 7a0bc4708784af6d4d362a790cad2881fbee15d1 (diff) | |
TSG-16618 策略验证适配Maat4关于compile表特性变更v3.0.22-20231030
| -rw-r--r-- | platform/src/verify_matcher.cpp | 89 | ||||
| -rw-r--r-- | resource/table_info.conf | 382 | ||||
| -rw-r--r-- | resource/table_info_simple.conf | 374 |
3 files changed, 537 insertions, 308 deletions
diff --git a/platform/src/verify_matcher.cpp b/platform/src/verify_matcher.cpp index a0417cb..1a25fd2 100644 --- a/platform/src/verify_matcher.cpp +++ b/platform/src/verify_matcher.cpp @@ -149,7 +149,6 @@ struct policy_scan_ctx int bool_id_array_idx; unsigned long long bool_id_array[256]; - int isExclusion; struct ip_data_ctx ip_ctx; int thread_id; }; @@ -164,6 +163,7 @@ struct verify_policy_rt int load_fqdn_cat; int hit_path_size; int compile_table_id[__SCAN_POLICY_MAX]; + int plugin_table_id[__SCAN_POLICY_MAX]; int profile_table_id [POLICY_PROFILE_TABLE_MAX]; int scan_table_id[__TSG_OBJ_MAX]; }; @@ -808,7 +808,7 @@ static enum policy_action decide_ctrl_action(int vsys_id, int compile_table_id, for (i = 0; i < n_hit && i<MAX_SCAN_RESULT; i++) { rule_ctx =(struct rule_data_ctx *)maat_plugin_table_get_ex_data(g_policy_rt->feather[vsys_id], - g_policy_rt->compile_table_id[compile_table_id], + g_policy_rt->plugin_table_id[compile_table_id], (const char *)&results[i], sizeof(long long)); if(!rule_ctx) { @@ -1167,21 +1167,10 @@ int http_hit_policy_list(struct verify_policy_query *verify_policy, int num, siz for (rules = 0; rules < ctx->n_enforce; rules++) { - if (ctx->enforce_rules[rules].action == PG_ACTION_INTERCEPT) + if (ctx->enforce_rules[rules].config_id == ctx->hit_rules[i].config_id) { - if (ctx->isExclusion != 1) - { - cJSON_AddBoolToObject(policy_obj, "isExecutePolicy", true); - succeeded = true; - } - } - else - { - if (ctx->enforce_rules[rules].config_id == ctx->hit_rules[i].config_id) - { - cJSON_AddBoolToObject(policy_obj, "isExecutePolicy", true); - succeeded = true; - } + cJSON_AddBoolToObject(policy_obj, "isExecutePolicy", true); + succeeded = true; } } if (succeeded == false) @@ -1956,6 +1945,33 @@ static void common_table_name_int(const char *table_name[__TSG_OBJ_MAX]) return; } +int maat_plugin_table_int(int vsys_id, int compile_type_id) +{ + int table_id=0; + const char *table_name=NULL; + + const char *conjunction_table_name_map[] = {"TSG_SECURITY_COMPILE_CONJUNCTION", "PXY_CTRL_COMPILE_CONJUNCTION", "TRAFFIC_SHAPING_COMPILE_CONJUNCTION", + "SERVICE_CHAINING_COMPILE_CONJUNCTION", "PXY_INTERCEPT_COMPILE_CONJUNCTION","STATISTICS_COMPILE_CONJUNCTION"}; + + table_name = conjunction_table_name_map[compile_type_id]; + table_id=g_policy_rt->compile_table_id[compile_type_id]=maat_get_table_id(g_policy_rt->feather[vsys_id], table_name); + if(table_id < 0) + { + return table_id; + } + + const char *plugin_table_name_map[] = {"TSG_SECURITY_COMPILE_PLUGIN", "PXY_CTRL_COMPILE_PLUGIN", "TRAFFIC_SHAPING_COMPILE_PLUGIN", + "SERVICE_CHAINING_COMPILE_PLUGIN", "PXY_INTERCEPT_COMPILE_PLUGIN", "STATISTICS_COMPILE_PLUGIN"}; + + table_name = plugin_table_name_map[compile_type_id]; + table_id = g_policy_rt->plugin_table_id[compile_type_id]=maat_get_table_id(g_policy_rt->feather[vsys_id], table_name); + if(table_id >=0 ) + { + maat_plugin_table_ex_schema_register(g_policy_rt->feather[vsys_id], table_name, compile_table_new_cb, compile_free_data, compile_dup_data, 0,NULL); + } + return table_id; +} + int maat_table_init(struct verify_policy * verify, const char* profile_path) { int ret = -1; int vsys_id=0; @@ -2000,41 +2016,14 @@ int maat_table_init(struct verify_policy * verify, const char* profile_path) mesa_runtime_log(RLOG_LV_DEBUG, "Register maat %p, table name %s, table id %d", g_policy_rt->feather[vsys_id], table_name[i], g_policy_rt->scan_table_id[i]); } - g_policy_rt->compile_table_id[TSG_TABLE_SECURITY]=maat_get_table_id(g_policy_rt->feather[vsys_id], "TSG_SECURITY_COMPILE"); - if(g_policy_rt->compile_table_id[TSG_TABLE_SECURITY] >= 0) + for(int compile_type_id = 0; compile_type_id < PXY_TABLE_DEFENCE; compile_type_id++) { - maat_plugin_table_ex_schema_register(g_policy_rt->feather[vsys_id], "TSG_SECURITY_COMPILE", compile_table_new_cb, compile_free_data, compile_dup_data, 0,NULL); - } - - g_policy_rt->compile_table_id[PXY_TABLE_MANIPULATION]=maat_get_table_id(g_policy_rt->feather[vsys_id], "PXY_CTRL_COMPILE"); - if(g_policy_rt->compile_table_id[PXY_TABLE_MANIPULATION] >= 0) - { - maat_plugin_table_ex_schema_register(g_policy_rt->feather[vsys_id], "PXY_CTRL_COMPILE", compile_table_new_cb, compile_free_data, compile_dup_data, 0,NULL); - } - - g_policy_rt->compile_table_id[TSG_TRAFFIC_SHAPING]=maat_get_table_id(g_policy_rt->feather[vsys_id], "TRAFFIC_SHAPING_COMPILE"); - if(g_policy_rt->compile_table_id[TSG_TRAFFIC_SHAPING] >= 0) - { - maat_plugin_table_ex_schema_register(g_policy_rt->feather[vsys_id], "TRAFFIC_SHAPING_COMPILE", compile_table_new_cb, compile_free_data, compile_dup_data, 0,NULL); - } - - g_policy_rt->compile_table_id[TSG_SERVICE_CHAINGNG]=maat_get_table_id(g_policy_rt->feather[vsys_id], "SERVICE_CHAINING_COMPILE"); - if(g_policy_rt->compile_table_id[TSG_SERVICE_CHAINGNG] >= 0) - { - maat_plugin_table_ex_schema_register(g_policy_rt->feather[vsys_id], "SERVICE_CHAINING_COMPILE", compile_table_new_cb, compile_free_data, compile_dup_data, 0,NULL); - } - - g_policy_rt->compile_table_id[PXY_TABLE_INTERCEPT]=maat_get_table_id(g_policy_rt->feather[vsys_id], "PXY_INTERCEPT_COMPILE"); - if(g_policy_rt->compile_table_id[PXY_TABLE_INTERCEPT] >= 0) - { - maat_plugin_table_ex_schema_register(g_policy_rt->feather[vsys_id], "PXY_INTERCEPT_COMPILE", compile_table_new_cb, compile_free_data, compile_dup_data, 0,NULL); - } - - g_policy_rt->compile_table_id[TSG_STATISTICS]=maat_get_table_id(g_policy_rt->feather[vsys_id], "STATISTICS_COMPILE"); - if(g_policy_rt->compile_table_id[TSG_STATISTICS] >= 0) - { - maat_plugin_table_ex_schema_register(g_policy_rt->feather[vsys_id], "STATISTICS_COMPILE", compile_table_new_cb, compile_free_data, compile_dup_data, 0,NULL); - } + ret = maat_plugin_table_int(vsys_id, compile_type_id); + if(ret<0) + { + goto error_out; + } + } for(int i = POLICY_ASN_USER_DEFINED; i < POLICY_FQDN_CAT_USER_DEFINED && g_policy_rt->load_ip_location; i++) { diff --git a/resource/table_info.conf b/resource/table_info.conf index 0088049..c94ab12 100644 --- a/resource/table_info.conf +++ b/resource/table_info.conf @@ -3,25 +3,45 @@ "table_id":0, "table_name":"TSG_SECURITY_COMPILE", "table_type":"compile", - "user_region_encoded":"escape", + "user_region_encoded":"escape", "valid_column":8, "custom": { "compile_id":1, - "service_id":2, - "action":3, - "do_blacklist":4, - "do_log":5, "tags":6, - "user_region":7, - "clause_num":9, - "evaluation_order":10 + "clause_num":9 } }, { "table_id":1, + "table_name":"TSG_SECURITY_COMPILE_CONJUNCTION", + "db_tables":["TSG_SECURITY_COMPILE"], + "default_compile_table":1, + "table_type":"compile", + "user_region_encoded":"escape", + "valid_column":8, + "custom": { + "compile_id":1, + "tags":6, + "clause_num":9 + } + }, + { + "table_id":2, + "table_name":"TSG_SECURITY_COMPILE_PLUGIN", + "db_tables":["TSG_SECURITY_COMPILE"], + "table_type":"plugin", + "valid_column":8, + "custom": { + "key":1, + "key_type":"integer", + "key_len":8 + } + }, + { + "table_id":3, "table_name":"GROUP_SECURITY_COMPILE_RELATION", "table_type":"group2compile", - "associated_compile_table_id":0, + "associated_compile_table_id":1, "valid_column":3, "custom": { "group_id":1, @@ -31,29 +51,49 @@ "clause_index":6 } }, - { - "table_id":2, + { + "table_id":4, "table_name":"PXY_CTRL_COMPILE", "table_type":"compile", "user_region_encoded":"escape", "valid_column":8, "custom": { "compile_id":1, - "service_id":2, - "action":3, - "do_blacklist":4, - "do_log":5, "tags":6, - "user_region":7, - "clause_num":9, - "evaluation_order":10 + "clause_num":9 + } + }, + { + "table_id":5, + "table_name":"PXY_CTRL_COMPILE_CONJUNCTION", + "db_tables":["PXY_CTRL_COMPILE"], + "default_compile_table":1, + "table_type":"compile", + "user_region_encoded":"escape", + "valid_column":8, + "custom": { + "compile_id":1, + "tags":6, + "clause_num":9 + } + }, + { + "table_id":6, + "table_name":"PXY_CTRL_COMPILE_PLUGIN", + "db_tables":["PXY_CTRL_COMPILE"], + "table_type":"plugin", + "valid_column":8, + "custom": { + "key":1, + "key_type":"integer", + "key_len": 8 } }, { - "table_id":3, + "table_id":7, "table_name":"GROUP_PXY_CTRL_COMPILE_RELATION", "table_type":"group2compile", - "associated_compile_table_id":2, + "associated_compile_table_id":5, "valid_column":3, "custom": { "group_id":1, @@ -64,28 +104,48 @@ } }, { - "table_id":4, + "table_id":8, "table_name":"TRAFFIC_SHAPING_COMPILE", "table_type":"compile", "user_region_encoded":"escape", "valid_column":8, "custom": { "compile_id":1, - "service_id":2, - "action":3, - "do_blacklist":4, - "do_log":5, "tags":6, - "user_region":7, - "clause_num":9, - "evaluation_order":10 + "clause_num":9 + } + }, + { + "table_id":9, + "table_name":"TRAFFIC_SHAPING_COMPILE_CONJUNCTION", + "db_tables":["TRAFFIC_SHAPING_COMPILE"], + "default_compile_table":1, + "table_type":"compile", + "user_region_encoded":"escape", + "valid_column":8, + "custom": { + "compile_id":1, + "tags":6, + "clause_num":9 + } + }, + { + "table_id":10, + "table_name":"TRAFFIC_SHAPING_COMPILE_PLUGIN", + "db_tables":["TRAFFIC_SHAPING_COMPILE"], + "table_type":"plugin", + "valid_column":8, + "custom": { + "key":1, + "key_type":"integer", + "key_len": 8 } }, { - "table_id":5, + "table_id":11, "table_name":"GROUP_SHAPING_COMPILE_RELATION", "table_type":"group2compile", - "associated_compile_table_id":4, + "associated_compile_table_id":9, "valid_column":3, "custom": { "group_id":1, @@ -96,28 +156,48 @@ } }, { - "table_id":6, + "table_id":12, "table_name":"SERVICE_CHAINING_COMPILE", "table_type":"compile", - "user_region_encoded":"escape", + "user_region_encoded":"escape", "valid_column":8, "custom": { "compile_id":1, - "service_id":2, - "action":3, - "do_blacklist":4, - "do_log":5, "tags":6, - "user_region":7, - "clause_num":9, - "evaluation_order":10 + "clause_num":9 } }, { - "table_id":7, + "table_id":13, + "table_name":"SERVICE_CHAINING_COMPILE_CONJUNCTION", + "db_tables":["SERVICE_CHAINING_COMPILE"], + "default_compile_table":1, + "table_type":"compile", + "user_region_encoded":"escape", + "valid_column":8, + "custom": { + "compile_id":1, + "tags":6, + "clause_num":9 + } + }, + { + "table_id":14, + "table_name":"SERVICE_CHAINING_COMPILE_PLUGIN", + "db_tables":["SERVICE_CHAINING_COMPILE"], + "table_type":"plugin", + "valid_column":8, + "custom": { + "key":1, + "key_type":"integer", + "key_len": 8 + } + }, + { + "table_id":15, "table_name":"GROUP_SERVICE_CHAINING_COMPILE_RELATION", "table_type":"group2compile", - "associated_compile_table_id":6, + "associated_compile_table_id":13, "valid_column":3, "custom": { "group_id":1, @@ -128,28 +208,48 @@ } }, { - "table_id":8, + "table_id":16, "table_name":"PXY_INTERCEPT_COMPILE", "table_type":"compile", "user_region_encoded":"escape", "valid_column":8, "custom": { "compile_id":1, - "service_id":2, - "action":3, - "do_blacklist":4, - "do_log":5, "tags":6, - "user_region":7, - "clause_num":9, - "evaluation_order":10 + "clause_num":9 + } + }, + { + "table_id":17, + "table_name":"PXY_INTERCEPT_COMPILE_CONJUNCTION", + "db_tables":["PXY_INTERCEPT_COMPILE"], + "default_compile_table":1, + "table_type":"compile", + "user_region_encoded":"escape", + "valid_column":8, + "custom": { + "compile_id":1, + "tags":6, + "clause_num":9 + } + }, + { + "table_id":18, + "table_name":"PXY_INTERCEPT_COMPILE_PLUGIN", + "db_tables":["PXY_INTERCEPT_COMPILE"], + "table_type":"plugin", + "valid_column":8, + "custom": { + "key":1, + "key_type":"integer", + "key_len":8 } }, { - "table_id":9, + "table_id":19, "table_name":"GROUP_PXY_INTERCEPT_COMPILE_RELATION", "table_type":"group2compile", - "associated_compile_table_id":8, + "associated_compile_table_id":17, "valid_column":3, "custom": { "group_id":1, @@ -160,28 +260,48 @@ } }, { - "table_id":10, + "table_id":20, "table_name":"STATISTICS_COMPILE", "table_type":"compile", "user_region_encoded":"escape", "valid_column":8, "custom": { "compile_id":1, - "service_id":2, - "action":3, - "do_blacklist":4, - "do_log":5, "tags":6, - "user_region":7, - "clause_num":9, - "evaluation_order":10 + "clause_num":9 + } + }, + { + "table_id":21, + "table_name":"STATISTICS_COMPILE_CONJUNCTION", + "db_tables":["STATISTICS_COMPILE"], + "default_compile_table":1, + "table_type":"compile", + "user_region_encoded":"escape", + "valid_column":8, + "custom": { + "compile_id":1, + "tags":6, + "clause_num":9 + } + }, + { + "table_id":22, + "table_name":"STATISTICS_COMPILE_PLUGIN", + "db_tables":["STATISTICS_COMPILE"], + "table_type":"plugin", + "valid_column":8, + "custom": { + "key":1, + "key_type":"integer", + "key_len": 8 } }, { - "table_id":11, + "table_id":23, "table_name":"GROUP_STATISTICS_COMPILE_RELATION", "table_type":"group2compile", - "associated_compile_table_id":10, + "associated_compile_table_id":21, "valid_column":3, "custom": { "group_id":1, @@ -192,7 +312,7 @@ } }, { - "table_id":12, + "table_id":24, "table_name":"GROUP_GROUP_RELATION", "table_type":"group2group", "valid_column":4, @@ -203,8 +323,8 @@ } }, { - "table_id":13, - "table_name":"TSG_OBJ_IP", + "table_id":25, + "table_name":"TSG_OBJ_IP", "db_tables":["TSG_OBJ_IP_ADDR","TSG_OBJ_IP_LEARNING_ADDR"], "table_type":"ip_plus", "valid_column":11, @@ -222,7 +342,7 @@ } }, { - "table_id":14, + "table_id":26, "table_name":"TSG_OBJ_SUBSCRIBER_ID", "table_type":"expr", "valid_column":7, @@ -236,7 +356,7 @@ } }, { - "table_id":15, + "table_id":27, "table_name":"TSG_OBJ_ACCOUNT", "table_type":"expr", "valid_column":7, @@ -250,7 +370,7 @@ } }, { - "table_id":16, + "table_id":28, "table_name":"TSG_OBJ_URL", "table_type":"expr", "valid_column":7, @@ -264,7 +384,7 @@ } }, { - "table_id":17, + "table_id":29, "table_name":"TSG_OBJ_FQDN", "table_type":"expr", "valid_column":7, @@ -278,7 +398,7 @@ } }, { - "table_id":18, + "table_id":30, "table_name":"TSG_OBJ_FQDN_CAT", "table_type":"intval", "valid_column":5, @@ -290,7 +410,7 @@ } }, { - "table_id":19, + "table_id":31, "table_name":"TSG_OBJ_KEYWORDS", "table_type":"expr", "valid_column":7, @@ -304,7 +424,7 @@ } }, { - "table_id":20, + "table_id":32, "table_name":"TSG_OBJ_APP_ID", "table_type":"intval", "valid_column":5, @@ -316,7 +436,7 @@ } }, { - "table_id":21, + "table_id":33, "table_name":"TSG_OBJ_HTTP_SIGNATURE", "table_type":"expr_plus", "valid_column":8, @@ -331,175 +451,175 @@ } }, { - "table_id":22, + "table_id":34, "table_name":"TSG_FIELD_HTTP_HOST", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":23, + "table_id":35, "table_name":"TSG_FIELD_HTTP_HOST_CAT", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN_CAT" }, { - "table_id":24, + "table_id":36, "table_name":"TSG_FIELD_HTTP_URL", "table_type":"virtual", "physical_table": "TSG_OBJ_URL" }, { - "table_id":25, + "table_id":37, "table_name":"TSG_FIELD_HTTP_REQ_HDR", "table_type":"virtual", "physical_table": "TSG_OBJ_HTTP_SIGNATURE" }, { - "table_id":26, + "table_id":38, "table_name":"TSG_FIELD_HTTP_RES_HDR", "table_type":"virtual", "physical_table": "TSG_OBJ_HTTP_SIGNATURE" }, { - "table_id":27, + "table_id":39, "table_name":"TSG_FIELD_HTTP_REQ_BODY", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id":28, + "table_id":40, "table_name":"TSG_FIELD_HTTP_RES_BODY", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id":29, + "table_id":41, "table_name":"TSG_FIELD_SSL_SNI", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":30, + "table_id":42, "table_name":"TSG_FIELD_SSL_SNI_CAT", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN_CAT" }, { - "table_id":31, + "table_id":43, "table_name":"TSG_FIELD_SSL_CN", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":32, + "table_id":44, "table_name":"TSG_FIELD_SSL_CN_CAT", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN_CAT" }, { - "table_id":33, + "table_id":45, "table_name":"TSG_FIELD_SSL_SAN", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":34, + "table_id":46, "table_name":"TSG_FIELD_SSL_SAN_CAT", "table_type":"virtual", "physical_table":"TSG_OBJ_FQDN_CAT" }, { - "table_id":35, + "table_id":47, "table_name":"TSG_FIELD_DNS_QNAME", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":36, + "table_id":48, "table_name":"TSG_FIELD_QUIC_SNI", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":37, + "table_id":49, "table_name":"TSG_FIELD_QUIC_SNI_CAT", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN_CAT" }, { - "table_id":38, + "table_id":50, "table_name":"TSG_FIELD_MAIL_ACCOUNT", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, { - "table_id":39, + "table_id":51, "table_name":"TSG_FIELD_MAIL_FROM", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, { - "table_id":40, + "table_id":52, "table_name":"TSG_FIELD_MAIL_TO", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, { - "table_id":41, + "table_id":53, "table_name":"TSG_FIELD_MAIL_SUBJECT", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id":42, + "table_id":54, "table_name":"TSG_FIELD_MAIL_CONTENT", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id":43, + "table_id":55, "table_name":"TSG_FIELD_MAIL_ATT_NAME", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id":44, + "table_id":56, "table_name":"TSG_FIELD_MAIL_ATT_CONTENT", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id":45, + "table_id":57, "table_name":"TSG_FIELD_FTP_URI", "table_type":"virtual", "physical_table": "TSG_OBJ_URL" }, { - "table_id":46, + "table_id":58, "table_name":"TSG_FIELD_FTP_CONTENT", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id":47, + "table_id":59, "table_name":"TSG_FIELD_FTP_ACCOUNT", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, { - "table_id":48, + "table_id":60, "table_name":"TSG_SECURITY_SOURCE_ADDR", "table_type":"virtual", "physical_table": "TSG_OBJ_IP" }, { - "table_id":49, + "table_id":61, "table_name":"TSG_SECURITY_DESTINATION_ADDR", "table_type":"virtual", "physical_table": "TSG_OBJ_IP" }, { - "table_id":50, + "table_id":62, "table_name":"TSG_IP_ASN_BUILT_IN", "table_type":"ip_plugin", "valid_column":19, @@ -512,7 +632,7 @@ } }, { - "table_id":51, + "table_id":63, "table_name":"TSG_IP_ASN_USER_DEFINED", "table_type":"ip_plugin", "valid_column":19, @@ -525,7 +645,7 @@ } }, { - "table_id":52, + "table_id":64, "table_name":"TSG_IP_LOCATION_BUILT_IN", "table_type":"ip_plugin", "valid_column":19, @@ -538,7 +658,7 @@ } }, { - "table_id":53, + "table_id":65, "table_name":"TSG_IP_LOCATION_USER_DEFINED", "table_type":"ip_plugin", "valid_column":19, @@ -551,7 +671,7 @@ } }, { - "table_id":54, + "table_id":66, "table_name":"TSG_OBJ_AS_NUMBER", "table_type":"expr", "valid_column":7, @@ -565,19 +685,19 @@ } }, { - "table_id":55, + "table_id":67, "table_name":"TSG_SECURITY_SOURCE_ASN", "table_type":"virtual", "physical_table": "TSG_OBJ_AS_NUMBER" }, { - "table_id":56, + "table_id":68, "table_name":"TSG_SECURITY_DESTINATION_ASN", "table_type":"virtual", "physical_table": "TSG_OBJ_AS_NUMBER" }, { - "table_id":57, + "table_id":69, "table_name":"TSG_OBJ_GEO_LOCATION", "table_type":"expr", "valid_column":7, @@ -591,19 +711,19 @@ } }, { - "table_id":58, + "table_id":70, "table_name":"TSG_SECURITY_SOURCE_LOCATION", "table_type":"virtual", "physical_table": "TSG_OBJ_GEO_LOCATION" }, { - "table_id":59, + "table_id":71, "table_name":"TSG_SECURITY_DESTINATION_LOCATION", "table_type":"virtual", "physical_table": "TSG_OBJ_GEO_LOCATION" }, { - "table_id":60, + "table_id":72, "table_name":"TSG_FQDN_CATEGORY_BUILT_IN", "table_type":"fqdn_plugin", "valid_column":5, @@ -614,7 +734,7 @@ } }, { - "table_id":61, + "table_id":73, "table_name":"TSG_FQDN_CATEGORY_USER_DEFINED", "table_type":"fqdn_plugin", "valid_column":5, @@ -625,19 +745,19 @@ } }, { - "table_id":62, + "table_id":74, "table_name":"TSG_FIELD_SIP_ORIGINATOR_DESCRIPTION", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, { - "table_id":63, + "table_id":75, "table_name":"TSG_FIELD_SIP_RESPONDER_DESCRIPTION", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, { - "table_id":64, + "table_id":76, "table_name":"TSG_OBJ_IMSI", "table_type":"expr", "valid_column":7, @@ -651,7 +771,7 @@ } }, { - "table_id":65, + "table_id":77, "table_name":"TSG_OBJ_PHONE_NUMBER", "table_type":"expr", "valid_column":7, @@ -665,7 +785,7 @@ } }, { - "table_id":66, + "table_id":78, "table_name":"TSG_OBJ_APN", "table_type":"expr", "valid_column":7, @@ -679,31 +799,31 @@ } }, { - "table_id":67, + "table_id":79, "table_name":"TSG_FILED_GTP_IMSI", "table_type":"virtual", "physical_table": "TSG_OBJ_IMSI" }, { - "table_id":68, + "table_id":80, "table_name":"TSG_FILED_GTP_PHONE_NUMBER", "table_type":"virtual", "physical_table": "TSG_OBJ_PHONE_NUMBER" }, { - "table_id":69, + "table_id":81, "table_name":"TSG_FILED_GTP_APN", "table_type":"virtual", "physical_table": "TSG_OBJ_APN" }, { - "table_id":70, + "table_id":82, "table_name":"TSG_DECYPTION_EXCLUSION_SSL_SNI", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":71, + "table_id":83, "table_name":"TSG_OBJ_TUNNEL_ID", "table_type":"intval", "valid_column":5, @@ -715,7 +835,7 @@ } }, { - "table_id":72, + "table_id":84, "table_name":"TSG_TUNNEL_CATALOG", "table_type":"bool_plugin", "valid_column":5, @@ -725,7 +845,7 @@ } }, { - "table_id":73, + "table_id":85, "table_name":"TSG_TUNNEL_ENDPOINT", "table_type":"ip_plugin", "valid_column":6, @@ -738,7 +858,7 @@ } }, { - "table_id":74, + "table_id":86, "table_name":"TSG_TUNNEL_LABEL", "table_type":"plugin", "valid_column":4, @@ -749,13 +869,13 @@ } }, { - "table_id":75, + "table_id":87, "table_name":"TSG_SECURITY_TUNNEL", "table_type":"virtual", "physical_table": "TSG_OBJ_TUNNEL_ID" }, { - "table_id":76, + "table_id":88, "table_name":"TSG_OBJ_FLAG", "table_type":"flag", "valid_column":5, @@ -767,25 +887,25 @@ } }, { - "table_id":77, + "table_id":89, "table_name":"TSG_SECURITY_FLAG", "table_type":"virtual", "physical_table": "TSG_OBJ_FLAG" }, { - "table_id":78, + "table_id":90, "table_name":"TSG_FIELD_DOH_QNAME", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":79, + "table_id":91, "table_name":"TSG_FIELD_DOH_HOST", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":80, + "table_id":92, "table_name":"TSG_FIELD_DOH_HOST_CAT", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN_CAT" diff --git a/resource/table_info_simple.conf b/resource/table_info_simple.conf index fe96839..8289deb 100644 --- a/resource/table_info_simple.conf +++ b/resource/table_info_simple.conf @@ -3,25 +3,45 @@ "table_id":0, "table_name":"TSG_SECURITY_COMPILE", "table_type":"compile", - "user_region_encoded":"escape", + "user_region_encoded":"escape", "valid_column":8, "custom": { "compile_id":1, - "service_id":2, - "action":3, - "do_blacklist":4, - "do_log":5, "tags":6, - "user_region":7, - "clause_num":9, - "evaluation_order":10 + "clause_num":9 } }, { "table_id":1, + "table_name":"TSG_SECURITY_COMPILE_CONJUNCTION", + "db_tables":["TSG_SECURITY_COMPILE"], + "default_compile_table":1, + "table_type":"compile", + "user_region_encoded":"escape", + "valid_column":8, + "custom": { + "compile_id":1, + "tags":6, + "clause_num":9 + } + }, + { + "table_id":2, + "table_name":"TSG_SECURITY_COMPILE_PLUGIN", + "db_tables":["TSG_SECURITY_COMPILE"], + "table_type":"plugin", + "valid_column":8, + "custom": { + "key":1, + "key_type":"integer", + "key_len":8 + } + }, + { + "table_id":3, "table_name":"GROUP_SECURITY_COMPILE_RELATION", "table_type":"group2compile", - "associated_compile_table_id":0, + "associated_compile_table_id":1, "valid_column":3, "custom": { "group_id":1, @@ -31,29 +51,49 @@ "clause_index":6 } }, - { - "table_id":2, + { + "table_id":4, "table_name":"PXY_CTRL_COMPILE", "table_type":"compile", - "user_region_encoded":"escape", + "user_region_encoded":"escape", "valid_column":8, "custom": { "compile_id":1, - "service_id":2, - "action":3, - "do_blacklist":4, - "do_log":5, "tags":6, - "user_region":7, - "clause_num":9, - "evaluation_order":10 + "clause_num":9 } }, { - "table_id":3, + "table_id":5, + "table_name":"PXY_CTRL_COMPILE_CONJUNCTION", + "db_tables":["PXY_CTRL_COMPILE"], + "default_compile_table":1, + "table_type":"compile", + "user_region_encoded":"escape", + "valid_column":8, + "custom": { + "compile_id":1, + "tags":6, + "clause_num":9 + } + }, + { + "table_id":6, + "table_name":"PXY_CTRL_COMPILE_PLUGIN", + "db_tables":["PXY_CTRL_COMPILE"], + "table_type":"plugin", + "valid_column":8, + "custom": { + "key":1, + "key_type":"integer", + "key_len": 8 + } + }, + { + "table_id":7, "table_name":"GROUP_PXY_CTRL_COMPILE_RELATION", "table_type":"group2compile", - "associated_compile_table_id":2, + "associated_compile_table_id":5, "valid_column":3, "custom": { "group_id":1, @@ -63,29 +103,49 @@ "clause_index":6 } }, - { - "table_id":4, + { + "table_id":8, "table_name":"TRAFFIC_SHAPING_COMPILE", "table_type":"compile", - "user_region_encoded":"escape", + "user_region_encoded":"escape", "valid_column":8, "custom": { "compile_id":1, - "service_id":2, - "action":3, - "do_blacklist":4, - "do_log":5, "tags":6, - "user_region":7, - "clause_num":9, - "evaluation_order":10 + "clause_num":9 + } + }, + { + "table_id":9, + "table_name":"TRAFFIC_SHAPING_COMPILE_CONJUNCTION", + "db_tables":["TRAFFIC_SHAPING_COMPILE"], + "default_compile_table":1, + "table_type":"compile", + "user_region_encoded":"escape", + "valid_column":8, + "custom": { + "compile_id":1, + "tags":6, + "clause_num":9 + } + }, + { + "table_id":10, + "table_name":"TRAFFIC_SHAPING_COMPILE_PLUGIN", + "db_tables":["TRAFFIC_SHAPING_COMPILE"], + "table_type":"plugin", + "valid_column":8, + "custom": { + "key":1, + "key_type":"integer", + "key_len": 8 } }, { - "table_id":5, + "table_id":11, "table_name":"GROUP_SHAPING_COMPILE_RELATION", "table_type":"group2compile", - "associated_compile_table_id":4, + "associated_compile_table_id":9, "valid_column":3, "custom": { "group_id":1, @@ -96,28 +156,48 @@ } }, { - "table_id":6, + "table_id":12, "table_name":"SERVICE_CHAINING_COMPILE", "table_type":"compile", "user_region_encoded":"escape", "valid_column":8, "custom": { "compile_id":1, - "service_id":2, - "action":3, - "do_blacklist":4, - "do_log":5, "tags":6, - "user_region":7, - "clause_num":9, - "evaluation_order":10 + "clause_num":9 + } + }, + { + "table_id":13, + "table_name":"SERVICE_CHAINING_COMPILE_CONJUNCTION", + "db_tables":["SERVICE_CHAINING_COMPILE"], + "default_compile_table":1, + "table_type":"compile", + "user_region_encoded":"escape", + "valid_column":8, + "custom": { + "compile_id":1, + "tags":6, + "clause_num":9 + } + }, + { + "table_id":14, + "table_name":"SERVICE_CHAINING_COMPILE_PLUGIN", + "db_tables":["SERVICE_CHAINING_COMPILE"], + "table_type":"plugin", + "valid_column":8, + "custom": { + "key":1, + "key_type":"integer", + "key_len": 8 } }, { - "table_id":7, + "table_id":15, "table_name":"GROUP_SERVICE_CHAINING_COMPILE_RELATION", "table_type":"group2compile", - "associated_compile_table_id":6, + "associated_compile_table_id":13, "valid_column":3, "custom": { "group_id":1, @@ -128,28 +208,48 @@ } }, { - "table_id":8, + "table_id":16, "table_name":"PXY_INTERCEPT_COMPILE", "table_type":"compile", "user_region_encoded":"escape", "valid_column":8, "custom": { "compile_id":1, - "service_id":2, - "action":3, - "do_blacklist":4, - "do_log":5, "tags":6, - "user_region":7, - "clause_num":9, - "evaluation_order":10 + "clause_num":9 + } + }, + { + "table_id":17, + "table_name":"PXY_INTERCEPT_COMPILE_CONJUNCTION", + "db_tables":["PXY_INTERCEPT_COMPILE"], + "default_compile_table":1, + "table_type":"compile", + "user_region_encoded":"escape", + "valid_column":8, + "custom": { + "compile_id":1, + "tags":6, + "clause_num":9 + } + }, + { + "table_id":18, + "table_name":"PXY_INTERCEPT_COMPILE_PLUGIN", + "db_tables":["PXY_INTERCEPT_COMPILE"], + "table_type":"plugin", + "valid_column":8, + "custom": { + "key":1, + "key_type":"integer", + "key_len":8 } }, { - "table_id":9, + "table_id":19, "table_name":"GROUP_PXY_INTERCEPT_COMPILE_RELATION", "table_type":"group2compile", - "associated_compile_table_id":8, + "associated_compile_table_id":17, "valid_column":3, "custom": { "group_id":1, @@ -160,28 +260,48 @@ } }, { - "table_id":10, + "table_id":20, "table_name":"STATISTICS_COMPILE", "table_type":"compile", "user_region_encoded":"escape", "valid_column":8, "custom": { "compile_id":1, - "service_id":2, - "action":3, - "do_blacklist":4, - "do_log":5, "tags":6, - "user_region":7, - "clause_num":9, - "evaluation_order":10 + "clause_num":9 + } + }, + { + "table_id":21, + "table_name":"STATISTICS_COMPILE_CONJUNCTION", + "db_tables":["STATISTICS_COMPILE"], + "default_compile_table":1, + "table_type":"compile", + "user_region_encoded":"escape", + "valid_column":8, + "custom": { + "compile_id":1, + "tags":6, + "clause_num":9 + } + }, + { + "table_id":22, + "table_name":"STATISTICS_COMPILE_PLUGIN", + "db_tables":["STATISTICS_COMPILE"], + "table_type":"plugin", + "valid_column":8, + "custom": { + "key":1, + "key_type":"integer", + "key_len": 8 } }, { - "table_id":11, + "table_id":23, "table_name":"GROUP_STATISTICS_COMPILE_RELATION", "table_type":"group2compile", - "associated_compile_table_id":10, + "associated_compile_table_id":21, "valid_column":3, "custom": { "group_id":1, @@ -192,7 +312,7 @@ } }, { - "table_id":12, + "table_id":24, "table_name":"GROUP_GROUP_RELATION", "table_type":"group2group", "valid_column":4, @@ -203,8 +323,8 @@ } }, { - "table_id":13, - "table_name":"TSG_OBJ_IP", + "table_id":25, + "table_name":"TSG_OBJ_IP", "db_tables":["TSG_OBJ_IP_ADDR","TSG_OBJ_IP_LEARNING_ADDR"], "table_type":"ip_plus", "valid_column":11, @@ -222,7 +342,7 @@ } }, { - "table_id":14, + "table_id":26, "table_name":"TSG_OBJ_SUBSCRIBER_ID", "table_type":"expr", "valid_column":7, @@ -236,7 +356,7 @@ } }, { - "table_id":15, + "table_id":27, "table_name":"TSG_OBJ_ACCOUNT", "table_type":"expr", "valid_column":7, @@ -250,7 +370,7 @@ } }, { - "table_id":16, + "table_id":28, "table_name":"TSG_OBJ_URL", "table_type":"expr", "valid_column":7, @@ -264,7 +384,7 @@ } }, { - "table_id":17, + "table_id":29, "table_name":"TSG_OBJ_FQDN", "table_type":"expr", "valid_column":7, @@ -278,7 +398,7 @@ } }, { - "table_id":18, + "table_id":30, "table_name":"TSG_OBJ_FQDN_CAT", "table_type":"intval", "valid_column":5, @@ -290,7 +410,7 @@ } }, { - "table_id":19, + "table_id":31, "table_name":"TSG_OBJ_KEYWORDS", "table_type":"expr", "valid_column":7, @@ -304,7 +424,7 @@ } }, { - "table_id":20, + "table_id":32, "table_name":"TSG_OBJ_APP_ID", "table_type":"intval", "valid_column":5, @@ -316,7 +436,7 @@ } }, { - "table_id":21, + "table_id":33, "table_name":"TSG_OBJ_HTTP_SIGNATURE", "table_type":"expr_plus", "valid_column":8, @@ -331,175 +451,175 @@ } }, { - "table_id":22, + "table_id":34, "table_name":"TSG_FIELD_HTTP_HOST", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":23, + "table_id":35, "table_name":"TSG_FIELD_HTTP_HOST_CAT", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN_CAT" }, { - "table_id":24, + "table_id":36, "table_name":"TSG_FIELD_HTTP_URL", "table_type":"virtual", "physical_table": "TSG_OBJ_URL" }, { - "table_id":25, + "table_id":37, "table_name":"TSG_FIELD_HTTP_REQ_HDR", "table_type":"virtual", "physical_table": "TSG_OBJ_HTTP_SIGNATURE" }, { - "table_id":26, + "table_id":38, "table_name":"TSG_FIELD_HTTP_RES_HDR", "table_type":"virtual", "physical_table": "TSG_OBJ_HTTP_SIGNATURE" }, { - "table_id":27, + "table_id":39, "table_name":"TSG_FIELD_HTTP_REQ_BODY", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id":28, + "table_id":40, "table_name":"TSG_FIELD_HTTP_RES_BODY", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id":29, + "table_id":41, "table_name":"TSG_FIELD_SSL_SNI", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":30, + "table_id":42, "table_name":"TSG_FIELD_SSL_SNI_CAT", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN_CAT" }, { - "table_id":31, + "table_id":43, "table_name":"TSG_FIELD_SSL_CN", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":32, + "table_id":44, "table_name":"TSG_FIELD_SSL_CN_CAT", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN_CAT" }, { - "table_id":33, + "table_id":45, "table_name":"TSG_FIELD_SSL_SAN", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":34, + "table_id":46, "table_name":"TSG_FIELD_SSL_SAN_CAT", "table_type":"virtual", "physical_table":"TSG_OBJ_FQDN_CAT" }, { - "table_id":35, + "table_id":47, "table_name":"TSG_FIELD_DNS_QNAME", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":36, + "table_id":48, "table_name":"TSG_FIELD_QUIC_SNI", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":37, + "table_id":49, "table_name":"TSG_FIELD_QUIC_SNI_CAT", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN_CAT" }, { - "table_id":38, + "table_id":50, "table_name":"TSG_FIELD_MAIL_ACCOUNT", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, { - "table_id":39, + "table_id":51, "table_name":"TSG_FIELD_MAIL_FROM", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, { - "table_id":40, + "table_id":52, "table_name":"TSG_FIELD_MAIL_TO", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, { - "table_id":41, + "table_id":53, "table_name":"TSG_FIELD_MAIL_SUBJECT", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id":42, + "table_id":54, "table_name":"TSG_FIELD_MAIL_CONTENT", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id":43, + "table_id":55, "table_name":"TSG_FIELD_MAIL_ATT_NAME", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id":44, + "table_id":56, "table_name":"TSG_FIELD_MAIL_ATT_CONTENT", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id":45, + "table_id":57, "table_name":"TSG_FIELD_FTP_URI", "table_type":"virtual", "physical_table": "TSG_OBJ_URL" }, { - "table_id":46, + "table_id":58, "table_name":"TSG_FIELD_FTP_CONTENT", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id":47, + "table_id":59, "table_name":"TSG_FIELD_FTP_ACCOUNT", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, { - "table_id":48, + "table_id":60, "table_name":"TSG_SECURITY_SOURCE_ADDR", "table_type":"virtual", "physical_table": "TSG_OBJ_IP" }, { - "table_id":49, + "table_id":61, "table_name":"TSG_SECURITY_DESTINATION_ADDR", "table_type":"virtual", "physical_table": "TSG_OBJ_IP" }, { - "table_id":52, + "table_id":62, "table_name":"TSG_OBJ_AS_NUMBER", "table_type":"expr", "valid_column":7, @@ -513,19 +633,19 @@ } }, { - "table_id":53, + "table_id":63, "table_name":"TSG_SECURITY_SOURCE_ASN", "table_type":"virtual", "physical_table": "TSG_OBJ_AS_NUMBER" }, { - "table_id":54, + "table_id":64, "table_name":"TSG_SECURITY_DESTINATION_ASN", "table_type":"virtual", "physical_table": "TSG_OBJ_AS_NUMBER" }, { - "table_id":55, + "table_id":65, "table_name":"TSG_OBJ_GEO_LOCATION", "table_type":"expr", "valid_column":7, @@ -539,31 +659,31 @@ } }, { - "table_id":56, + "table_id":66, "table_name":"TSG_SECURITY_SOURCE_LOCATION", "table_type":"virtual", "physical_table": "TSG_OBJ_GEO_LOCATION" }, { - "table_id":57, + "table_id":67, "table_name":"TSG_SECURITY_DESTINATION_LOCATION", "table_type":"virtual", "physical_table": "TSG_OBJ_GEO_LOCATION" }, { - "table_id":60, + "table_id":68, "table_name":"TSG_FIELD_SIP_ORIGINATOR_DESCRIPTION", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, { - "table_id":61, + "table_id":69, "table_name":"TSG_FIELD_SIP_RESPONDER_DESCRIPTION", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, { - "table_id":62, + "table_id":70, "table_name":"TSG_OBJ_IMSI", "table_type":"expr", "valid_column":7, @@ -577,7 +697,7 @@ } }, { - "table_id":63, + "table_id":71, "table_name":"TSG_OBJ_PHONE_NUMBER", "table_type":"expr", "valid_column":7, @@ -591,7 +711,7 @@ } }, { - "table_id":64, + "table_id":72, "table_name":"TSG_OBJ_APN", "table_type":"expr", "valid_column":7, @@ -605,31 +725,31 @@ } }, { - "table_id":65, + "table_id":73, "table_name":"TSG_FILED_GTP_IMSI", "table_type":"virtual", "physical_table": "TSG_OBJ_IMSI" }, { - "table_id":66, + "table_id":74, "table_name":"TSG_FILED_GTP_PHONE_NUMBER", "table_type":"virtual", "physical_table": "TSG_OBJ_PHONE_NUMBER" }, { - "table_id":67, + "table_id":75, "table_name":"TSG_FILED_GTP_APN", "table_type":"virtual", "physical_table": "TSG_OBJ_APN" }, { - "table_id":68, + "table_id":76, "table_name":"TSG_DECYPTION_EXCLUSION_SSL_SNI", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":69, + "table_id":77, "table_name":"TSG_OBJ_TUNNEL_ID", "table_type":"intval", "valid_column":5, @@ -641,7 +761,7 @@ } }, { - "table_id":70, + "table_id":78, "table_name":"TSG_TUNNEL_CATALOG", "table_type":"bool_plugin", "valid_column":5, @@ -651,7 +771,7 @@ } }, { - "table_id":71, + "table_id":79, "table_name":"TSG_TUNNEL_ENDPOINT", "table_type":"ip_plugin", "valid_column":6, @@ -664,7 +784,7 @@ } }, { - "table_id":72, + "table_id":80, "table_name":"TSG_TUNNEL_LABEL", "table_type":"plugin", "valid_column":4, @@ -675,13 +795,13 @@ } }, { - "table_id":73, + "table_id":81, "table_name":"TSG_SECURITY_TUNNEL", "table_type":"virtual", "physical_table": "TSG_OBJ_TUNNEL_ID" }, { - "table_id":74, + "table_id":82, "table_name":"TSG_OBJ_FLAG", "table_type":"flag", "valid_column":5, @@ -693,25 +813,25 @@ } }, { - "table_id":75, + "table_id":83, "table_name":"TSG_SECURITY_FLAG", "table_type":"virtual", "physical_table": "TSG_OBJ_FLAG" }, { - "table_id":76, + "table_id":84, "table_name":"TSG_FIELD_DOH_QNAME", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":77, + "table_id":85, "table_name":"TSG_FIELD_DOH_HOST", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":78, + "table_id":86, "table_name":"TSG_FIELD_DOH_HOST_CAT", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN_CAT" |