From eab8c03ccec188d62ab7076fd92bf7e767e7a560 Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 13 Apr 2021 12:12:44 +0100 Subject: [PATCH] Tidy up BCSQ logging --- bridge_master.py | 2 +- hblink.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bridge_master.py b/bridge_master.py index bf5c278..84470d5 100755 --- a/bridge_master.py +++ b/bridge_master.py @@ -1319,7 +1319,7 @@ class routerOBP(OPENBRIDGE): if CONFIG['SYSTEMS'][self._system]['ENHANCED_OBP'] and '_bcsq' not in self.STATUS[_stream_id]: systems[self._system].send_bcsq(_dst_id,_stream_id) - logger.warning("(%s) OBP *BridgeControl* This system Sent BCSQ , STREAM ID: %s, TG %s",self._system, int_id(_stream_id), int_id(_dst_id)) + logger.warning("(%s) OBP *BridgeControl* Sent BCSQ , STREAM ID: %s, TG %s",self._system, int_id(_stream_id), int_id(_dst_id)) self.STATUS[_stream_id]['_bcsq'] = True diff --git a/hblink.py b/hblink.py index 7fe2cb8..1054469 100755 --- a/hblink.py +++ b/hblink.py @@ -144,7 +144,7 @@ class OPENBRIDGE(DatagramProtocol): _packet = b''.join([BCSQ, _tgid, _stream_id]) _packet = b''.join([_packet, (hmac_new(self._config['PASSPHRASE'],_packet,sha1).digest())]) self.transport.write(_packet, (self._config['TARGET_IP'], self._config['TARGET_PORT'])) - logger.debug('(%s) *BridgeControl* sent Source Quench, TG: %s, Stream ID: %s',self._system,int_id(_tgid), int_id(_stream_id)) + logger.info('(%s) *BridgeControl* sent BCSQ Source Quench, TG: %s, Stream ID: %s',self._system,int_id(_tgid), int_id(_stream_id)) def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data): @@ -242,13 +242,13 @@ class OPENBRIDGE(DatagramProtocol): _stream_id = _packet[7:11] _ckhs = hmac_new(self._config['PASSPHRASE'],_packet[:11],sha1).digest() if compare_digest(_hash, _ckhs): - logger.info('(%s) *BridgeControl* Source Quench request received for TGID: %s, Stream ID: %s',self._system,int_id(_tgid), int_id(_stream_id)) + logger.info('(%s) *BridgeControl* BCSQ Source Quench request received for TGID: %s, Stream ID: %s',self._system,int_id(_tgid), int_id(_stream_id)) if '_bcsq' not in self._config: self._config['_bcsq'] = {} self._config['_bcsq'][_tgid] = _stream_id else: h,p = _sockaddr - logger.info('(%s) *BridgeControl* BCSQ invalid Source Quench, packet discarded - OPCODE: %s DATA: %s HMAC LENGTH: %s HMAC: %s SRC IP: %s SRC PORT: %s', self._system, _packet[:4], repr(_packet[:53]), len(_packet[53:]), repr(_packet[53:]),h,p) + logger.warning('(%s) *BridgeControl* BCSQ invalid Source Quench, packet discarded - OPCODE: %s DATA: %s HMAC LENGTH: %s HMAC: %s SRC IP: %s SRC PORT: %s', self._system, _packet[:4], repr(_packet[:53]), len(_packet[53:]), repr(_packet[53:]),h,p)