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

If ENHANCED_OBP, don't start sending to system until at least one BCKA seen from system

Browse Source
This commit is contained in:
Simon 2021-05-04 01:41:35 +01:00
parent 57aeb3078c
commit 22326f6319
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bridge_master.py
View File

@ -361,8 +361,11 @@ def kaReporting():
logger.debug('(ROUTER) KeepAlive reporting loop started') logger.debug('(ROUTER) KeepAlive reporting loop started')
for system in systems: for system in systems:
if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE': if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE':
if '_bcka' in CONFIG['SYSTEMS'][system] and CONFIG['SYSTEMS'][system]['_bcka'] < time() - 60: if CONFIG['SYSTEMS'][system]['ENHANCED_OBP']:
logger.warning('(ROUTER) not sending to system %s as last KeepAlive was %s seconds ago',system, int(time() - CONFIG['SYSTEMS'][system]['_bcka'])) if '_bcka' not in CONFIG['SYSTEMS'][system]:
logger.warning('(ROUTER) not sending to system %s as KeepAlive never seen',system)
elif CONFIG['SYSTEMS'][system]['_bcka'] < time() - 60:
logger.warning('(ROUTER) not sending to system %s as last KeepAlive was %s seconds ago',system, int(time() - CONFIG['SYSTEMS'][system]['_bcka']))
# run this every 10 seconds to trim stream ids # run this every 10 seconds to trim stream ids
def stream_trimmer_loop(): def stream_trimmer_loop():
@ -1114,7 +1117,7 @@ class routerOBP(OPENBRIDGE):
continue continue
#If target has missed 6 (on 1 min) of keepalives, don't send #If target has missed 6 (on 1 min) of keepalives, don't send
if _target_system['ENHANCED_OBP'] and '_bcka' in _target_system and _target_system['_bcka'] < pkt_time - 60: if _target_system['ENHANCED_OBP'] and ('_bcka' not in _target_system or _target_system['_bcka'] < pkt_time - 60):
continue continue