gfwleak/tango-tsg-master
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TSG-14946: 安全策略支持allow(deny)和monitor动作同时命中

Browse Source
This commit is contained in:
刘学利
2023-05-27 09:37:46 +00:00
parent bc7909e57b
commit 7abc576621
14 changed files with 183 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/tsg_bridge.cpp
View File

@@ -109,12 +109,6 @@ void session_runtime_process_context_free(const struct streaminfo *a_stream, int
srt_process_context->mid=NULL;
}
if(srt_process_context->hited_result!=NULL)
{
dictator_free(a_stream->threadnum, (void *)srt_process_context->hited_result);
srt_process_context->hited_result=NULL;
}
dictator_free(a_stream->threadnum, (void *)srt_process_context);
srt_process_context=NULL;
}
@@ -561,6 +555,16 @@ const char *srt_process_context_get_quic_ua(const struct session_runtime_process
return NULL;
}
unsigned char srt_process_context_get_hitted_allow_flag(const struct session_runtime_process_context *srt_process_context)
{
if(srt_process_context!=NULL)
{
return srt_process_context->is_hitted_allow;
}
return 0;
}
int session_runtime_action_context_async(const struct streaminfo *a_stream, void *data)
{
return session_async_bridge_set_data(a_stream, g_tm_bridge_para[BRIDGE_TYPE_SESSION_ACTION_CONTEXT].id, data);
@@ -899,16 +903,6 @@ void session_matched_rules_notify(const struct streaminfo *a_stream, TSG_SERVICE
session_matched_rules_free_by_bridge(a_stream, g_tm_bridge_para[bridge_idx].id, (void *)matched_policy);
}
}
if(rules[0].action<matched_policy->rules[0].action)
{
return ;
}
if(rules[0].action>matched_policy->rules[0].action)
{
matched_policy->n_rules=0;
}
size_t num=MIN(MAX_RESULT_NUM-matched_policy->n_rules, n_rules);
for(size_t i=0; i<num; i++)