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

TSG-15094: tsg_master增加bridge的相关白盒测试用例

Browse Source
This commit is contained in:
刘学利
2023-05-24 02:07:42 +00:00
parent 4599bf039d
commit 71e390f0da
3 changed files with 555 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tsg_bridge.cpp
View File

@@ -507,7 +507,7 @@ const struct session_runtime_process_context *session_runtime_process_context_ne
int ret=session_async_bridge_set_data(a_stream, g_tm_bridge_para[BRIDGE_TYPE_SESSION_PROCESS_CONTEXT].id, (void *)srt_attribute);
if(ret<0)
{
session_runtime_attribute_free(a_stream, g_tm_bridge_para[BRIDGE_TYPE_SESSION_PROCESS_CONTEXT].id, (void *)srt_attribute);
session_runtime_process_context_free(a_stream, g_tm_bridge_para[BRIDGE_TYPE_SESSION_PROCESS_CONTEXT].id, (void *)srt_attribute);
srt_attribute=NULL;
return NULL;
}
@@ -577,7 +577,7 @@ const struct session_runtime_action_context *session_runtime_action_context_new(
int ret=session_async_bridge_set_data(a_stream, g_tm_bridge_para[BRIDGE_TYPE_SESSION_ACTION_CONTEXT].id, (void *)srt_action_context);
if(ret<0)
{
session_runtime_attribute_free(a_stream, g_tm_bridge_para[BRIDGE_TYPE_SESSION_ACTION_CONTEXT].id, (void *)srt_action_context);
session_runtime_action_context_free(a_stream, g_tm_bridge_para[BRIDGE_TYPE_SESSION_ACTION_CONTEXT].id, (void *)srt_action_context);
srt_action_context=NULL;
return NULL;
}
@@ -784,6 +784,8 @@ const struct matched_policy_rules *session_matched_rules_get(const struct stream
return (struct matched_policy_rules *)session_async_bridge_get_data(a_stream, g_tm_bridge_para[BRIDGE_TYPE_SHAPING_RESULT].id);
case TSG_SERVICE_INTERCEPT:
return (struct matched_policy_rules *)session_async_bridge_get_data(a_stream, g_tm_bridge_para[BRIDGE_TYPE_INTERCEPT_RESULT].id);
case TSG_SERVICE_SIGNATURE:
return (struct matched_policy_rules *)session_async_bridge_get_data(a_stream, g_tm_bridge_para[BRIDGE_TYPE_APP_SIGNATURE_RESULT].id);
default:
break;
}
@@ -802,7 +804,7 @@ int session_matched_rules_sync(const struct streaminfo *a_stream, TSG_SERVICE se
case TSG_SERVICE_SHAPING:
return stream_bridge_sync_data_put(a_stream, g_tm_bridge_para[BRIDGE_TYPE_SHAPING_RESULT].id, data);
case TSG_SERVICE_INTERCEPT:
return stream_bridge_sync_data_put(a_stream, g_tm_bridge_para[BRIDGE_TYPE_SECURITY_RESULT].id, data);
return stream_bridge_sync_data_put(a_stream, g_tm_bridge_para[BRIDGE_TYPE_INTERCEPT_RESULT].id, data);
case TSG_SERVICE_SIGNATURE:
return stream_bridge_sync_data_put(a_stream, g_tm_bridge_para[BRIDGE_TYPE_APP_SIGNATURE_RESULT].id, data);
default:

12
src/tsg_sync_state.cpp
View File

@@ -31,6 +31,7 @@ static int mpack_init_map(const struct streaminfo *a_stream, mpack_writer_t *wri
static int mpack_send_pkt(const struct streaminfo *a_stream, mpack_writer_t *writer, char **mpack_data, size_t *mpack_size)
{
int ret = 0;
mpack_complete_map(writer); // mpack_init_map
if (mpack_writer_destroy(writer) != mpack_ok)
{
@@ -38,12 +39,17 @@ static int mpack_send_pkt(const struct streaminfo *a_stream, mpack_writer_t *wri
return -1;
}
MESA_handle_runtime_log(g_tsg_para.logger, RLOG_LV_DEBUG, "MSGPACK_PROXY_BUFF", "send buff_len = %lu", *mpack_size);
sapp_inject_ctrl_pkt((struct streaminfo *)a_stream, SIO_DEFAULT, *mpack_data, *mpack_size, a_stream->routedir);
MESA_handle_runtime_log(g_tsg_para.logger, RLOG_LV_DEBUG, "MSGPACK_BUFF", "send buff_len = %lu, state: %u", *mpack_size, (uint8_t)a_stream->opstate);
ret = sapp_inject_ctrl_pkt((struct streaminfo *)a_stream, SIO_DEFAULT, *mpack_data, *mpack_size, a_stream->routedir);
if (ret == -1)
{
MESA_handle_runtime_log(g_tsg_para.logger, RLOG_LV_FATAL, "MSGPACK_BUFF_SEND", "An error occurred injecting the data!");
}
free(*mpack_data);
*mpack_data = NULL;
*mpack_size = 0;
return 0;
return ret;
}
int tsg_send_session_state(const struct streaminfo *a_stream, unsigned char state)