From 9accbafe68b9284ecf4eaf8a01c1b0164435d4b0 Mon Sep 17 00:00:00 2001 From: Cort Buffington Date: Tue, 13 May 2014 11:18:44 -0500 Subject: [PATCH] Work on Master Support --- dmrlink.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dmrlink.py b/dmrlink.py index 8c2d499..e1e20aa 100755 --- a/dmrlink.py +++ b/dmrlink.py @@ -997,11 +997,13 @@ class IPSC(DatagramProtocol): # When we hear from the master, record it's ID, flag that we're connected, and reset the dead counter. elif _packettype == MASTER_REG_REPLY: - _hex_mode = (data[5]) - _hex_flags = (data[6:10]) + _hex_mode = data[5] + _hex_flags = data[6:10] + _num_peers = data[10:12] _decoded_mode = process_mode_byte(_hex_mode) _decoded_flags = process_flags_bytes(_hex_flags) - + + self._local['NUM_PEERS'] = int(h(_num_peers), 16) self._master['RADIO_ID'] = _peerid self._master['MODE'] = _hex_mode self._master['MODE_DECODE'] = _decoded_mode @@ -1009,14 +1011,14 @@ class IPSC(DatagramProtocol): self._master['FLAGS_DECODE'] = _decoded_flags self._master_stat['CONNECTED'] = True self._master_stat['KEEP_ALIVES_OUTSTANDING'] = 0 - logger.debug('(%s) Registration response (we requested reg) from the Master %s', self._network, int_id(_peerid)) + logger.warning('(%s) Registration response (we requested reg) from the Master %s (%s peers)', self._network, int_id(_peerid), self._local['NUM_PEERS']) return # This is if we operate as a master... work in progress elif _packettype == MASTER_REG_REQ: - _hex_mode = (data[5]) - _hex_flags = (data[6:10]) + _hex_mode = data[5] + _hex_flags = data[6:10] _decoded_mode = process_mode_byte(_hex_mode) _decoded_flags = process_flags_bytes(_hex_flags)