TSG-11997 策略验证支持按Traffic Vsys验证流量v2.3.7-20221010

1 files changed, 8 insertions, 18 deletions

diff --git a/platform/src/verify_policy.cpp b/platform/src/verify_policy.cpp
index c18b1b0..4f1639c 100644
--- a/platform/src/verify_policy.cpp
+++ b/platform/src/verify_policy.cpp
@@ -360,6 +360,13 @@ cJSON *get_query_from_request(const char *data, int thread_id)
 					goto free;
 				}
 			}
+
+			item = cJSON_GetObjectItem(subitem, "vsysId");
+			if(item && item->type==cJSON_Number)
+			{
+				verify_policy->vsys_id = item->valueint;
+			}
+
 			item = cJSON_GetObjectItem(subitem,"verifySession");
 			if(item == NULL || item->type!=cJSON_Object)
 			{
@@ -372,29 +379,12 @@ cJSON *get_query_from_request(const char *data, int thread_id)
 
 				for (subchild = attributes->child; subchild != NULL; subchild = subchild->next)
 				{
-					item = cJSON_GetObjectItem(subchild, "attributeName");
-					if(item && item->type==cJSON_String)
-					{
-						if(0 == strcasecmp(item->valuestring, "tunnel_endpointa"))
-						{
-							verify_policy_tunnle_add(ctx);
-						}
-
-						if(0 == strcasecmp(item->valuestring, "tunnel_endpointb"))
-						{
-							verify_policy_tunnle_add(ctx);
-						}
-					}
-				}
-
-				for (subchild = attributes->child; subchild != NULL; subchild = subchild->next)
-				{
 					xret = get_attribute_from_json(i, subchild, verify_policy);
 					if (xret < 0)
 					{
 						goto free;
 					}
-					hit_cnt = verify_policy_scan(verify_policy->type, &verify_policy->verify_object[i], data_obj, ctx);
+					hit_cnt = verify_policy_scan(verify_policy->vsys_id, verify_policy->type, &verify_policy->verify_object[i], data_obj, ctx);
 					if(0 == strcasecmp(verify_policy->verify_object[i].attri_name, "source") ||
 					   0 == strcasecmp(verify_policy->verify_object[i].attri_name, "destination"))
 					{