4784df923e
这个目录里的 104 协议栈原先按「第三方导入、逐字节保真」的方式管理:
改动要登记进哈希清单,门禁靠对比上游字节来判断有没有被动过。现在它已经是
团队自己的代码(用户裁定有完整处置权),这套机制就变成了纯粹的阻力——
它会让正常的功能修改看起来像篡改。这一版把它拆掉。
主要动作:
- App/iec60870/IMPORT.md 改名为 README.md。原来的名字本身就在说「这是导入的」,
而按仓库文档规范,每个自建代码目录都该有 README。
- 删除 App/iec60870/UPSTREAM.sha256(84 条上游哈希)。它唯一的运行时消费者
是 transport 测试的源文件清单,那个脚本已改成显式列出 27 个 .c。
- 许可证表述改为项目自有。仓库根的 IEC60870-Slave/ 是另一件事:那份仍是原始
快照、仅作独立验证基线,许可状态未确认,不因本目录收编而改变。
- 四个子目录 README 从 4~6 行扩写到 32~69 行,各自说清职责、边界与改动纪律。
- coding-standard 的排除面收窄:从排除整个 104/ 改为只排除 business/ 与
大写开头的 IEC104_*。我们自己的适配层 iec104_*.{c,h} 重新进入受检面,
11 个文件实测 RC=0。
保留的技术知识(没有随保真框架一起删掉):C99 静态断言为何需要 shim 与
43 处断言条件未改、SOE 深度 128 的合规依据、点表元素 12B 降到 8B 以放进
const Flash、无符号上界比较消诊断、FaultEvent 的链接依赖、11 个容量宏的
默认值表、以及能力边界(历史/录波/文件/升级后端未导入)。
验证:
- 全量 pre-commit 12 Passed / 0 Failed
- doc-links 308 篇 / 30 处问题,全部在 IEC60870-Slave/ 内,我方零新增
- transport 测试改前改后编译集逐字节一致(27 个 .c,哈希相同),10 条用例全过
- 8 个改动文件字节体检 BOM=False / CR=0 / U+FFFD=0
104 lines
6.1 KiB
Python
104 lines
6.1 KiB
Python
"""Original independent Net fixtures compiled ONLY against migrated vendor code."""
|
|
import argparse
|
|
import hashlib
|
|
import json
|
|
import os
|
|
from pathlib import Path
|
|
import subprocess
|
|
import sys
|
|
|
|
from oracle import ROOT
|
|
sys.path.insert(0, str(ROOT / "test/host/common"))
|
|
from unit_test_harness import decode, locate_toolchain
|
|
|
|
|
|
def main():
|
|
parser = argparse.ArgumentParser(description=__doc__)
|
|
parser.add_argument("--output", type=Path, default=ROOT / "ci-artifacts/iec104-tests/transport")
|
|
parser.add_argument("--only", default="")
|
|
args = parser.parse_args()
|
|
output = args.output.resolve()
|
|
output.mkdir(parents=True, exist_ok=True)
|
|
vendor = ROOT / "App/iec60870"
|
|
original = ROOT / "IEC60870-Slave/test"
|
|
cl, inc, lib = locate_toolchain()
|
|
if not cl:
|
|
raise RuntimeError("MSVC compiler not found")
|
|
env = dict(os.environ, INCLUDE=os.pathsep.join(inc), LIB=os.pathsep.join(lib))
|
|
# 协议栈源文件清单写死在这里,不再从清单文件推导:App/iec60870 已是项目自有
|
|
# 代码,增删文件时本次修改要同步这张表,别让测试悄悄少编一个单元。
|
|
# 每个夹具自带 TcpServer.c 并自己提供 Net 实现,故这两份不在此列。
|
|
sources = [vendor / rel for rel in (
|
|
"104/IEC104_AsduQueue.c",
|
|
"104/IEC104_Codec.c",
|
|
"104/IEC104_Connection.c",
|
|
"104/IEC104_Link.c",
|
|
"104/IEC104_Link_Slave_StartStop.c",
|
|
"104/IEC104_Receiver.c",
|
|
"104/IEC104_SendBuffer.c",
|
|
"104/IEC104_SendManager.c",
|
|
"104/IEC104_Slave.c",
|
|
"104/business/IEC104_ClockSynchronization.c",
|
|
"104/business/IEC104_Command.c",
|
|
"104/business/IEC104_CounterInterrogation.c",
|
|
"104/business/IEC104_GeneralInterrogation.c",
|
|
"104/business/IEC104_Interrogation.c",
|
|
"104/business/IEC104_Parameter.c",
|
|
"104/business/IEC104_PeriodicScan.c",
|
|
"104/business/IEC104_Read.c",
|
|
"104/business/IEC104_RemoteParameter.c",
|
|
"104/business/IEC104_Spontaneous.c",
|
|
"104/business/IEC104_Startup.c",
|
|
"104/business/IEC104_SystemCommand.c",
|
|
"common/IEC60870_Asdu.c",
|
|
"common/IEC60870_Codec.c",
|
|
"common/IEC60870_FaultEvent.c",
|
|
"common/IEC60870_InformationObjects.c",
|
|
"common/IEC60870_Slave.c",
|
|
"common/IEC60870_Time.c",
|
|
)]
|
|
assert len(sources) == 27 and all(p.is_file() for p in sources)
|
|
include = [vendor / "104", vendor / "104/business", vendor / "common", vendor / "platform", vendor / "examples", original]
|
|
names = ("iec104_response_transport_test", "iec104_ack_tracking_test", "iec104_idle_transport_test", "iec104_strict_priority_transport_test", "iec104_tcp_event_ring_test", "iec104_tcp_scheduler_test", "iec104_remote_parameter_test")
|
|
results = []
|
|
for name in names + ("source_binding_test", "vendor_boundary_test", "core_lifecycle_test"):
|
|
if args.only and args.only not in name:
|
|
continue
|
|
target = output / name
|
|
target.mkdir(exist_ok=True)
|
|
fixture = Path(__file__).parent / (name + ".c") if name in ("source_binding_test", "vendor_boundary_test", "core_lifecycle_test") else original / (name + ".c")
|
|
adaptation = None
|
|
if name == "iec104_idle_transport_test":
|
|
text = fixture.read_text(encoding="utf-8-sig")
|
|
old = " CHECK(IEC104_Receiver_Feed(&sut->connection.receiver, sut->generation, bytes, length, &consumed) =="
|
|
new = " CHECK(length <= UINT32_MAX);\n CHECK(IEC104_Receiver_Feed(&sut->connection.receiver, sut->generation, bytes, (uint32_t)length, &consumed) =="
|
|
assert text.count(old) == 1
|
|
adaptation = {"original_sha256": hashlib.sha256(fixture.read_bytes()).hexdigest(), "change": "checked size_t to uint32 length conversion for MSVC x64 only"}
|
|
fixture = target / "idle_fixture_checked.c"
|
|
fixture.write_text(text.replace(old, new), encoding="utf-8")
|
|
extra = []
|
|
if name == "source_binding_test":
|
|
extra = [ROOT / "App/iec60870/104/iec104_source.c", ROOT / "App/iec60870/104/iec104_dtu_table.c", vendor / "104/IEC104_Net_Windows.c", vendor / "104/IEC104_TcpServer.c"]
|
|
if name == "core_lifecycle_test":
|
|
extra = [ROOT / "App/iec60870/104/iec104_core.c", ROOT / "App/iec60870/104/iec104_source.c", ROOT / "App/iec60870/104/iec104_dtu_table.c"]
|
|
flags = ["/nologo", "/std:c11", "/O2", "/W3", "/WX", "/utf-8", "/D_CRT_SECURE_NO_WARNINGS"]
|
|
if name == "iec104_remote_parameter_test":
|
|
flags += ["/DIEC104_REMOTE_PARAMETER_TEST_HOOKS", "/DIEC104_TCP_HIGH_CAPACITY=251"]
|
|
command = [cl] + flags + ["/I" + str(p) for p in include] + ["/I" + str(ROOT / "App/iec60870/104")] + [str(fixture)] + [str(p) for p in sources + extra] + ["/Fe:" + str(target / (name + ".exe"))] + (["/link", "ws2_32.lib"] if extra else [])
|
|
build = subprocess.run(command, cwd=target, env=env, capture_output=True)
|
|
(target / "build.log").write_text(decode(build.stdout) + decode(build.stderr), encoding="utf-8")
|
|
row = {"name": name, "build_rc": build.returncode, "command": command, "fixture_sha256": hashlib.sha256(fixture.read_bytes()).hexdigest(), "adaptation": adaptation, "extra_sources_sha256": {str(p.relative_to(ROOT)): hashlib.sha256(p.read_bytes()).hexdigest() for p in extra}}
|
|
if build.returncode == 0:
|
|
run = subprocess.run([str(target / (name + ".exe"))], cwd=target, capture_output=True, timeout=120)
|
|
(target / "run.log").write_text(decode(run.stdout) + decode(run.stderr), encoding="utf-8")
|
|
row["run_rc"] = run.returncode
|
|
results.append(row)
|
|
print(name, row.get("run_rc", "build failed"), flush=True)
|
|
report = {"compiler": cl, "vendor_sources": {str(p.relative_to(ROOT)): hashlib.sha256(p.read_bytes()).hexdigest() for p in sources}, "tcp_source_sha256": hashlib.sha256((vendor / "104/IEC104_TcpServer.c").read_bytes()).hexdigest(), "results": results}
|
|
(output / "report.json").write_text(json.dumps(report, indent=2), encoding="utf-8")
|
|
return 0 if all(r.get("run_rc", -1) == 0 for r in results) else 1
|
|
|
|
|
|
if __name__ == "__main__":
|
|
raise SystemExit(main())
|