7efa58d9a1
分两段(用户裁定 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 绝对路径)
187 lines
6.6 KiB
Python
187 lines
6.6 KiB
Python
#!/usr/bin/env python3
|
||
# -*- coding: utf-8 -*-
|
||
"""E11:CH395F 服务器侧 KeepAlive —— "链路在、对端静默"判死验证(PC 侧注入)。
|
||
|
||
背景(E11):手册 §5.56 规定 TCP 服务器应在 SINT_STAT_CONNECT 后开启
|
||
KeepAlive;本仓该调用 2026-10-12 被撤回,全仓仅剩客户端分支启用,而
|
||
App/ 无任何 net_connect() → 产品上 keepalive 实际关闭。本脚本用于验证
|
||
"开启后能否在有界时间内判死静默对端,且不误杀正常空闲会话"。
|
||
|
||
用法:
|
||
# 场景「正常空闲存活」:连接后静默 hold 秒,末尾发 KEEPLIVE 验证会话仍在
|
||
python e11_keepalive_probe.py --mode idle --hold-s 90
|
||
|
||
# 场景「静默对端」:连接后立即装 Windows 防火墙入站 DROP(仅本连接本地端口 +
|
||
# 设备 IP)→ 芯片 keepalive 探测得不到 ACK → 期望设备在
|
||
# IDLE + INTVL×CNT 内判死(本仓 60 + 5x3 = 75s)
|
||
python e11_keepalive_probe.py --mode block --hold-s 120
|
||
|
||
判据(设备侧事件由串口日志核对,本脚本打印 PC 侧时间线):
|
||
期望:串口出现 `[ERR][NET] sockN TIMEOUT`(耗时≈75s),随后
|
||
`sockN pump/relisten` 恢复;本脚本移除规则后新连接必须成功。
|
||
期望:hold 期间**无** TIMEOUT;末尾 KEEPLIVE 必须收到 0xBB 回显。
|
||
|
||
需要管理员权限(仅 block 模式装/卸防火墙规则;脚本自行清理)。
|
||
"""
|
||
|
||
import argparse
|
||
import socket
|
||
import subprocess
|
||
import sys
|
||
import time
|
||
|
||
import bench_defaults # 台架连接默认值单一真源
|
||
|
||
TAG_C, TAG_D = 0xAA, 0xBB
|
||
CMD_KEEPLIVE = 0
|
||
RULE_NAME = "SELFHEAL-E11-DROP"
|
||
|
||
|
||
def _crc(data: bytes) -> int:
|
||
c = 0
|
||
for b in data:
|
||
c ^= b
|
||
return c
|
||
|
||
|
||
def build_frame(cmd: int, data: bytes = b"") -> bytes:
|
||
n = len(data)
|
||
return bytes([TAG_C, cmd, (n >> 8) & 0xFF, n & 0xFF]) + data + bytes([_crc(data)])
|
||
|
||
|
||
def recv_frame(sock: socket.socket, timeout: float = 3.0):
|
||
sock.settimeout(timeout)
|
||
hdr = b""
|
||
while len(hdr) < 4:
|
||
chunk = sock.recv(4 - len(hdr))
|
||
if not chunk:
|
||
return None
|
||
hdr += chunk
|
||
tag, cmd, n = hdr[0], hdr[1], (hdr[2] << 8) | hdr[3]
|
||
body = b""
|
||
while len(body) < n + 1:
|
||
chunk = sock.recv(n + 1 - len(body))
|
||
if not chunk:
|
||
return None
|
||
body += chunk
|
||
data, crcb = body[:n], body[n]
|
||
return cmd, data, (tag == TAG_D) and (crcb == _crc(data))
|
||
|
||
|
||
def firewall(action: str, local_port: int, remote_ip: str) -> bool:
|
||
verb = "add" if action == "add" else "delete"
|
||
cmd = ["netsh", "advfirewall", "firewall", verb, "rule",
|
||
f"name={RULE_NAME}", "dir=in", "action=block", "protocol=TCP",
|
||
f"localport={local_port}", f"remoteip={remote_ip}"]
|
||
if verb == "delete":
|
||
cmd = ["netsh", "advfirewall", "firewall", "delete", "rule",
|
||
f"name={RULE_NAME}"]
|
||
r = subprocess.run(cmd, capture_output=True, text=True)
|
||
if r.returncode != 0:
|
||
print(f"[WARN] 防火墙 {verb} 失败:{r.stdout.strip()} {r.stderr.strip()}")
|
||
return False
|
||
return True
|
||
|
||
|
||
def connect(host: str, port: int, timeout: float = 5.0):
|
||
s = socket.create_connection((host, port), timeout)
|
||
return s
|
||
|
||
|
||
def main() -> int:
|
||
ap = argparse.ArgumentParser()
|
||
ap.add_argument("--host", default=bench_defaults.DEVICE_IP)
|
||
ap.add_argument("--port", type=int, default=7003)
|
||
ap.add_argument("--mode", choices=["idle", "block"], required=True)
|
||
ap.add_argument("--hold-s", type=float, default=90.0)
|
||
ap.add_argument("--expect-detect-s", type=float, default=75.0,
|
||
help="判死上界(IDLE + INTVL*CNT),仅用于提示")
|
||
args = ap.parse_args()
|
||
|
||
t0 = time.time()
|
||
|
||
def log(msg: str) -> None:
|
||
print(f"[{time.strftime('%H:%M:%S')} +{time.time() - t0:6.1f}s] {msg}",
|
||
flush=True)
|
||
|
||
log(f"模式={args.mode} 目标={args.host}:{args.port} hold={args.hold_s}s")
|
||
log(f"(设备侧判死上界参考 = {args.expect_detect_s}s)")
|
||
|
||
try:
|
||
s = connect(args.host, args.port)
|
||
except OSError as e:
|
||
print(f"[FAIL] 连接失败:{e}")
|
||
return 2
|
||
s.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 0) # PC 侧不参与
|
||
lport = s.getsockname()[1]
|
||
log(f"已连接(本地端口 {lport})→ 进入静默")
|
||
|
||
rc = 0
|
||
if args.mode == "block":
|
||
# 入站 DROP:设备发来的 keepalive 探测包在 PC 侧被丢弃 → 永不回 ACK
|
||
if not firewall("add", lport, args.host):
|
||
s.close()
|
||
return 2
|
||
log(f"已装防火墙入站 DROP(本地端口 {lport} <- {args.host})→ 对端静默开始")
|
||
|
||
try:
|
||
time.sleep(args.hold_s)
|
||
except KeyboardInterrupt:
|
||
pass
|
||
|
||
if args.mode == "idle":
|
||
# 存活探针:KEEPLIVE 必须被回显
|
||
log("静默结束 → 发 KEEPLIVE 验证会话存活")
|
||
try:
|
||
s.sendall(build_frame(CMD_KEEPLIVE))
|
||
r = recv_frame(s, 3.0)
|
||
except OSError as e:
|
||
r = None
|
||
log(f"KEEPLIVE 发送/接收异常:{e}")
|
||
if r and r[2]:
|
||
log("PASS:收到 0xBB KEEPLIVE 回显 → 正常空闲会话未被误杀")
|
||
else:
|
||
log(f"FAIL:未收到有效回显({r})→ 空闲置的会话被断开(误杀)")
|
||
rc = 1
|
||
s.close()
|
||
return rc
|
||
|
||
# block 模式:卸规则 → 验证旧连接已死 + 监听器已恢复
|
||
log("静默结束 → 卸载防火墙规则")
|
||
firewall("delete", lport, args.host)
|
||
time.sleep(1.0)
|
||
|
||
# 旧连接是否已被设备判死(应读到 EOF/RST;读不到也算进程侧正常)
|
||
try:
|
||
s.settimeout(2.0)
|
||
d = s.recv(16)
|
||
log(f"旧连接 recv → {d!r}(b'' = 已收到 FIN,即设备已判死并释放)")
|
||
except OSError as e:
|
||
log(f"旧连接 recv 异常(设备已判死/连接被拆):{e}")
|
||
s.close()
|
||
|
||
# 监听器恢复验证:新连接 + KEEPLIVE 回显
|
||
log("验证监听器恢复:新建连接 + KEEPLIVE")
|
||
ok = False
|
||
for attempt in range(1, 6):
|
||
try:
|
||
s2 = connect(args.host, args.port)
|
||
s2.sendall(build_frame(CMD_KEEPLIVE))
|
||
r = recv_frame(s2, 3.0)
|
||
s2.close()
|
||
if r and r[2]:
|
||
log(f"PASS:第 {attempt} 次新连接建立并收到回显 → 监听器已恢复")
|
||
ok = True
|
||
break
|
||
except OSError as e:
|
||
log(f"第 {attempt} 次新连接失败:{e}")
|
||
time.sleep(2.0)
|
||
if not ok:
|
||
log("FAIL:监听器未恢复(端口仍不接客)")
|
||
rc = 1
|
||
return rc
|
||
|
||
|
||
if __name__ == "__main__":
|
||
sys.exit(main())
|