From 7086174e34f7b59ac8fd0937bda6b5c8c7b860aa Mon Sep 17 00:00:00 2001 From: Simon Date: Sun, 20 Dec 2020 17:10:13 +0000 Subject: [PATCH] Only avoid openbridge for dups --- bridge_master.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bridge_master.py b/bridge_master.py index 125b48d..520abbb 100755 --- a/bridge_master.py +++ b/bridge_master.py @@ -926,7 +926,8 @@ class routerOBP(OPENBRIDGE): #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'])) #Ignore this system and TS pair if it's called again on this packet #We want to ignore this system and TS combination if it's called again for this packet - _sysIgnore.append((_target['SYSTEM'],_target['TS'])) + if _target_system['MODE'] == 'OPENBRIDGE': + _sysIgnore.append((_target['SYSTEM'],_target['TS'])) return(_sysIgnore) @@ -1190,7 +1191,8 @@ class routerHBP(HBSYSTEM): # Transmit the packet to the destination system systems[_target['SYSTEM']].send_system(_tmp_data) #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'])) - _sysIgnore.append((_target['SYSTEM'],_target['TS'])) + if _target_system['MODE'] == 'OPENBRIDGE': + _sysIgnore.append((_target['SYSTEM'],_target['TS'])) return _sysIgnore def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data):