From 043f9cbad7bd2be51b655067b274c31ffdeefde0 Mon Sep 17 00:00:00 2001 From: luwenpeng Date: Wed, 6 Nov 2024 15:03:31 +0800 Subject: [PATCH] =?UTF-8?q?TSG-23403=20SCE=E9=80=82=E9=85=8D=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E5=AD=97=E6=AE=B5=E5=8F=98=E6=9B=B4=EF=BC=9Asc=5Frule?= =?UTF-8?q?=5Flist->sc=5Frule=5Fuuid=5Flist;=20sc=5Frsp=5Fraw->sc=5Frsp=5F?= =?UTF-8?q?raw=5Fuuid=5Flist;=20sc=5Frsp=5Fdecrypted->sc=5Frsp=5Fdecrypted?= =?UTF-8?q?=5Fuuid=5Flist?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/test/gtest_control_packet.cpp | 28 +++++++++++++++------------- platform/src/packet_io.cpp | 6 +++--- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/common/test/gtest_control_packet.cpp b/common/test/gtest_control_packet.cpp index 3473b82..80b8da6 100644 --- a/common/test/gtest_control_packet.cpp +++ b/common/test/gtest_control_packet.cpp @@ -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, 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, - 0x63, 0x65, 0x83, 0xAC, 0x73, 0x63, 0x5F, 0x72, 0x75, 0x6C, 0x65, 0x5F, 0x6C, 0x69, 0x73, 0x74, - 0x92, 0xC4, 0x10, 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, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x02, 0xAA, 0x73, 0x63, 0x5F, 0x72, 0x73, 0x70, 0x5F, 0x72, 0x61, 0x77, - 0x92, 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, 0xB0, 0x73, 0x63, 0x5F, 0x72, 0x73, 0x70, 0x5F, 0x64, 0x65, 0x63, - 0x72, 0x79, 0x70, 0x74, 0x65, 0x64, 0x92, 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}; + 0x63, 0x65, 0x83, 0xB1, 0x73, 0x63, 0x5F, 0x72, 0x75, 0x6C, 0x65, 0x5F, 0x75, 0x75, 0x69, 0x64, + 0x5F, 0x6C, 0x69, 0x73, 0x74, 0x92, 0xC4, 0x10, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xB4, 0x73, 0x63, 0x5F, 0x72, 0x73, + 0x70, 0x5F, 0x72, 0x61, 0x77, 0x5F, 0x75, 0x75, 0x69, 0x64, 0x5F, 0x6C, 0x69, 0x73, 0x74, 0x92, + 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, 0xBA, 0x73, 0x63, 0x5F, 0x72, 0x73, 0x70, 0x5F, 0x64, 0x65, 0x63, 0x72, + 0x79, 0x70, 0x74, 0x65, 0x64, 0x5F, 0x75, 0x75, 0x69, 0x64, 0x5F, 0x6C, 0x69, 0x73, 0x74, 0x92, + 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 uuid2; @@ -436,7 +438,7 @@ TEST(CONTROL_PACKET, SEND) 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 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 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 for (int i = 0; i < sf_num; i++) { diff --git a/platform/src/packet_io.cpp b/platform/src/packet_io.cpp index 34dc5d5..273bade 100644 --- a/platform/src/packet_io.cpp +++ b/platform/src/packet_io.cpp @@ -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_write_cstr(&writer, "sc_rule_list"); + mpack_write_cstr(&writer, "sc_rule_uuid_list"); mpack_build_array(&writer); // sc_rule_list begin 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 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 for (int i = 0; i < chaining_decrypted->chaining_used; i++) {