7d1db02164
104 协议侧参数通道此前镜像了厂商点表的全部 430 条参数(697 槽), 但其中 413 条在本设备上没有任何消费者——104 与设备侧真实定值模型 prot_set 之间零调用,主站改定值只落在无人读的 RAM 镜像里,保护功能 毫无感知。本次按"严格按消费者收窄"口径收口: 可见性以 iec104_dtu_protection_mapping() 语义桥表为唯一判据,只放行 三段过流投退/定值/延时(9 项)、低压与过压定值/延时(4 项)、PT 与 CT 一次/二次额定(4 项)。其余参数在位表枚举层即不可见,主站读取 得到 COT=47 + P/N=1 的显式否定确认,不静默丢弃。values[697]→values[53]、 staged[264]→staged[17],并删除生成式 iec104_source_ranks.h。 桥表接真实源:iec104_serv 的 parameter_read/apply 从 NULL 改为直读 prot_set 与整批原子提交,Q10 量化后一次事务落地,持久化仍由 defaultTask 的脏标志闭环负责。 prot_set 因此出现两个运行时写者(netTask 的 104 与 uiTask 的本地整 定),原"写者靠启动时序串行"的约定失效。加入写事务互斥与 seqlock 序号:四个写入口全部进锁,校验与提前返回一律在 enter 之前;序号卡 奇数连续 8 拍即判保护闭锁,避免自检被永久跳过而静默失去防篡改能力。 锁的安装在 defaultTask 的存储 bring-up 阶段,不在 app_main_init—— 后者早于 osKernelInitialize,内核启动前禁止任何 RTOS 创建类 API。 实测:RW_IRAM1 117,304→113,720 B(−3,584 B,89.50%→86.76%); ER_IROM1 413,392→411,668 B(−1,724 B);iec104_source.o 5,656→2,056 B; prot_set.o 344→352 B(+8 B,写事务序号与锁句柄)。Keil 构建 0 错误 0 警告;主机侧 prot_set 175/175、iec104_dtu 7/7;真实 TCP 验收 13/13;暂存口径门禁 18 项全通过。 已知边界:模拟器不链接 iec104_serv.c,TCP 验收不覆盖 prot_set 绑定, 板端需实机确认主站写入能反映到本地定值页;17 项中 15 项的出厂默认 值与点表字面量不同,主站读到的是真实模型的值;绑定真实源后定值区 切换一律拒绝(单套活跃值无原子整区事务)。
68 lines
3.0 KiB
Python
68 lines
3.0 KiB
Python
"""Test the independent acceptance oracle/decoder; not product acceptance."""
|
|
import struct
|
|
import sys
|
|
import unittest
|
|
from pathlib import Path
|
|
|
|
HERE = Path(__file__).resolve().parent
|
|
if str(HERE) not in sys.path:
|
|
sys.path.insert(0, str(HERE))
|
|
|
|
# Pure Python oracle/decoder checks: no C translation unit, so C line coverage does not apply.
|
|
COVERAGE_SKIP = "纯 Python oracle/解码器测试,无 C 编译单元"
|
|
|
|
from oracle import reference
|
|
from wire import asdu, header, objects, remote_objects, tlv
|
|
|
|
|
|
class WireOracleTests(unittest.TestCase):
|
|
def test_reference_has_independently_derived_sets(self):
|
|
ref = reference()
|
|
self.assertEqual(len(ref["gi"]), 225)
|
|
self.assertEqual(len(ref["read"]), 121)
|
|
self.assertEqual(len(ref["counters"]), 8)
|
|
self.assertEqual(len(ref["remote"]), 17)
|
|
self.assertEqual(len(ref["diagnostic_aliases_pending_scope"]), 150)
|
|
self.assertNotIn(0x9601, ref["remote"])
|
|
self.assertNotIn(0x8858, ref["remote"])
|
|
self.assertEqual(ref["remote"][0x8842], (38, "1.2"))
|
|
|
|
def test_pn_zero_positive_and_one_negative(self):
|
|
self.assertFalse(header(bytes.fromhex("64010711010000000014"))["pn"])
|
|
self.assertTrue(header(bytes.fromhex("64014711010000000014"))["pn"])
|
|
self.assertEqual(header(bytes.fromhex("64014711010000000014"))["cot"], 7)
|
|
|
|
def test_float_objects_nonsequential_and_sequential(self):
|
|
rows = objects(bytes.fromhex("0d02141101000140000000c03f00024000000020c000"))
|
|
self.assertEqual([(r["ioa"], r["value"]) for r in rows], [(0x4001, 1.5), (0x4002, -2.5)])
|
|
rows = objects(bytes.fromhex("0d82141101000140000000c03f00000020c000"))
|
|
self.assertEqual([(r["ioa"], r["value"]) for r in rows], [(0x4001, 1.5), (0x4002, -2.5)])
|
|
|
|
def test_truncation_and_trailing_bytes_rejected(self):
|
|
valid = bytes.fromhex("01011411010001000000")
|
|
for bad in (valid[:-1], valid + b"\x00"):
|
|
with self.assertRaises(AssertionError):
|
|
objects(bad)
|
|
|
|
def test_remote_type_tags_decode_independent_vector(self):
|
|
vector = bytes.fromhex("ca030711010000000020880001010123880026040000e0402d88002d020100")
|
|
rows = remote_objects(vector)
|
|
self.assertEqual([(r["ioa"], r["tag"], r["value"]) for r in rows], [(0x8820, 1, 1), (0x8823, 38, 7.0), (0x882D, 45, 1)])
|
|
self.assertEqual(tlv(0x8823, 38, 7.0), bytes.fromhex("23880026040000e040"))
|
|
|
|
def test_remote_malformed_tlv_length_rejected(self):
|
|
with self.assertRaises(AssertionError):
|
|
remote_objects(bytes.fromhex("ca01071101000000002388002603000000"))
|
|
|
|
def test_maximum_apdu_is_255_not_257(self):
|
|
payload = bytes.fromhex("000080ffffff0000") + bytes(235)
|
|
data = asdu(203, payload)
|
|
self.assertEqual(len(data), 249)
|
|
frame = bytes((0x68, len(data) + 4)) + struct.pack("<HH", 0, 0) + data
|
|
self.assertEqual(len(frame), 255)
|
|
self.assertEqual(frame[1], 253)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main(verbosity=2)
|