Revert "Revert "Try another method to match all for dial bridges""

This reverts commit 2ce31622be.
5 years ago · 2f38da5ba8
parent 2ce31622be
commit 2f38da5ba8
1 changed files with 2 additions and 1 deletions
--- a/bridge_master.py
+++ b/bridge_master.py
@ -1167,7 +1167,8 @@ class routerOBP(OPENBRIDGE):
                #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) \
+                        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)