Work on Master support

This commit is contained in:
Cort Buffington 2014-05-08 08:39:41 -05:00
parent 182fe4f93b
commit bba5d42511

View File

@ -341,6 +341,7 @@ def send_to_ipsc(_target, _packet):
_peers = _network['PEERS'] _peers = _network['PEERS']
# Send to the Master # Send to the Master
if _network['MASTER']['STATUS']['CONNECTED']:
_network_instance.transport.write(_packet, (_network['MASTER']['IP'], _network['MASTER']['PORT'])) _network_instance.transport.write(_packet, (_network['MASTER']['IP'], _network['MASTER']['PORT']))
# Send to each connected Peer # Send to each connected Peer
for peer in _peers.keys(): for peer in _peers.keys():
@ -516,6 +517,9 @@ def print_peer_list(_network):
# Gratuitous print-out of Master info.. Pretty much debug stuff. # Gratuitous print-out of Master info.. Pretty much debug stuff.
# #
def print_master(_network): def print_master(_network):
if NETWORK[_network]['LOCAL']['MASTER_PEER']:
print('DMRlink is the Master for %s' % _network)
else:
_master = NETWORK[_network]['MASTER'] _master = NETWORK[_network]['MASTER']
print('Master for %s' % _network) print('Master for %s' % _network)
print('\tRADIO ID: {}' .format(int(h(_master['RADIO_ID']), 16))) print('\tRADIO ID: {}' .format(int(h(_master['RADIO_ID']), 16)))