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

Finally! Proper peer list processing!!!

Browse Source
This commit is contained in:
Cort Buffington 2013-08-06 22:33:04 -05:00
parent 6660c8b810
commit 86c03c7702
1 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
ipsc.py
View File

@ -16,6 +16,7 @@ import binascii
import hmac import hmac
import hashlib import hashlib
import socket import socket
#from logging.config import dictConfig #from logging.config import dictConfig
#import logging #import logging
@ -64,13 +65,14 @@ except ImportError:
def strip_hash(_data): def strip_hash(_data):
return _data[:-10] return _data[:-10]
# Determine if the provided peer ID is valid for the provided network # Determine if the provided peer ID is valid for the provided network
# #
def valid_peer(_network, _peerid): def valid_peer(_peer_list, _peerid):
for peer in NETWORK[_network]['PEERS']: if _peerid in _peer_list:
if peer['RADIO_ID'] == _peerid: return True
return True return False
return True #MUST BE FIXED!!!!!! should return false, but there are other issues right now...
# Determine if the provided master ID is valid for the provided network # Determine if the provided master ID is valid for the provided network
# #
@ -80,6 +82,7 @@ def valid_master(_network, _peerid):
else: else:
return False return False
# Take a packet to be SENT, calcualte auth hash and return the whole thing # Take a packet to be SENT, calcualte auth hash and return the whole thing
# #
def hashed_packet(_key, _data): def hashed_packet(_key, _data):
@ -102,12 +105,17 @@ def validate_auth(_key, _data):
_log(' AUTH: Invalid - Payload: %s, Hash: %s', binascii.b2a_hex(_payload), binascii.b2a_hex(_hash)) _log(' AUTH: Invalid - Payload: %s, Hash: %s', binascii.b2a_hex(_payload), binascii.b2a_hex(_hash))
return False return False
# Take a recieved peer list and the network it belongs to, process and populate the # Take a recieved peer list and the network it belongs to, process and populate the
# data structure in my_ipsc_config with the results. # data structure in my_ipsc_config with the results.
# #
def process_peer_list(_data, _network): def process_peer_list(_data, _network):
_log = logger.debug _log = logger.debug
_radio_ids = []
for _peer_data in NETWORK[_network]['PEERS']:
_radio_ids.append(_peer_data['RADIO_ID'])
NETWORK[_network]['MASTER']['STATUS']['PEER-LIST'] = True NETWORK[_network]['MASTER']['STATUS']['PEER-LIST'] = True
_num_peers = int(str(int(binascii.b2a_hex(_data[5:7]), 16))[1:]) _num_peers = int(str(int(binascii.b2a_hex(_data[5:7]), 16))[1:])
NETWORK[_network]['LOCAL']['NUM_PEERS'] = _num_peers NETWORK[_network]['LOCAL']['NUM_PEERS'] = _num_peers
@ -115,34 +123,31 @@ def process_peer_list(_data, _network):
_log('<<- (%s) The Peer List has been Received from Master\n%s \ _log('<<- (%s) The Peer List has been Received from Master\n%s \
There are %s peers in this IPSC Network', _network, (' '*(len(_network)+7)), _num_peers) There are %s peers in this IPSC Network', _network, (' '*(len(_network)+7)), _num_peers)
del NETWORK[_network]['PEERS'][:]
for i in range(7, (_num_peers*11)+7, 11): for i in range(7, (_num_peers*11)+7, 11):
hex_radio_id = (_data[i:i+4]) hex_radio_id = (_data[i:i+4])
hex_address = (_data[i+4:i+8]) hex_address = (_data[i+4:i+8])
hex_port = (_data[i+8:i+10]) hex_port = (_data[i+8:i+10])
hex_mode = (_data[i+10:i+11]) hex_mode = (_data[i+10:i+11])
decoded_mode = mode_decode(hex_mode) decoded_mode = mode_decode(hex_mode)
# NEXT TO-DO ITEM:
# if not in the current list, add it...
# if in the current list, but not in what we received, remove it...
# then take out the he ugliness that is below here (and up above where it deletes the whol list)
# for radio_id in NETWORK[_network]['PEERS']:
# print(binascii.b2a_hex(radio_id['RADIO_ID']))
# if hex_radio_id in radio_id['RADIO_ID']:
# print('---->', radio_id)
NETWORK[_network]['PEERS'].append({ if hex_radio_id not in _radio_ids:
'RADIO_ID': hex_radio_id, NETWORK[_network]['PEERS'].append({
'IP': socket.inet_ntoa(hex_address), 'RADIO_ID': hex_radio_id,
'PORT': int(binascii.b2a_hex(hex_port), 16), 'IP': socket.inet_ntoa(hex_address),
'MODE': hex_mode, 'PORT': int(binascii.b2a_hex(hex_port), 16),
'PEER_OPER': decoded_mode[0], 'MODE': hex_mode,
'PEER_MODE': decoded_mode[1], 'PEER_OPER': decoded_mode[0],
'TS1_LINK': decoded_mode[2], 'PEER_MODE': decoded_mode[1],
'TS2_LINK': decoded_mode[3], 'TS1_LINK': decoded_mode[2],
'STATUS': {'CONNECTED': False, 'KEEP_ALIVES_SENT': 0, 'KEEP_ALIVES_MISSED': 0, 'KEEP_ALIVES_OUTSTANDING': 0} 'TS2_LINK': decoded_mode[3],
}) 'STATUS': {'CONNECTED': False, 'KEEP_ALIVES_SENT': 0, 'KEEP_ALIVES_MISSED': 0, 'KEEP_ALIVES_OUTSTANDING': 0}
})
_radio_ids = []
for _peer_data in NETWORK[_network]['PEERS']:
_radio_ids.append(_peer_data['RADIO_ID'])
return _radio_ids
# Given a mode byte, decode the functions and return a tuple of results # Given a mode byte, decode the functions and return a tuple of results
# #
@ -239,6 +244,8 @@ class IPSC(DatagramProtocol):
self._master_sock = self._master['IP'], self._master['PORT'] self._master_sock = self._master['IP'], self._master['PORT']
# #
self._peers = self._config['PEERS'] self._peers = self._config['PEERS']
#
self._peer_list = []
args = () args = ()
@ -314,7 +321,6 @@ class IPSC(DatagramProtocol):
self.transport.write(peer_list_req_packet, (self._master_sock)) self.transport.write(peer_list_req_packet, (self._master_sock))
logger.debug('->> (%s) List Reqested from Master:%s', self._network, self._master_sock) logger.debug('->> (%s) List Reqested from Master:%s', self._network, self._master_sock)
# Logic problems in the next if.... bad ones. Fix them.
if (_peer_list_rx == True): if (_peer_list_rx == True):
for peer in (self._peers): for peer in (self._peers):
if (peer['RADIO_ID'] == self._local_id): # We are in the peer-list, but don't need to talk to ourselves if (peer['RADIO_ID'] == self._local_id): # We are in the peer-list, but don't need to talk to ourselves
@ -363,14 +369,15 @@ class IPSC(DatagramProtocol):
return return
if (_packettype == GROUP_VOICE): if (_packettype == GROUP_VOICE):
if not(valid_master(self._network, _peerid) == False or valid_peer(self._network, _peerid) == False): if not(valid_master(self._network, _peerid) == False or valid_peer(self._peer_list, _peerid) == False):
logger.warning('(%s) PeerError: Peer not in peer-list: %s', self._network, _dec_peerid) logger.warning('(%s) PeerError: Peer not in peer-list: %s', self._network, _dec_peerid)
return return
logger.debug('<<- (%s) Group Voice Packet From:%s:%s', self._network, host, port) logger.debug('<<- (%s) Group Voice Packet From:%s:%s', self._network, host, port)
elif (_packettype == PEER_ALIVE_REQ): elif (_packettype == PEER_ALIVE_REQ):
if valid_peer(self._network, _peerid) == False: if valid_peer(self._peer_list, _peerid) == False:
logger.warning('(%s) PeerError: Peer not in peer-list: %s', self._network, _dec_peerid)
logger.warning('(%s) PeerError: Peer %s not in peer-list: %s', self._network, _dec_peerid, self._peer_list)
return return
logger.debug('<<- (%s) Peer Keep-alive Request From Peer ID %s at:%s:%s', self._network, _dec_peerid, host, port) logger.debug('<<- (%s) Peer Keep-alive Request From Peer ID %s at:%s:%s', self._network, _dec_peerid, host, port)
@ -380,7 +387,7 @@ class IPSC(DatagramProtocol):
elif (_packettype == MASTER_ALIVE_REPLY): elif (_packettype == MASTER_ALIVE_REPLY):
if valid_master(self._network, _peerid) == False: if valid_master(self._network, _peerid) == False:
logger.warning('(%s) PeerError: Peer not in peer-list: %s', self._network, _dec_peerid) logger.warning('(%s) PeerError: Peer %s not in peer-list: %s', self._network, _dec_peerid, self._peer_list)
return return
logger.debug('<<- (%s) Master Keep-alive Reply From: %s \t@ IP: %s:%s', self._network, _dec_peerid, host, port) logger.debug('<<- (%s) Master Keep-alive Reply From: %s \t@ IP: %s:%s', self._network, _dec_peerid, host, port)
@ -417,7 +424,8 @@ class IPSC(DatagramProtocol):
logger.debug('<<- (%s) XCMP_XNL From:%s:%s, but we did not indicate XCMP capable!', self._network, host, port) logger.debug('<<- (%s) XCMP_XNL From:%s:%s, but we did not indicate XCMP capable!', self._network, host, port)
elif (_packettype == PEER_LIST_REPLY): elif (_packettype == PEER_LIST_REPLY):
process_peer_list(data, self._network) self._peer_list = process_peer_list(data, self._network)
print(self._peer_list)
elif (_packettype == PVT_VOICE): elif (_packettype == PVT_VOICE):
logger.debug('<<- (%s) Voice Packet From:%s:%s', self._network, host, port) logger.debug('<<- (%s) Voice Packet From:%s:%s', self._network, host, port)