From d0d496b232cf203dd58c5306726951bbadcdfd10 Mon Sep 17 00:00:00 2001 From: Cort Buffington Date: Thu, 15 Oct 2020 16:23:55 -0500 Subject: [PATCH] Add necessary pieces for Talker Alias DMRA --- const.py | 2 +- hblink.py | 5 ++--- install.sh | 6 ------ 3 files changed, 3 insertions(+), 10 deletions(-) delete mode 100755 install.sh diff --git a/const.py b/const.py index 164992d..f873a94 100755 --- a/const.py +++ b/const.py @@ -50,6 +50,7 @@ HBPF_SLT_VHEAD = 0x1 HBPF_SLT_VTERM = 0x2 # HomeBrew Protocol Commands +DMRA = b'DMRA' DMRD = b'DMRD' MSTCL = b'MSTCL' MSTNAK = b'MSTNAK' @@ -67,7 +68,6 @@ RPTC = b'RPTC' RPTP = b'RPTP' RPTA = b'RPTA' RPTO = b'RPTO' -DMRA = b'DMRA' # Higheset peer ID permitted by HBP diff --git a/hblink.py b/hblink.py index e91c4c5..f8ac097 100755 --- a/hblink.py +++ b/hblink.py @@ -497,10 +497,9 @@ class HBSYSTEM(DatagramProtocol): logger.info('(%s) Peer %s (%s) has send options: %s', self._system, self._peers[_peer_id]['CALLSIGN'], int_id(_peer_id), _data[8:]) self.transport.write(b''.join([RPTACK, _peer_id]), _sockaddr) - elif _command == DMRA: - _peer_if = _data[4:8] - logger.info('(%s) Recieved DMR Talker Alias from peer %s, subscriber %s', self._system, self._peers[_peer_id]['CALLSIGN'], int_id(_peer_id)) + _peer_id = _data[4:8] + logger.info('(%s) Recieved DMR Talker Alias from peer %s, subscriber %s', self._system, self._peers[_peer_id]['CALLSIGN'], int_id(_rf_src)) else: logger.error('(%s) Unrecognized command. Raw HBP PDU: %s', self._system, ahex(_data)) diff --git a/install.sh b/install.sh deleted file mode 100755 index c47b9db..0000000 --- a/install.sh +++ /dev/null @@ -1,6 +0,0 @@ -#! /bin/bash - -# Install the required support programs -apt-get install python3 python3-pip -y -pip3 install -r requirements.txt -