gfwleak/tango-tsg-master
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TSG-13764: 日志中shaping_rule_ids字段格式不正确导致UI未正常展示

Browse Source
This commit is contained in:
liuxueli
2023-02-15 14:35:25 +08:00
parent 485ae03da1
commit 2bf5b5a120
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/tsg_send_log.cpp
View File

@@ -1334,19 +1334,13 @@ int set_shaping_rule_ids(struct tsg_log_instance_t *_instance, struct TLD_handle
return 0; return 0;
} }
int offset=0; Value shaping_rule_ids_array(kArrayType);
char shaping_rule_ids[512]={0};
for(int i=0; i<shaping_label->shaping_result_num; i++) for(int i=0; i<shaping_label->shaping_result_num; i++)
{ {
offset+=snprintf(shaping_rule_ids+offset, sizeof(shaping_rule_ids)-offset, "%d,", shaping_label->shaping_result[i].config_id); shaping_rule_ids_array.PushBack(shaping_label->shaping_result[i].config_id, _handle->document->GetAllocator());
} }
if(offset>0) TLD_append(_handle, _instance->id2field[LOG_COMMON_SHAPING_RULE_IDS].name, (void *) &shaping_rule_ids_array, TLD_TYPE_OBJECT);
{
shaping_rule_ids[offset-1]='\0';
TLD_append(_handle, _instance->id2field[LOG_COMMON_SHAPING_RULE_IDS].name, (void *)shaping_rule_ids, TLD_TYPE_STRING);
return 1;
}
return 0; return 0;
} }

2
test/src/gtest_master.cpp
View File

@@ -69,7 +69,7 @@ TEST(TSGMaster, ShapingSetRuleIds)
set_shaping_rule_ids(g_tsg_log_instance, handle, (struct streaminfo *)&a_stream); set_shaping_rule_ids(g_tsg_log_instance, handle, (struct streaminfo *)&a_stream);
char shaping_rule_ids[256]={0}; char shaping_rule_ids[256]={0};
TLD_convert_json(handle, shaping_rule_ids, sizeof(shaping_rule_ids)); TLD_convert_json(handle, shaping_rule_ids, sizeof(shaping_rule_ids));
EXPECT_STREQ("{\"common_shaping_rule_ids\":\"32,33,34,35,36,37,38,39\"}", shaping_rule_ids); EXPECT_STREQ("{\"common_shaping_rule_ids\":[32,33,34,35,36,37,38,39]}", shaping_rule_ids);
struct notify_shaping_policy *shaping_label=(struct notify_shaping_policy *)stream_bridge_async_data_get(&a_stream, g_tsg_para.bridge[BRIDGE_TYPE_NOTIFY_SHAPING_RESULT].id); struct notify_shaping_policy *shaping_label=(struct notify_shaping_policy *)stream_bridge_async_data_get(&a_stream, g_tsg_para.bridge[BRIDGE_TYPE_NOTIFY_SHAPING_RESULT].id);
EXPECT_NE(nullptr, shaping_label); EXPECT_NE(nullptr, shaping_label);