summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author童宗振 <[email protected]>2024-05-10 06:36:14 +0000
committer童宗振 <[email protected]>2024-05-10 06:36:14 +0000
commit5ea5d989829a725664e1f35a38ece2d452c00f2c (patch)
treeab66c59331df4cf683969d390eef89c695a0bc98
parentba7585e87961516ae2b54f097c16cb209f1dcb93 (diff)
parent49f701c39b6dfd1831a429443cd416381729ca43 (diff)
Merge branch 'messagepack_add_snaplen' into 'master'
(TSG-21082)Messagepack apply snaplen See merge request tsg/dp_telemetry_app!29
-rw-r--r--src/trace_output.c5
1 files changed, 4 insertions, 1 deletions
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));