ShaYmez/RYSEN
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only ignore openbridge (again)

Browse Source
This commit is contained in:
Simon 2020-12-20 18:05:19 +00:00
parent 7ed54e09ae
commit f4c17e9540
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bridge_master.py
View File

@ -790,9 +790,11 @@ class routerOBP(OPENBRIDGE):
logger.debug("(DEDUP) Skipping system %s TS: %s",_target['SYSTEM'],_target['TS']) logger.debug("(DEDUP) Skipping system %s TS: %s",_target['SYSTEM'],_target['TS'])
continue continue
if _target_system['MODE'] == 'OPENBRIDGE': if _target_system['MODE'] == 'OPENBRIDGE':
print(int_id(_target['TGID']))
if _noOBP == True: if _noOBP == True:
continue continue
#We want to ignore this system and TS combination if it's called again for this packet
_sysIgnore.append((_target['SYSTEM'],_target['TS']))
# Is this a new call stream on the target? # Is this a new call stream on the target?
if (_stream_id not in _target_status): if (_stream_id not in _target_status):
# This is a new call stream on the target # This is a new call stream on the target
@ -926,9 +928,6 @@ class routerOBP(OPENBRIDGE):
systems[_target['SYSTEM']].send_system(_tmp_data) 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'])) #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 #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
if _target_system['MODE'] == 'OPENBRIDGE':
_sysIgnore.append((_target['SYSTEM'],_target['TS']))
return(_sysIgnore) return(_sysIgnore)
@ -1065,6 +1064,9 @@ class routerHBP(HBSYSTEM):
if _target_system['MODE'] == 'OPENBRIDGE': if _target_system['MODE'] == 'OPENBRIDGE':
if _noOBP == True: if _noOBP == True:
continue continue
#We want to ignore this system and TS combination if it's called again for this packet
_sysIgnore.append((_target['SYSTEM'],_target['TS']))
# Is this a new call stream on the target? # Is this a new call stream on the target?
if (_stream_id not in _target_status): if (_stream_id not in _target_status):
# This is a new call stream on the target # This is a new call stream on the target
@ -1192,9 +1194,7 @@ class routerHBP(HBSYSTEM):
# Transmit the packet to the destination system # Transmit the packet to the destination system
systems[_target['SYSTEM']].send_system(_tmp_data) 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'])) #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']))
if _target_system['MODE'] == 'OPENBRIDGE':
_sysIgnore.append((_target['SYSTEM'],_target['TS']))
return _sysIgnore return _sysIgnore
def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data): def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data):