From 1d84cf7d332c657901cf7d75bd3b0fd92e78779c Mon Sep 17 00:00:00 2001 From: Simon Date: Sun, 9 Jan 2022 01:51:42 +0000 Subject: [PATCH] SHA1 HMAC is a keyed 160bit CRC anyway. Use that --- bridge_master.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bridge_master.py b/bridge_master.py index 747fea5..82a16b0 100644 --- a/bridge_master.py +++ b/bridge_master.py @@ -1460,13 +1460,14 @@ class routerOBP(OPENBRIDGE): systems[_target]._report.send_bridgeEvent('UNIT DATA,START,TX,{},{},{},{},{},{}'.format(_target, int_id(_stream_id), int_id(_peer_id), int_id(_rf_src), 1, _int_dst_id).encode(encoding='utf-8', errors='ignore')) - def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data): + def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data,_hash): pkt_time = time() dmrpkt = _data[20:53] _bits = _data[15] #_pkt_crc = Crc32.calc(_data[4:53]) #_pkt_crc = Crc32.calc(dmrpkt) - _pkt_crc = _data[53:] + #_pkt_crc = _data[53:] + _pkt_crc = _hash # Match UNIT data, SMS/GPS, and send it to the dst_id if it is in SUB_MAP