From a2242b7345a7e2cd6ba1e764e11456e297b6e17d Mon Sep 17 00:00:00 2001 From: Wanderingss <1624155937@qq.com> Date: Thu, 19 Nov 2026 13:05:22 +0800 Subject: [PATCH] =?UTF-8?q?fix(iec104):=20IEC104=5FNet=5FListen=20?= =?UTF-8?q?=E5=88=A4=E7=A9=BA=E4=B8=8E=E8=A7=A3=E5=BC=95=E7=94=A8=E8=90=BD?= =?UTF-8?q?=E5=9C=A8=E5=90=8C=E4=B8=80=E5=88=86=E6=94=AF=EF=BC=88=E7=9C=9F?= =?UTF-8?q?=20cppcheck=20=E6=8A=93=E5=87=BA=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 装真 cppcheck 2.21.0 后全库扫出 nullPointerRedundantCheck 两条,落在 App/iec60870/104/iec104_net_mcu.c 的 IEC104_Net_Listen: if (... || listener == NULL || bound_port == NULL || ...) { *listener = IEC104_NET_INVALID_SOCKET; /* listener 可能就是 NULL */ *bound_port = 0U; /* bound_port 可能就是 NULL */ return ...; } 判空之后在同一个失败分支里解引用这两个指针。真机上当前唯一调用点传的都是 合法对象地址,所以现网不发作;但这是 ABI 的防御分支,任何传 NULL 的新调用点 或测试都会踩空指针——实测坏实现上进程直接 0xC0000005 终止。 同目录 IEC104_Net_Windows.c 的同名函数早已是正确的两步写法(先条件清空输出、 再判空返回),本次把 MCU 版对齐到那个顺序。s_inited 与 owner 两个条件原样保留。 校验之后原来那两行无条件清空同时删除——拆分后走到那里两指针必然非空、输出 已是 INVALID/0,保留只是同值重赋。 TDD:先加 N13~N16 四条入参校验用例(bind_address NULL / 未 Init / listener NULL / bound_port NULL),在旧实现上跑是崩溃红(run_rc=0xC0000005、无 FAIL 行), 修完 17/17 绿。四条断言 ERROR+NET_ERR_INVAL、可写输出被清成 INVALID/0、零硬件调用。 顺带修掉 runner 一个假绿:旧口径用例数取 CASE_COUNT - len(failed_cases),进程 被访问违例杀掉时没有 FAIL 行,于是打印 "passed 13/13" 并 return 0。现改为 run_rc != 0 或没跑到汇总行 → 打印 NOT green + return 1。这是本次红证据能成立 的前提——没有它,崩溃会被读成满分。 另:results/ 下三份 report 与 selftest 改为 LF + 尾换行(json.dump 原来不带), selftest.txt 改记仓库相对路径(原来写绝对路径,跨机器/跨工作树必漂)。 --- App/iec60870/104/iec104_net_mcu.c | 16 ++- test/host/iec104_netmcu/MATRIX.md | 33 +++-- test/host/iec104_netmcu/check_static.py | 5 +- .../iec104_netmcu/check_static_selftest.py | 15 ++- test/host/iec104_netmcu/netmcu_test.c | 116 +++++++++++++++++- test/host/iec104_netmcu/results/report.json | 20 +-- .../iec104_netmcu/results/static/report.json | 12 +- .../static_mutant/iec104_net_mcu_BAD.c | 16 ++- .../results/static_mutant/report.json | 12 +- .../results/static_mutant/selftest.txt | 4 +- test/host/iec104_netmcu/run_netmcu_tests.py | 62 ++++++++-- 11 files changed, 257 insertions(+), 54 deletions(-) diff --git a/App/iec60870/104/iec104_net_mcu.c b/App/iec60870/104/iec104_net_mcu.c index 9273c836..4f7a746a 100644 --- a/App/iec60870/104/iec104_net_mcu.c +++ b/App/iec60870/104/iec104_net_mcu.c @@ -259,14 +259,22 @@ IEC104_NetResult_t IEC104_Net_Listen( struct net_sockaddr_in addr; slot_t *slot = NULL; + /* 先统一失败输出:只清空值,不替调用方关闭原来保存在其中的句柄。 + * 每个输出各自判空后再写——入参校验必须允许"某个输出为 NULL"这种调用形态, + * 否则清空动作本身就是对 NULL 的写入(cppcheck nullPointerRedundantCheck)。 + * 这段同时覆盖成功路径的起点:走到参数校验之后 listener/bound_port 必然非空, + * 两个输出已是 INVALID/0,因此校验之后不再重复写一遍(旧实现那两行在拆分后 + * 只会是同值重赋,删除不改变任何可观察行为)。 */ + if (listener != NULL) { + *listener = IEC104_NET_INVALID_SOCKET; + } + if (bound_port != NULL) { + *bound_port = 0U; + } if (s_inited == 0U || bind_address == NULL || listener == NULL || bound_port == NULL || net_ctx_is_owner_task() == 0U) { - *listener = IEC104_NET_INVALID_SOCKET; - *bound_port = 0U; return result(IEC104_NET_ERROR, NET_ERR_INVAL, native_error); } - *listener = IEC104_NET_INVALID_SOCKET; - *bound_port = 0U; /* 代次闸(网络自愈):net_stack_bring_up 先 net_init(芯片硬复位、 * net 层 s_net_socks 清零)后 net_generation_inc;旧槽的 fd 已不存在, * 且 fd 号可能被本次重建复用。这里只清表、绝不向旧 fd 发硬件关闭, diff --git a/test/host/iec104_netmcu/MATRIX.md b/test/host/iec104_netmcu/MATRIX.md index 4ff3f4a4..1a29544a 100644 --- a/test/host/iec104_netmcu/MATRIX.md +++ b/test/host/iec104_netmcu/MATRIX.md @@ -2,7 +2,7 @@ ## 交接说明(最终交付状态) -- **这组测试证明什么**:针对 `App/iec60870/104/iec104_net_mcu.c`(被测 SHA256 `08ca22b9d61ec86181973ab97d7fab68ec8f0ecbf944bfd758e1546a80dc8b35`)的真实后端,在 fake net 层上证明 IEC104 Net ABI 契约:同 fd 语义下 Close 不毁监听、Pending_Input 精确/降级有界续收、Send 短写且不借用 buffer、Now_Ms 跨 32 位 tick 回绕单调、网络代次与句柄失效、断链重连、非 owner 入口拒绝、两句柄模型下代次重建后的监听存活(armed==1)与无 ABA、以及单 fd 会话的 Accept 一次性语义(已有 CLIENT/CLIENT_EOF 槽时 WOULD_BLOCK、零芯片事务、Close 后释放;旧语义"re-Accept 再发新句柄"已实测导致板端拆活连接,2026-11-18 台架)。最终实测:文本级静态 2/2、静态 checker 变异自测 `real_rc=0 mutant_rc=1`、动态 12/12(`real backend passed 12/12`)。 +- **这组测试证明什么**:针对 `App/iec60870/104/iec104_net_mcu.c`(被测 SHA256 `8528f6031180d0fcf7e99c86486123664c9d14ae1931ce9734f7e53ce889c864`)的真实后端,在 fake net 层上证明 IEC104 Net ABI 契约:同 fd 语义下 Close 不毁监听、Pending_Input 精确/降级有界续收、Send 短写且不借用 buffer、Now_Ms 跨 32 位 tick 回绕单调、网络代次与句柄失效、断链重连、非 owner 入口拒绝、两句柄模型下代次重建后的监听存活(armed==1)与无 ABA、单 fd 会话的 Accept 一次性语义(已有 CLIENT/CLIENT_EOF 槽时 WOULD_BLOCK、零芯片事务、Close 后释放;旧语义"re-Accept 再发新句柄"已实测导致板端拆活连接,2026-11-18 台架),以及 `IEC104_Net_Listen` 的入参校验(N13~N16:某个输出指针为 NULL 时必须清空其余输出并返回 ERROR,绝不向 NULL 写入)。最终实测:文本级静态 2/2、静态 checker 变异自测 `real_rc=0 mutant_rc=1`、动态 17/17(`real backend passed 17/17`)。 - **这组测试不证明什么**:fake net 层只是按产品头语义实现,不是真实 CH395F 驱动或板端电路;**CH395F 板端行为未验**(同 fd 语义待板端确认);**core / TcpServer 集成未验**(完整 STARTDT 建链为 NOT_RUN);netTask 队列/临界区与板端时序未验;MCU WCET / 性能未测;真实后端编译期坏变体未做,历史 TEST DOUBLE B1~B7 仅证明 harness 有效性;S1/S2 是文本级静态检查,不覆盖宏展开或函数指针间接调用。禁止据此写“板端已验证”。 - **N4 的职责边界**:monotonic / wrap 断言测的是 fake 受控 tick 下适配层 `IEC104_Net_Now_Ms` 的调用面契约;**实现层**的 32 位 tick 回绕扩展由 `test/host/sys_clock` 覆盖(该套件有回绕变异反证)。两者职责正交,不要用本处断言推断时钟实现正确。 - **一条命令复现**(仓库根执行):`python test/host/iec104_netmcu/check_static_selftest.py && python test/host/iec104_netmcu/check_static.py && python test/host/iec104_netmcu/run_netmcu_tests.py && git diff --check -- test/host/iec104_netmcu` @@ -33,7 +33,7 @@ ## 动态用例矩阵 -共 **12 个命名用例**(N2 拆为 N2a/N2b 两个 case,但同属一个 N2 测试函数;`report.json` 的 `case_count=12`、`case_names` 与 `case_count_basis` 与此一致)。 +共 **17 个命名用例**(N2 拆为 N2a/N2b 两个 case,但同属一个 N2 测试函数;`report.json` 的 `case_count=17`、`case_names` 与 `case_count_basis` 与此一致)。 | 编号 | 用例 | 关键断言 | 实测 | |---|---|---|---| @@ -50,6 +50,17 @@ | N10 | 代次切换的两句柄模型(戊+不变量) | h_client ≠ h_listener;代次推进后两句柄均失效;旧 client Close 幂等 OK 且 `hardware_calls` 不增、`listen_closed_attempts==0`;代次推进后旧 listener 已失效(`armed==0`),**重建 Listen 后 `net_fake_listener_armed()==1` 正向断言**;不调 Init 重建 h3 严格 >旧句柄(无 ABA);新 client Send OK | PASS | | N11 | 单 fd 会话的 Accept 一次性语义(2026-11-18 台架事故修复证据) | 已有 CLIENT 槽时第 2 次 Accept 返回 `IEC104_NET_WOULD_BLOCK`、client 出参不变;`drop_conn_calls` / `hardware_calls` 均**不增**(闸为纯 RAM,零芯片事务);`listen_closed_attempts==0`;`armed==1`;**H1 正向证明**:库手里的首个 client 句柄仍能命中 CLIENT 槽并 Send OK、会话 fd 不变且与监听槽同 fd(旧代码 memset 旧槽会让 H1 悬空 → BADF → Drop_Client,这是"STARTDT 无回应 + 20~33ms EOF"的第一击);Close 旧 client 后新 Accept 成功(无永久静默拒连) | PASS | | N12 | 会话在役时 Wait 不报假 ACCEPT(重复 Accept 引擎闸) | 无会话时 `IEC104_Net_Wait(ACCEPT)` 报 READY;会话在役后 `ready_events` **不含** `IEC104_NET_EVENT_ACCEPT`(`net_listener_armed` 对 ESTABLISHED 恒返 1,不挡则库每轮误判可接入、重复调 Accept);Close 后恢复报 READY(非永久静默拒接) | PASS | +| N13 | Listen 拒绝 NULL bind_address | `bind_address==NULL`(两个输出非空)→ `ERROR` + `NET_ERR_INVAL`;入参预置的哨兵值被清成 `INVALID_SOCKET` / `0`;`hardware_calls` 零增长 | PASS | +| N14 | Listen 拒绝未 Init 态 | `IEC104_Net_Cleanup()` 之后三指针全非空 → `ERROR` + `NET_ERR_INVAL`;两个输出同样被清空;零硬件访问 | PASS | +| N15 | Listen 拒绝 NULL listener(cppcheck 缺陷回归) | `listener==NULL`、`bound_port` 非空 → `ERROR` + `NET_ERR_INVAL` 且**不崩溃**;`*bound_port` 仍被清成 `0`(证明"清空其余输出"仍生效);零硬件访问 | PASS(改前:访问违例 0xC0000005) | +| N16 | Listen 拒绝 NULL bound_port(cppcheck 缺陷回归) | `bound_port==NULL`、`listener` 非空 → `ERROR` + `NET_ERR_INVAL` 且**不崩溃**;`*listener` 仍被清成 `INVALID_SOCKET`;零硬件访问 | PASS(改前:访问违例 0xC0000005) | + +> N13~N16 的来源:cppcheck 2.21.0 `nullPointerRedundantCheck` 指出 `IEC104_Net_Listen` 在 +> 判空之后、同一个失败分支里写 `*listener` / `*bound_port`。旧实现对 N15/N16 两条输入 +> 直接在宿主上访问违例(0xC0000005),进程无 FAIL 行即中止。修复按 +> `App/protocol/iec60870/104/IEC104_Net_Windows.c` 的顺序:先各自判空清空输出,再统一 +> 判空返回;`s_inited` 与 owner 两个条件原样保留。红/绿原始日志见 +> `ci-artifacts/net-listen-null-tdd-red.log` / `...-green.log`(不入库)。 > 两句柄模型(net-cutover 第三轮定案):LISTEN 槽 handle 在监听生命周期内不变,Accept 另起 CLIENT 槽与新 handle;不再翻转监听槽 role。这正是 N8 / N10 / N11 的判据来源。 > N11 原语义("re-Accept 再发新句柄、只 memset 旧槽")已实测导致板端拆活连接,两层伤害:① 第 2 次 Accept 的 `memset(client_slot)` 清掉库仍持有的 H1 槽 → `slot_by_handle(H1)` 失败 → STARTDT_ACT 的 Send 报 BADF → Drop_Client(第一击,解释了 STARTDT 无回应 + 20~33ms EOF);② 即便不清槽而另开 H2,库仍在 `IEC104_TcpServer.c:1606` Close(client) 把与监听同 fd 的会话拆掉(第二击)。现行语义 = Accept 一次性硬闸(已有当前代次 CLIENT/CLIENT_EOF 槽一律 WOULD_BLOCK,含 EOF 收尾窗口,先纯 RAM 判后碰芯片)+ Wait 侧 ACCEPT 就绪闸(N12),Close 后自动释放。这是防止同根因复发的行为证据。 @@ -57,7 +68,7 @@ ## 坏变体与注入有效性 - **TEST DOUBLE 阶段(历史 harness-validity 证据,不是产品证据)**:`netmcu_stub_test.c` + `stub_iec104_netmcu.c` 的 B1~B7 全部变红:`good 7/7`;`B1..B7 red 7/7`。注入点:B1 Close 误用 net_close、B2 Pending 降级谎报 0、B3 Send 借用 buffer、B4 tick 强转、B5 忽略代次、B6 陈旧 Close 误关、B7 重连沿用 startup_ack。原始逐变体日志保留在 `results/good/` 与 `results/B1/`~`results/B7/`。 -- **真实后端阶段**:B1~B7 宏依赖 TEST DOUBLE,不适用于真实后端,标记 **NOT_RUN**;真实后端的文本级静态面由 S1/S2 + `check_static_selftest.py` 覆盖,行为面由 N1~N12 覆盖。不得把 TEST DOUBLE 的 7/7 红当成真实后端坏变体结果。 +- **真实后端阶段**:B1~B7 宏依赖 TEST DOUBLE,不适用于真实后端,标记 **NOT_RUN**;真实后端的文本级静态面由 S1/S2 + `check_static_selftest.py` 覆盖,行为面由 N1~N16 覆盖。不得把 TEST DOUBLE 的 7/7 红当成真实后端坏变体结果。N15/N16 另有一份单元级别的反向证据:用 HEAD 版后端副本(`NETMCU_BACKEND` 指向 `ci-artifacts/net-listen-null/head_iec104_net_mcu.c`,SHA256 与 `git show HEAD:...` 一致)跑同一套用例,进程以 0xC0000005 中止,runner 报 `NOT green`。 ## 测试发现的问题(独立验收追溯) @@ -69,7 +80,7 @@ ## 复现命令与最终实测输出 -仓库根执行(最终后端 SHA256 `08ca22b9d61ec86181973ab97d7fab68ec8f0ecbf944bfd758e1546a80dc8b35`): +仓库根执行(最终后端 SHA256 `8528f6031180d0fcf7e99c86486123664c9d14ae1931ce9734f7e53ce889c864`): ``` python test/host/iec104_netmcu/check_static.py @@ -80,18 +91,20 @@ python test/host/iec104_netmcu/run_netmcu_tests.py 实测输出: ``` -static source sha256=08ca22b9d61ec86181973ab97d7fab68ec8f0ecbf944bfd758e1546a80dc8b35 -S1: Close CLIENT/CLIENT_EOF branch contains no net_close_sock 582-588 passed=True -S2: Recv EOF branch only changes role; no close/drop call 408-414 passed=True +static source sha256=8528f6031180d0fcf7e99c86486123664c9d14ae1931ce9734f7e53ce889c864 +S1: Close CLIENT/CLIENT_EOF branch contains no net_close_sock 642-648 passed=True +S2: Recv EOF branch only changes role; no close/drop call 462-468 passed=True static passed 2/2 static-checker selftest: real_rc=0 mutant_rc=1 real: build_rc=0 run_rc=0 note= failed_cases=[] -real backend passed 12/12 +real backend passed 17/17 ``` -`git diff --check -- test/host/iec104_netmcu` 无输出(RC0)。`results/real/build.log` / `results/real/run.log` 是逐条原始日志,`results/real/report.json` 记录被测源文件哈希、测试源文件哈希、case count = 13、失败用例列表、NOT_RUN 项与已知偏离。`results/static/report.json` 与 `results/static_mutant/report.json` 记录静态正向/变异结果。 +`git diff --check -- test/host/iec104_netmcu` 无输出(RC0)。`results/real/build.log` / `results/real/run.log` 是逐条原始日志,`results/real/report.json` 记录被测源文件哈希、测试源文件哈希、case count = 17、失败用例列表、NOT_RUN 项与已知偏离。`results/static/report.json` 与 `results/static_mutant/report.json` 记录静态正向/变异结果。 + +runner 另有一条崩溃闸(本次 N15/N16 红测时暴露的假绿口径):旧版把"用例总数 − FAIL 用例数"当作通过数,进程被访问违例杀掉时没有 FAIL 行 → 打印 `passed N/N` 并 return 0。现口径为:只有 `run_rc==0` 且跑到汇总行才打印 `passed`,否则打印 `real backend NOT green: crashed: rc=...(0xC0000005)` 并 return 1。`NETMCU_BACKEND` / `NETMCU_OUT` 环境变量可把产品源或结果目录指向临时副本,用于在不改产品源的前提下复现历史红线。 ## 证据口径 -- 动态 13/13 + 文本级静态 2/2 + 静态 checker 变异自测 1 red 只证明:真实 Net 后端在 fake net 层上的 ABI 契约、两个文本级静态不变量,以及 N11 单 fd Accept 一次性语义(WOULD_BLOCK + 零芯片事务 + H1 仍有效 + Close 后释放)与 N12 Wait 侧 ACCEPT 就绪闸(会话在役不报假 ACCEPT、Close 后恢复)。 +- 动态 17/17 + 文本级静态 2/2 + 静态 checker 变异自测 1 red 只证明:真实 Net 后端在 fake net 层上的 ABI 契约、两个文本级静态不变量、N11 单 fd Accept 一次性语义(WOULD_BLOCK + 零芯片事务 + H1 仍有效 + Close 后释放)、N12 Wait 侧 ACCEPT 就绪闸(会话在役不报假 ACCEPT、Close 后恢复),以及 N13~N16 的 Listen 入参校验(NULL 输出指针不清空即崩溃,其余输出仍被条件清空)。 - 未证明 / NOT_RUN:完整 IEC104 STARTDT 业务链路、真实 CH395F 同 fd 行为(fake 忠实模拟但板端未验)、netTask 队列/临界区、板端时序与 MCU WCET、真实后端编译期坏变体、宏/函数指针间接调用形态的静态覆盖。不得写“板端已验证”。 diff --git a/test/host/iec104_netmcu/check_static.py b/test/host/iec104_netmcu/check_static.py index 56096736..10732c78 100644 --- a/test/host/iec104_netmcu/check_static.py +++ b/test/host/iec104_netmcu/check_static.py @@ -97,8 +97,11 @@ def main(src_path=None, report_path=None): "passed": sum(1 for c in checks if c["passed"]), "total": len(checks), } - with open(os.path.join(report_path, "report.json"), "w", encoding="utf-8") as fh: + # newline="\n":results/ 下入库产物统一 LF(同 run_netmcu_tests.py)。 + with open(os.path.join(report_path, "report.json"), "w", encoding="utf-8", + newline="\n") as fh: json.dump(report, fh, ensure_ascii=False, indent=2) + fh.write("\n") # end-of-file-fixer 要求文本文件以换行收尾 print("static source sha256={}".format(report["source_sha256"])) for c in checks: print("{}: {} {}-{} passed={}".format(c["id"], c["description"], diff --git a/test/host/iec104_netmcu/check_static_selftest.py b/test/host/iec104_netmcu/check_static_selftest.py index 5d27c17d..d850eafb 100644 --- a/test/host/iec104_netmcu/check_static_selftest.py +++ b/test/host/iec104_netmcu/check_static_selftest.py @@ -21,6 +21,15 @@ MUTANT = os.path.join(OUT, "iec104_net_mcu_BAD.c") NEEDLE = " client_slot_drop(slot);\n return result(IEC104_NET_OK, 0, native_error);\n }\n /* LISTEN 分支" +def _repo_rel(path): + """报告里写仓库相对路径:绝对路径会随机器/工作树漂移,把入库产物变成噪音 diff。""" + try: + rel = os.path.relpath(path, ROOT) + except ValueError: # 不同盘符:Windows 下 relpath 会抛 + return path + return path if rel.startswith("..") else rel.replace(os.sep, "/") + + def main(): os.makedirs(OUT, exist_ok=True) with open(SRC, "r", encoding="utf-8") as fh: @@ -37,9 +46,11 @@ def main(): real_rc = check_static.main() mutant_rc = check_static.main(MUTANT, OUT) - with open(os.path.join(OUT, "selftest.txt"), "w", encoding="utf-8") as fh: + with open(os.path.join(OUT, "selftest.txt"), "w", encoding="utf-8", + newline="\n") as fh: fh.write("real_rc={}\nmutant_rc={}\n".format(real_rc, mutant_rc)) - fh.write("real source: {}\nmutant: {}\n".format(SRC, MUTANT)) + fh.write("real source: {}\nmutant: {}\n".format( + _repo_rel(SRC), _repo_rel(MUTANT))) print("static-checker selftest: real_rc={} mutant_rc={}".format(real_rc, mutant_rc)) return 0 if real_rc == 0 and mutant_rc != 0 else 1 diff --git a/test/host/iec104_netmcu/netmcu_test.c b/test/host/iec104_netmcu/netmcu_test.c index dcbce754..6a404056 100644 --- a/test/host/iec104_netmcu/netmcu_test.c +++ b/test/host/iec104_netmcu/netmcu_test.c @@ -463,6 +463,86 @@ static void N11_accept_is_one_shot_until_client_closed(void) "new client accepted after old client closed (no permanent lockout)"); } +/* N13~N16:IEC104_Net_Listen 的入参校验回归(cppcheck 2.21.0 报 + * nullPointerRedundantCheck:判空之后、在同一个失败分支里解引用这两个指针)。 + * 契约:ERROR + NET_ERR_INVAL;可写的输出一律清成 IEC104_NET_INVALID_SOCKET / 0; + * 传了 NULL 的输出绝不能被解引用。 + * 顺序刻意把两条会崩溃的用例排在最后:坏实现上它们触发访问违例直接终止进程, + * 排在前面会把其余用例的证据一起吞掉(单跑某条用 `netmcu_test.exe N15`)。 */ +static void N13_listen_rejects_null_bind_address(void) +{ + IEC104_NetSocket_t l = (IEC104_NetSocket_t)0x1234U; + IEC104_NetSocket_t good; + uint16_t bound = 0xABCDU; + int ne = 0; + net_fake_stats_t before, after; + current_case = "N13"; + net_fake_reset(); + CHECK(IEC104_Net_Init(NULL) == IEC104_NET_OK, "Init"); + net_fake_stats(&before); + CHECK(IEC104_Net_Listen(NULL, 24016, &l, &bound, &ne) == IEC104_NET_ERROR && + ne == NET_ERR_INVAL, "NULL bind_address -> ERROR/NET_ERR_INVAL"); + CHECK(l == IEC104_NET_INVALID_SOCKET, "listener pre-set to INVALID on reject"); + CHECK(bound == 0U, "bound_port pre-set to 0 on reject"); + net_fake_stats(&after); + CHECK(after.hardware_calls == before.hardware_calls, + "reject happens before any net_* hardware call"); + good = setup_listen(24016); + CHECK(good != IEC104_NET_INVALID_SOCKET, "backend still listens after a rejected Listen"); +} + +static void N14_listen_rejects_before_init(void) +{ + IEC104_NetSocket_t l = (IEC104_NetSocket_t)0x1234U; + uint16_t bound = 0xABCDU; + int ne = 0; + net_fake_stats_t before, after; + current_case = "N14"; + net_fake_reset(); + CHECK(IEC104_Net_Init(NULL) == IEC104_NET_OK, "Init"); + IEC104_Net_Cleanup(); /* 回到未 Init 态(s_inited = 0) */ + net_fake_stats(&before); + CHECK(IEC104_Net_Listen("0.0.0.0", 24017, &l, &bound, &ne) == IEC104_NET_ERROR && + ne == NET_ERR_INVAL, "Listen before Init -> ERROR/NET_ERR_INVAL"); + CHECK(l == IEC104_NET_INVALID_SOCKET && bound == 0U, + "both outputs pre-set to INVALID/0 before Init"); + net_fake_stats(&after); + CHECK(after.hardware_calls == before.hardware_calls, + "no hardware access while uninitialised"); +} + +static void N15_listen_rejects_null_listener(void) +{ + uint16_t bound = 0xABCDU; + int ne = 0; + net_fake_stats_t before, after; + current_case = "N15"; + net_fake_reset(); + CHECK(IEC104_Net_Init(NULL) == IEC104_NET_OK, "Init"); + net_fake_stats(&before); + CHECK(IEC104_Net_Listen("0.0.0.0", 24018, NULL, &bound, &ne) == IEC104_NET_ERROR && + ne == NET_ERR_INVAL, "NULL listener -> ERROR/NET_ERR_INVAL"); + CHECK(bound == 0U, "bound_port cleared even though listener arg is NULL"); + net_fake_stats(&after); + CHECK(after.hardware_calls == before.hardware_calls, "no hardware access"); +} + +static void N16_listen_rejects_null_bound_port(void) +{ + IEC104_NetSocket_t l = (IEC104_NetSocket_t)0x1234U; + int ne = 0; + net_fake_stats_t before, after; + current_case = "N16"; + net_fake_reset(); + CHECK(IEC104_Net_Init(NULL) == IEC104_NET_OK, "Init"); + net_fake_stats(&before); + CHECK(IEC104_Net_Listen("0.0.0.0", 24019, &l, NULL, &ne) == IEC104_NET_ERROR && + ne == NET_ERR_INVAL, "NULL bound_port -> ERROR/NET_ERR_INVAL"); + CHECK(l == IEC104_NET_INVALID_SOCKET, "listener cleared even though bound_port arg is NULL"); + net_fake_stats(&after); + CHECK(after.hardware_calls == before.hardware_calls, "no hardware access"); +} + static void N12_wait_reports_no_accept_while_session_active(void) { IEC104_NetSocket_t l, c; @@ -493,8 +573,36 @@ static void N12_wait_reports_no_accept_while_session_active(void) "ACCEPT ready again after session closed"); } -int main(void) +int main(int argc, char **argv) { + /* argv[1] 可选:只跑某个具名用例(如 `netmcu_test.exe N15`)。坏实现上 + * N15/N16 会以访问违例中止进程,单跑开关让每条红线都能单独留证。 + * 输出不缓冲:崩溃时前面的 FAIL 行必须已经在 stdout 里。 */ + setvbuf(stdout, NULL, _IONBF, 0); + if (argc > 1 && strcmp(argv[1], "N13") == 0) { + printf("=== N13 only ===\n"); + N13_listen_rejects_null_bind_address(); + printf("=== N13 only: %d failures ===\n", failures); + return failures ? 1 : 0; + } + if (argc > 1 && strcmp(argv[1], "N14") == 0) { + printf("=== N14 only ===\n"); + N14_listen_rejects_before_init(); + printf("=== N14 only: %d failures ===\n", failures); + return failures ? 1 : 0; + } + if (argc > 1 && strcmp(argv[1], "N15") == 0) { + printf("=== N15 only ===\n"); + N15_listen_rejects_null_listener(); + printf("=== N15 only: %d failures ===\n", failures); + return failures ? 1 : 0; + } + if (argc > 1 && strcmp(argv[1], "N16") == 0) { + printf("=== N16 only ===\n"); + N16_listen_rejects_null_bound_port(); + printf("=== N16 only: %d failures ===\n", failures); + return failures ? 1 : 0; + } printf("=== IEC104 Net MCU real-backend contract tests (bad=%d) ===\n", NETMCU_BAD); N1_close_keeps_listener(); N2_pending_input(); @@ -508,6 +616,12 @@ int main(void) N10_generation_two_handles(); N11_accept_is_one_shot_until_client_closed(); N12_wait_reports_no_accept_while_session_active(); + N13_listen_rejects_null_bind_address(); + N14_listen_rejects_before_init(); + /* 会崩的两条排最后:一旦触发访问违例,前面的用例证据已经落盘。 */ + N15_listen_rejects_null_listener(); + N16_listen_rejects_null_bound_port(); printf("=== IEC104 Net MCU real-backend contract tests: %d failures ===\n", failures); + fflush(stdout); return failures ? 1 : 0; } diff --git a/test/host/iec104_netmcu/results/report.json b/test/host/iec104_netmcu/results/report.json index 58d4f8c6..229190fd 100644 --- a/test/host/iec104_netmcu/results/report.json +++ b/test/host/iec104_netmcu/results/report.json @@ -1,15 +1,16 @@ { "scope": "REAL backend App/iec60870/104/iec104_net_mcu.c + fake net layer; host-only isolation evidence, not full core/TcpServer/hardware", - "backend_sha256": "2fa4696159cd6c2ff5e3ade78fe5f79e3a6ba25e1cb74345e787af536ae11d53", + "backend": "App/iec60870/104/iec104_net_mcu.c", + "backend_sha256": "b4c2878742213213ad3b3472a72147736ef1dc71a62e0be6b8058a36853e8082", "sources": { - "MATRIX.md": "e8ec30ed2935200ed07e2c04e1137a77d5a853cc7c1c758d025b3458ce50fc39", + "MATRIX.md": "e430599e1aea5868819992c43c257ecfb57b28c598fa3b0b5465fad5b9efd7a4", "net_socket_fake.h": "c7c712256b5ac4b5162fd445319296dd32ada4abc6efa0384e65e2635bba38c9", "net_socket_fake.c": "f1eab03db48da3de3cd3e7211fb51eaba7068b45e377f42afd1468e49a7f247c", - "netmcu_test.c": "a0b2b3b7719e7e355376ffd49755ebb116bcd072722075c0728c7ba37b2cacb4", - "check_static.py": "21fdcf1f67c959232b7dcdcdf4ec1c86b3ac75d632aabef480303487f7ab5448" + "netmcu_test.c": "da07b9f14893781cb8bb4f78756cd09aa86b1045a8acb00b646e9efc74ad4f7b", + "check_static.py": "f7c6a4d1b6cfd3e5c5da3862c926e7220075e750fb0810a880e9317247022d70" }, - "case_count": 13, - "case_count_basis": "13 named cases; N2a/N2b are two cases in one N2 test function", + "case_count": 17, + "case_count_basis": "17 named cases; N2a/N2b are two cases in one N2 test function; N13~N16 are the IEC104_Net_Listen argument-validation regressions", "case_names": [ "N1", "N2a", @@ -23,12 +24,17 @@ "N9", "N10", "N11", - "N12" + "N12", + "N13", + "N14", + "N15", + "N16" ], "result": { "build_rc": 0, "run_rc": 0, "failures": 0, + "finished": true, "failed_cases": [], "note": "" }, diff --git a/test/host/iec104_netmcu/results/static/report.json b/test/host/iec104_netmcu/results/static/report.json index 91c7630a..aff20ab7 100644 --- a/test/host/iec104_netmcu/results/static/report.json +++ b/test/host/iec104_netmcu/results/static/report.json @@ -1,14 +1,14 @@ { - "source": "D:\\Code\\DTU Code\\STM32F4-Base\\.agents\\worktrees\\dsh-d2fd6422-281a\\App\\iec60870\\104\\iec104_net_mcu.c", - "source_sha256": "1bcb602946485156ce04b49343ece9525e8ed50f5d5ee0c1d580982e8d77ecd9", + "source": "D:\\Code\\DTU Code\\STM32F4-Base\\App\\iec60870\\104\\iec104_net_mcu.c", + "source_sha256": "b4c2878742213213ad3b3472a72147736ef1dc71a62e0be6b8058a36853e8082", "checks": [ { "id": "S1", "description": "Close CLIENT/CLIENT_EOF branch contains no net_close_sock", "passed": true, "source_lines": [ - 615, - 621 + 642, + 648 ], "evidence": "{\n /* CLIENT 分支:只拆本客户端会话、清 CLIENT 槽,监听槽的 handle/fd/\n * net_gen/role 一概不动(库侧 listen_socket 是固定值,必须始终有效)。" }, @@ -17,8 +17,8 @@ "description": "Recv EOF branch only changes role; no close/drop call", "passed": true, "source_lines": [ - 435, - 441 + 462, + 468 ], "evidence": "{\n /* 只读 EOF 事实:槽角色保持 CLIENT_EOF,绝不置回 LISTEN——\n * 否则紧随其后的 Close 会落到 LISTEN 分支真关监听(不可逆事故)。 */\n slot->role = SLOT_CLIENT_EOF;\n out.result = IEC104_NET_EOF;\n return out;\n }" } diff --git a/test/host/iec104_netmcu/results/static_mutant/iec104_net_mcu_BAD.c b/test/host/iec104_netmcu/results/static_mutant/iec104_net_mcu_BAD.c index 5cba663e..fac76822 100644 --- a/test/host/iec104_netmcu/results/static_mutant/iec104_net_mcu_BAD.c +++ b/test/host/iec104_netmcu/results/static_mutant/iec104_net_mcu_BAD.c @@ -259,14 +259,22 @@ IEC104_NetResult_t IEC104_Net_Listen( struct net_sockaddr_in addr; slot_t *slot = NULL; + /* 先统一失败输出:只清空值,不替调用方关闭原来保存在其中的句柄。 + * 每个输出各自判空后再写——入参校验必须允许"某个输出为 NULL"这种调用形态, + * 否则清空动作本身就是对 NULL 的写入(cppcheck nullPointerRedundantCheck)。 + * 这段同时覆盖成功路径的起点:走到参数校验之后 listener/bound_port 必然非空, + * 两个输出已是 INVALID/0,因此校验之后不再重复写一遍(旧实现那两行在拆分后 + * 只会是同值重赋,删除不改变任何可观察行为)。 */ + if (listener != NULL) { + *listener = IEC104_NET_INVALID_SOCKET; + } + if (bound_port != NULL) { + *bound_port = 0U; + } if (s_inited == 0U || bind_address == NULL || listener == NULL || bound_port == NULL || net_ctx_is_owner_task() == 0U) { - *listener = IEC104_NET_INVALID_SOCKET; - *bound_port = 0U; return result(IEC104_NET_ERROR, NET_ERR_INVAL, native_error); } - *listener = IEC104_NET_INVALID_SOCKET; - *bound_port = 0U; /* 代次闸(网络自愈):net_stack_bring_up 先 net_init(芯片硬复位、 * net 层 s_net_socks 清零)后 net_generation_inc;旧槽的 fd 已不存在, * 且 fd 号可能被本次重建复用。这里只清表、绝不向旧 fd 发硬件关闭, diff --git a/test/host/iec104_netmcu/results/static_mutant/report.json b/test/host/iec104_netmcu/results/static_mutant/report.json index 1c461e80..1ef2fd3b 100644 --- a/test/host/iec104_netmcu/results/static_mutant/report.json +++ b/test/host/iec104_netmcu/results/static_mutant/report.json @@ -1,14 +1,14 @@ { - "source": "D:\\Code\\DTU Code\\STM32F4-Base\\.agents\\worktrees\\dsh-d2fd6422-281a\\test\\host\\iec104_netmcu\\results\\static_mutant\\iec104_net_mcu_BAD.c", - "source_sha256": "6ede122b69d5ed0074bcff01c8dd30223a8e5e521f5d78fafdc97791e1d7790e", + "source": "D:\\Code\\DTU Code\\STM32F4-Base\\test\\host\\iec104_netmcu\\results\\static_mutant\\iec104_net_mcu_BAD.c", + "source_sha256": "f0fee39496c59fbc14ed386df07801c23082e58c6e6136c2db0be00d932f7a38", "checks": [ { "id": "S1", "description": "Close CLIENT/CLIENT_EOF branch contains no net_close_sock", "passed": false, "source_lines": [ - 615, - 622 + 642, + 649 ], "evidence": "{\n /* CLIENT 分支:只拆本客户端会话、清 CLIENT 槽,监听槽的 handle/fd/\n * net_gen/role 一概不动(库侧 listen_socket 是固定值,必须始终有效)。" }, @@ -17,8 +17,8 @@ "description": "Recv EOF branch only changes role; no close/drop call", "passed": true, "source_lines": [ - 435, - 441 + 462, + 468 ], "evidence": "{\n /* 只读 EOF 事实:槽角色保持 CLIENT_EOF,绝不置回 LISTEN——\n * 否则紧随其后的 Close 会落到 LISTEN 分支真关监听(不可逆事故)。 */\n slot->role = SLOT_CLIENT_EOF;\n out.result = IEC104_NET_EOF;\n return out;\n }" } diff --git a/test/host/iec104_netmcu/results/static_mutant/selftest.txt b/test/host/iec104_netmcu/results/static_mutant/selftest.txt index 8c665c13..ff8d0da5 100644 --- a/test/host/iec104_netmcu/results/static_mutant/selftest.txt +++ b/test/host/iec104_netmcu/results/static_mutant/selftest.txt @@ -1,4 +1,4 @@ real_rc=0 mutant_rc=1 -real source: D:\Code\DTU Code\STM32F4-Base\.agents\worktrees\dsh-d2fd6422-281a\App\iec60870\104_port\iec104_net_mcu.c -mutant: D:\Code\DTU Code\STM32F4-Base\.agents\worktrees\dsh-d2fd6422-281a\test\host\iec104_netmcu\results\static_mutant\iec104_net_mcu_BAD.c +real source: App/iec60870/104/iec104_net_mcu.c +mutant: test/host/iec104_netmcu/results/static_mutant/iec104_net_mcu_BAD.c diff --git a/test/host/iec104_netmcu/run_netmcu_tests.py b/test/host/iec104_netmcu/run_netmcu_tests.py index 6f0553bd..04f80f96 100644 --- a/test/host/iec104_netmcu/run_netmcu_tests.py +++ b/test/host/iec104_netmcu/run_netmcu_tests.py @@ -17,7 +17,22 @@ ROOT = os.path.dirname(os.path.dirname(os.path.dirname(HERE))) sys.path.insert(0, os.path.join(ROOT, "test", "host", "common")) from unit_test_harness import locate_toolchain # noqa: E402 -OUT = os.path.join(HERE, "results") +OUT = os.environ.get("NETMCU_OUT") or os.path.join(HERE, "results") + +# 被测后端源文件。默认就是产品源;NETMCU_BACKEND 可指向一份临时副本, +# 用来在不动产品源的前提下复现历史红线(例如引回空指针解引用的旧副本), +# 顺便验证 runner 的崩溃闸确实把"访问违例"判成红而不是满分。 +BACKEND = os.environ.get("NETMCU_BACKEND") or os.path.join( + ROOT, "App", "iec60870", "104", "iec104_net_mcu.c") + + +def backend_id(path): + """报告里记录可移植的来源标识:仓库内文件写相对路径,临时副本写绝对路径。""" + try: + rel = os.path.relpath(path, ROOT) + except ValueError: # 不同盘符:Windows 下 relpath 会抛 + return path + return path if rel.startswith("..") else rel.replace(os.sep, "/") def sha256(path): @@ -28,6 +43,11 @@ def sha256(path): return h.hexdigest() +CASE_COUNT = 17 +CASE_NAMES = ["N1", "N2a", "N2b", "N3", "N4", "N5", "N6", "N7", "N8", "N9", + "N10", "N11", "N12", "N13", "N14", "N15", "N16"] + + def run_real(cl, inc, lib): work = os.path.join(OUT, "real") os.makedirs(work, exist_ok=True) @@ -37,7 +57,7 @@ def run_real(cl, inc, lib): sources = [ os.path.join(HERE, "netmcu_test.c"), os.path.join(HERE, "net_socket_fake.c"), - os.path.join(ROOT, "App", "iec60870", "104", "iec104_net_mcu.c"), + BACKEND, ] env = dict(os.environ) env["INCLUDE"] = os.pathsep.join(inc + [ @@ -73,11 +93,21 @@ def run_real(cl, inc, lib): f.write(r.stdout + r.stderr) text = (r.stdout + r.stderr).decode("utf-8", "replace") fail_lines = [ln for ln in text.splitlines() if ln.strip().startswith("FAIL ")] + # 崩溃闸:进程被访问违例杀掉时不会有 FAIL 行,旧口径会把它报成满分。 + # 只有正常退出(rc==0,且跑了全部用例)才算全绿;其余一律标 crashed。 + finished = "contract tests: " in text and "failures ===" in text + note = "" + if r.returncode != 0 and not fail_lines: + note = "crashed: rc={} (0x{:08X}), no FAIL line".format( + r.returncode, r.returncode & 0xFFFFFFFF) + if not finished: + note += ", no summary line either" return {"build_rc": 0, "run_rc": r.returncode, "failures": len(fail_lines), + "finished": finished, "failed_cases": sorted(set( ln.split()[1].rstrip(":") for ln in fail_lines if len(ln.split()) > 1)), - "note": ""} + "note": note} def main(): @@ -91,26 +121,36 @@ def main(): res["build_rc"], res["run_rc"], res["note"], res.get("failed_cases", []))) report = { "scope": "REAL backend App/iec60870/104/iec104_net_mcu.c + fake net layer; host-only isolation evidence, not full core/TcpServer/hardware", - "backend_sha256": sha256(os.path.join( - ROOT, "App", "iec60870", "104", "iec104_net_mcu.c")), + "backend": backend_id(BACKEND), + "backend_sha256": sha256(BACKEND), "sources": {f: sha256(os.path.join(HERE, f)) for f in [ "MATRIX.md", "net_socket_fake.h", "net_socket_fake.c", "netmcu_test.c", "check_static.py"]}, - "case_count": 13, - "case_count_basis": "13 named cases; N2a/N2b are two cases in one N2 test function", - "case_names": ["N1", "N2a", "N2b", "N3", "N4", "N5", "N6", "N7", "N8", "N9", "N10", "N11", "N12"], + "case_count": CASE_COUNT, + "case_count_basis": "17 named cases; N2a/N2b are two cases in one N2 test function; " + "N13~N16 are the IEC104_Net_Listen argument-validation regressions", + "case_names": CASE_NAMES, "result": res, "bad_variants": "NOT_RUN for real backend; TEST DOUBLE B1..B7 evidence retained in results_stub/report.json", "not_run": ["full IEC104 STARTDT over core/TcpServer", "board CH395F", "MCU timing/WCET"], "known_deviations": ["NODELAY: App/iec60870/104/iec104_net_mcu.h comment; CH395F has no setsockopt, treated as always no-Nagle and NOT an OK condition"], } - with open(os.path.join(OUT, "report.json"), "w", encoding="utf-8") as f: + # newline="\n":results/ 下是入库产物,仓库按 .gitattributes 统一 LF; + # Windows 默认 CRLF 会让每次重生成都产生纯行尾噪音 diff。 + with open(os.path.join(OUT, "report.json"), "w", encoding="utf-8", + newline="\n") as f: json.dump(report, f, indent=2, ensure_ascii=False) + f.write("\n") # end-of-file-fixer 要求文本文件以换行收尾 if res["build_rc"] != 0 or res["run_rc"] is None: return 1 + if res["run_rc"] != 0 or not res.get("finished"): + # 崩溃 / 中途退出:绝不打印 "passed N/N",否则零 FAIL 行会被读成满分。 + print("real backend NOT green: {}".format( + res["note"] or "run_rc={}".format(res["run_rc"]))) + return 1 print("real backend passed {}/{}".format( - 13 - len(res.get("failed_cases", [])), 13)) - return 0 if res["run_rc"] == 0 else 1 + CASE_COUNT - len(res.get("failed_cases", [])), CASE_COUNT)) + return 0 if __name__ == "__main__":