diff --git a/bridge_master.py b/bridge_master.py index ff95663..8a4fdab 100755 --- a/bridge_master.py +++ b/bridge_master.py @@ -960,16 +960,14 @@ 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): 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) - #Send to reflector or TG too, if it exists - if _bridge[0:1] == '#': - _bridge = _bridge[1:] - else: - _bridge = '#'+_bridge + _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) @@ -1367,16 +1365,13 @@ class routerHBP(HBSYSTEM): 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): 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) - #Send to reflector or TG too, if it exists - if _bridge[0:1] == '#': - _bridge = _bridge[1:] - else: - _bridge = '#'+_bridge + _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)