From 6130170f369eabdb032cb1805bbfce7c2cf3ee89 Mon Sep 17 00:00:00 2001 From: Simon Date: Sat, 5 Dec 2020 20:27:54 +0000 Subject: [PATCH] Does it really work now? --- bridge_master.py | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/bridge_master.py b/bridge_master.py index 8a4fdab..77ceb18 100755 --- a/bridge_master.py +++ b/bridge_master.py @@ -959,17 +959,31 @@ class routerOBP(OPENBRIDGE): for _bridge in BRIDGES: - for _system in BRIDGES[_bridge]: - - if _bridge[0:1] == '#': - continue - if (_system['SYSTEM'] == self._system and _system['TGID'] == _dst_id and _system['TS'] == _slot and _system['ACTIVE'] == True): + _refIgnore = [] + _tgignore = [] + if _bridge[0:1] != '#': + for _system in BRIDGES[_bridge]: + if (_system['SYSTEM'] == self._system and _system['TGID'] == _dst_id and _system['TS'] == _slot and _system['ACTIVE'] == True and (_bridge not in _tgIgnore)): - 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) - - _bridge = '#'+_bridge - if _bridge in BRIDGES: - 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,True) + 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) + + _bridge = '#'+_bridge + if _bridge in BRIDGES: + 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,True) + _refIgnore.push(_bridge) + + elif _bridge[0:1] == '#': + for _system in BRIDGES[_bridge]: + if (_system['SYSTEM'] == self._system and _system['TGID'] == _dst_id and _system['TS'] == _slot and _system['ACTIVE'] == True and (_bridge not in _refIgnore)): + + 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) + + _bridge = _bridge[1:] + if _bridge in BRIDGES: + 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,True) + _tgIgnore.push(_bridge) + + # Final actions - Is this a voice terminator?