13ed84a0f0
104 从 App/protocol 迁入 App/iec60870 时,协议核心(common/ 104/ examples/) 与我方平台适配层(原 104_port/)仍分成两个平行目录。既然这个库已转为项目自有 代码,适配层没有独立存在的理由——它本来就是对协议的装配与平台后端。 本次只做目录合并,不动任何协议逻辑: - App/iec60870/104_port/ 的 11 个文件全部移入 App/iec60870/104/ (iec104_core / iec104_source / iec104_source_ranks / iec104_net_mcu / iec104_dtu_table / iec104_comm 的 .c/.h),空目录删除 - Keil 删掉 ../App/iec60870/104_port include 路径;模拟器 CMake 把重复的 104_port include 行合并进既有的 IEC60870_DIR/104 - 单测运行器里硬拼的 "104_port" 路径段改成 "104"(rename_ref 只认斜杠形态) - .pre-commit-config.yaml 的 iec104-tcp 触发面去掉 104_port 前缀;coding-standard 的排除注释改写为「库已转为自有代码,排除项待收编完成后删除」 - 文档与生成物同步:项目架构总览、软件架构与运行时规格、IEC104 上行设计说明、 产品需求、网络配置说明、App/README、仓根 README,以及引用关系图与架构 SVG 验证(均为实跑): - Keil UV4 RC=0,0 errors 0 warnings,Code=367464 RO=48492 RW=2288 ZI=173544 - 模拟器构建 OK,编译告警 0,iec104-tcp 13/13 真实 TCP 回环通过 - 受影响单测:iec104_comm 50/50、iec104_serv 50/50、iec104_netmcu 13/13 与 static 2/2、soe 32/32、iec104_dtu 7 tests OK - 覆盖率门禁 RC=0,line 8204/9185 (89.3%),49/49 套件 - 全仓 104_port 残留:仅 App/README 里一句「原 104_port 并入 104」的历史说明
115 lines
4.1 KiB
Python
115 lines
4.1 KiB
Python
#!/usr/bin/env python3
|
|
# -*- coding: utf-8 -*-
|
|
"""Static acceptance checks for App/iec60870/104/iec104_net_mcu.c
|
|
|
|
S1: IEC104_Net_Close CLIENT/CLIENT_EOF branch must not contain net_close_sock.
|
|
S2: IEC104_Net_Recv rc==0 EOF branch must not call close/drop on the session.
|
|
Both checks use brace matching from the exact branch header, not line guesses.
|
|
"""
|
|
import hashlib
|
|
import json
|
|
import os
|
|
import re
|
|
|
|
HERE = os.path.dirname(os.path.abspath(__file__))
|
|
ROOT = os.path.dirname(os.path.dirname(os.path.dirname(HERE)))
|
|
SRC = os.path.join(ROOT, "App", "iec60870", "104", "iec104_net_mcu.c")
|
|
OUT = os.path.join(HERE, "results", "static")
|
|
|
|
|
|
def sha256(path):
|
|
h = hashlib.sha256()
|
|
with open(path, "rb") as fh:
|
|
h.update(fh.read())
|
|
return h.hexdigest()
|
|
|
|
|
|
def brace_span(text, brace_pos):
|
|
assert text[brace_pos] == "{", "not a brace"
|
|
depth = 0
|
|
i = brace_pos
|
|
while i < len(text):
|
|
c = text[i]
|
|
if c == "{":
|
|
depth += 1
|
|
elif c == "}":
|
|
depth -= 1
|
|
if depth == 0:
|
|
return brace_pos, i + 1
|
|
i += 1
|
|
raise ValueError("unbalanced brace")
|
|
|
|
|
|
def func_body(text, name):
|
|
m = re.search(r"\b" + re.escape(name) + r"\s*\([^;{]*\)\s*\{", text)
|
|
if m is None:
|
|
raise ValueError("function not found: " + name)
|
|
start = text.index("{", m.start())
|
|
return brace_span(text, start)
|
|
|
|
|
|
def branch_body(text, span, needle):
|
|
a, b = span
|
|
pos = text.find(needle, a, b)
|
|
if pos < 0:
|
|
raise ValueError("branch not found: " + needle)
|
|
brace = text.index("{", pos)
|
|
assert brace < b
|
|
return brace_span(text, brace)
|
|
|
|
|
|
def main(src_path=None, report_path=None):
|
|
src_path = src_path or SRC
|
|
report_path = report_path or OUT
|
|
os.makedirs(report_path, exist_ok=True)
|
|
with open(src_path, "r", encoding="utf-8") as fh:
|
|
text = fh.read()
|
|
checks = []
|
|
close_span = func_body(text, "IEC104_Net_Close")
|
|
client_branch = branch_body(text, close_span,
|
|
"if (slot->role == SLOT_CLIENT || slot->role == SLOT_CLIENT_EOF)")
|
|
body = text[client_branch[0]:client_branch[1]]
|
|
checks.append({
|
|
"id": "S1",
|
|
"description": "Close CLIENT/CLIENT_EOF branch contains no net_close_sock",
|
|
"passed": "net_close_sock" not in body,
|
|
"source_lines": [text.count("\n", 0, client_branch[0]) + 1,
|
|
text.count("\n", 0, client_branch[1]) + 1],
|
|
"evidence": "\n".join(text[client_branch[0]:client_branch[1]].splitlines()[:3]),
|
|
})
|
|
recv_span = func_body(text, "IEC104_Net_Recv")
|
|
eof_branch = branch_body(text, recv_span, "if (rc == 0)")
|
|
eof_body = text[eof_branch[0]:eof_branch[1]]
|
|
forbidden = [tok for tok in ["net_close_sock", "net_drop_conn_locked",
|
|
"net_close(", "net_drop_conn("] if tok in eof_body]
|
|
checks.append({
|
|
"id": "S2",
|
|
"description": "Recv EOF branch only changes role; no close/drop call",
|
|
"passed": not forbidden,
|
|
"source_lines": [text.count("\n", 0, eof_branch[0]) + 1,
|
|
text.count("\n", 0, eof_branch[1]) + 1],
|
|
"evidence": eof_body.strip(),
|
|
})
|
|
report = {
|
|
"source": src_path,
|
|
"source_sha256": sha256(src_path),
|
|
"checks": checks,
|
|
"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:
|
|
json.dump(report, fh, ensure_ascii=False, indent=2)
|
|
print("static source sha256={}".format(report["source_sha256"]))
|
|
for c in checks:
|
|
print("{}: {} {}-{} passed={}".format(c["id"], c["description"],
|
|
c["source_lines"][0], c["source_lines"][1],
|
|
c["passed"]))
|
|
if not c["passed"]:
|
|
print(" evidence: {}".format(c["evidence"].replace("\n", " | ")))
|
|
print("static passed {}/{}".format(report["passed"], report["total"]))
|
|
return 0 if report["passed"] == report["total"] else 1
|
|
|
|
|
|
if __name__ == "__main__":
|
|
raise SystemExit(main())
|