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

TSG-23403 SCE适配日志字段变更：sc_rule_list->sc_rule_uuid_list; sc_rsp_raw->sc_rsp_raw_uuid_list; sc_rsp_decrypted->sc_rsp_decrypted_uuid_list

Browse Source
This commit is contained in:
luwenpeng
2024-11-06 15:03:31 +08:00
parent 431ac5f67d
commit 043f9cbad7
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
common/test/gtest_control_packet.cpp
View File

@@ -46,16 +46,18 @@ static u_char control_packet_send[] = {
0x69, 0x6F, 0x6E, 0x5F, 0x69, 0x64, 0x01, 0xA5, 0x73, 0x74, 0x61, 0x74, 0x65, 0xA6, 0x61, 0x63, 0x69, 0x6F, 0x6E, 0x5F, 0x69, 0x64, 0x01, 0xA5, 0x73, 0x74, 0x61, 0x74, 0x65, 0xA6, 0x61, 0x63,
0x74, 0x69, 0x76, 0x65, 0xA6, 0x6D, 0x65, 0x74, 0x68, 0x6F, 0x64, 0xAA, 0x6C, 0x6F, 0x67, 0x5F, 0x74, 0x69, 0x76, 0x65, 0xA6, 0x6D, 0x65, 0x74, 0x68, 0x6F, 0x64, 0xAA, 0x6C, 0x6F, 0x67, 0x5F,
0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0xA6, 0x70, 0x61, 0x72, 0x61, 0x6D, 0x73, 0x81, 0xA3, 0x73, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0xA6, 0x70, 0x61, 0x72, 0x61, 0x6D, 0x73, 0x81, 0xA3, 0x73,
0x63, 0x65, 0x83, 0xAC, 0x73, 0x63, 0x5F, 0x72, 0x75, 0x6C, 0x65, 0x5F, 0x6C, 0x69, 0x73, 0x74, 0x63, 0x65, 0x83, 0xB1, 0x73, 0x63, 0x5F, 0x72, 0x75, 0x6C, 0x65, 0x5F, 0x75, 0x75, 0x69, 0x64,
0x92, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x6C, 0x69, 0x73, 0x74, 0x92, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x01, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x02, 0xAA, 0x73, 0x63, 0x5F, 0x72, 0x73, 0x70, 0x5F, 0x72, 0x61, 0x77, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xB4, 0x73, 0x63, 0x5F, 0x72, 0x73,
0x92, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x5F, 0x72, 0x61, 0x77, 0x5F, 0x75, 0x75, 0x69, 0x64, 0x5F, 0x6C, 0x69, 0x73, 0x74, 0x92,
0x00, 0x00, 0x03, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x04, 0xB0, 0x73, 0x63, 0x5F, 0x72, 0x73, 0x70, 0x5F, 0x64, 0x65, 0x63, 0x00, 0x03, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x72, 0x79, 0x70, 0x74, 0x65, 0x64, 0x92, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xBA, 0x73, 0x63, 0x5F, 0x72, 0x73, 0x70, 0x5F, 0x64, 0x65, 0x63, 0x72,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0x70, 0x74, 0x65, 0x64, 0x5F, 0x75, 0x75, 0x69, 0x64, 0x5F, 0x6C, 0x69, 0x73, 0x74, 0x92,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04}; 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x03, 0xC4, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x04};
static uuid_t uuid1; static uuid_t uuid1;
static uuid_t uuid2; static uuid_t uuid2;
@@ -436,7 +438,7 @@ TEST(CONTROL_PACKET, SEND)
mpack_build_map(&writer); // sce value begin mpack_build_map(&writer); // sce value begin
{ {
mpack_write_cstr(&writer, "sc_rule_list"); mpack_write_cstr(&writer, "sc_rule_uuid_list");
mpack_build_array(&writer); // sc_rule_list begin mpack_build_array(&writer); // sc_rule_list begin
for (int i = 0; i < rule_num; i++) for (int i = 0; i < rule_num; i++)
{ {
@@ -446,7 +448,7 @@ TEST(CONTROL_PACKET, SEND)
} }
{ {
mpack_write_cstr(&writer, "sc_rsp_raw"); mpack_write_cstr(&writer, "sc_rsp_raw_uuid_list");
mpack_build_array(&writer); // sc_rsp_raw begin mpack_build_array(&writer); // sc_rsp_raw begin
for (int i = 0; i < sf_num; i++) for (int i = 0; i < sf_num; i++)
{ {
@@ -456,7 +458,7 @@ TEST(CONTROL_PACKET, SEND)
} }
{ {
mpack_write_cstr(&writer, "sc_rsp_decrypted"); mpack_write_cstr(&writer, "sc_rsp_decrypted_uuid_list");
mpack_build_array(&writer); // sc_rsp_decrypted begin mpack_build_array(&writer); // sc_rsp_decrypted begin
for (int i = 0; i < sf_num; i++) for (int i = 0; i < sf_num; i++)
{ {

6
platform/src/packet_io.cpp
View File

@@ -834,7 +834,7 @@ static int send_ctrl_packet(struct session_ctx *session_ctx, struct thread_ctx *
mpack_build_map(&writer); // sce value begin mpack_build_map(&writer); // sce value begin
{ {
mpack_write_cstr(&writer, "sc_rule_list"); mpack_write_cstr(&writer, "sc_rule_uuid_list");
mpack_build_array(&writer); // sc_rule_list begin mpack_build_array(&writer); // sc_rule_list begin
for (int i = 0; i < num; i++) for (int i = 0; i < num; i++)
{ {
@@ -844,7 +844,7 @@ static int send_ctrl_packet(struct session_ctx *session_ctx, struct thread_ctx *
} }
{ {
mpack_write_cstr(&writer, "sc_rsp_raw"); mpack_write_cstr(&writer, "sc_rsp_raw_uuid_list");
mpack_build_array(&writer); // sc_rsp_raw begin mpack_build_array(&writer); // sc_rsp_raw begin
for (int i = 0; i < chaining_raw->chaining_used; i++) for (int i = 0; i < chaining_raw->chaining_used; i++)
{ {
@@ -862,7 +862,7 @@ static int send_ctrl_packet(struct session_ctx *session_ctx, struct thread_ctx *
} }
{ {
mpack_write_cstr(&writer, "sc_rsp_decrypted"); mpack_write_cstr(&writer, "sc_rsp_decrypted_uuid_list");
mpack_build_array(&writer); // sc_rsp_decrypted begin mpack_build_array(&writer); // sc_rsp_decrypted begin
for (int i = 0; i < chaining_decrypted->chaining_used; i++) for (int i = 0; i < chaining_decrypted->chaining_used; i++)
{ {