From f28ef3eb16c3fdefcb7b883d92c3937473ecc12b Mon Sep 17 00:00:00 2001 From: Simon Date: Sun, 10 Jan 2021 20:46:53 +0000 Subject: [PATCH] Revert "Revert "Revert "Try another method to match all for dial bridges""" This reverts commit 2f38da5ba8b84d52c96129aa5618bdf4d1fa6278. --- bridge_master.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bridge_master.py b/bridge_master.py index d8a1ca0..779358f 100755 --- a/bridge_master.py +++ b/bridge_master.py @@ -1580,7 +1580,10 @@ class routerHBP(HBSYSTEM): #if _bridge[0:1] != '#': if True: for _system in BRIDGES[_bridge]: - if _system['SYSTEM'] == self._system and _system['TGID'] == _dst_id and _system['TS'] == _slot and _system['ACTIVE'] == True: + #if _system['SYSTEM'] == self._system and _system['TGID'] == _dst_id and _system['TS'] == _slot and #_system['ACTIVE'] == True: + # _sysIgnore = self.to_target(_peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data, pkt_time, dmrpkt, _bits,_bridge,_system,False,_sysIgnore) + if (_system['SYSTEM'] == self._system and _system['TGID'] == _dst_id and _system['TS'] == _slot and _system['ACTIVE'] == True) \ + or (_system['SYSTEM'] == self._system and int_id(_system['TGID']) == int(_bridge) and _system['TS'] == _slot and _system['ACTIVE'] == True): _sysIgnore = self.to_target(_peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data, pkt_time, dmrpkt, _bits,_bridge,_system,False,_sysIgnore) # Final actions - Is this a voice terminator?