diff --git a/hblink.py b/hblink.py index d7a379d..49abec3 100755 --- a/hblink.py +++ b/hblink.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # ############################################################################### -# Copyright (C) 2016-2019 Cortney T. Buffington, N0MJS +# Copyright (C) 2016-2020 Cortney T. Buffington, N0MJS # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -249,18 +249,19 @@ class HBSYSTEM(DatagramProtocol): if _packet[:4] == DMRD: _packet = b''.join([_packet[:11], _peer, _packet[15:]]) self.transport.write(_packet, self._peers[_peer]['SOCKADDR']) - # KEEP THE FOLLOWING COMMENTED OUT UNLESS YOU'RE DEBUGGING DEEPLY!!!! #logger.debug('(%s) TX Packet to %s on port %s: %s', self._peers[_peer]['RADIO_ID'], self._peers[_peer]['IP'], self._peers[_peer]['PORT'], ahex(_packet)) def send_master(self, _packet): if _packet[:4] == DMRD: _packet = b''.join([_packet[:11], self._config['RADIO_ID'], _packet[15:]]) self.transport.write(_packet, self._config['MASTER_SOCKADDR']) - # KEEP THE FOLLOWING COMMENTED OUT UNLESS YOU'RE DEBUGGING DEEPLY!!!! # logger.debug('(%s) TX Packet to %s:%s -- %s', self._system, self._config['MASTER_IP'], self._config['MASTER_PORT'], ahex(_packet)) def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data): pass + + def dmra_recieved(self, _data): + pass def master_dereg(self): for _peer in self._peers: @@ -273,7 +274,6 @@ class HBSYSTEM(DatagramProtocol): # Aliased in __init__ to datagramReceived if system is a master def master_datagramReceived(self, _data, _sockaddr): - # Keep This Line Commented Unless HEAVILY Debugging! # logger.debug('(%s) RX packet from %s -- %s', self._system, _sockaddr, ahex(_data)) # Extract the command, which is various length, all but one 4 significant characters -- RPTCL @@ -466,6 +466,12 @@ class HBSYSTEM(DatagramProtocol): self.transport.write(b''.join([MSTNAK, _peer_id]), _sockaddr) logger.warning('(%s) Ping from Radio ID that is not logged in: %s', self._system, int_id(_peer_id)) + # Talker alias callback + elif _command == DMRA: + self.dmrd_received(_data) + #logger.info('(%s) DMRA recieved', self._system) + + else: logger.error('(%s) Unrecognized command. Raw HBP PDU: %s', self._system, ahex(_data))