diff --git a/common/include/verify_policy.h b/common/include/verify_policy.h index 819f65b..f7d67e4 100644 --- a/common/include/verify_policy.h +++ b/common/include/verify_policy.h @@ -31,6 +31,7 @@ enum compile_table_typle TSG_STATISTICS, TSG_MONITOR, DOS_PROTECTION, + TSG_TUNNEL, PXY_TABLE_DEFENCE, __SCAN_POLICY_MAX }; @@ -95,6 +96,9 @@ enum tsg_obj_table TSG_OBJ_TUNNEL_LEVEL, TSG_OBJ_INTERNAL_ASN, TSG_OBJ_EXTERNAL_ASN, + TSG_OBJ_TUNNEL_GTP_ENDPOINT, + TSG_OBJ_TUNNEL_GRE_ENDPOINT, + TSG_OBJ_TUNNEL_IP_IN_IP_ENDPOINT, __TSG_OBJ_MAX }; @@ -137,6 +141,7 @@ struct request_query_obj char *attri_name; struct ipaddr *ip_addr; char *subscriberid; + char *tunnel_type; int merge_nth_scan_num; int exclude_nth_scan[MERGE_SCAN_NTH]; int merge_nth_scan[MERGE_SCAN_NTH]; diff --git a/platform/src/verify_matcher.cpp b/platform/src/verify_matcher.cpp index 1321461..4546afa 100644 --- a/platform/src/verify_matcher.cpp +++ b/platform/src/verify_matcher.cpp @@ -166,6 +166,7 @@ struct app_id_dict struct policy_scan_ctx { + int thread_id; enum policy_action action; char * action_para; struct maat_state *scan_mid; @@ -184,6 +185,7 @@ struct policy_scan_ctx unsigned long long bool_id_array[256]; struct ip_data_ctx ip_ctx; + struct maat_state *tunnel_scan_mid; }; struct verify_policy_rt @@ -223,6 +225,7 @@ void verify_policy_tunnle_add(void * pme) void *policy_scan_ctx_new(unsigned int thread_id, int vsys_id, int compile_table_id) { struct policy_scan_ctx * ctx = ALLOC(struct policy_scan_ctx, 1); + ctx->thread_id = thread_id;; ctx->scan_mid = maat_state_new(g_policy_rt->feather[vsys_id], thread_id); maat_state_set_scan_compile_table(ctx->scan_mid, g_policy_rt->compile_table_id[compile_table_id]); @@ -242,6 +245,12 @@ void policy_scan_ctx_free(void * pme) maat_state_free(ctx->scan_mid); ctx->scan_mid = NULL; + if(ctx->tunnel_scan_mid) + { + maat_state_free(ctx->tunnel_scan_mid); + ctx->tunnel_scan_mid = NULL; + } + struct ip_data_ctx *ip_ctx = &ctx->ip_ctx; if(ip_ctx->asn_client) FREE(&ip_ctx->asn_client); @@ -1719,54 +1728,111 @@ int tunnel_level_scan(struct request_query_obj *request, struct policy_scan_ctx return hit_cnt_tunnel; } -int tunnel_scan(struct request_query_obj *request, struct policy_scan_ctx *ctx, int vsys_id, int hit_cnt, struct ip_addr *sip) +int get_tunnel_type_table_id(char *tunnel_type) { -#define TUNNEL_BOOL_ID_MAX 128 -#define TUNNEL_CATALOG_MAX 128 + int table_id=TSG_OBJ_TUNNEL_GTP_ENDPOINT; + size_t i = 0; + const char *tunnel_type_map[] = {"GTP", "GRE", "IPv4/IPv6"}; - size_t n_hit_result=0; - int i=0,ret=0,n_read=0; - int scan_ret=0, hit_cnt_tunnel=0; - int hit_path_cnt=0; - struct maat_hit_group hit_group; - struct tunnel_data_ctx *endpoint_data[TUNNEL_BOOL_ID_MAX]; - - ret=maat_ip_plugin_table_get_ex_data(g_policy_rt->feather[vsys_id], g_policy_rt->profile_table_id[PROFILE_TUNNEL_ENDPOINT], sip, (void **)&endpoint_data, TUNNEL_BOOL_ID_MAX); - for(i=0; ibool_id_array[ctx->bool_id_array_idx]=(long long)endpoint_data[i]->id; - ctx->bool_id_array_idx++; - tunnel_table_free(endpoint_data[i]); + return table_id; } - struct tunnel_data_ctx *tunnel_catalog[TUNNEL_CATALOG_MAX]; - ret=maat_bool_plugin_table_get_ex_data(g_policy_rt->feather[vsys_id], g_policy_rt->profile_table_id[PROFILE_TUNNEL_CATALOG], ctx->bool_id_array, ctx->bool_id_array_idx, (void**)(&tunnel_catalog), TUNNEL_CATALOG_MAX); - for(i=0; igroup_id; - scan_ret=maat_scan_group(g_policy_rt->feather[vsys_id], g_policy_rt->scan_table_id[TSG_OBJ_TUNNEL], &hit_group, 1, - ctx->result+hit_cnt+hit_cnt_tunnel, MAX_SCAN_RESULT-hit_cnt-hit_cnt_tunnel, &n_hit_result, ctx->scan_mid); + if (0 == strcasecmp(tunnel_type, tunnel_type_map[i])) + break; + } + + switch (i) + { + case 0: + table_id = TSG_OBJ_TUNNEL_GTP_ENDPOINT; + break; + case 1: + table_id = TSG_OBJ_TUNNEL_GRE_ENDPOINT; + break; + case 2: + table_id = TSG_OBJ_TUNNEL_IP_IN_IP_ENDPOINT; + break; + default: + table_id = TSG_OBJ_TUNNEL_GTP_ENDPOINT; + break; + } + return table_id; +} + +int tunnel_scan(struct request_query_obj *request, struct policy_scan_ctx *ctx, int vsys_id, int hit_cnt, struct ipaddr *ip_addr) +{ + int i=0,hit_path_cnt=0; + int n_read=0, hit_cnt_endpoint=0; + struct maat_hit_group hit_group; + int scan_ret=0, hit_cnt_tunnel=0; + size_t n_hit_result=0; + long long result[MAX_SCAN_RESULT]={0}; + + if(ctx->tunnel_scan_mid == NULL) + { + ctx->tunnel_scan_mid = maat_state_new(g_policy_rt->feather[vsys_id], ctx->thread_id); + } + maat_state_set_scan_compile_table(ctx->tunnel_scan_mid, g_policy_rt->compile_table_id[TSG_TUNNEL]); + + int tunnel_table_id = get_tunnel_type_table_id(request->tunnel_type); + if (ip_addr->addrtype == ADDR_TYPE_IPV4) + { + scan_ret = maat_scan_ipv4_port(g_policy_rt->feather[vsys_id], g_policy_rt->scan_table_id[tunnel_table_id], ip_addr->v4->saddr, ip_addr->v4->source, + result, MAX_SCAN_RESULT, &n_hit_result, ctx->tunnel_scan_mid); if(scan_ret == MAAT_SCAN_HIT) { - hit_cnt_tunnel+=n_hit_result; + hit_cnt_endpoint+=n_hit_result; } - scan_ret = maat_scan_not_logic(g_policy_rt->feather[vsys_id], g_policy_rt->scan_table_id[TSG_OBJ_TUNNEL],ctx->result+hit_cnt+hit_cnt_tunnel, MAX_SCAN_RESULT-hit_cnt-hit_cnt_tunnel, - &n_hit_result, ctx->scan_mid); - if (scan_ret == MAAT_SCAN_HIT) + } + + if (ip_addr->addrtype == ADDR_TYPE_IPV6) + { + scan_ret = maat_scan_ipv6_port(g_policy_rt->feather[vsys_id], g_policy_rt->scan_table_id[tunnel_table_id], ip_addr->v6->saddr, ip_addr->v6->source, + result, MAX_SCAN_RESULT, &n_hit_result, ctx->tunnel_scan_mid); + if(scan_ret == MAAT_SCAN_HIT) { - hit_cnt_tunnel+=n_hit_result; + hit_cnt_endpoint+=n_hit_result; } - if(scan_ret >= MAAT_SCAN_OK) + } + + scan_ret = maat_scan_not_logic(g_policy_rt->feather[vsys_id], g_policy_rt->scan_table_id[tunnel_table_id], result, MAX_SCAN_RESULT, + &n_hit_result, ctx->tunnel_scan_mid); + if(scan_ret == MAAT_SCAN_HIT) + { + hit_cnt_endpoint+=n_hit_result; + } + + if(hit_cnt_endpoint < 0) + { + goto finish; + } + + for(i = 0; i< hit_cnt_endpoint; i++) + { + memset(&hit_group, 0, sizeof(hit_group)); + hit_group.group_id=result[i]; + if(hit_group.group_id != 0) { - n_read=maat_state_get_hit_paths(ctx->scan_mid, ctx->hit_path, HIT_PATH_SIZE); - request->merge_nth_scan[hit_path_cnt] = maat_state_get_scan_count(ctx->scan_mid); - ctx->n_read=n_read; - hit_path_cnt++; + scan_ret = group_scan(ctx, vsys_id, hit_cnt, hit_group, TSG_OBJ_TUNNEL); + if(scan_ret > 0) + { + hit_cnt_tunnel+=scan_ret; + } + if(scan_ret >= MAAT_SCAN_OK) + { + n_read=maat_state_get_hit_paths(ctx->scan_mid, ctx->hit_path, HIT_PATH_SIZE); + request->merge_nth_scan[hit_path_cnt] = maat_state_get_scan_count(ctx->scan_mid); + ctx->n_read=n_read; + hit_path_cnt++; + } } - tunnel_table_free(tunnel_catalog[i]); } request->merge_nth_scan_num = hit_path_cnt; +finish: return hit_cnt_tunnel; } @@ -2113,7 +2179,7 @@ size_t policy_verify_scan(int vsys_id, int compile_table_id, struct request_quer memset(&dest_ip, 0, sizeof(dest_ip)); memset(&source_ip, 0, sizeof(source_ip)); ip_addr_to_address(request->ip_addr, &dest_ip, &source_ip); - scan_ret = tunnel_scan(request, ctx, vsys_id, hit_cnt, &source_ip); + scan_ret = tunnel_scan(request, ctx, vsys_id, hit_cnt, request->ip_addr); if(scan_ret) { hit_cnt+=scan_ret; @@ -2354,6 +2420,9 @@ static void common_table_name_int(const char *table_name[__TSG_OBJ_MAX]) table_name[TSG_OBJ_TUNNEL_LEVEL]="ATTR_TUNNEL_LEVEL"; table_name[TSG_OBJ_INTERNAL_ASN]="ATTR_INTERNAL_ASN"; table_name[TSG_OBJ_EXTERNAL_ASN]="ATTR_EXTERNAL_ASN"; + table_name[TSG_OBJ_TUNNEL_GTP_ENDPOINT]="ATTR_TUNNEL_GTP_ENDPOINT"; + table_name[TSG_OBJ_TUNNEL_GRE_ENDPOINT]="ATTR_TUNNEL_GRE_ENDPOINT"; + table_name[TSG_OBJ_TUNNEL_IP_IN_IP_ENDPOINT]="ATTR_TUNNEL_IP_IN_IP_ENDPOINT"; return; } @@ -2364,7 +2433,7 @@ int maat_complie_plugin_table_init(int vsys_id, int compile_type_id) const char *conjunction_table_name_map[] = {"SECURITY_COMPILE_CONJUNCTION", "PXY_CTRL_COMPILE_CONJUNCTION", "TRAFFIC_SHAPING_COMPILE_CONJUNCTION", "SERVICE_CHAINING_COMPILE_CONJUNCTION", "PXY_INTERCEPT_COMPILE_CONJUNCTION","STATISTICS_COMPILE_CONJUNCTION", - "MONITOR_COMPILE_CONJUNCTION", "DOS_PROTECTION_COMPILE_CONJUNCTION"}; + "MONITOR_COMPILE_CONJUNCTION", "DOS_PROTECTION_COMPILE_CONJUNCTION", "TUNNEL_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); @@ -2375,7 +2444,7 @@ int maat_complie_plugin_table_init(int vsys_id, int compile_type_id) const char *plugin_table_name_map[] = {"SECURITY_COMPILE_PLUGIN", "PXY_CTRL_COMPILE_PLUGIN", "TRAFFIC_SHAPING_COMPILE_PLUGIN", "SERVICE_CHAINING_COMPILE_PLUGIN", "PXY_INTERCEPT_COMPILE_PLUGIN", "STATISTICS_COMPILE_PLUGIN", - "MONITOR_COMPILE_PLUGIN", "DOS_PROTECTION_COMPILE_PLUGIN"}; + "MONITOR_COMPILE_PLUGIN", "DOS_PROTECTION_COMPILE_PLUGIN", "TUNNEL_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); diff --git a/platform/src/verify_policy.cpp b/platform/src/verify_policy.cpp index 3e1b061..8b4666c 100644 --- a/platform/src/verify_policy.cpp +++ b/platform/src/verify_policy.cpp @@ -152,6 +152,9 @@ int protoco_field_type_str2idx(const char *action_str, char *buff, char **p) table_name[TSG_OBJ_TUNNEL_LEVEL]="ATTR_TUNNEL_LEVEL"; table_name[TSG_OBJ_INTERNAL_ASN]="ATTR_INTERNAL_ASN"; table_name[TSG_OBJ_EXTERNAL_ASN]="ATTR_EXTERNAL_ASN"; + table_name[TSG_OBJ_TUNNEL_GTP_ENDPOINT]="ATTR_TUNNEL_GTP_ENDPOINT"; + table_name[TSG_OBJ_TUNNEL_GRE_ENDPOINT]="ATTR_TUNNEL_GRE_ENDPOINT"; + table_name[TSG_OBJ_TUNNEL_IP_IN_IP_ENDPOINT]="ATTR_TUNNEL_IP_IN_IP_ENDPOINT"; size_t i = 0; for (i = 0; i < __TSG_OBJ_MAX; i++) @@ -186,9 +189,9 @@ struct ipaddr *ip_to_stream_addr(const char *clientIp1, unsigned int clientPort1 struct stream_tuple4_v4 *v4_addr = ALLOC(struct stream_tuple4_v4, 1); ip_addr->addrtype=ADDR_TYPE_IPV4; inet_pton(AF_INET,clientIp1,&(v4_addr->saddr)); - v4_addr->source=htons(clientPort1); + v4_addr->source=clientPort1; inet_pton(AF_INET,serverIp1,&(v4_addr->daddr)); - v4_addr->dest=htons(serverPort1); + v4_addr->dest=serverPort1; ip_addr->v4=v4_addr; } if(addr_type == 6) @@ -196,9 +199,9 @@ struct ipaddr *ip_to_stream_addr(const char *clientIp1, unsigned int clientPort1 struct stream_tuple4_v6 *v6_addr = ALLOC(struct stream_tuple4_v6, 1); ip_addr->addrtype=ADDR_TYPE_IPV6; inet_pton(AF_INET6,clientIp1,&(v6_addr->saddr)); - v6_addr->source=htons(clientPort1); + v6_addr->source=clientPort1; inet_pton(AF_INET6,serverIp1,&(v6_addr->daddr)); - v6_addr->dest=htons(serverPort1); + v6_addr->dest=serverPort1; ip_addr->v6=v6_addr; } mesa_runtime_log(RLOG_LV_INFO, " [I] %s, clientIp1=%s, clientPort1=%d, serverIp=%s, serverPort=%d, addr_type=%d, protocol=%d", buff, @@ -327,7 +330,7 @@ static int get_attribute_from_json(int curr_id, cJSON* subchild, struct verify_p int xret = -1; const char *attribute_type=NULL; char buff[VERIFY_STRING_MAX*2], *p = NULL; - cJSON* item = NULL, *attributeValue=NULL; + cJSON* item = NULL, *attributeValue=NULL, *tunnelType_item=NULL; p = buff; item = cJSON_GetObjectItem(subchild, "attributeType"); @@ -362,6 +365,12 @@ static int get_attribute_from_json(int curr_id, cJSON* subchild, struct verify_p goto finish; } + tunnelType_item = cJSON_GetObjectItem(attributeValue,"tunnel_type"); + if(tunnelType_item && tunnelType_item->type==cJSON_String) + { + policy_query->request_object[curr_id].tunnel_type=tunnelType_item->valuestring; + } + if(0 == strcasecmp(attribute_type, "ip")) { policy_query->request_object[curr_id].ip_addr = get_ip_from_json(attributeValue, policy_query->request_object[curr_id].attri_name, &(policy_query->request_object[curr_id].numeric), buff); diff --git a/resource/table_info.conf b/resource/table_info.conf index df2aa89..4dfd4ef 100644 --- a/resource/table_info.conf +++ b/resource/table_info.conf @@ -417,6 +417,58 @@ }, { "table_id":32, + "table_name":"TUNNEL_COMPILE", + "table_type":"compile", + "user_region_encoded":"escape", + "valid_column":9, + "custom": { + "compile_id":1, + "tags":6, + "clause_num":8 + } + }, + { + "table_id":33, + "table_name":"TUNNEL_COMPILE_CONJUNCTION", + "db_tables":["TUNNEL_COMPILE"], + "default_compile_table":1, + "table_type":"compile", + "user_region_encoded":"escape", + "valid_column":9, + "custom": { + "compile_id":1, + "tags":6, + "clause_num":8 + } + }, + { + "table_id":34, + "table_name":"TUNNEL_COMPILE_PLUGIN", + "db_tables":["TUNNEL_COMPILE"], + "table_type":"plugin", + "valid_column":9, + "custom": { + "key":1, + "key_type":"integer", + "key_len": 8 + } + }, + { + "table_id":35, + "table_name":"GROUP_TUNNEL_COMPILE_RELATION", + "table_type":"group2compile", + "associated_compile_table_id":33, + "valid_column":6, + "custom": { + "group_id":1, + "compile_id":2, + "not_flag":3, + "virtual_table_name":4, + "clause_index":5 + } + }, + { + "table_id":36, "table_name":"OBJECT_GROUP", "table_type":"group2group", "valid_column":4, @@ -427,7 +479,7 @@ } }, { - "table_id":33, + "table_id":37, "table_name":"TSG_OBJ_IP", "db_tables":["TSG_OBJ_IP_ADDR","TSG_OBJ_IP_LEARNING_ADDR"], "table_type":"ip", @@ -443,7 +495,7 @@ } }, { - "table_id":34, + "table_id":38, "table_name":"TSG_OBJ_SUBSCRIBER_ID", "table_type":"expr", "valid_column":7, @@ -457,7 +509,7 @@ } }, { - "table_id":35, + "table_id":39, "table_name":"TSG_OBJ_ACCOUNT", "table_type":"expr", "valid_column":7, @@ -471,7 +523,7 @@ } }, { - "table_id":36, + "table_id":40, "table_name":"TSG_OBJ_URL", "table_type":"expr", "valid_column":7, @@ -485,7 +537,7 @@ } }, { - "table_id":37, + "table_id":41, "table_name":"TSG_OBJ_FQDN", "table_type":"expr", "valid_column":7, @@ -499,7 +551,7 @@ } }, { - "table_id":38, + "table_id":42, "table_name":"TSG_OBJ_FQDN_CAT", "table_type":"interval", "valid_column":5, @@ -511,7 +563,7 @@ } }, { - "table_id":39, + "table_id":43, "table_name":"TSG_OBJ_KEYWORDS", "table_type":"expr", "valid_column":7, @@ -525,7 +577,7 @@ } }, { - "table_id":40, + "table_id":44, "table_name":"TSG_OBJ_HTTP_SIGNATURE", "table_type":"expr_plus", "valid_column":8, @@ -540,139 +592,139 @@ } }, { - "table_id":41, + "table_id":45, "table_name":"ATTR_HTTP_URL", "table_type":"virtual", "physical_table": "TSG_OBJ_URL" }, { - "table_id":42, + "table_id":46, "table_name":"ATTR_HTTP_REQ_HDR", "table_type":"virtual", "physical_table": "TSG_OBJ_HTTP_SIGNATURE" }, { - "table_id":43, + "table_id":47, "table_name":"ATTR_HTTP_RES_HDR", "table_type":"virtual", "physical_table": "TSG_OBJ_HTTP_SIGNATURE" }, { - "table_id":44, + "table_id":48, "table_name":"ATTR_HTTP_REQ_BODY", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id":45, + "table_id":49, "table_name":"ATTR_HTTP_RES_BODY", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id":46, + "table_id":50, "table_name":"ATTR_SSL_CN", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":47, + "table_id":51, "table_name":"ATTR_SSL_CN_CAT", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN_CAT" }, { - "table_id":48, + "table_id":52, "table_name":"ATTR_SSL_SAN", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":49, + "table_id":53, "table_name":"ATTR_SSL_SAN_CAT", "table_type":"virtual", "physical_table":"TSG_OBJ_FQDN_CAT" }, { - "table_id":50, + "table_id":54, "table_name":"ATTR_DNS_QNAME", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":51, + "table_id":55, "table_name":"ATTR_MAIL_ACCOUNT", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, { - "table_id":52, + "table_id":56, "table_name":"ATTR_MAIL_FROM", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, { - "table_id":53, + "table_id":57, "table_name":"ATTR_MAIL_TO", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, { - "table_id":54, + "table_id":58, "table_name":"ATTR_MAIL_SUBJECT", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id":55, + "table_id":59, "table_name":"ATTR_MAIL_CONTENT", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id":56, + "table_id":60, "table_name":"ATTR_MAIL_ATT_NAME", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id":57, + "table_id":61, "table_name":"ATTR_MAIL_ATT_CONTENT", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id":58, + "table_id":62, "table_name":"ATTR_FTP_URI", "table_type":"virtual", "physical_table": "TSG_OBJ_URL" }, { - "table_id":59, + "table_id":63, "table_name":"ATTR_FTP_CONTENT", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id":60, + "table_id":64, "table_name":"ATTR_FTP_ACCOUNT", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, { - "table_id":61, + "table_id":65, "table_name":"ATTR_SOURCE_IP", "table_type":"virtual", "physical_table": "TSG_OBJ_IP" }, { - "table_id":62, + "table_id":66, "table_name":"ATTR_DESTINATION_IP", "table_type":"virtual", "physical_table": "TSG_OBJ_IP" }, { - "table_id":63, + "table_id":67, "table_name":"TSG_OBJ_IP_ASN_BUILT_IN", "table_type":"ip_plugin", "valid_column":9, @@ -686,7 +738,7 @@ } }, { - "table_id":64, + "table_id":68, "table_name":"TSG_OBJ_IP_ASN_USER_DEFINED", "table_type":"ip_plugin", "valid_column":9, @@ -700,7 +752,7 @@ } }, { - "table_id":65, + "table_id":69, "table_name":"TSG_IP_LOCATION_BUILT_IN", "table_type":"ip_plugin", "valid_column":24, @@ -713,7 +765,7 @@ } }, { - "table_id":66, + "table_id":70, "table_name":"TSG_IP_LOCATION_USER_DEFINED", "table_type":"ip_plugin", "valid_column":24, @@ -726,7 +778,7 @@ } }, { - "table_id":67, + "table_id":71, "table_name":"TSG_OBJ_AS_NUMBER", "table_type":"expr", "valid_column":7, @@ -740,19 +792,19 @@ } }, { - "table_id":68, + "table_id":72, "table_name":"ATTR_SOURCE_ASN", "table_type":"virtual", "physical_table": "TSG_OBJ_AS_NUMBER" }, { - "table_id":69, + "table_id":73, "table_name":"ATTR_DESTINATION_ASN", "table_type":"virtual", "physical_table": "TSG_OBJ_AS_NUMBER" }, { - "table_id":70, + "table_id":74, "table_name":"TSG_OBJ_GEO_LOCATION", "table_type":"expr", "valid_column":7, @@ -766,55 +818,55 @@ } }, { - "table_id":71, + "table_id":75, "table_name":"ATTR_SOURCE_GEO_COUNTRY", "table_type":"virtual", "physical_table": "TSG_OBJ_GEO_LOCATION" }, { - "table_id":72, + "table_id":76, "table_name":"ATTR_SOURCE_GEO_SUPER_ADMINISTRATIVE_AREA", "table_type":"virtual", "physical_table": "TSG_OBJ_GEO_LOCATION" }, { - "table_id":73, + "table_id":77, "table_name":"ATTR_SOURCE_GEO_ADMINISTRATIVE_AREA", "table_type":"virtual", "physical_table": "TSG_OBJ_GEO_LOCATION" }, { - "table_id":74, + "table_id":78, "table_name":"ATTR_SOURCE_GEO_SUB_ADMINISTRATIVE_AREA", "table_type":"virtual", "physical_table": "TSG_OBJ_GEO_LOCATION" }, { - "table_id":75, + "table_id":79, "table_name":"ATTR_DESTINATION_GEO_COUNTRY", "table_type":"virtual", "physical_table": "TSG_OBJ_GEO_LOCATION" }, { - "table_id":76, + "table_id":80, "table_name":"ATTR_DESTINATION_GEO_SUPER_ADMINISTRATIVE_AREA", "table_type":"virtual", "physical_table": "TSG_OBJ_GEO_LOCATION" }, { - "table_id":77, + "table_id":81, "table_name":"ATTR_DESTINATION_GEO_ADMINISTRATIVE_AREA", "table_type":"virtual", "physical_table": "TSG_OBJ_GEO_LOCATION" }, { - "table_id":78, + "table_id":82, "table_name":"ATTR_DESTINATION_GEO_SUB_ADMINISTRATIVE_AREA", "table_type":"virtual", "physical_table": "TSG_OBJ_GEO_LOCATION" }, { - "table_id":79, + "table_id":83, "table_name":"TSG_FQDN_CATEGORY_BUILT_IN", "table_type":"fqdn_plugin", "valid_column":6, @@ -825,7 +877,7 @@ } }, { - "table_id":80, + "table_id":84, "table_name":"TSG_FQDN_CATEGORY_USER_DEFINED", "table_type":"fqdn_plugin", "valid_column":6, @@ -836,19 +888,19 @@ } }, { - "table_id":81, + "table_id":85, "table_name":"ATTR_SIP_ORIGINATOR_DESCRIPTION", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, { - "table_id":82, + "table_id":86, "table_name":"ATTR_SIP_RESPONDER_DESCRIPTION", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, { - "table_id":83, + "table_id":87, "table_name":"TSG_OBJ_IMSI", "table_type":"expr", "valid_column":7, @@ -862,7 +914,7 @@ } }, { - "table_id":84, + "table_id":88, "table_name":"TSG_OBJ_PHONE_NUMBER", "table_type":"expr", "valid_column":7, @@ -876,7 +928,7 @@ } }, { - "table_id":85, + "table_id":89, "table_name":"TSG_OBJ_APN", "table_type":"expr", "valid_column":7, @@ -890,25 +942,25 @@ } }, { - "table_id":86, + "table_id":90, "table_name":"ATTR_GTP_IMSI", "table_type":"virtual", "physical_table": "TSG_OBJ_IMSI" }, { - "table_id":87, + "table_id":91, "table_name":"ATTR_GTP_PHONE_NUMBER", "table_type":"virtual", "physical_table": "TSG_OBJ_PHONE_NUMBER" }, { - "table_id":88, + "table_id":92, "table_name":"ATTR_GTP_APN", "table_type":"virtual", "physical_table": "TSG_OBJ_APN" }, { - "table_id":89, + "table_id":93, "table_name":"TSG_TUNNEL_CATALOG", "table_type":"bool_plugin", "valid_column":6, @@ -918,7 +970,7 @@ } }, { - "table_id":90, + "table_id":94, "table_name":"TSG_TUNNEL_ENDPOINT", "table_type":"ip_plugin", "valid_column":6, @@ -930,7 +982,7 @@ } }, { - "table_id":91, + "table_id":95, "table_name":"TSG_TUNNEL_LABEL", "table_type":"plugin", "valid_column":4, @@ -941,13 +993,13 @@ } }, { - "table_id":92, + "table_id":96, "table_name":"ATTR_TUNNEL", "table_type":"virtual", "physical_table": "TSG_TUNNEL_CATALOG" }, { - "table_id":93, + "table_id":97, "table_name":"TSG_OBJ_FLAG", "table_type":"flag", "valid_column":5, @@ -959,19 +1011,19 @@ } }, { - "table_id":94, + "table_id":98, "table_name":"ATTR_FLAG", "table_type":"virtual", "physical_table": "TSG_OBJ_FLAG" }, { - "table_id":95, + "table_id":99, "table_name":"ATTR_DOH_QNAME", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":96, + "table_id":100, "table_name":"TSG_OBJ_IMEI", "table_type":"expr", "valid_column":7, @@ -985,13 +1037,13 @@ } }, { - "table_id":97, + "table_id":101, "table_name":"ATTR_GTP_IMEI", "table_type":"virtual", "physical_table": "TSG_OBJ_IMEI" }, { - "table_id":98, + "table_id":102, "table_name": "APP_ID_DICT", "table_type": "plugin", "valid_column": 19, @@ -1002,43 +1054,43 @@ } }, { - "table_id":99, + "table_id":103, "table_name":"ATTR_SUBSCRIBER_ID", "table_type":"virtual", "physical_table": "TSG_OBJ_SUBSCRIBER_ID" }, { - "table_id":100, + "table_id":104, "table_name":"ATTR_APP_ID", "table_type":"virtual", "physical_table": "APP_ID_DICT" }, { - "table_id":101, + "table_id":105, "table_name": "ATTR_SERVER_FQDN", "table_type": "virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":102, + "table_id":106, "table_name": "ATTR_SERVER_FQDN_CAT", "table_type": "virtual", "physical_table": "TSG_OBJ_FQDN_CAT" }, { - "table_id":103, + "table_id":107, "table_name":"ATTR_INTERNAL_IP", "table_type":"virtual", "physical_table": "TSG_OBJ_IP" }, { - "table_id":104, + "table_id":108, "table_name":"ATTR_EXTERNAL_IP", "table_type":"virtual", "physical_table": "TSG_OBJ_IP" }, { - "table_id":105, + "table_id":109, "table_name": "TSG_IP_PROTOCOL", "table_type": "plugin", "valid_column": 4, @@ -1049,7 +1101,7 @@ } }, { - "table_id":106, + "table_id":110, "table_name":"TSG_OBJ_PORT", "table_type":"interval", "valid_column":5, @@ -1061,69 +1113,87 @@ } }, { - "table_id":107, + "table_id":111, "table_name": "ATTR_SOURCE_PORT", "table_type": "virtual", "physical_table": "TSG_OBJ_PORT" }, { - "table_id":108, + "table_id":112, "table_name": "ATTR_DESTINATION_PORT", "table_type": "virtual", "physical_table": "TSG_OBJ_PORT" }, { - "table_id":109, + "table_id":113, "table_name": "ATTR_INTERNAL_PORT", "table_type": "virtual", "physical_table": "TSG_OBJ_PORT" }, { - "table_id":110, + "table_id":114, "table_name": "ATTR_EXTERNAL_PORT", "table_type": "virtual", "physical_table": "TSG_OBJ_PORT" }, { - "table_id":111, + "table_id":115, "table_name": "ATTR_IP_PROTOCOL", "table_type": "virtual", "physical_table": "TSG_IP_PROTOCOL" }, { - "table_id":112, + "table_id":116, "table_name": "ATTR_SSL_ECH", "table_type": "virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":113, + "table_id":117, "table_name": "ATTR_SSL_ESNI", "table_type": "virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":114, + "table_id":118, "table_name": "ATTR_SSL_NO_SNI", "table_type": "virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":115, + "table_id":119, "table_name":"ATTR_TUNNEL_LEVEL", "table_type":"virtual", "physical_table": "TSG_TUNNEL_CATALOG" }, { - "table_id":116, + "table_id":120, "table_name":"ATTR_INTERNAL_ASN", "table_type":"virtual", "physical_table": "TSG_OBJ_AS_NUMBER" }, { - "table_id":117, + "table_id":121, "table_name":"ATTR_EXTERNAL_ASN", "table_type":"virtual", "physical_table": "TSG_OBJ_AS_NUMBER" + }, + { + "table_id":122, + "table_name":"ATTR_TUNNEL_GTP_ENDPOINT", + "table_type":"virtual", + "physical_table": "TSG_OBJ_IP" + }, + { + "table_id":123, + "table_name":"ATTR_TUNNEL_GRE_ENDPOINT", + "table_type":"virtual", + "physical_table": "TSG_OBJ_IP" + }, + { + "table_id":124, + "table_name":"ATTR_TUNNEL_IP_IN_IP_ENDPOINT", + "table_type":"virtual", + "physical_table": "TSG_OBJ_IP" } ] \ No newline at end of file diff --git a/resource/table_info_simple.conf b/resource/table_info_simple.conf index 2fb2a49..10b96f5 100644 --- a/resource/table_info_simple.conf +++ b/resource/table_info_simple.conf @@ -417,6 +417,58 @@ }, { "table_id":32, + "table_name":"TUNNEL_COMPILE", + "table_type":"compile", + "user_region_encoded":"escape", + "valid_column":9, + "custom": { + "compile_id":1, + "tags":6, + "clause_num":8 + } + }, + { + "table_id":33, + "table_name":"TUNNEL_COMPILE_CONJUNCTION", + "db_tables":["TUNNEL_COMPILE"], + "default_compile_table":1, + "table_type":"compile", + "user_region_encoded":"escape", + "valid_column":9, + "custom": { + "compile_id":1, + "tags":6, + "clause_num":8 + } + }, + { + "table_id":34, + "table_name":"TUNNEL_COMPILE_PLUGIN", + "db_tables":["TUNNEL_COMPILE"], + "table_type":"plugin", + "valid_column":9, + "custom": { + "key":1, + "key_type":"integer", + "key_len": 8 + } + }, + { + "table_id":35, + "table_name":"GROUP_TUNNEL_COMPILE_RELATION", + "table_type":"group2compile", + "associated_compile_table_id":33, + "valid_column":6, + "custom": { + "group_id":1, + "compile_id":2, + "not_flag":3, + "virtual_table_name":4, + "clause_index":5 + } + }, + { + "table_id":36, "table_name":"OBJECT_GROUP", "table_type":"group2group", "valid_column":4, @@ -427,7 +479,7 @@ } }, { - "table_id":33, + "table_id":37, "table_name":"TSG_OBJ_IP", "db_tables":["TSG_OBJ_IP_ADDR","TSG_OBJ_IP_LEARNING_ADDR"], "table_type":"ip", @@ -443,7 +495,7 @@ } }, { - "table_id":34, + "table_id":38, "table_name":"TSG_OBJ_SUBSCRIBER_ID", "table_type":"expr", "valid_column":7, @@ -457,7 +509,7 @@ } }, { - "table_id":35, + "table_id":39, "table_name":"TSG_OBJ_ACCOUNT", "table_type":"expr", "valid_column":7, @@ -471,7 +523,7 @@ } }, { - "table_id":36, + "table_id":40, "table_name":"TSG_OBJ_URL", "table_type":"expr", "valid_column":7, @@ -485,7 +537,7 @@ } }, { - "table_id":37, + "table_id":41, "table_name":"TSG_OBJ_FQDN", "table_type":"expr", "valid_column":7, @@ -499,7 +551,7 @@ } }, { - "table_id":38, + "table_id":42, "table_name":"TSG_OBJ_FQDN_CAT", "table_type":"interval", "valid_column":5, @@ -511,7 +563,7 @@ } }, { - "table_id":39, + "table_id":43, "table_name":"TSG_OBJ_KEYWORDS", "table_type":"expr", "valid_column":7, @@ -525,7 +577,7 @@ } }, { - "table_id":40, + "table_id":44, "table_name":"TSG_OBJ_HTTP_SIGNATURE", "table_type":"expr_plus", "valid_column":8, @@ -540,133 +592,133 @@ } }, { - "table_id":41, + "table_id":45, "table_name":"ATTR_HTTP_URL", "table_type":"virtual", "physical_table": "TSG_OBJ_URL" }, { - "table_id":42, + "table_id":46, "table_name":"ATTR_HTTP_REQ_HDR", "table_type":"virtual", "physical_table": "TSG_OBJ_HTTP_SIGNATURE" }, { - "table_id":43, + "table_id":47, "table_name":"ATTR_HTTP_RES_HDR", "table_type":"virtual", "physical_table": "TSG_OBJ_HTTP_SIGNATURE" }, { - "table_id":44, + "table_id":48, "table_name":"ATTR_HTTP_REQ_BODY", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id":45, + "table_id":49, "table_name":"ATTR_HTTP_RES_BODY", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id":46, + "table_id":50, "table_name":"ATTR_SSL_CN", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":47, + "table_id":51, "table_name":"ATTR_SSL_CN_CAT", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN_CAT" }, { - "table_id":48, + "table_id":52, "table_name":"ATTR_SSL_SAN", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":49, + "table_id":53, "table_name":"ATTR_SSL_SAN_CAT", "table_type":"virtual", "physical_table":"TSG_OBJ_FQDN_CAT" }, { - "table_id":50, + "table_id":54, "table_name":"ATTR_DNS_QNAME", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":51, + "table_id":55, "table_name":"ATTR_MAIL_ACCOUNT", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, { - "table_id":52, + "table_id":56, "table_name":"ATTR_MAIL_FROM", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, { - "table_id":53, + "table_id":57, "table_name":"ATTR_MAIL_TO", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, { - "table_id":54, + "table_id":58, "table_name":"ATTR_MAIL_SUBJECT", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id":55, + "table_id":59, "table_name":"ATTR_MAIL_CONTENT", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id":56, + "table_id":60, "table_name":"ATTR_MAIL_ATT_NAME", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id":57, + "table_id":61, "table_name":"ATTR_MAIL_ATT_CONTENT", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id":58, + "table_id":62, "table_name":"ATTR_FTP_URI", "table_type":"virtual", "physical_table": "TSG_OBJ_URL" }, { - "table_id":59, + "table_id":63, "table_name":"ATTR_FTP_CONTENT", "table_type":"virtual", "physical_table": "TSG_OBJ_KEYWORDS" }, { - "table_id":60, + "table_id":64, "table_name":"ATTR_FTP_ACCOUNT", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, { - "table_id":61, + "table_id":65, "table_name":"ATTR_SOURCE_IP", "table_type":"virtual", "physical_table": "TSG_OBJ_IP" }, { - "table_id":62, + "table_id":66, "table_name":"ATTR_DESTINATION_IP", "table_type":"virtual", "physical_table": "TSG_OBJ_IP" @@ -686,19 +738,19 @@ } }, { - "table_id":68, + "table_id":72, "table_name":"ATTR_SOURCE_ASN", "table_type":"virtual", "physical_table": "TSG_OBJ_AS_NUMBER" }, { - "table_id":69, + "table_id":73, "table_name":"ATTR_DESTINATION_ASN", "table_type":"virtual", "physical_table": "TSG_OBJ_AS_NUMBER" }, { - "table_id":70, + "table_id":74, "table_name":"TSG_OBJ_GEO_LOCATION", "table_type":"expr", "valid_column":7, @@ -712,67 +764,67 @@ } }, { - "table_id":71, + "table_id":75, "table_name":"ATTR_SOURCE_GEO_COUNTRY", "table_type":"virtual", "physical_table": "TSG_OBJ_GEO_LOCATION" }, { - "table_id":72, + "table_id":76, "table_name":"ATTR_SOURCE_GEO_SUPER_ADMINISTRATIVE_AREA", "table_type":"virtual", "physical_table": "TSG_OBJ_GEO_LOCATION" }, { - "table_id":73, + "table_id":77, "table_name":"ATTR_SOURCE_GEO_ADMINISTRATIVE_AREA", "table_type":"virtual", "physical_table": "TSG_OBJ_GEO_LOCATION" }, { - "table_id":74, + "table_id":78, "table_name":"ATTR_SOURCE_GEO_SUB_ADMINISTRATIVE_AREA", "table_type":"virtual", "physical_table": "TSG_OBJ_GEO_LOCATION" }, { - "table_id":75, + "table_id":79, "table_name":"ATTR_DESTINATION_GEO_COUNTRY", "table_type":"virtual", "physical_table": "TSG_OBJ_GEO_LOCATION" }, { - "table_id":76, + "table_id":80, "table_name":"ATTR_DESTINATION_GEO_SUPER_ADMINISTRATIVE_AREA", "table_type":"virtual", "physical_table": "TSG_OBJ_GEO_LOCATION" }, { - "table_id":77, + "table_id":81, "table_name":"ATTR_DESTINATION_GEO_ADMINISTRATIVE_AREA", "table_type":"virtual", "physical_table": "TSG_OBJ_GEO_LOCATION" }, { - "table_id":78, + "table_id":82, "table_name":"ATTR_DESTINATION_GEO_SUB_ADMINISTRATIVE_AREA", "table_type":"virtual", "physical_table": "TSG_OBJ_GEO_LOCATION" }, { - "table_id":81, + "table_id":85, "table_name":"ATTR_SIP_ORIGINATOR_DESCRIPTION", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, { - "table_id":82, + "table_id":86, "table_name":"ATTR_SIP_RESPONDER_DESCRIPTION", "table_type":"virtual", "physical_table": "TSG_OBJ_ACCOUNT" }, { - "table_id":83, + "table_id":87, "table_name":"TSG_OBJ_IMSI", "table_type":"expr", "valid_column":7, @@ -786,7 +838,7 @@ } }, { - "table_id":84, + "table_id":88, "table_name":"TSG_OBJ_PHONE_NUMBER", "table_type":"expr", "valid_column":7, @@ -800,7 +852,7 @@ } }, { - "table_id":85, + "table_id":89, "table_name":"TSG_OBJ_APN", "table_type":"expr", "valid_column":7, @@ -814,25 +866,25 @@ } }, { - "table_id":86, + "table_id":90, "table_name":"ATTR_GTP_IMSI", "table_type":"virtual", "physical_table": "TSG_OBJ_IMSI" }, { - "table_id":87, + "table_id":91, "table_name":"ATTR_GTP_PHONE_NUMBER", "table_type":"virtual", "physical_table": "TSG_OBJ_PHONE_NUMBER" }, { - "table_id":88, + "table_id":92, "table_name":"ATTR_GTP_APN", "table_type":"virtual", "physical_table": "TSG_OBJ_APN" }, { - "table_id":89, + "table_id":93, "table_name":"TSG_TUNNEL_CATALOG", "table_type":"bool_plugin", "valid_column":6, @@ -842,7 +894,7 @@ } }, { - "table_id":90, + "table_id":94, "table_name":"TSG_TUNNEL_ENDPOINT", "table_type":"ip_plugin", "valid_column":6, @@ -854,7 +906,7 @@ } }, { - "table_id":91, + "table_id":95, "table_name":"TSG_TUNNEL_LABEL", "table_type":"plugin", "valid_column":4, @@ -865,13 +917,13 @@ } }, { - "table_id":92, + "table_id":96, "table_name":"ATTR_TUNNEL", "table_type":"virtual", "physical_table": "TSG_TUNNEL_CATALOG" }, { - "table_id":93, + "table_id":97, "table_name":"TSG_OBJ_FLAG", "table_type":"flag", "valid_column":5, @@ -883,19 +935,19 @@ } }, { - "table_id":94, + "table_id":98, "table_name":"ATTR_FLAG", "table_type":"virtual", "physical_table": "TSG_OBJ_FLAG" }, { - "table_id":95, + "table_id":99, "table_name":"ATTR_DOH_QNAME", "table_type":"virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":96, + "table_id":100, "table_name":"TSG_OBJ_IMEI", "table_type":"expr", "valid_column":7, @@ -909,13 +961,13 @@ } }, { - "table_id":97, + "table_id":101, "table_name":"ATTR_GTP_IMEI", "table_type":"virtual", "physical_table": "TSG_OBJ_IMEI" }, { - "table_id":98, + "table_id":102, "table_name": "APP_ID_DICT", "table_type": "plugin", "valid_column": 19, @@ -926,43 +978,43 @@ } }, { - "table_id":99, + "table_id":103, "table_name":"ATTR_SUBSCRIBER_ID", "table_type":"virtual", "physical_table": "TSG_OBJ_SUBSCRIBER_ID" }, { - "table_id":100, + "table_id":104, "table_name":"ATTR_APP_ID", "table_type":"virtual", "physical_table": "APP_ID_DICT" }, { - "table_id":101, + "table_id":105, "table_name": "ATTR_SERVER_FQDN", "table_type": "virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":102, + "table_id":106, "table_name": "ATTR_SERVER_FQDN_CAT", "table_type": "virtual", "physical_table": "TSG_OBJ_FQDN_CAT" }, { - "table_id":103, + "table_id":107, "table_name":"ATTR_INTERNAL_IP", "table_type":"virtual", "physical_table": "TSG_OBJ_IP" }, { - "table_id":104, + "table_id":108, "table_name":"ATTR_EXTERNAL_IP", "table_type":"virtual", "physical_table": "TSG_OBJ_IP" }, { - "table_id":105, + "table_id":109, "table_name": "TSG_IP_PROTOCOL", "table_type": "plugin", "valid_column": 4, @@ -973,7 +1025,7 @@ } }, { - "table_id":106, + "table_id":110, "table_name":"TSG_OBJ_PORT", "table_type":"interval", "valid_column":5, @@ -985,69 +1037,87 @@ } }, { - "table_id":107, + "table_id":111, "table_name": "ATTR_SOURCE_PORT", "table_type": "virtual", "physical_table": "TSG_OBJ_PORT" }, { - "table_id":108, + "table_id":112, "table_name": "ATTR_DESTINATION_PORT", "table_type": "virtual", "physical_table": "TSG_OBJ_PORT" }, { - "table_id":109, + "table_id":113, "table_name": "ATTR_INTERNAL_PORT", "table_type": "virtual", "physical_table": "TSG_OBJ_PORT" }, { - "table_id":110, + "table_id":114, "table_name": "ATTR_EXTERNAL_PORT", "table_type": "virtual", "physical_table": "TSG_OBJ_PORT" }, { - "table_id":111, + "table_id":115, "table_name": "ATTR_IP_PROTOCOL", "table_type": "virtual", "physical_table": "TSG_IP_PROTOCOL" }, { - "table_id":112, + "table_id":116, "table_name": "ATTR_SSL_ECH", "table_type": "virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":113, + "table_id":117, "table_name": "ATTR_SSL_ESNI", "table_type": "virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":114, + "table_id":118, "table_name": "ATTR_SSL_NO_SNI", "table_type": "virtual", "physical_table": "TSG_OBJ_FQDN" }, { - "table_id":115, + "table_id":119, "table_name":"ATTR_TUNNEL_LEVEL", "table_type":"virtual", "physical_table": "TSG_TUNNEL_CATALOG" }, { - "table_id":116, + "table_id":120, "table_name":"ATTR_INTERNAL_ASN", "table_type":"virtual", "physical_table": "TSG_OBJ_AS_NUMBER" }, { - "table_id":117, + "table_id":121, "table_name":"ATTR_EXTERNAL_ASN", "table_type":"virtual", "physical_table": "TSG_OBJ_AS_NUMBER" + }, + { + "table_id":122, + "table_name":"ATTR_TUNNEL_GTP_ENDPOINT", + "table_type":"virtual", + "physical_table": "TSG_OBJ_IP" + }, + { + "table_id":123, + "table_name":"ATTR_TUNNEL_GRE_ENDPOINT", + "table_type":"virtual", + "physical_table": "TSG_OBJ_IP" + }, + { + "table_id":124, + "table_name":"ATTR_TUNNEL_IP_IN_IP_ENDPOINT", + "table_type":"virtual", + "physical_table": "TSG_OBJ_IP" } ] \ No newline at end of file