merge: 合入网络 fd 失效值契约(含 104 目录重构解冲突)

把 dsh-204f318c-38b4 的网络 fd 契约工作流合入主树:NET_FD_INVALID
单一契约 + 静态门禁 + 回归测试 + 全仓审计 + 最小加固。

解冲突与集成修复:
- 5 个数值快照(RAM 文档/tsv/size_attestation/report.json)两侧各自
  过时,取主线重构后结构,合并后用权威 Keil 构建(0/0)重新回填:
  Code=365896 RO=48336 RW=2736 ZI=173104,IRAM1 90.3% / CCM 87.9%。
- iec104_net_mcu.c 的 net_fd 改动随主树 104 目录重构
  App/protocol/ → App/iec60870/ 自动迁移,路径正确。
- net-handle 豁免面从旧路径 App/protocol/iec60870/ 对齐到主树重构后的
  App/iec60870/(大写 IEC104_* 上游代码暂免检,小写 iec104_* 自研
  适配层仍受检),消除 read_socket 布尔标志的误报。

验证:net-handle 0 违规/493 文件 + selftest 42 PASS;size-gate 同码
PASS;mem 双区 <92%;本次 6 文档链接 PASS;主机套件全绿。
预存红项(ioboard_di.c / IEC60870-Slave 第三方文档)不在本次提交。
This commit is contained in:
2026-11-18 22:28:49 +08:00
52 changed files with 1964 additions and 313 deletions
+11 -11
View File
@@ -1,17 +1,17 @@
{
"built_at": "2026-11-18T21:50:20+08:00",
"fingerprint": "9e6301ede83014653be5ff5c14b6753244713e86c8ed5dd907a6c21483c772ac",
"fingerprint_files": 1563,
"built_at": "2026-11-18T22:22:18+08:00",
"fingerprint": "256d83d9b538cf07128939875d5be8c19b63937dbb183d69d3228d8dbcf2e5c9",
"fingerprint_files": 1564,
"fingerprint_source": "git-index",
"gated_regions": [
"RW_IRAM1",
"RW_CCM"
],
"git_head": "50ee1b44021c7cc291f70fcad1c73f3385e15dc6",
"git_head": "be18b81e82ad300c9132ec48781eac40e7b42402",
"map": "MDK-ARM/STM32F407-Demo/STM32F407-Demo.map",
"map_mtime": 1795009797,
"map_mtime": 1795011694,
"pct": {
"ER_IROM1": 39.49,
"ER_IROM1": 39.5,
"RW_CCM": 87.89,
"RW_IRAM1": 90.34,
"UNINIT_CCM": 18.75
@@ -19,7 +19,7 @@
"regions": {
"ER_IROM1": {
"max": 1048576,
"size": 414128
"size": 414232
},
"RW_CCM": {
"max": 65280,
@@ -27,7 +27,7 @@
},
"RW_IRAM1": {
"max": 131072,
"size": 118408
"size": 118416
},
"UNINIT_CCM": {
"max": 256,
@@ -37,10 +37,10 @@
"schema": 2,
"scope_note": "\u540c\u7801\u51ed\u8bc1\uff1a\u6307\u7eb9\u8986\u76d6\u56fa\u4ef6\u4f53\u79ef\u76f8\u5173\u6e90\u7801\uff0c\u53e3\u5f84\u89c1\u672c\u811a\u672c docstring",
"sizes": {
"code": 365792,
"code": 365896,
"ro_data": 48336,
"rw_data": 2288,
"zi_data": 173544
"rw_data": 2736,
"zi_data": 173104
},
"threshold_pct": 92.0,
"worktree_dirt_at_stamp": 0,