TSG-17777 优化App ID的扫描处理逻辑, HTTP多次扫描支持非配置

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

1 files changed, 39 insertions, 16 deletions

diff --git a/resource/pangu/table_info.conf b/resource/pangu/table_info.conf
index d96dcb5..77ecd33 100644
--- a/resource/pangu/table_info.conf
+++ b/resource/pangu/table_info.conf
@@ -97,7 +97,7 @@
     },	
 	{
         "table_id":7,
-        "table_name":"TSG_FIELD_HTTP_URL",
+        "table_name":"ATTR_HTTP_URL",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_URL"
     },	
@@ -129,13 +129,13 @@
     },
 	{
         "table_id":10,
-        "table_name":"TSG_FIELD_HTTP_HOST",
+        "table_name":"ATTR_HTTP_HOST",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
 	{
         "table_id":11,
-        "table_name":"TSG_FIELD_HTTP_HOST_CAT",
+        "table_name":"ATTR_HTTP_HOST_CAT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN_CAT"
     },		
@@ -156,13 +156,13 @@
     },	
 	{
         "table_id":13,
-        "table_name":"TSG_FIELD_HTTP_REQ_HDR",
+        "table_name":"ATTR_HTTP_REQ_HDR",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_HTTP_SIGNATURE"
     },
 	{
         "table_id":14,
-        "table_name":"TSG_FIELD_HTTP_RES_HDR",
+        "table_name":"ATTR_HTTP_RES_HDR",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_HTTP_SIGNATURE"
     },
@@ -182,13 +182,13 @@
     },	
 	{
         "table_id":16,
-        "table_name":"TSG_FIELD_HTTP_REQ_BODY",
+        "table_name":"ATTR_HTTP_REQ_BODY",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_KEYWORDS"
     },
 	{
         "table_id":17,
-        "table_name":"TSG_FIELD_HTTP_RES_BODY",
+        "table_name":"ATTR_HTTP_RES_BODY",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_KEYWORDS"
     },
@@ -220,13 +220,13 @@
     },
 	{
         "table_id":20,
-        "table_name":"TSG_SECURITY_SOURCE_ADDR",
+        "table_name":"ATTR_SOURCE_ADDR",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_IP"
     },
 	{
         "table_id":21,
-        "table_name":"TSG_SECURITY_DESTINATION_ADDR",
+        "table_name":"ATTR_DESTINATION_ADDR",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_IP"
     },
@@ -411,13 +411,13 @@
     },
 	{
         "table_id":37,
-        "table_name":"TSG_SECURITY_SOURCE_ASN",
+        "table_name":"ATTR_SOURCE_ASN",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_AS_NUMBER"
     },
 	{
         "table_id":38,
-        "table_name":"TSG_SECURITY_DESTINATION_ASN",
+        "table_name":"ATTR_DESTINATION_ASN",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_AS_NUMBER"
     },
@@ -437,31 +437,31 @@
     },
 	{
         "table_id":40,
-        "table_name":"TSG_SECURITY_SOURCE_LOCATION",
+        "table_name":"ATTR_SOURCE_LOCATION",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_GEO_LOCATION"
     },
 	{
         "table_id":41,
-        "table_name":"TSG_SECURITY_DESTINATION_LOCATION",
+        "table_name":"ATTR_DESTINATION_LOCATION",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_GEO_LOCATION"
     },
 	{
         "table_id":42,
-        "table_name":"TSG_FIELD_DOH_QNAME",
+        "table_name":"ATTR_DOH_QNAME",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
 	{
         "table_id":43,
-        "table_name":"TSG_FIELD_DOH_HOST",
+        "table_name":"ATTR_DOH_HOST",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN"
     },
 	{
         "table_id":44,
-        "table_name":"TSG_FIELD_DOH_HOST_CAT",
+        "table_name":"ATTR_DOH_HOST_CAT",
         "table_type":"virtual",
         "physical_table": "TSG_OBJ_FQDN_CAT"
     },
@@ -505,5 +505,28 @@
             "key":1,
             "key_type":"pointer"
         }
+    },
+    {
+        "table_id": 49,
+        "table_name": "APP_ID_DICT",
+        "table_type": "plugin",
+        "valid_column": 18,
+        "custom": {
+            "key": 1,
+            "key_type": "integer",
+            "key_len": 8
+        }
+    },
+    {
+        "table_id":50,
+        "table_name":"ATTR_APP_ID",
+        "table_type":"virtual",
+        "physical_table": "APP_ID_DICT"
+    },
+    {
+        "table_id":51,
+        "table_name":"ATTR_SUBSCRIBER_ID",
+        "table_type":"virtual",
+        "physical_table": "TSG_OBJ_SUBSCRIBER_ID"
     }
 ]
\ No newline at end of file