Tidy up BCSQ logging
This commit is contained in:
parent
ed3f266761
commit
eab8c03cce
|
@ -1319,7 +1319,7 @@ class routerOBP(OPENBRIDGE):
|
||||||
|
|
||||||
if CONFIG['SYSTEMS'][self._system]['ENHANCED_OBP'] and '_bcsq' not in self.STATUS[_stream_id]:
|
if CONFIG['SYSTEMS'][self._system]['ENHANCED_OBP'] and '_bcsq' not in self.STATUS[_stream_id]:
|
||||||
systems[self._system].send_bcsq(_dst_id,_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
|
self.STATUS[_stream_id]['_bcsq'] = True
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -144,7 +144,7 @@ class OPENBRIDGE(DatagramProtocol):
|
||||||
_packet = b''.join([BCSQ, _tgid, _stream_id])
|
_packet = b''.join([BCSQ, _tgid, _stream_id])
|
||||||
_packet = b''.join([_packet, (hmac_new(self._config['PASSPHRASE'],_packet,sha1).digest())])
|
_packet = b''.join([_packet, (hmac_new(self._config['PASSPHRASE'],_packet,sha1).digest())])
|
||||||
self.transport.write(_packet, (self._config['TARGET_IP'], self._config['TARGET_PORT']))
|
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):
|
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]
|
_stream_id = _packet[7:11]
|
||||||
_ckhs = hmac_new(self._config['PASSPHRASE'],_packet[:11],sha1).digest()
|
_ckhs = hmac_new(self._config['PASSPHRASE'],_packet[:11],sha1).digest()
|
||||||
if compare_digest(_hash, _ckhs):
|
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:
|
if '_bcsq' not in self._config:
|
||||||
self._config['_bcsq'] = {}
|
self._config['_bcsq'] = {}
|
||||||
self._config['_bcsq'][_tgid] = _stream_id
|
self._config['_bcsq'][_tgid] = _stream_id
|
||||||
else:
|
else:
|
||||||
h,p = _sockaddr
|
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)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue