summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortongzongzhen <[email protected]>2024-05-28 14:59:28 +0800
committertongzongzhen <[email protected]>2024-05-28 14:59:28 +0800
commitb0b1777a1032a11ad227ee04ca1f96eb2046821d (patch)
tree3a53af991f4520db6289b4f7d74707843cdfeb57
parentd85f991f782bea6896c434f66fd5c44dfb909096 (diff)
when traffic link id is not valid, dont send it.
-rw-r--r--README.md2
-rw-r--r--src/mocking.c6
-rw-r--r--src/trace_output.c7
3 files changed, 12 insertions, 3 deletions
diff --git a/README.md b/README.md
index 05abd75..d450d46 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,8 @@
## 编译
+当前默认分支:dev-0.1
+
目前只支持centos8。
需要先安装依赖库,见CI脚本。有些是公司内部的库,逐包下载安装是比较麻烦了,最好直接添加公司的yum源,直接找同事要个yum源文件即可。
diff --git a/src/mocking.c b/src/mocking.c
index 79a49a9..3255261 100644
--- a/src/mocking.c
+++ b/src/mocking.c
@@ -46,7 +46,11 @@ int kafka_dump_to_log(zlog_category_t * logger, const void * payload, size_t len
mpack_node_copy_cstr(mpack_node_map_cstr(root, "device_group"), packet.device_group, sizeof(packet.device_group));
- packet.traffic_link_id = mpack_node_i32(mpack_node_map_cstr(root, "traffic_link_id"));
+ mpack_node_t traffic_link_id_node = mpack_node_map_cstr(root, "traffic_link_id");
+ if (!mpack_node_is_nil(traffic_link_id_node))
+ {
+ packet.traffic_link_id = mpack_node_i32(traffic_link_id_node);
+ }
mpack_node_t source_ip_node = mpack_node_map_cstr(root, "source_ip");
if (!mpack_node_is_nil(source_ip_node))
diff --git a/src/trace_output.c b/src/trace_output.c
index e04834e..15ea94e 100644
--- a/src/trace_output.c
+++ b/src/trace_output.c
@@ -545,8 +545,11 @@ static void dp_trace_decode_to_message_pack(marsio_buff_t * mr_mbuf, char ** dat
mpack_write_cstr(&writer, "device_group");
mpack_write_cstr(&writer, conf->device_group);
- mpack_write_cstr(&writer, "traffic_link_id");
- mpack_write_i32(&writer, trace_buff_info.traffic_link_id);
+ if (trace_buff_info.traffic_link_id != 0 && trace_buff_info.traffic_link_id != 65535)
+ {
+ mpack_write_cstr(&writer, "traffic_link_id");
+ mpack_write_i32(&writer, trace_buff_info.traffic_link_id);
+ }
if (strlen(trace_buff_info.inner_src_addr_str) != 0)
{