From fb45584aab2d89cd900e745614f6264907df1acd Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 9 Feb 2021 09:37:44 +0000 Subject: [PATCH] Revert "Remove "to" from linked messages so it at least makes sense" This reverts commit e882b4226bcb7db89c257904a397d3b45c9c133e. --- bridge_master.py | 6 +++--- hblink.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bridge_master.py b/bridge_master.py index ce2ceaa..809bee4 100755 --- a/bridge_master.py +++ b/bridge_master.py @@ -441,7 +441,7 @@ def disconnectedVoice(system): _say.append(words['silence']) _say.append(words['linkedto']) _say.append(words['silence']) - #_say.append(words['2']) + _say.append(words['2']) _say.append(words['silence']) _say.append(words['silence']) @@ -1456,7 +1456,7 @@ class routerHBP(HBSYSTEM): _say.append(words['silence']) _say.append(words['linkedto']) _say.append(words['silence']) - # _say.append(words['2']) + _say.append(words['2']) _say.append(words['silence']) _say.append(words['silence']) @@ -1476,7 +1476,7 @@ class routerHBP(HBSYSTEM): _say.append(words['silence']) _say.append(words['linkedto']) _say.append(words['silence']) - # _say.append(words['2']) + _say.append(words['2']) _say.append(words['silence']) _say.append(words['silence']) diff --git a/hblink.py b/hblink.py index 651fc0b..86c4a81 100755 --- a/hblink.py +++ b/hblink.py @@ -193,7 +193,7 @@ class OPENBRIDGE(DatagramProtocol): self.dmrd_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data) else: h,p = _sockaddr - logger.info('(%s) OpenBridge HMAC failed, packet discarded - OPCODE: %s DATA: %s HMAC LENGTH: %s HMAC: %s IP: %s PORT: %s', self._system, _packet[:4], repr(_packet[:53]), len(_packet[53:]), repr(_packet[53:]),h,p) + logger.info('(%s) OpenBridge HMAC failed, packet discarded - OPCODE: %s DATA: %s HMAC LENGTH: %s HMAC: %s %s %s', self._system, _packet[:4], repr(_packet[:53]), len(_packet[53:]), repr(_packet[53:]),h,p) #************************************************ # HB MASTER CLASS