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

ALL PACKETS BRIDGED! (but works)

Browse Source 
currently no real rule checking in place, other than bridging to any
target network listed, client or master
This commit is contained in:
Cort Buffington 2016-08-01 21:31:28 -05:00
parent 237085cb09
commit 06be02c69f
1 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
hb_router.py
View File

@ -20,7 +20,7 @@ from twisted.internet import reactor
from twisted.internet import task from twisted.internet import task
# Things we import from the main hblink module # Things we import from the main hblink module
from hblink import CONFIG, HBMASTER, HBCLIENT, logger, masters, clients, hex_str_3 from hblink import CONFIG, HBMASTER, HBCLIENT, logger, masters, clients, hex_str_3, int_id
# Import Bridging rules # Import Bridging rules
# Note: A stanza *must* exist for any MASTER or CLIENT configured in the main # Note: A stanza *must* exist for any MASTER or CLIENT configured in the main
@ -84,13 +84,49 @@ __status__ = 'pre-alpha'
class routerMASTER(HBMASTER): class routerMASTER(HBMASTER):
def dmrd_received(self, _radio_id, _rf_src, _dst_id, _seq, _data): def dmrd_received(self, _radio_id, _rf_src, _dst_id, _seq, _data):
for rule in RULES['MASTERS'][self._master]: for rule in RULES['MASTERS'][self._master]['GROUP_VOICE']:
print(rule) _target = rule['DST_NET']
if _target in RULES['MASTERS']:
_tmp_data = _data
_tmp_data = _tmp_data.replace(_radio_id, CONFIG['MASTERS'][_target]['RADIO_ID'])
for _client in CONFIG['MASTERS'][_target]._clients:
if _client != _radio_id:
masters[_target].send_packet(_client, _tmp_data)
logger.debug('(%s) Packet bridged to client: %s', self._master, _target)
elif _target in RULES['CLIENTS']:
_tmp_data = _data
_tmp_data = _tmp_data.replace(_radio_id, CONFIG['CLIENTS'][_target]['RADIO_ID'])
clients[_target].send_packet(_tmp_data)
logger.debug('(%s) Packet bridged to master: %s', self._master, _target)
else:
print('no luck')
continue
class routerCLIENT(HBCLIENT): class routerCLIENT(HBCLIENT):
def dmrd_received(self, _radio_id, _rf_src, _dst_id, _seq, _data): def dmrd_received(self, _radio_id, _rf_src, _dst_id, _seq, _data):
pass for rule in RULES['CLIENTS'][self._master]['GROUP_VOICE']:
_target = rule['DST_NET']
if _target in RULES['MASTERS']:
_tmp_data = _data
_tmp_data = _tmp_data.replace(_radio_id, CONFIG['MASTERS'][_target]['RADIO_ID'])
for _client in CONFIG['MASTERS'][_target]._clients:
if _client != _radio_id:
masters[_target].send_packet(_client, _tmp_data)
logger.debug('(%s) Packet bridged to client: %s', self._client, _target)
elif _target in RULES['CLIENTS']:
_tmp_data = _data
_tmp_data = _tmp_data.replace(_radio_id, CONFIG['CLIENTS'][_target]['RADIO_ID'])
clients[_target].send_packet(_tmp_data)
logger.debug('(%s) Packet bridged to master: %s', self._client, _target)
else:
print('no luck')
continue
#************************************************ #************************************************
# MAIN PROGRAM LOOP STARTS HERE # MAIN PROGRAM LOOP STARTS HERE
@ -102,13 +138,13 @@ if __name__ == '__main__':
# HBlink Master # HBlink Master
for master in CONFIG['MASTERS']: for master in CONFIG['MASTERS']:
if CONFIG['MASTERS'][master]['ENABLED']: if CONFIG['MASTERS'][master]['ENABLED']:
masters[master] = HBMASTER(master) masters[master] = routerMASTER(master)
reactor.listenUDP(CONFIG['MASTERS'][master]['PORT'], masters[master], interface=CONFIG['MASTERS'][master]['IP']) reactor.listenUDP(CONFIG['MASTERS'][master]['PORT'], masters[master], interface=CONFIG['MASTERS'][master]['IP'])
logger.debug('MASTER instance created: %s, %s', master, masters[master]) logger.debug('MASTER instance created: %s, %s', master, masters[master])
for client in CONFIG['CLIENTS']: for client in CONFIG['CLIENTS']:
if CONFIG['CLIENTS'][client]['ENABLED']: if CONFIG['CLIENTS'][client]['ENABLED']:
clients[client] = HBCLIENT(client) clients[client] = routerCLIENT(client)
reactor.listenUDP(CONFIG['CLIENTS'][client]['PORT'], clients[client], interface=CONFIG['CLIENTS'][client]['IP']) reactor.listenUDP(CONFIG['CLIENTS'][client]['PORT'], clients[client], interface=CONFIG['CLIENTS'][client]['IP'])
logger.debug('CLIENT instance created: %s, %s', client, clients[client]) logger.debug('CLIENT instance created: %s, %s', client, clients[client])