TSG-17797 PolicyVerify适配虚拟表名变更

4 files changed, 207 insertions, 220 deletions

diff --git a/platform/src/verify_matcher.cpp b/platform/src/verify_matcher.cpp
index 1d013f4..8857e73 100644
--- a/platform/src/verify_matcher.cpp
+++ b/platform/src/verify_matcher.cpp
@@ -463,29 +463,17 @@ void ip_table_free(struct ip_data_table* ip_asn)
 
 void tunnel_catalog_table_new_cb(const char *table_name, int table_id, const char* key, const char* table_line, void **ad, long argl, void* argp)
 {
-	int ret=0,tunnel_id=0,is_valid=0;
+	int ret=0,tunnel_id=0,group_id=0,is_valid=0;
 	char tunnel_name[VERIFY_ARRAY_MAX]={0},tunnel_type[16]={0};
 	char composition[VERIFY_ARRAY_MAX]={0};
 
-	ret=sscanf(table_line, "%d\t%s\t%s\t%s\t%d", &tunnel_id, tunnel_name, tunnel_type, composition, &is_valid);
-	if(ret!=5)
+	ret=sscanf(table_line, "%d\t%s\t%s\t%s\t%d\t%d", &tunnel_id, tunnel_name, tunnel_type, composition, &group_id, &is_valid);
+	if(ret!=6)
 	{
 		mesa_runtime_log(RLOG_LV_FATAL, "Policy catalog table parse tunnel catalog failed, ret:%d, %s", ret, table_line);
 		return;
 	}
 
-	int group_id=0; char *group_id_str=NULL;
-	size_t offset=0, len=0;
-
-	ret = maat_helper_read_column(table_line, 8, &offset, &len);
-	if(ret >= 0)
-	{
-		group_id_str=ALLOC(char, len+1);
-		memcpy(group_id_str, table_line+offset, len);
-		group_id=atoll(group_id_str);
-		FREE(&group_id_str);
-	}
-
 	struct tunnel_data_ctx *tunnel=ALLOC(struct tunnel_data_ctx, 1);
 	memset(tunnel, 0, sizeof(struct tunnel_data_ctx));
 	tunnel->id=tunnel_id;
@@ -781,12 +769,11 @@ void fqdn_cat_dup_data(int table_id, void **to, void **from, long argl, void* ar
 void fqdn_cat_new_data(const char *table_name, int table_id, const char* key, const char* table_line, void **ad, long argl, void* argp)
 {
 	int ret=0,id=0,is_valid=0;
-	long long int op_time=0;
 
 	struct fqdn_category_ctx *fqdn_cat = ALLOC(struct fqdn_category_ctx, 1);
 
-	ret=sscanf(table_line, "%d\t%u\t%s\t%d\t%d\t%llu\t%llu",&id, &fqdn_cat->fqdn_cat_id, fqdn_cat->fqdn, &fqdn_cat->match_method, &is_valid, &op_time, &fqdn_cat->group_id);
-	if(ret!=7)
+	ret=sscanf(table_line, "%d\t%u\t%s\t%d\t%llu\t%d",&id, &fqdn_cat->fqdn_cat_id, fqdn_cat->fqdn, &fqdn_cat->match_method, &fqdn_cat->group_id, &is_valid);
+	if(ret!=6)
 	{
 		FREE(&fqdn_cat);
 		mesa_runtime_log(RLOG_LV_FATAL, "Parse fqdn category failed, ret: %d table_id: %d table_line: %s", ret, table_id, table_line);
@@ -1276,7 +1263,7 @@ int http_hit_policy_list(struct verify_policy_query *verify_policy, int num, siz
 			}
 			succeeded = false;
 			policy_obj=cJSON_CreateObject();
-			cJSON_AddNumberToObject(policy_obj, "policyId",ctx->hit_rules[i].config_id);
+			cJSON_AddNumberToObject(policy_obj, "id",ctx->hit_rules[i].config_id);
 			cJSON_AddStringToObject(policy_obj, "policyName", "");
 
 			for (rules = 0; rules < ctx->n_enforce; rules++)
@@ -2041,62 +2028,62 @@ error_out:
 
 static void http_table_name_init(const char *table_name[__TSG_OBJ_MAX])
 {
-	table_name[TSG_OBJ_HTTP_URL] = "TSG_FIELD_HTTP_URL";
-	table_name[TSG_OBJ_HTTP_HOST] =  "TSG_FIELD_HTTP_HOST";
-	table_name[TSG_OBJ_HTTP_HOST_CAT] = "TSG_FIELD_HTTP_HOST_CAT";
-	table_name[TSG_OBJ_HTTP_REQ_HDR] =  "TSG_FIELD_HTTP_REQ_HDR";
-	table_name[TSG_OBJ_HTTP_REQ_BODY] =  "TSG_FIELD_HTTP_REQ_BODY";
-	table_name[TSG_OBJ_HTTP_RES_HDR] =  "TSG_FIELD_HTTP_RES_HDR";
-	table_name[TSG_OBJ_HTTP_RES_BODY] = "TSG_FIELD_HTTP_RES_BODY";
-	table_name[TSG_OBJ_SSL_SNI] =  "TSG_FIELD_SSL_SNI";
-	table_name[TSG_OBJ_SSL_SNI_CAT] = "TSG_FIELD_SSL_SNI_CAT";
-	table_name[TSG_OBJ_SSL_CN] =  "TSG_FIELD_SSL_CN";
-	table_name[TSG_OBJ_SSL_CN_CAT] = "TSG_FIELD_SSL_CN_CAT";
-	table_name[TSG_OBJ_SSL_SAN] = "TSG_FIELD_SSL_SAN";
-	table_name[TSG_OBJ_SSL_SAN_CAT] = "TSG_FIELD_SSL_SAN_CAT";
+	table_name[TSG_OBJ_HTTP_URL] = "ATTR_HTTP_URL";
+	table_name[TSG_OBJ_HTTP_HOST] =  "ATTR_HTTP_HOST";
+	table_name[TSG_OBJ_HTTP_HOST_CAT] = "ATTR_HTTP_HOST_CAT";
+	table_name[TSG_OBJ_HTTP_REQ_HDR] =  "ATTR_HTTP_REQ_HDR";
+	table_name[TSG_OBJ_HTTP_REQ_BODY] =  "ATTR_HTTP_REQ_BODY";
+	table_name[TSG_OBJ_HTTP_RES_HDR] =  "ATTR_HTTP_RES_HDR";
+	table_name[TSG_OBJ_HTTP_RES_BODY] = "ATTR_HTTP_RES_BODY";
+	table_name[TSG_OBJ_SSL_SNI] =  "ATTR_SSL_SNI";
+	table_name[TSG_OBJ_SSL_SNI_CAT] = "ATTR_SSL_SNI_CAT";
+	table_name[TSG_OBJ_SSL_CN] =  "ATTR_SSL_CN";
+	table_name[TSG_OBJ_SSL_CN_CAT] = "ATTR_SSL_CN_CAT";
+	table_name[TSG_OBJ_SSL_SAN] = "ATTR_SSL_SAN";
+	table_name[TSG_OBJ_SSL_SAN_CAT] = "ATTR_SSL_SAN_CAT";
 	return;
 }
 
 static void doq_table_name_init(const char *table_name[__TSG_OBJ_MAX])
 {
-	table_name[TSG_OBJ_DOH_QNAME]="TSG_FIELD_DOH_QNAME";
-	table_name[TSG_OBJ_DOH_HOST]="TSG_FIELD_DOH_HOST";
-	table_name[TSG_OBJ_DOH_HOST_CAT]="TSG_FIELD_DOH_HOST_CAT";
-	table_name[TSG_OBJ_DNS_QNAME] = "TSG_FIELD_DNS_QNAME";
-	table_name[TSG_OBJ_QUIC_SNI] = "TSG_FIELD_QUIC_SNI";
-	table_name[TSG_OBJ_QUIC_SNI_CAT] = "TSG_FIELD_QUIC_SNI_CAT";
+	table_name[TSG_OBJ_DOH_QNAME]="ATTR_DNS_QNAME";
+	table_name[TSG_OBJ_DOH_HOST]="ATTR_DOH_HOST";
+	table_name[TSG_OBJ_DOH_HOST_CAT]="ATTR_DOH_HOST_CAT";
+	table_name[TSG_OBJ_DNS_QNAME] = "ATTR_DOH_QNAME";
+	table_name[TSG_OBJ_QUIC_SNI] = "ATTR_QUIC_SNI";
+	table_name[TSG_OBJ_QUIC_SNI_CAT] = "ATTR_QUIC_SNI_CAT";
 	return;
 }
 
 static void mail_table_name_int(const char *table_name[__TSG_OBJ_MAX])
 {
-	table_name[TSG_OBJ_MAIL_ACCOUNT] = "TSG_FIELD_MAIL_ACCOUNT";
-	table_name[TSG_OBJ_MAIL_FROM] = "TSG_FIELD_MAIL_FROM";
-	table_name[TSG_OBJ_MAIL_TO] = "TSG_FIELD_MAIL_TO";
-	table_name[TSG_OBJ_MAIL_SUBJECT] = "TSG_FIELD_MAIL_SUBJECT";
-	table_name[TSG_OBJ_MAIL_CONTENT] = "TSG_FIELD_MAIL_CONTENT";
-	table_name[TSG_OBJ_MAIL_ATT_NAME] = "TSG_FIELD_MAIL_ATT_NAME";
-	table_name[TSG_OBJ_MAIL_ATT_CONTENT] = "TSG_FIELD_MAIL_ATT_CONTENT";
-	table_name[TSG_OBJ_FTP_URI] = "TSG_FIELD_FTP_URI";
-	table_name[TSG_OBJ_FTP_CONTENT] = "TSG_FIELD_FTP_CONTENT";
-	table_name[TSG_OBJ_FTP_ACCOUNT] = "TSG_FIELD_FTP_ACCOUNT";
+	table_name[TSG_OBJ_MAIL_ACCOUNT] = "ATTR_MAIL_ACCOUNT";
+	table_name[TSG_OBJ_MAIL_FROM] = "ATTR_MAIL_FROM";
+	table_name[TSG_OBJ_MAIL_TO] = "ATTR_MAIL_TO";
+	table_name[TSG_OBJ_MAIL_SUBJECT] = "ATTR_MAIL_SUBJECT";
+	table_name[TSG_OBJ_MAIL_CONTENT] = "ATTR_MAIL_CONTENT";
+	table_name[TSG_OBJ_MAIL_ATT_NAME] = "ATTR_MAIL_ATT_NAME";
+	table_name[TSG_OBJ_MAIL_ATT_CONTENT] = "ATTR_MAIL_ATT_CONTENT";
+	table_name[TSG_OBJ_FTP_URI] = "ATTR_FTP_URI";
+	table_name[TSG_OBJ_FTP_CONTENT] = "ATTR_FTP_CONTENT";
+	table_name[TSG_OBJ_FTP_ACCOUNT] = "ATTR_FTP_ACCOUNT";
 	return;
 }
 
 static void common_table_name_int(const char *table_name[__TSG_OBJ_MAX])
 {
-	table_name[TSG_OBJ_SIP_FROM]="TSG_FIELD_SIP_ORIGINATOR_DESCRIPTION";
-	table_name[TSG_OBJ_SIP_TO]="TSG_FIELD_SIP_RESPONDER_DESCRIPTION";
-	table_name[TSG_OBJ_IMSI]="TSG_FILED_GTP_IMSI";
-	table_name[TSG_OBJ_PHONE_NUMBER]="TSG_FILED_GTP_PHONE_NUMBER";
-	table_name[TSG_OBJ_APN]="TSG_FILED_GTP_APN";
-	table_name[TSG_OBJ_TUNNEL]="TSG_SECURITY_TUNNEL",
-	table_name[TSG_OBJ_FLAG]="TSG_SECURITY_FLAG";
-	table_name[TSG_OBJ_GTP_IMEI]="TSG_FILED_GTP_IMEI";
-	table_name[TSG_OBJ_IP_SRC_ASN]="TSG_SECURITY_SOURCE_ASN";
-	table_name[TSG_OBJ_IP_DST_ASN]="TSG_SECURITY_DESTINATION_ASN";
-	table_name[TSG_OBJ_IP_SRC_LOCATION]="TSG_SECURITY_SOURCE_LOCATION";
-	table_name[TSG_OBJ_IP_DST_LOCATION]="TSG_SECURITY_DESTINATION_LOCATION";
+	table_name[TSG_OBJ_SIP_FROM]="ATTR_SIP_ORIGINATOR_DESCRIPTION";
+	table_name[TSG_OBJ_SIP_TO]="ATTR_SIP_RESPONDER_DESCRIPTION";
+	table_name[TSG_OBJ_IMSI]="ATTR_GTP_IMSI";
+	table_name[TSG_OBJ_PHONE_NUMBER]="ATTR_GTP_PHONE_NUMBER";
+	table_name[TSG_OBJ_APN]="ATTR_GTP_APN";
+	table_name[TSG_OBJ_TUNNEL]="ATTR_TUNNEL",
+	table_name[TSG_OBJ_FLAG]="ATTR_FLAG";
+	table_name[TSG_OBJ_GTP_IMEI]="ATTR_GTP_IMEI";
+	table_name[TSG_OBJ_IP_SRC_ASN]="ATTR_SOURCE_ASN";
+	table_name[TSG_OBJ_IP_DST_ASN]="ATTR_DESTINATION_ASN";
+	table_name[TSG_OBJ_IP_SRC_LOCATION]="ATTR_SOURCE_LOCATION";
+	table_name[TSG_OBJ_IP_DST_LOCATION]="ATTR_DESTINATION_LOCATION";
 	return;
 }
 
@@ -2151,10 +2138,10 @@ int maat_table_init(struct verify_policy * verify, const char* profile_path)
 			goto error_out;
 		}
 		const char * table_name[__TSG_OBJ_MAX];
-		table_name[TSG_OBJ_SOURCE_ADDR] = "TSG_SECURITY_SOURCE_ADDR";
-		table_name[TSG_OBJ_DESTINATION_ADDR]="TSG_SECURITY_DESTINATION_ADDR";
-		table_name[TSG_OBJ_SUBSCRIBE_ID] = "TSG_OBJ_SUBSCRIBER_ID";
-		table_name[TSG_OBJ_APP_ID] = "TSG_OBJ_APP_ID";
+		table_name[TSG_OBJ_SOURCE_ADDR] = "ATTR_SOURCE_ADDR";
+		table_name[TSG_OBJ_DESTINATION_ADDR]="ATTR_DESTINATION_ADDR";
+		table_name[TSG_OBJ_SUBSCRIBE_ID] = "ATTR_SUBSCRIBER_ID";
+		table_name[TSG_OBJ_APP_ID] = "ATTR_APP_ID";
 		http_table_name_init(table_name);
 		doq_table_name_init(table_name);
 		mail_table_name_int(table_name);
diff --git a/platform/src/verify_policy.cpp b/platform/src/verify_policy.cpp
index f175c59..15c7002 100644
--- a/platform/src/verify_policy.cpp
+++ b/platform/src/verify_policy.cpp
@@ -92,51 +92,51 @@ int protoco_field_type_str2idx(const char *action_str, char *buff, char **p)
 {
 	const char * table_name[__TSG_OBJ_MAX] ={0};
 
-	table_name[TSG_OBJ_SOURCE_ADDR] = "TSG_SECURITY_SOURCE_ADDR";
-	table_name[TSG_OBJ_DESTINATION_ADDR]="TSG_SECURITY_DESTINATION_ADDR";
-	table_name[TSG_OBJ_SUBSCRIBE_ID] = "TSG_OBJ_SUBSCRIBER_ID";
-	table_name[TSG_OBJ_APP_ID] = "TSG_OBJ_APP_ID";
-	table_name[TSG_OBJ_HTTP_URL] = "TSG_FIELD_HTTP_URL";
-	table_name[TSG_OBJ_HTTP_HOST] = "TSG_FIELD_HTTP_HOST";
-	table_name[TSG_OBJ_HTTP_HOST_CAT] ="TSG_FIELD_HTTP_HOST_CAT";
-	table_name[TSG_OBJ_HTTP_REQ_HDR] = "TSG_FIELD_HTTP_REQ_HDR";
-	table_name[TSG_OBJ_HTTP_REQ_BODY] = "TSG_FIELD_HTTP_REQ_BODY";
-	table_name[TSG_OBJ_HTTP_RES_HDR] = "TSG_FIELD_HTTP_RES_HDR";
-	table_name[TSG_OBJ_HTTP_RES_BODY] = "TSG_FIELD_HTTP_RES_BODY";
-	table_name[TSG_OBJ_SSL_SNI] = "TSG_FIELD_SSL_SNI";
-	table_name[TSG_OBJ_SSL_SNI_CAT] = "TSG_FIELD_SSL_SNI_CAT";
-	table_name[TSG_OBJ_SSL_CN] = "TSG_FIELD_SSL_CN";
-	table_name[TSG_OBJ_SSL_CN_CAT] = "TSG_FIELD_SSL_CN_CAT";
-	table_name[TSG_OBJ_SSL_SAN] = "TSG_FIELD_SSL_SAN";
-	table_name[TSG_OBJ_SSL_SAN_CAT] = "TSG_FIELD_SSL_SAN_CAT";
-	table_name[TSG_OBJ_DOH_QNAME]="TSG_FIELD_DOH_QNAME";
-	table_name[TSG_OBJ_DOH_HOST]="TSG_FIELD_DOH_HOST";
-	table_name[TSG_OBJ_DOH_HOST_CAT]="TSG_FIELD_DOH_HOST_CAT";
-	table_name[TSG_OBJ_DNS_QNAME] = "TSG_FIELD_DNS_QNAME";
-	table_name[TSG_OBJ_QUIC_SNI] = "TSG_FIELD_QUIC_SNI";
-	table_name[TSG_OBJ_QUIC_SNI_CAT] = "TSG_FIELD_QUIC_SNI_CAT";
-	table_name[TSG_OBJ_MAIL_ACCOUNT] = "TSG_FIELD_MAIL_ACCOUNT";
-	table_name[TSG_OBJ_MAIL_FROM] = "TSG_FIELD_MAIL_FROM";
-	table_name[TSG_OBJ_MAIL_TO] = "TSG_FIELD_MAIL_TO";
-	table_name[TSG_OBJ_MAIL_SUBJECT] = "TSG_FIELD_MAIL_SUBJECT";
-	table_name[TSG_OBJ_MAIL_CONTENT] = "TSG_FIELD_MAIL_CONTENT";
-	table_name[TSG_OBJ_MAIL_ATT_NAME] = "TSG_FIELD_MAIL_ATT_NAME";
-	table_name[TSG_OBJ_MAIL_ATT_CONTENT] = "TSG_FIELD_MAIL_ATT_CONTENT";
-	table_name[TSG_OBJ_FTP_URI] = "TSG_FIELD_FTP_URI";
-	table_name[TSG_OBJ_FTP_CONTENT] = "TSG_FIELD_FTP_CONTENT";
-	table_name[TSG_OBJ_FTP_ACCOUNT] = "TSG_FIELD_FTP_ACCOUNT";
-	table_name[TSG_OBJ_SIP_FROM]="TSG_FIELD_SIP_ORIGINATOR_DESCRIPTION";
-	table_name[TSG_OBJ_SIP_TO]="TSG_FIELD_SIP_RESPONDER_DESCRIPTION";
-	table_name[TSG_OBJ_IMSI]="TSG_FILED_GTP_IMSI";
-	table_name[TSG_OBJ_PHONE_NUMBER]="TSG_FILED_GTP_PHONE_NUMBER";
-	table_name[TSG_OBJ_APN]="TSG_FILED_GTP_APN";
-	table_name[TSG_OBJ_TUNNEL]="TSG_SECURITY_TUNNEL",
-	table_name[TSG_OBJ_FLAG]="TSG_SECURITY_FLAG";
-	table_name[TSG_OBJ_GTP_IMEI]="TSG_FILED_GTP_IMEI";
-	table_name[TSG_OBJ_IP_SRC_ASN]="TSG_SECURITY_SOURCE_ASN";
-	table_name[TSG_OBJ_IP_DST_ASN]="TSG_SECURITY_DESTINATION_ASN";
-	table_name[TSG_OBJ_IP_SRC_LOCATION]="TSG_SECURITY_SOURCE_LOCATION";
-	table_name[TSG_OBJ_IP_DST_LOCATION]="TSG_SECURITY_DESTINATION_LOCATION";
+	table_name[TSG_OBJ_SOURCE_ADDR] = "ATTR_SOURCE_ADDR";
+	table_name[TSG_OBJ_DESTINATION_ADDR]="ATTR_DESTINATION_ADDR";
+	table_name[TSG_OBJ_SUBSCRIBE_ID] = "ATTR_SUBSCRIBER_ID";
+	table_name[TSG_OBJ_APP_ID] = "ATTR_APP_ID";
+	table_name[TSG_OBJ_HTTP_URL] = "ATTR_HTTP_URL";
+	table_name[TSG_OBJ_HTTP_HOST] = "ATTR_HTTP_HOST";
+	table_name[TSG_OBJ_HTTP_HOST_CAT] ="ATTR_HTTP_HOST_CAT";
+	table_name[TSG_OBJ_HTTP_REQ_HDR] = "ATTR_HTTP_REQ_HDR";
+	table_name[TSG_OBJ_HTTP_REQ_BODY] = "ATTR_HTTP_REQ_BODY";
+	table_name[TSG_OBJ_HTTP_RES_HDR] = "ATTR_HTTP_RES_HDR";
+	table_name[TSG_OBJ_HTTP_RES_BODY] = "ATTR_HTTP_RES_BODY";
+	table_name[TSG_OBJ_SSL_SNI] = "ATTR_SSL_SNI";
+	table_name[TSG_OBJ_SSL_SNI_CAT] = "ATTR_SSL_SNI_CAT";
+	table_name[TSG_OBJ_SSL_CN] = "ATTR_SSL_CN";
+	table_name[TSG_OBJ_SSL_CN_CAT] = "ATTR_SSL_CN_CAT";
+	table_name[TSG_OBJ_SSL_SAN] = "ATTR_SSL_SAN";
+	table_name[TSG_OBJ_SSL_SAN_CAT] = "ATTR_SSL_SAN_CAT";
+	table_name[TSG_OBJ_DOH_QNAME]="ATTR_DOH_QNAME";
+	table_name[TSG_OBJ_DOH_HOST]="ATTR_DOH_HOST";
+	table_name[TSG_OBJ_DOH_HOST_CAT]="ATTR_DOH_HOST_CAT";
+	table_name[TSG_OBJ_DNS_QNAME] = "ATTR_DNS_QNAME";
+	table_name[TSG_OBJ_QUIC_SNI] = "ATTR_QUIC_SNI";
+	table_name[TSG_OBJ_QUIC_SNI_CAT] = "ATTR_QUIC_SNI_CAT";
+	table_name[TSG_OBJ_MAIL_ACCOUNT] = "ATTR_MAIL_ACCOUNT";
+	table_name[TSG_OBJ_MAIL_FROM] = "ATTR_MAIL_FROM";
+	table_name[TSG_OBJ_MAIL_TO] = "ATTR_MAIL_TO";
+	table_name[TSG_OBJ_MAIL_SUBJECT] = "ATTR_MAIL_SUBJECT";
+	table_name[TSG_OBJ_MAIL_CONTENT] = "ATTR_MAIL_CONTENT";
+	table_name[TSG_OBJ_MAIL_ATT_NAME] = "ATTR_MAIL_ATT_NAME";
+	table_name[TSG_OBJ_MAIL_ATT_CONTENT] = "ATTR_MAIL_ATT_CONTENT";
+	table_name[TSG_OBJ_FTP_URI] = "ATTR_FTP_URI";
+	table_name[TSG_OBJ_FTP_CONTENT] = "ATTR_FTP_CONTENT";
+	table_name[TSG_OBJ_FTP_ACCOUNT] = "ATTR_FTP_ACCOUNT";
+	table_name[TSG_OBJ_SIP_FROM]="ATTR_SIP_ORIGINATOR_DESCRIPTION";
+	table_name[TSG_OBJ_SIP_TO]="ATTR_SIP_RESPONDER_DESCRIPTION";
+	table_name[TSG_OBJ_IMSI]="ATTR_GTP_IMSI";
+	table_name[TSG_OBJ_PHONE_NUMBER]="ATTR_GTP_PHONE_NUMBER";
+	table_name[TSG_OBJ_APN]="ATTR_GTP_APN";
+	table_name[TSG_OBJ_TUNNEL]="ATTR_TUNNEL",
+	table_name[TSG_OBJ_FLAG]="ATTR_FLAG";
+	table_name[TSG_OBJ_GTP_IMEI]="ATTR_GTP_IMEI";
+	table_name[TSG_OBJ_IP_SRC_ASN]="ATTR_SOURCE_ASN";
+	table_name[TSG_OBJ_IP_DST_ASN]="ATTR_DESTINATION_ASN";
+	table_name[TSG_OBJ_IP_SRC_LOCATION]="ATTR_SOURCE_LOCATION";
+	table_name[TSG_OBJ_IP_DST_LOCATION]="ATTR_DESTINATION_LOCATION";
 
 	size_t i = 0;
 	for (i = 0; i < __TSG_OBJ_MAX; i++)
@@ -411,7 +411,7 @@ int get_query_result_policy(cJSON *subitem, cJSON *data_obj, int thread_id)
 	struct verify_policy_query *verify_policy = NULL;
 
 	verify_policy = ALLOC(struct verify_policy_query, 1);
-	item = cJSON_GetObjectItem(subitem,"policyType");
+	item = cJSON_GetObjectItem(subitem,"type");
 	if(item && item->type==cJSON_String)
 	{
 		verify_policy->compile_table_id = tsg_policy_type_str2idx(item->valuestring);
diff --git a/resource/table_info.conf b/resource/table_info.conf
index 5c01e6d..8993208 100644
--- a/resource/table_info.conf
+++ b/resource/table_info.conf
@@ -424,18 +424,6 @@
         }
     },
 	{
-        "table_id":32,
-        "table_name":"TSG_OBJ_APP_ID",
-        "table_type":"interval",
-        "valid_column":5,
-        "custom": {
-            "item_id":1,
-            "group_id":2,
-            "low_bound":3,
-            "up_bound":4
-        }
-    },
-	{
         "table_id":33,
         "table_name":"TSG_OBJ_HTTP_SIGNATURE",
         "table_type":"expr_plus",
@@ -452,169 +440,169 @@
     },
 	{
         "table_id":34,
-        "table_name":"TSG_FIELD_HTTP_HOST",
+        "table_name":"ATTR_HTTP_HOST",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
 	{
         "table_id":35,
-        "table_name":"TSG_FIELD_HTTP_HOST_CAT",
+        "table_name":"ATTR_HTTP_HOST_CAT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN_CAT"
     },		
 	{
         "table_id":36,
-        "table_name":"TSG_FIELD_HTTP_URL",
+        "table_name":"ATTR_HTTP_URL",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_URL"
     },
 	{
         "table_id":37,
-        "table_name":"TSG_FIELD_HTTP_REQ_HDR",
+        "table_name":"ATTR_HTTP_REQ_HDR",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_HTTP_SIGNATURE"
     },
 	{
         "table_id":38,
-        "table_name":"TSG_FIELD_HTTP_RES_HDR",
+        "table_name":"ATTR_HTTP_RES_HDR",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_HTTP_SIGNATURE"
     },
 	{
         "table_id":39,
-        "table_name":"TSG_FIELD_HTTP_REQ_BODY",
+        "table_name":"ATTR_HTTP_REQ_BODY",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_KEYWORDS"
     },
 	{
         "table_id":40,
-        "table_name":"TSG_FIELD_HTTP_RES_BODY",
+        "table_name":"ATTR_HTTP_RES_BODY",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_KEYWORDS"
     },
 	{
         "table_id":41,
-        "table_name":"TSG_FIELD_SSL_SNI",
+        "table_name":"ATTR_SSL_SNI",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
 	{
         "table_id":42,
-        "table_name":"TSG_FIELD_SSL_SNI_CAT",
+        "table_name":"ATTR_SSL_SNI_CAT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN_CAT"
     },
 	{
         "table_id":43,
-        "table_name":"TSG_FIELD_SSL_CN",
+        "table_name":"ATTR_SSL_CN",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
 	{
         "table_id":44,
-        "table_name":"TSG_FIELD_SSL_CN_CAT",
+        "table_name":"ATTR_SSL_CN_CAT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN_CAT"
     },
 	{
         "table_id":45,
-        "table_name":"TSG_FIELD_SSL_SAN",
+        "table_name":"ATTR_SSL_SAN",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
 	{
         "table_id":46,
-        "table_name":"TSG_FIELD_SSL_SAN_CAT",
+        "table_name":"ATTR_SSL_SAN_CAT",
         "table_type":"virtual",
         "physical_table":"TSG_OBJ_FQDN_CAT"
     },
 	{
         "table_id":47,
-        "table_name":"TSG_FIELD_DNS_QNAME",
+        "table_name":"ATTR_DNS_QNAME",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
 	{
         "table_id":48,
-        "table_name":"TSG_FIELD_QUIC_SNI",
+        "table_name":"ATTR_QUIC_SNI",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
 	{
         "table_id":49,
-        "table_name":"TSG_FIELD_QUIC_SNI_CAT",
+        "table_name":"ATTR_QUIC_SNI_CAT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN_CAT"
     },
 	{
         "table_id":50,
-        "table_name":"TSG_FIELD_MAIL_ACCOUNT",
+        "table_name":"ATTR_MAIL_ACCOUNT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_ACCOUNT"
     },
 	{
         "table_id":51,
-        "table_name":"TSG_FIELD_MAIL_FROM",
+        "table_name":"ATTR_MAIL_FROM",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_ACCOUNT"
     },
 	{
         "table_id":52,
-        "table_name":"TSG_FIELD_MAIL_TO",
+        "table_name":"ATTR_MAIL_TO",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_ACCOUNT"
     },
 	{
         "table_id":53,
-        "table_name":"TSG_FIELD_MAIL_SUBJECT",
+        "table_name":"ATTR_MAIL_SUBJECT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_KEYWORDS"
     },
 	{
         "table_id":54,
-        "table_name":"TSG_FIELD_MAIL_CONTENT",
+        "table_name":"ATTR_MAIL_CONTENT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_KEYWORDS"
     },
 	{
         "table_id":55,
-        "table_name":"TSG_FIELD_MAIL_ATT_NAME",
+        "table_name":"ATTR_MAIL_ATT_NAME",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_KEYWORDS"
     },
 	{
         "table_id":56,
-        "table_name":"TSG_FIELD_MAIL_ATT_CONTENT",
+        "table_name":"ATTR_MAIL_ATT_CONTENT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_KEYWORDS"
     },
 	{
         "table_id":57,
-        "table_name":"TSG_FIELD_FTP_URI",
+        "table_name":"ATTR_FTP_URI",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_URL"
     },
 	{
         "table_id":58,
-        "table_name":"TSG_FIELD_FTP_CONTENT",
+        "table_name":"ATTR_FTP_CONTENT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_KEYWORDS"
     },
 	{
         "table_id":59,
-        "table_name":"TSG_FIELD_FTP_ACCOUNT",
+        "table_name":"ATTR_FTP_ACCOUNT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_ACCOUNT"
     },
 	{
         "table_id":60,
-        "table_name":"TSG_SECURITY_SOURCE_ADDR",
+        "table_name":"ATTR_SOURCE_ADDR",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_IP"
     },
 	{
         "table_id":61,
-        "table_name":"TSG_SECURITY_DESTINATION_ADDR",
+        "table_name":"ATTR_DESTINATION_ADDR",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_IP"
     },
@@ -686,13 +674,13 @@
     },
 	{
         "table_id":67,
-        "table_name":"TSG_SECURITY_SOURCE_ASN",
+        "table_name":"ATTR_SOURCE_ASN",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_AS_NUMBER"
     },
 	{
         "table_id":68,
-        "table_name":"TSG_SECURITY_DESTINATION_ASN",
+        "table_name":"ATTR_DESTINATION_ASN",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_AS_NUMBER"
     },
@@ -712,13 +700,13 @@
     },
 	{
         "table_id":70,
-        "table_name":"TSG_SECURITY_SOURCE_LOCATION",
+        "table_name":"ATTR_SOURCE_LOCATION",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_GEO_LOCATION"
     },
 	{
         "table_id":71,
-        "table_name":"TSG_SECURITY_DESTINATION_LOCATION",
+        "table_name":"ATTR_DESTINATION_LOCATION",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_GEO_LOCATION"
     },
@@ -746,13 +734,13 @@
     },
 	{
         "table_id":74,
-        "table_name":"TSG_FIELD_SIP_ORIGINATOR_DESCRIPTION",
+        "table_name":"ATTR_SIP_ORIGINATOR_DESCRIPTION",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_ACCOUNT"
     },
 	{
         "table_id":75,
-        "table_name":"TSG_FIELD_SIP_RESPONDER_DESCRIPTION",
+        "table_name":"ATTR_SIP_RESPONDER_DESCRIPTION",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_ACCOUNT"
     },
@@ -800,19 +788,19 @@
     },
 	{
         "table_id":79,
-        "table_name":"TSG_FILED_GTP_IMSI",
+        "table_name":"ATTR_GTP_IMSI",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_IMSI"
     },
 	{
         "table_id":80,
-        "table_name":"TSG_FILED_GTP_PHONE_NUMBER",
+        "table_name":"ATTR_GTP_PHONE_NUMBER",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_PHONE_NUMBER"
     },
 	{
         "table_id":81,
-        "table_name":"TSG_FILED_GTP_APN",
+        "table_name":"ATTR_GTP_APN",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_APN"
     },
@@ -870,7 +858,7 @@
     },
 	{
         "table_id":87,
-        "table_name":"TSG_SECURITY_TUNNEL",
+        "table_name":"ATTR_TUNNEL",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_TUNNEL_ID"
     },
@@ -888,25 +876,25 @@
     },
 	{
         "table_id":89,
-        "table_name":"TSG_SECURITY_FLAG",
+        "table_name":"ATTR_FLAG",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FLAG"
     },
     {
         "table_id":90,
-        "table_name":"TSG_FIELD_DOH_QNAME",
+        "table_name":"ATTR_DOH_QNAME",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
 	{
         "table_id":91,
-        "table_name":"TSG_FIELD_DOH_HOST",
+        "table_name":"ATTR_DOH_HOST",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
 	{
         "table_id":92,
-        "table_name":"TSG_FIELD_DOH_HOST_CAT",
+        "table_name":"ATTR_DOH_HOST_CAT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN_CAT"
     },
@@ -926,7 +914,7 @@
     },
 	{
         "table_id":94,
-        "table_name":"TSG_FILED_GTP_IMEI",
+        "table_name":"ATTR_GTP_IMEI",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_IMEI"
     },
@@ -940,5 +928,17 @@
             "key_type": "integer",
             "key_len": 8
         }
+    },
+    {
+        "table_id":96,
+        "table_name":"ATTR_SUBSCRIBER_ID",
+        "table_type":"virtual",
+        "physical_table": "TSG_OBJ_SUBSCRIBER_ID"
+    },
+    {
+        "table_id":97,
+        "table_name":"ATTR_APP_ID",
+        "table_type":"virtual",
+        "physical_table": "APP_ID_DICT"
     }
 ]
\ No newline at end of file
diff --git a/resource/table_info_simple.conf b/resource/table_info_simple.conf
index 81f1de8..1d750b9 100644
--- a/resource/table_info_simple.conf
+++ b/resource/table_info_simple.conf
@@ -424,18 +424,6 @@
         }
     },
 	{
-        "table_id":32,
-        "table_name":"TSG_OBJ_APP_ID",
-        "table_type":"interval",
-        "valid_column":5,
-        "custom": {
-            "item_id":1,
-            "group_id":2,
-            "low_bound":3,
-            "up_bound":4
-        }
-    },
-	{
         "table_id":33,
         "table_name":"TSG_OBJ_HTTP_SIGNATURE",
         "table_type":"expr_plus",
@@ -452,169 +440,169 @@
     },
 	{
         "table_id":34,
-        "table_name":"TSG_FIELD_HTTP_HOST",
+        "table_name":"ATTR_HTTP_HOST",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
 	{
         "table_id":35,
-        "table_name":"TSG_FIELD_HTTP_HOST_CAT",
+        "table_name":"ATTR_HTTP_HOST_CAT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN_CAT"
     },		
 	{
         "table_id":36,
-        "table_name":"TSG_FIELD_HTTP_URL",
+        "table_name":"ATTR_HTTP_URL",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_URL"
     },
 	{
         "table_id":37,
-        "table_name":"TSG_FIELD_HTTP_REQ_HDR",
+        "table_name":"ATTR_HTTP_REQ_HDR",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_HTTP_SIGNATURE"
     },
 	{
         "table_id":38,
-        "table_name":"TSG_FIELD_HTTP_RES_HDR",
+        "table_name":"ATTR_HTTP_RES_HDR",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_HTTP_SIGNATURE"
     },
 	{
         "table_id":39,
-        "table_name":"TSG_FIELD_HTTP_REQ_BODY",
+        "table_name":"ATTR_HTTP_REQ_BODY",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_KEYWORDS"
     },
 	{
         "table_id":40,
-        "table_name":"TSG_FIELD_HTTP_RES_BODY",
+        "table_name":"ATTR_HTTP_RES_BODY",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_KEYWORDS"
     },
 	{
         "table_id":41,
-        "table_name":"TSG_FIELD_SSL_SNI",
+        "table_name":"ATTR_SSL_SNI",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
 	{
         "table_id":42,
-        "table_name":"TSG_FIELD_SSL_SNI_CAT",
+        "table_name":"ATTR_SSL_SNI_CAT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN_CAT"
     },
 	{
         "table_id":43,
-        "table_name":"TSG_FIELD_SSL_CN",
+        "table_name":"ATTR_SSL_CN",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
 	{
         "table_id":44,
-        "table_name":"TSG_FIELD_SSL_CN_CAT",
+        "table_name":"ATTR_SSL_CN_CAT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN_CAT"
     },
 	{
         "table_id":45,
-        "table_name":"TSG_FIELD_SSL_SAN",
+        "table_name":"ATTR_SSL_SAN",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
 	{
         "table_id":46,
-        "table_name":"TSG_FIELD_SSL_SAN_CAT",
+        "table_name":"ATTR_SSL_SAN_CAT",
         "table_type":"virtual",
         "physical_table":"TSG_OBJ_FQDN_CAT"
     },
 	{
         "table_id":47,
-        "table_name":"TSG_FIELD_DNS_QNAME",
+        "table_name":"ATTR_DNS_QNAME",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
 	{
         "table_id":48,
-        "table_name":"TSG_FIELD_QUIC_SNI",
+        "table_name":"ATTR_QUIC_SNI",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
 	{
         "table_id":49,
-        "table_name":"TSG_FIELD_QUIC_SNI_CAT",
+        "table_name":"ATTR_QUIC_SNI_CAT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN_CAT"
     },
 	{
         "table_id":50,
-        "table_name":"TSG_FIELD_MAIL_ACCOUNT",
+        "table_name":"ATTR_MAIL_ACCOUNT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_ACCOUNT"
     },
 	{
         "table_id":51,
-        "table_name":"TSG_FIELD_MAIL_FROM",
+        "table_name":"ATTR_MAIL_FROM",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_ACCOUNT"
     },
 	{
         "table_id":52,
-        "table_name":"TSG_FIELD_MAIL_TO",
+        "table_name":"ATTR_MAIL_TO",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_ACCOUNT"
     },
 	{
         "table_id":53,
-        "table_name":"TSG_FIELD_MAIL_SUBJECT",
+        "table_name":"ATTR_MAIL_SUBJECT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_KEYWORDS"
     },
 	{
         "table_id":54,
-        "table_name":"TSG_FIELD_MAIL_CONTENT",
+        "table_name":"ATTR_MAIL_CONTENT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_KEYWORDS"
     },
 	{
         "table_id":55,
-        "table_name":"TSG_FIELD_MAIL_ATT_NAME",
+        "table_name":"ATTR_MAIL_ATT_NAME",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_KEYWORDS"
     },
 	{
         "table_id":56,
-        "table_name":"TSG_FIELD_MAIL_ATT_CONTENT",
+        "table_name":"ATTR_MAIL_ATT_CONTENT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_KEYWORDS"
     },
 	{
         "table_id":57,
-        "table_name":"TSG_FIELD_FTP_URI",
+        "table_name":"ATTR_FTP_URI",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_URL"
     },
 	{
         "table_id":58,
-        "table_name":"TSG_FIELD_FTP_CONTENT",
+        "table_name":"ATTR_FTP_CONTENT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_KEYWORDS"
     },
 	{
         "table_id":59,
-        "table_name":"TSG_FIELD_FTP_ACCOUNT",
+        "table_name":"ATTR_FTP_ACCOUNT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_ACCOUNT"
     },
 	{
         "table_id":60,
-        "table_name":"TSG_SECURITY_SOURCE_ADDR",
+        "table_name":"ATTR_SOURCE_ADDR",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_IP"
     },
 	{
         "table_id":61,
-        "table_name":"TSG_SECURITY_DESTINATION_ADDR",
+        "table_name":"ATTR_DESTINATION_ADDR",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_IP"
     },
@@ -634,13 +622,13 @@
     },
 	{
         "table_id":63,
-        "table_name":"TSG_SECURITY_SOURCE_ASN",
+        "table_name":"ATTR_SOURCE_ASN",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_AS_NUMBER"
     },
 	{
         "table_id":64,
-        "table_name":"TSG_SECURITY_DESTINATION_ASN",
+        "table_name":"ATTR_DESTINATION_ASN",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_AS_NUMBER"
     },
@@ -660,25 +648,25 @@
     },
 	{
         "table_id":66,
-        "table_name":"TSG_SECURITY_SOURCE_LOCATION",
+        "table_name":"ATTR_SOURCE_LOCATION",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_GEO_LOCATION"
     },
 	{
         "table_id":67,
-        "table_name":"TSG_SECURITY_DESTINATION_LOCATION",
+        "table_name":"ATTR_DESTINATION_LOCATION",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_GEO_LOCATION"
     },
 	{
         "table_id":68,
-        "table_name":"TSG_FIELD_SIP_ORIGINATOR_DESCRIPTION",
+        "table_name":"ATTR_SIP_ORIGINATOR_DESCRIPTION",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_ACCOUNT"
     },
 	{
         "table_id":69,
-        "table_name":"TSG_FIELD_SIP_RESPONDER_DESCRIPTION",
+        "table_name":"ATTR_SIP_RESPONDER_DESCRIPTION",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_ACCOUNT"
     },
@@ -726,19 +714,19 @@
     },
 	{
         "table_id":73,
-        "table_name":"TSG_FILED_GTP_IMSI",
+        "table_name":"ATTR_GTP_IMSI",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_IMSI"
     },
 	{
         "table_id":74,
-        "table_name":"TSG_FILED_GTP_PHONE_NUMBER",
+        "table_name":"ATTR_GTP_PHONE_NUMBER",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_PHONE_NUMBER"
     },
 	{
         "table_id":75,
-        "table_name":"TSG_FILED_GTP_APN",
+        "table_name":"ATTR_GTP_APN",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_APN"
     },
@@ -796,7 +784,7 @@
     },
 	{
         "table_id":81,
-        "table_name":"TSG_SECURITY_TUNNEL",
+        "table_name":"ATTR_TUNNEL",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_TUNNEL_ID"
     },
@@ -814,25 +802,25 @@
     },
 	{
         "table_id":83,
-        "table_name":"TSG_SECURITY_FLAG",
+        "table_name":"ATTR_FLAG",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FLAG"
     },
     {
         "table_id":84,
-        "table_name":"TSG_FIELD_DOH_QNAME",
+        "table_name":"ATTR_DOH_QNAME",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
 	{
         "table_id":85,
-        "table_name":"TSG_FIELD_DOH_HOST",
+        "table_name":"ATTR_DOH_HOST",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
 	{
         "table_id":86,
-        "table_name":"TSG_FIELD_DOH_HOST_CAT",
+        "table_name":"ATTR_DOH_HOST_CAT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN_CAT"
     },
@@ -852,7 +840,7 @@
     },
 	{
         "table_id":88,
-        "table_name":"TSG_FILED_GTP_IMEI",
+        "table_name":"ATTR_GTP_IMEI",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_IMEI"
     },
@@ -866,5 +854,17 @@
             "key_type": "integer",
             "key_len": 8
         }
+    },
+	{
+        "table_id":90,
+        "table_name":"ATTR_SUBSCRIBER_ID",
+        "table_type":"virtual",
+        "physical_table": "TSG_OBJ_SUBSCRIBER_ID"
+    },
+    {
+        "table_id":91,
+        "table_name":"ATTR_APP_ID",
+        "table_type":"virtual",
+        "physical_table": "APP_ID_DICT"
     }
 ]
\ No newline at end of file