From 49f701c39b6dfd1831a429443cd416381729ca43 Mon Sep 17 00:00:00 2001 From: 童宗振 Date: Fri, 10 May 2024 06:36:14 +0000 Subject: (TSG-21082)Messagepack apply snaplen --- src/trace_output.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/trace_output.c b/src/trace_output.c index 2c68f4c..5effd04 100644 --- a/src/trace_output.c +++ b/src/trace_output.c @@ -535,8 +535,11 @@ static void dp_trace_decode_to_message_pack(marsio_buff_t * mr_mbuf, char ** dat mpack_write_cstr(&writer, "destination_port"); mpack_write_i32(&writer, pkt_info.dst_port); + unsigned int snaplen = trace_buff_info.snaplen; + snaplen = (snaplen < marsio_buff_datalen(mr_mbuf)) ? snaplen : marsio_buff_datalen(mr_mbuf); + mpack_write_cstr(&writer, "packet"); - mpack_write_bin(&writer, marsio_buff_mtod(mr_mbuf), marsio_buff_datalen(mr_mbuf)); + mpack_write_bin(&writer, marsio_buff_mtod(mr_mbuf), snaplen); mpack_write_cstr(&writer, "packet_length"); mpack_write_i32(&writer, marsio_buff_datalen(mr_mbuf)); -- cgit v1.2.3