diff options
| author | root <[email protected]> | 2024-10-17 10:20:30 +0000 |
|---|---|---|
| committer | root <[email protected]> | 2024-10-17 10:20:30 +0000 |
| commit | d0d37d605abe3413ff8afca150e20e475880e78e (patch) | |
| tree | 296b4cf7b4fb3172a9d493bc8745fb7293b73463 /shaping/src/shaper_marsio.cpp | |
| parent | b0de64f0deb1672f0b183f72b99d615f00a73b3b (diff) | |
TSG-22757: 1.适配新版maat，加载json格式的规则 2.适配规则ID变为UUID
Diffstat (limited to 'shaping/src/shaper_marsio.cpp')
| -rw-r--r-- | shaping/src/shaper_marsio.cpp | 4 |
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: |