network: 台架 IP 迁到 192.168.31.100,并把重复写死的值收进单一真源
分两段(用户裁定 2026-11-02):先做地址迁移,再把同类字面量收敛成
单一真源,以后再改地址只动一处。
一、IP 迁移 192.168.1.100 → 192.168.31.100(gw 同步 → .31.1)
- 工厂默认:Drivers/BSP/NETCFG/net_cfg.c 的 NET_CFG_DEF_IP/_GW
- 注释/文档示例、主机与板级测试、台架 py 脚本、两份 sim_config.ini
- 字节序教学点同步换算 hex:0x6401A8C0 → 0x641FA8C0(内存
C0 A8 1F 64),旧版示例引文与历史 Trap 记录按冻结纪律不动
- UI 黄金基准:网口设置 4 态 + shot_info 共 5 张 .bin 由
check_content_pages.py --update 重刷(渲染值 IP 变了,属预期变更)
- 保留判定:客户点表引用(IEC104/继电保护规划)、芯片手册摘录、
日期冻结的变更记录行、已退役台架档案 MDK-ARM/retracted_bench_*
二、单一真源收口(A+B+C+D,用户批准全做)
- 新建 test/host/bench_defaults.py:台架 py 默认值唯一定义点
(DEVICE_IP/DEVICE_GW/PC_IP/NET_BCAST),22 个脚本改为引用;
MDK-ARM 两探针与 scripts/board_ui_nav.py 经 sys.path shim 引入
- test/board/net_test_task.h 新增 TEST_PC_PEER_IP,板测三处
PHASE*_REMOTE_IP 改引该宏(保留 -D 覆盖);Phase1 断言改
memcmp 数组比较,数组各只出现一次
- simulator/tests/check_content_pages.py 从 net_cfg.c 正则解析
NET_CFG_DEF_* 推导期望值(解析失败即报错、不静默兜底),
脚本内台架 IP 字面量清零
- 装饰性注释去具体值(net_cfg.h/net_socket.h/net_socket.c/
net_socket_sim.c);字节序教学 hex 对刻意保留为唯一写值点
- 刻意不动:主机单测夹具 IP(逐文件钉住的任意值是正确测试
实践)、文档正文 IP(那是文档内容本身)
顺带:scripts/gen_task_table.py 规范串清掉「,B5」——编号清退提交
72b4b094 改了受管区没重跑生成器,task-table 门禁因此一直红
验证:产品 @build 0/0;CH395F 套件开关构建 0/0 后还原产品态;
6 套主机单测 rc=0;content_pages(含宏推导路径)/菜单 8 态/
推流位比对全 PASS;bom-drift 99 无漂移;doc-links/coding-standard/
cppcheck 绿;py_compile 23 文件 + --help 冒烟(含 shim 绝对路径)
This commit is contained in:
@@ -402,17 +402,17 @@ static void tc_550_family_roundtrip(void)
|
||||
(void)memset(&in, 0, sizeof(in));
|
||||
CHECK(net_getsockname(0, sa, &addrlen) == 0,
|
||||
"TC-NETSOCK-550a getsockname precondition ok");
|
||||
CHECK(in.sin_addr.s_addr == net_inet_addr("192.168.1.100"),
|
||||
CHECK(in.sin_addr.s_addr == net_inet_addr("192.168.31.100"),
|
||||
"TC-NETSOCK-550b getsockname s_addr is the same family as inet_addr (direct equality)");
|
||||
CHECK(strcmp(net_inet_ntoa(in.sin_addr.s_addr, txt), "192.168.1.100") == 0,
|
||||
"TC-NETSOCK-550c local address closes parse-store-print (old code printed 100.1.168.192)");
|
||||
CHECK(strcmp(net_inet_ntoa(in.sin_addr.s_addr, txt), "192.168.31.100") == 0,
|
||||
"TC-NETSOCK-550c local address closes parse-store-print (old code printed 100.31.168.192)");
|
||||
|
||||
/* 2) connect 的对端簿记同样闭合(lftpd:864 与 104 显示走的就是这条链) */
|
||||
fd = net_socket(NET_AF_INET, NET_SOCK_STREAM);
|
||||
(void)memset(&in, 0, sizeof(in));
|
||||
in.sin_family = NET_AF_INET;
|
||||
in.sin_port = net_htons(2404U);
|
||||
in.sin_addr.s_addr = net_inet_addr("192.168.1.200");
|
||||
in.sin_addr.s_addr = net_inet_addr("192.168.31.200");
|
||||
g_ns_cur_task = (TaskHandle_t)&g_ns_task_net;
|
||||
CHECK(net_connect_locked(fd, sa, (int)sizeof(in)) == 0,
|
||||
"TC-NETSOCK-550d connect precondition ok");
|
||||
@@ -420,13 +420,13 @@ static void tc_550_family_roundtrip(void)
|
||||
(void)memset(&in, 0, sizeof(in));
|
||||
CHECK(net_getpeername(fd, sa, &addrlen) == 0,
|
||||
"TC-NETSOCK-550e getpeername ok (reads event cache, zero SPI)");
|
||||
CHECK(in.sin_addr.s_addr == net_inet_addr("192.168.1.200"),
|
||||
CHECK(in.sin_addr.s_addr == net_inet_addr("192.168.31.200"),
|
||||
"TC-NETSOCK-550f getpeername peer equals the s_addr fed into net_connect");
|
||||
CHECK(strcmp(net_inet_ntoa(in.sin_addr.s_addr, txt), "192.168.1.200") == 0,
|
||||
CHECK(strcmp(net_inet_ntoa(in.sin_addr.s_addr, txt), "192.168.31.200") == 0,
|
||||
"TC-NETSOCK-550g peer address prints right (lftpd connection-received log depends on it)");
|
||||
CHECK(s_net_socks[fd].remote_ip_arr[0] == 192U &&
|
||||
s_net_socks[fd].remote_ip_arr[3] == 200U,
|
||||
"TC-NETSOCK-550h chip des_ip array stays wire order [192,168,1,200]: on-wire behaviour unchanged");
|
||||
"TC-NETSOCK-550h chip des_ip array stays wire order [192,168,31,200]: on-wire behaviour unchanged");
|
||||
reset_all();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user