From 2bd244d8ed9e549807ae0311c742bd3424c2f610 Mon Sep 17 00:00:00 2001 From: Simon Date: Sat, 26 Feb 2022 22:28:55 +0000 Subject: [PATCH] update bridge.py to current --- bridge.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/bridge.py b/bridge.py index 93ed474..67bd603 100755 --- a/bridge.py +++ b/bridge.py @@ -249,7 +249,7 @@ class routerOBP(OPENBRIDGE): self._lastSeq = False - def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data,_hash,_hops = b''): + def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data,_hash,_hops = b'', _source_server = b'\x00\x00\x00\x00', _ber = b'\x00', _rssi = b'\x00'): pkt_time = time() dmrpkt = _data[20:53] _bits = _data[15] @@ -483,7 +483,7 @@ class routerOBP(OPENBRIDGE): _tmp_data = b''.join([_tmp_data, dmrpkt, b'\x00\x00']) # Add two bytes of nothing since OBP doesn't include BER & RSSI bytes #_data[53:55] # Transmit the packet to the destination system - systems[_target['SYSTEM']].send_system(_tmp_data,_hops) + systems[_target['SYSTEM']].send_system(_tmp_data,_hops,_ber,_rssi,_source_server) #logger.debug('(%s) Packet routed by bridge: %s to system: %s TS: %s, TGID: %s', self._system, _bridge, _target['SYSTEM'], _target['TS'], int_id(_target['TGID'])) @@ -576,6 +576,11 @@ class routerHBP(HBSYSTEM): pkt_time = time() dmrpkt = _data[20:53] _bits = _data[15] + + _ber = _data[53:54] + _rssi = _data[54:55] + + _source_server = self._CONFIG['GLOBAL']['SERVER_ID'] if _call_type == 'group': @@ -790,7 +795,7 @@ class routerHBP(HBSYSTEM): _tmp_data = b''.join([_tmp_data, dmrpkt, _data[53:55]]) # Transmit the packet to the destination system - systems[_target['SYSTEM']].send_system(_tmp_data,_hops) + systems[_target['SYSTEM']].send_system(_tmp_data,_hops,ber,_rssi,_source_server) #logger.debug('(%s) Packet routed by bridge: %s to system: %s TS: %s, TGID: %s', self._system, _bridge, _target['SYSTEM'], _target['TS'], int_id(_target['TGID'])) @@ -935,7 +940,7 @@ if __name__ == '__main__': signal.signal(sig, sig_handler) # Create the name-number mapping dictionaries - peer_ids, subscriber_ids, talkgroup_ids = mk_aliases(CONFIG) + peer_ids, subscriber_ids, talkgroup_ids, local_subscriber_ids = mk_aliases(CONFIG) # Import the ruiles file as a module, and create BRIDGES from it spec = importlib.util.spec_from_file_location("module.name", cli_args.RULES_FILE)