TSG-23921 Tfe uses field instead of attribute and field_name value to remove the attr prefix

2 files changed, 19 insertions, 19 deletions

diff --git a/plugin/business/doh/src/doh.cpp b/plugin/business/doh/src/doh.cpp
index 49f8ad5..17b55e0 100644
--- a/plugin/business/doh/src/doh.cpp
+++ b/plugin/business/doh/src/doh.cpp
@@ -283,22 +283,22 @@ static void doh_maat_scan(const struct tfe_stream *stream, const struct tfe_http
 	const char *host = session->req->req_spec.host;
 	if (host)
 	{
- 		scan_ret = maat_scan_string(g_doh_conf->maat, "TSG_OBJ_FQDN", "ATTR_SERVER_FQDN", host, strlen(host),
+ 		scan_ret = maat_scan_string(g_doh_conf->maat, "TSG_OBJ_FQDN", "SERVER_FQDN", host, strlen(host),
 									result + hit_cnt, MAX_SCAN_RESULT - hit_cnt, &n_hit_result, ctx->scan_mid);
 		if (scan_ret == MAAT_SCAN_HIT)
 		{
 			memset(result_str, 0, sizeof(result_str));
             uuid_unparse(result[hit_cnt], result_str);
             TFE_LOG_INFO(g_doh_conf->local_logger, "Scan %s, Hit host: %s scan ret: %d policy_id: %s addr: %s",
-                         "ATTR_SERVER_FQDN", host, scan_ret, result_str, stream->str_stream_info);
+                         "SERVER_FQDN", host, scan_ret, result_str, stream->str_stream_info);
             hit_cnt += n_hit_result;
 		}
 		else
 		{
             TFE_LOG_INFO(g_doh_conf->local_logger, "Scan %s, NO hit host: %s scan ret: %d addr: %s",
-                         "ATTR_SERVER_FQDN", host, scan_ret, stream->str_stream_info);
+                         "SERVER_FQDN", host, scan_ret, stream->str_stream_info);
         }
-		scan_ret = maat_scan_not_logic(g_doh_conf->maat, "TSG_OBJ_FQDN", "ATTR_SERVER_FQDN",
+		scan_ret = maat_scan_not_logic(g_doh_conf->maat, "TSG_OBJ_FQDN", "SERVER_FQDN",
 									   result + hit_cnt, MAX_SCAN_RESULT - hit_cnt, &n_hit_result, ctx->scan_mid);
         if (scan_ret == MAAT_SCAN_HIT)
         {
@@ -355,22 +355,22 @@ static void doh_maat_scan(const struct tfe_stream *stream, const struct tfe_http
 	}
 
 	// scan qname
-	scan_ret = maat_scan_string(g_doh_conf->maat, "TSG_OBJ_FQDN", "ATTR_DOH_QNAME", qname, strlen(qname),
+	scan_ret = maat_scan_string(g_doh_conf->maat, "TSG_OBJ_FQDN", "DOH_QNAME", qname, strlen(qname),
 							    result + hit_cnt, MAX_SCAN_RESULT - hit_cnt, &n_hit_result, ctx->scan_mid);
 	if (scan_ret == MAAT_SCAN_HIT)
 	{
 		memset(result_str, 0, sizeof(result_str));
         uuid_unparse(result[hit_cnt], result_str);
         TFE_LOG_INFO(g_doh_conf->local_logger, "Scan %s, Hit domain: %s scan ret: %d qtype: %d policy_id: %s addr: %s",
-                     "ATTR_DOH_QNAME", qname, scan_ret, qtype, result_str, stream->str_stream_info);
+                     "DOH_QNAME", qname, scan_ret, qtype, result_str, stream->str_stream_info);
         hit_cnt += n_hit_result;
 	}
 	else
 	{
         TFE_LOG_INFO(g_doh_conf->local_logger, "Scan %s, NO hit domain: %s scan ret: %d addr: %s",
-                     "ATTR_DOH_QNAME", qname, scan_ret, stream->str_stream_info);
+                     "DOH_QNAME", qname, scan_ret, stream->str_stream_info);
     }
-	scan_ret = maat_scan_not_logic(g_doh_conf->maat, "TSG_OBJ_FQDN", "ATTR_DOH_QNAME",
+	scan_ret = maat_scan_not_logic(g_doh_conf->maat, "TSG_OBJ_FQDN", "DOH_QNAME",
 								   result + hit_cnt, MAX_SCAN_RESULT - hit_cnt, &n_hit_result, ctx->scan_mid);
 	if (scan_ret == MAAT_SCAN_HIT)
 	{
diff --git a/plugin/business/doh/src/logger.cpp b/plugin/business/doh/src/logger.cpp
index 12d383a..50e2648 100644
--- a/plugin/business/doh/src/logger.cpp
+++ b/plugin/business/doh/src/logger.cpp
@@ -372,9 +372,9 @@ int doh_send_log(struct doh_conf *handle, const struct tfe_http_session *http, c
 		doh_get_integer_by_cmsg(common_obj, cmsg, TFE_CMSG_COMMON_DIRECTION, "direction");
     }
     
-    tfe_get_library_tags(stream, common_obj, TFE_CMSG_SRC_IP_TAGS_IDS_ARR, "client_ip_tags");
-	tfe_get_library_tags(stream, common_obj, TFE_CMSG_DST_IP_TAGS_IDS_ARR, "server_ip_tags");
-	tfe_get_library_tags(stream, common_obj, TFE_CMSG_FQDN_TAGS_IDS_ARR, "server_fqdn_tags");
+    tfe_get_library_tags(stream, common_obj, TFE_CMSG_SRC_IP_TAGS_IDS_ARR, "source_ip_tags");
+	tfe_get_library_tags(stream, common_obj, TFE_CMSG_DST_IP_TAGS_IDS_ARR, "destination_ip_tags");
+	tfe_get_library_tags(stream, common_obj, TFE_CMSG_FQDN_TAGS_IDS_ARR, "destination_fqdn_tags");
 
     if (http->req)
     {
@@ -400,19 +400,19 @@ int doh_send_log(struct doh_conf *handle, const struct tfe_http_session *http, c
         cJSON_AddNumberToObject(common_obj, "address_type", 4);
         inet_ntop(AF_INET, &addr->tuple4_v4->saddr, src_ip_str, sizeof(src_ip_str));
         inet_ntop(AF_INET, &addr->tuple4_v4->daddr, dst_ip_str, sizeof(dst_ip_str));
-        cJSON_AddStringToObject(common_obj, "client_ip", src_ip_str);
-        cJSON_AddStringToObject(common_obj, "server_ip", dst_ip_str);
-        cJSON_AddNumberToObject(common_obj, "client_port", ntohs(addr->tuple4_v4->source));
-        cJSON_AddNumberToObject(common_obj, "server_port", ntohs(addr->tuple4_v4->dest));
+        cJSON_AddStringToObject(common_obj, "source_ip", src_ip_str);
+        cJSON_AddStringToObject(common_obj, "destination_ip", dst_ip_str);
+        cJSON_AddNumberToObject(common_obj, "source_port", ntohs(addr->tuple4_v4->source));
+        cJSON_AddNumberToObject(common_obj, "destination_port", ntohs(addr->tuple4_v4->dest));
         break;
     case TFE_ADDR_STREAM_TUPLE4_V6:
         cJSON_AddNumberToObject(common_obj, "address_type", 6);
         inet_ntop(AF_INET6, &addr->tuple4_v6->saddr, src_ip_str, sizeof(src_ip_str));
         inet_ntop(AF_INET6, &addr->tuple4_v6->daddr, dst_ip_str, sizeof(dst_ip_str));
-        cJSON_AddStringToObject(common_obj, "client_ip", src_ip_str);
-        cJSON_AddStringToObject(common_obj, "server_ip", dst_ip_str);
-        cJSON_AddNumberToObject(common_obj, "client_port", ntohs(addr->tuple4_v6->source));
-        cJSON_AddNumberToObject(common_obj, "server_port", ntohs(addr->tuple4_v6->dest));
+        cJSON_AddStringToObject(common_obj, "source_ip", src_ip_str);
+        cJSON_AddStringToObject(common_obj, "destination_ip", dst_ip_str);
+        cJSON_AddNumberToObject(common_obj, "source_port", ntohs(addr->tuple4_v6->source));
+        cJSON_AddNumberToObject(common_obj, "destination_port", ntohs(addr->tuple4_v6->dest));
         break;
     default:
         break;