ShaYmez
/
HBLink
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

NOW FULLY CONNECTS!!! 

Still working out some of the info fields.
This commit is contained in:
Cort Buffington 2016-07-23 10:25:34 -05:00
parent 88a922543c
commit ffd035fc8c
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hb_config.py
View File

@ -61,7 +61,7 @@ def build_config(_config_file):
'PACKAGE_ID': config.get(section, 'PACKAGE_ID').rjust(40) 'PACKAGE_ID': config.get(section, 'PACKAGE_ID').rjust(40)
}}) }})
CONFIG['CLIENTS'][section].update({'STATS': { CONFIG['CLIENTS'][section].update({'STATS': {
'CONNECTION': 'NO', # NO, RTPL_SENT, AUTHENTICATED, CONFIG, YES 'CONNECTION': 'NO', # NO, RTPL_SENT, AUTHENTICATED, CONFIG-SENT, YES
'PINGS_SENT': 0, 'PINGS_SENT': 0,
'PINGS_ACKD': 0, 'PINGS_ACKD': 0,
'PING_OUTSTANDING': False, 'PING_OUTSTANDING': False,

20
hblink.py
View File

@ -112,8 +112,8 @@ class HBCLIENT(DatagramProtocol):
self._stats['CONNECTION'] = 'RTPL_SENT' self._stats['CONNECTION'] = 'RTPL_SENT'
logger.debug('(%s) Sending login request to master', self._client) logger.debug('(%s) Sending login request to master', self._client)
if self._stats['CONNECTION'] == 'YES': if self._stats['CONNECTION'] == 'YES':
logger.debug('(%s) Sending ping to Master', self._client) self.send_packet('RPTPING'+self._config['RADIO_ID'])
###### change timing after connected: self._peer_maintenance_loop = self._peer_maintenance._reschedule(60) logger.debug('(%s) Ping Sent to Master', self._client)
def send_packet(self, _packet): def send_packet(self, _packet):
self.transport.write(_packet, (self._config['MASTER_IP'], self._config['MASTER_PORT'])) self.transport.write(_packet, (self._config['MASTER_IP'], self._config['MASTER_PORT']))
@ -125,17 +125,19 @@ class HBCLIENT(DatagramProtocol):
_command = _data[:4] _command = _data[:4]
if _command == 'DMRD': # DMRData -- encapsulated DMR data frame if _command == 'DMRD': # DMRData -- encapsulated DMR data frame
print('DMRD Received') print('DMRD Received')
elif _command == 'MSTN': # Actually MSTNAK -- a NACK from the master elif _command == 'MSTN': # Actually MSTNAK -- a NACK from the master
print('MSTNAC Received') print('MSTNAC Received')
elif _command == 'RPTA': # Actually RPTACK -- an ACK from the master elif _command == 'RPTA': # Actually RPTACK -- an ACK from the master
if self._stats['CONNECTION'] == 'RTPL_SENT': if self._stats['CONNECTION'] == 'RTPL_SENT':
_login_int32 = _data[6:10] _login_int32 = _data[6:10]
logger.info('(%s) Repeater Login ACK Received with 32bit ID: %s', self._client, h(_login_int32)) logger.info('(%s) Repeater Login ACK Received with 32bit ID: %s', self._client, h(_login_int32))
_pass_hash = sha256(_login_int32+self._config['PASSPHRASE']).hexdigest() _pass_hash = sha256(_login_int32+self._config['PASSPHRASE']).hexdigest()
_pass_hash = a(_pass_hash) _pass_hash = a(_pass_hash)
self.send_packet('RPTK'+self._config['RADIO_ID']+_pass_hash) self.send_packet('RPTK'+self._config['RADIO_ID']+_pass_hash)
self._stats['CONNECTION'] = 'AUTHENTICATED' self._stats['CONNECTION'] = 'AUTHENTICATED'
elif self._stats['CONNECTION'] == 'AUTHENTICATED': elif self._stats['CONNECTION'] == 'AUTHENTICATED':
if _data[6:10] == self._config['RADIO_ID']: if _data[6:10] == self._config['RADIO_ID']:
logger.info('(%s) Repeater Authentication Accepted', self._client) logger.info('(%s) Repeater Authentication Accepted', self._client)
@ -156,11 +158,19 @@ class HBCLIENT(DatagramProtocol):
self.send_packet('RPTC'+_config_packet) self.send_packet('RPTC'+_config_packet)
print(len('RPTC'+_config_packet)) print(len('RPTC'+_config_packet))
self._stats['CONNECTION'] = 'CONFIG-SENT'
elif self._stats['CONNECTION'] == 'CONFIG-SENT':
if _data[6:10] == self._config['RADIO_ID']:
logger.info('(%s) Repeater Configuration Accepted', self._client)
self._stats['CONNECTION'] = 'YES'
elif _command == 'MSTP': # Actually MSTPONG -- a reply to RPTPING (send by client)
print('MSTPONG Received')
elif _command == 'RPTP': # Actually RPTPONG -- a reply to MSTPING (send by client)
print('RPTPONG Received')
elif _command == 'MSTC': # Actually MSTCL -- notify the master this client is closing elif _command == 'MSTC': # Actually MSTCL -- notify the master this client is closing
print('MSTCL Recieved') print('MSTCL Recieved')
else: else:
logger.error('(%s) Received an invalid command in packet: %s', self._client, h(_data)) logger.error('(%s) Received an invalid command in packet: %s', self._client, h(_data))