TSG-18276 PolicyVerify支持虚拟表表名变更v4.0.7-20231229

1 files changed, 57 insertions, 111 deletions

diff --git a/resource/table_info.conf b/resource/table_info.conf
index 60f4b53..ca007a3 100644
--- a/resource/table_info.conf
+++ b/resource/table_info.conf
@@ -492,174 +492,138 @@
     },
     {
         "table_id":37,
-        "table_name": "ATTR_HTTP_HOST",
-        "table_type": "virtual",
-        "physical_table": "TSG_OBJ_FQDN"
-    },
-    {
-        "table_id":38,
-        "table_name": "ATTR_HTTP_HOST_CAT",
-        "table_type": "virtual",
-        "physical_table": "TSG_OBJ_FQDN_CAT"
-    },
-    {
-        "table_id":39,
         "table_name":"ATTR_HTTP_URL",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_URL"
     },
     {
-        "table_id":40,
+        "table_id":38,
         "table_name":"ATTR_HTTP_REQ_HDR",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_HTTP_SIGNATURE"
     },
     {
-        "table_id":41,
+        "table_id":39,
         "table_name":"ATTR_HTTP_RES_HDR",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_HTTP_SIGNATURE"
     },
     {
-        "table_id":42,
+        "table_id":40,
         "table_name":"ATTR_HTTP_REQ_BODY",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_KEYWORDS"
     },
     {
-        "table_id":43,
+        "table_id":41,
         "table_name":"ATTR_HTTP_RES_BODY",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_KEYWORDS"
     },
     {
-        "table_id":44,
-        "table_name": "ATTR_SSL_SNI",
-        "table_type": "virtual",
-        "physical_table": "TSG_OBJ_FQDN"
-    },
-    {
-        "table_id":45,
-        "table_name": "ATTR_SSL_SNI_CAT",
-        "table_type": "virtual",
-        "physical_table": "TSG_OBJ_FQDN_CAT"
-    },
-    {
-        "table_id":46,
+        "table_id":42,
         "table_name":"ATTR_SSL_CN",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
     {
-        "table_id":47,
+        "table_id":43,
         "table_name":"ATTR_SSL_CN_CAT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN_CAT"
     },
     {
-        "table_id":48,
+        "table_id":44,
         "table_name":"ATTR_SSL_SAN",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
     {
-        "table_id":49,
+        "table_id":45,
         "table_name":"ATTR_SSL_SAN_CAT",
         "table_type":"virtual",
         "physical_table":"TSG_OBJ_FQDN_CAT"
     },
     {
-        "table_id":50,
+        "table_id":46,
         "table_name":"ATTR_DNS_QNAME",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
-    {
-        "table_id":51,
-        "table_name": "ATTR_QUIC_SNI",
-        "table_type": "virtual",
-        "physical_table": "TSG_OBJ_FQDN"
-    },
-    {
-        "table_id":52,
-        "table_name": "ATTR_QUIC_SNI_CAT",
-        "table_type": "virtual",
-        "physical_table": "TSG_OBJ_FQDN_CAT"
-    },
 	{
-        "table_id":53,
+        "table_id":47,
         "table_name":"ATTR_MAIL_ACCOUNT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_ACCOUNT"
     },
     {
-        "table_id":54,
+        "table_id":48,
         "table_name":"ATTR_MAIL_FROM",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_ACCOUNT"
     },
     {
-        "table_id":55,
+        "table_id":49,
         "table_name":"ATTR_MAIL_TO",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_ACCOUNT"
     },
     {
-        "table_id":56,
+        "table_id":50,
         "table_name":"ATTR_MAIL_SUBJECT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_KEYWORDS"
     },
     {
-        "table_id":57,
+        "table_id":51,
         "table_name":"ATTR_MAIL_CONTENT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_KEYWORDS"
     },
     {
-        "table_id":58,
+        "table_id":52,
         "table_name":"ATTR_MAIL_ATT_NAME",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_KEYWORDS"
     },
     {
-        "table_id":59,
+        "table_id":53,
         "table_name":"ATTR_MAIL_ATT_CONTENT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_KEYWORDS"
     },
     {
-        "table_id":60,
+        "table_id":54,
         "table_name":"ATTR_FTP_URI",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_URL"
     },
     {
-        "table_id":61,
+        "table_id":55,
         "table_name":"ATTR_FTP_CONTENT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_KEYWORDS"
     },
     {
-        "table_id":62,
+        "table_id":56,
         "table_name":"ATTR_FTP_ACCOUNT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_ACCOUNT"
     },
     {
-        "table_id":63,
+        "table_id":57,
         "table_name":"ATTR_SOURCE_ADDR",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_IP"
     },
     {
-        "table_id":64,
+        "table_id":58,
         "table_name":"ATTR_DESTINATION_ADDR",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_IP"
     },
     {
-        "table_id":65,
+        "table_id":59,
         "table_name":"TSG_IP_ASN_BUILT_IN",
         "table_type":"ip_plugin",
 		"valid_column":19,
@@ -672,7 +636,7 @@
         }
     },
 	{
-        "table_id":66,
+        "table_id":60,
         "table_name":"TSG_IP_ASN_USER_DEFINED",
         "table_type":"ip_plugin",
 		"valid_column":19,
@@ -685,7 +649,7 @@
         }
     },
 	{
-        "table_id":67,
+        "table_id":61,
         "table_name":"TSG_IP_LOCATION_BUILT_IN",
         "table_type":"ip_plugin",
 		"valid_column":19,
@@ -698,7 +662,7 @@
         }
     },
 	{
-        "table_id":68,
+        "table_id":62,
         "table_name":"TSG_IP_LOCATION_USER_DEFINED",
         "table_type":"ip_plugin",
 		"valid_column":19,
@@ -711,7 +675,7 @@
         }
     },
 	{
-        "table_id":69,
+        "table_id":63,
         "table_name":"TSG_OBJ_AS_NUMBER",
         "table_type":"expr",
         "valid_column":7,
@@ -725,19 +689,19 @@
         }
     },
     {
-        "table_id":70,
+        "table_id":64,
         "table_name":"ATTR_SOURCE_ASN",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_AS_NUMBER"
     },
     {
-        "table_id":71,
+        "table_id":65,
         "table_name":"ATTR_DESTINATION_ASN",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_AS_NUMBER"
     },
     {
-        "table_id":72,
+        "table_id":66,
         "table_name":"TSG_OBJ_GEO_LOCATION",
         "table_type":"expr",
         "valid_column":7,
@@ -751,19 +715,19 @@
         }
     },
     {
-        "table_id":73,
+        "table_id":67,
         "table_name":"ATTR_SOURCE_LOCATION",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_GEO_LOCATION"
     },
     {
-        "table_id":74,
+        "table_id":68,
         "table_name":"ATTR_DESTINATION_LOCATION",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_GEO_LOCATION"
     },
     {
-        "table_id":75,
+        "table_id":69,
         "table_name":"TSG_FQDN_CATEGORY_BUILT_IN",
         "table_type":"fqdn_plugin",
         "valid_column":6,
@@ -774,7 +738,7 @@
         }
     },
 	{
-        "table_id":76,
+        "table_id":70,
         "table_name":"TSG_FQDN_CATEGORY_USER_DEFINED",
         "table_type":"fqdn_plugin",
         "valid_column":6,
@@ -785,19 +749,19 @@
         }
     },
 	{
-        "table_id":77,
+        "table_id":71,
         "table_name":"ATTR_SIP_ORIGINATOR_DESCRIPTION",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_ACCOUNT"
     },
     {
-        "table_id":78,
+        "table_id":72,
         "table_name":"ATTR_SIP_RESPONDER_DESCRIPTION",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_ACCOUNT"
     },
     {
-        "table_id":79,
+        "table_id":73,
         "table_name":"TSG_OBJ_IMSI",
         "table_type":"expr",
         "valid_column":7,
@@ -811,7 +775,7 @@
         }
     },
     {
-        "table_id":80,
+        "table_id":74,
         "table_name":"TSG_OBJ_PHONE_NUMBER",
         "table_type":"expr",
         "valid_column":7,
@@ -825,7 +789,7 @@
         }
     },
     {
-        "table_id":81,
+        "table_id":75,
         "table_name":"TSG_OBJ_APN",
         "table_type":"expr",
         "valid_column":7,
@@ -839,31 +803,25 @@
         }
     },
     {
-        "table_id":82,
+        "table_id":76,
         "table_name":"ATTR_GTP_IMSI",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_IMSI"
     },
     {
-        "table_id":83,
+        "table_id":77,
         "table_name":"ATTR_GTP_PHONE_NUMBER",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_PHONE_NUMBER"
     },
     {
-        "table_id":84,
+        "table_id":78,
         "table_name":"ATTR_GTP_APN",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_APN"
     },
     {
-        "table_id":85,
-        "table_name":"TSG_DECYPTION_EXCLUSION_SSL_SNI",
-        "table_type":"virtual",
-        "physical_table": "TSG_OBJ_FQDN"
-    },
-    {
-        "table_id":86,
+        "table_id":79,
         "table_name":"TSG_TUNNEL_CATALOG",
         "table_type":"bool_plugin",
         "valid_column":6,
@@ -873,7 +831,7 @@
         }
     },	
     {
-        "table_id":87,
+        "table_id":80,
         "table_name":"TSG_TUNNEL_ENDPOINT",
         "table_type":"ip_plugin",
 		"valid_column":6,
@@ -886,7 +844,7 @@
         }
     },
     {
-        "table_id":88,
+        "table_id":81,
         "table_name":"TSG_TUNNEL_LABEL",
         "table_type":"plugin",
         "valid_column":4,
@@ -897,13 +855,13 @@
         }
     },
     {
-        "table_id":89,
+        "table_id":82,
         "table_name":"ATTR_TUNNEL",
         "table_type":"virtual",
         "physical_table": "TSG_TUNNEL_CATALOG"
     },
     {
-        "table_id":90,
+        "table_id":83,
         "table_name":"TSG_OBJ_FLAG",
         "table_type":"flag",
         "valid_column":5,
@@ -915,31 +873,19 @@
         }
     },
     {
-        "table_id":91,
+        "table_id":84,
         "table_name":"ATTR_FLAG",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FLAG"
     },
     {
-        "table_id":92,
+        "table_id":85,
         "table_name":"ATTR_DOH_QNAME",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
     {
-        "table_id":93,
-        "table_name":"ATTR_DOH_HOST",
-        "table_type":"virtual",
-        "physical_table": "TSG_OBJ_FQDN"
-    },
-    {
-        "table_id":94,
-        "table_name":"ATTR_DOH_HOST_CAT",
-        "table_type":"virtual",
-        "physical_table": "TSG_OBJ_FQDN_CAT"
-    },
-    {
-        "table_id":95,
+        "table_id":86,
         "table_name":"TSG_OBJ_IMEI",
         "table_type":"expr",
         "valid_column":7,
@@ -953,13 +899,13 @@
         }
     },
     {
-        "table_id":96,
+        "table_id":87,
         "table_name":"ATTR_GTP_IMEI",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_IMEI"
     },
     {
-        "table_id":97,
+        "table_id":88,
         "table_name": "APP_ID_DICT",
         "table_type": "plugin",
         "valid_column": 19,
@@ -970,37 +916,37 @@
         }
     },
     {
-        "table_id":98,
+        "table_id":89,
         "table_name":"ATTR_SUBSCRIBER_ID",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_SUBSCRIBER_ID"
     },
     {
-        "table_id":99,
+        "table_id":90,
         "table_name":"ATTR_APP_ID",
         "table_type":"virtual",
         "physical_table": "APP_ID_DICT"
     },
     {
-        "table_id": 100,
+        "table_id":91,
         "table_name": "ATTR_SERVER_FQDN",
         "table_type": "virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
     {
-        "table_id": 101,
+        "table_id":92,
         "table_name": "ATTR_SERVER_FQDN_CAT",
         "table_type": "virtual",
         "physical_table": "TSG_OBJ_FQDN_CAT"
     },
     {
-        "table_id":102,
+        "table_id":93,
         "table_name":"ATTR_INTERNAL_ADDR",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_IP"
     },
     {
-        "table_id":103,
+        "table_id":94,
         "table_name":"ATTR_EXTERNAL_ADDR",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_IP"