TSG-13864: 安全事件日志中添加common_flags_identify_info字段

bin/tsg_log_field.conf

@@ -123,3 +123,4 @@ LONG		common_t_vsys_id		110
 STRING		common_app_full_path	111
 LONG		common_flags		112
 LONG		common_shaping_rule_ids	113
+LONG		common_flags_identify_info	114

src/tsg_send_log.cpp

@@ -1326,6 +1326,36 @@ static int set_tunnel_ipv4v6_port(struct tsg_log_instance_t *_instance, struct T
 	return 0;
 }
 
+#define SESSION_MARKER_ALL_FIELD_NUM 13
+
+struct session_marker_notify_ctx 
+{
+	uint64_t flags;
+	uint32_t identify[SESSION_MARKER_ALL_FIELD_NUM];
+	char *identify_str;
+};
+
+int set_session_flags(struct tsg_log_instance_t *_instance, struct TLD_handle_t *_handle, struct streaminfo *a_stream)
+{
+	struct session_marker_notify_ctx *sm_notify=(struct session_marker_notify_ctx *)tsg_get_xxx_from_bridge(a_stream, _instance->bridge_id[LOG_BRIDGE_ASYNC_SESSION_FLAGS]);
+	if(sm_notify==NULL)
+	{
+		return 0;
+	}
+
+	if(!TLD_search(_handle, _instance->id2field[LOG_COMMON_FLAGS].name))
+	{
+		TLD_append(_handle, _instance->id2field[LOG_COMMON_FLAGS].name, (void *)(long)(sm_notify->flags), TLD_TYPE_LONG);
+	}
+
+	if(!TLD_search(_handle, _instance->id2field[LOG_COMMON_FLAGS_IDENTIFY_INFO].name))
+	{
+		TLD_append(_handle, _instance->id2field[LOG_COMMON_FLAGS_IDENTIFY_INFO].name, (void *)(long)(sm_notify->identify_str), TLD_TYPE_STRING);
+	}
+
+	return 0;
+}
+
 int set_shaping_rule_ids(struct tsg_log_instance_t *_instance, struct TLD_handle_t *_handle, struct streaminfo *a_stream)
 {
 	struct notify_shaping_policy *shaping_label=(struct notify_shaping_policy *)tsg_get_xxx_from_bridge(a_stream, g_tsg_para.bridge[BRIDGE_TYPE_NOTIFY_SHAPING_RESULT].id);
@@ -1728,6 +1758,8 @@ int TLD_append_streaminfo(struct tsg_log_instance_t *instance, struct TLD_handle
 	set_session_attributes(_instance, _handle, a_stream);
 	set_lua_scripts_result(_instance, _handle, a_stream);
 	
+	set_session_flags(_instance, _handle, a_stream);
+	
 	if(is_tunnels(a_stream))
 	{
 		set_common_tunnels(_instance, _handle, a_stream);
@@ -1894,6 +1926,7 @@ struct tsg_log_instance_t *tsg_sendlog_init(const char *conffile, screen_stat_ha
 	MESA_load_profile_string_def(conffile, "TSG_LOG", "BUSINESS_S3_FILENAME", bridge_name[LOG_BRIDGE_BUSINESS_S3_FILENAME], sizeof(bridge_name[LOG_BRIDGE_BUSINESS_S3_FILENAME]), "TSG_BUSINESS_S3_FILENAME");
 	MESA_load_profile_string_def(conffile, "SYSTEM", "APP_BEHAVIOR_BRIDGE_NAME", bridge_name[LOG_BRIDGE_APP_BEHAVIOR_RESULT], sizeof(bridge_name[LOG_BRIDGE_APP_BEHAVIOR_RESULT]), "TSG_APPLICATION_BEHAVIOR");
 	MESA_load_profile_string_def(conffile, "SYSTEM", "NOTIFY_EXEC_RESULT_BRIDGE_NAME", bridge_name[LOG_BRIDGE_CONN_SKETCH_EXEC_RESULT], sizeof(bridge_name[LOG_BRIDGE_CONN_SKETCH_EXEC_RESULT]), "TSG_NOTIFICATION_EXECUTION_RESULT");
+	MESA_load_profile_string_def(conffile, "SYSTEM", "NOTIFY_ASYNC_FLAGS_BRIDGE_NAME", bridge_name[LOG_BRIDGE_ASYNC_SESSION_FLAGS], sizeof(bridge_name[LOG_BRIDGE_ASYNC_SESSION_FLAGS]), "SESSION_FLAGS_ASYNC_NOTIFY_DATA");
 
 	for(int i=0; i<LOG_BRIDGE_MAX; i++)
 	{

src/tsg_send_log_internal.h

@@ -138,6 +138,7 @@ typedef enum _tsg_log_field_id
 	LOG_COMMON_APP_FULL_PATH,
 	LOG_COMMON_FLAGS,
 	LOG_COMMON_SHAPING_RULE_IDS,
+	LOG_COMMON_FLAGS_IDENTIFY_INFO,
 	LOG_COMMON_MAX
 }tsg_log_field_id_t;
 
@@ -176,6 +177,7 @@ enum LOG_BRIDGE
 	LOG_BRIDGE_BUSINESS_S3_FILENAME,
 	LOG_BRIDGE_APP_BEHAVIOR_RESULT,
 	LOG_BRIDGE_CONN_SKETCH_EXEC_RESULT,
+	LOG_BRIDGE_ASYNC_SESSION_FLAGS,
 	LOG_BRIDGE_MAX
 };
 

test/src/gtest_common.cpp

@@ -94,7 +94,7 @@ int get_rawpkt_opt_from_streaminfo(const struct streaminfo * pstream, int type,
 	return 0;
 }
 
-#define	MAX_BRIDGE_NUM	16
+#define	MAX_BRIDGE_NUM	32
 void *g_bridge_async_data[MAX_BRIDGE_NUM]={0};
 stream_bridge_free_cb_t *g_bridge_async_free[MAX_BRIDGE_NUM]={0};
 stream_bridge_sync_cb_t *g_bridge_sync_cb[MAX_BRIDGE_NUM]={0};