From 3a1626fde79e902db6177a3364f78b02c4e30e8c Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 15 Apr 2021 18:57:51 +0100 Subject: [PATCH] Revert "bcka test" This reverts commit d7bf07c23ae4c714289ba4d27aecbb222b6f2c34. --- bridge_master.py | 4 ---- hblink.py | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/bridge_master.py b/bridge_master.py index 69e5e2a..185ce35 100755 --- a/bridge_master.py +++ b/bridge_master.py @@ -1102,10 +1102,6 @@ class routerOBP(OPENBRIDGE): #logger.info('(%s) Conference Bridge: %s, is Source Quenched for Stream ID: %s, skipping system: %s TS: %s, TGID: %s', self._system, _bridge, int_id(_stream_id), _target['SYSTEM'], _target['TS'], int_id(_target['TGID'])) continue - #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: - logger.debug('**************************') - continue # Is this a new call stream on the target? diff --git a/hblink.py b/hblink.py index c4a6eb2..a3243d0 100755 --- a/hblink.py +++ b/hblink.py @@ -232,8 +232,8 @@ class OPENBRIDGE(DatagramProtocol): _hash = _packet[4:] _ckhs = hmac_new(self._config['PASSPHRASE'],_packet[:4],sha1).digest() if compare_digest(_hash, _ckhs): + logger.debug('(%s) *BridgeControl* Keep Alive received',self._system) self._config['_bcka'] = time() - logger.debug('(%s) *BridgeControl* Keep Alive received: time %s',self._system,int(self._config['_bcka'])) if _sockaddr != self._config['TARGET_SOCK']: h,p = _sockaddr logger.info('(%s) *BridgeControl* Source IP and Port has changed for OBP from %s:%s to %s:%s, updating',self._system,self._config['TARGET_IP'],self._config['TARGET_PORT'],h,p)