summaryrefslogtreecommitdiff
path: root/shaping/src/shaper_marsio.cpp
diff options
context:
space:
mode:
author刘畅 <[email protected]>2024-10-18 01:54:04 +0000
committer刘畅 <[email protected]>2024-10-18 01:54:04 +0000
commitef65ec1447d900f105c93b86ac55339d83d987f6 (patch)
tree13e5e2e2134a35a5b2b95d54b2bdbe40f991d11a /shaping/src/shaper_marsio.cpp
parentb0de64f0deb1672f0b183f72b99d615f00a73b3b (diff)
parent6e63a4b7edce57ecd5f5186c209320efd3efe074 (diff)
Merge branch 'adapt_rule_with_uuid' into 'rel'v3.2.1v3.2.0
Adapt rule with uuid See merge request tango/shaping-engine!104
Diffstat (limited to 'shaping/src/shaper_marsio.cpp')
-rw-r--r--shaping/src/shaper_marsio.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/shaping/src/shaper_marsio.cpp b/shaping/src/shaper_marsio.cpp
index 357e818..a2c1097 100644
--- a/shaping/src/shaper_marsio.cpp
+++ b/shaping/src/shaper_marsio.cpp
@@ -265,11 +265,11 @@ int shaper_marsio_ctrl_pkt_data_parse(struct ctrl_pkt_data *ctrl_data, const cha
shaping_rule_id_array_size = mpack_node_array_length(tmp_node);
ctrl_data->shaping_rule_num = MIN(shaping_rule_id_array_size, SHAPING_RULE_NUM_MAX);
for (int i = 0; i < ctrl_data->shaping_rule_num; i++) {
- if (mpack_type_uint != mpack_node_type(mpack_node_array_at(tmp_node, i))) {
+ if (mpack_type_bin != mpack_node_type(mpack_node_array_at(tmp_node, i))) {
LOG_ERROR("%s: shaping marsio msgpack shaping rule id type wrong at index %d, type is %d", LOG_TAG_MARSIO, i, mpack_node_type(mpack_node_array_at(tmp_node, i)));
goto ERROR;
}
- ctrl_data->shaping_rule_ids[i] = mpack_node_i64(mpack_node_array_at(tmp_node, i));
+ uuid_copy(ctrl_data->shaping_rule_uuids[i], *(uuid_t*)mpack_node_bin_data(mpack_node_array_at(tmp_node, i)));
}
SUCCESS: