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

DON'T rewrite "RptId"

Browse Source
This commit is contained in:
Cort Buffington 2016-08-02 18:23:04 -05:00
parent b0752ad9ca
commit 80229bc5b0
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hb_router.py
View File

@ -87,14 +87,11 @@ class routerMASTER(HBMASTER):
for rule in RULES['MASTERS'][self._master]['GROUP_VOICE']: for rule in RULES['MASTERS'][self._master]['GROUP_VOICE']:
_target = rule['DST_NET'] _target = rule['DST_NET']
if _target in RULES['MASTERS']: if _target in RULES['MASTERS']:
_tmp_data = _data masters[_target].send_clients(_data)
masters[_target].send_clients(_client, _tmp_data)
logger.debug('(%s) Packet routed to master instance: %s', self._master, _target) logger.debug('(%s) Packet routed to master instance: %s', self._master, _target)
elif _target in RULES['CLIENTS']: elif _target in RULES['CLIENTS']:
_tmp_data = _data clients[_target].send_packet(_data)
_tmp_data = _tmp_data.replace(_radio_id, CONFIG['CLIENTS'][_target]['RADIO_ID'])
clients[_target].send_packet(_tmp_data)
logger.debug('(%s) Packet routed to client instance: %s', self._master, _target) logger.debug('(%s) Packet routed to client instance: %s', self._master, _target)
else: else:
@ -108,14 +105,11 @@ class routerCLIENT(HBCLIENT):
for rule in RULES['CLIENTS'][self._client]['GROUP_VOICE']: for rule in RULES['CLIENTS'][self._client]['GROUP_VOICE']:
_target = rule['DST_NET'] _target = rule['DST_NET']
if _target in RULES['MASTERS']: if _target in RULES['MASTERS']:
_tmp_data = _data masters[_target].send_clients(_data)
masters[_target].send_packet(_client, _tmp_data)
logger.debug('(%s) Packet routed to master instance: %s', self._client, _target) logger.debug('(%s) Packet routed to master instance: %s', self._client, _target)
elif _target in RULES['CLIENTS']: elif _target in RULES['CLIENTS']:
_tmp_data = _data clients[_target].send_packet(_data)
_tmp_data = _tmp_data.replace(_radio_id, CONFIG['CLIENTS'][_target]['RADIO_ID'])
clients[_target].send_packet(_tmp_data)
logger.debug('(%s) Packet routed to client instance: %s', self._client, _target) logger.debug('(%s) Packet routed to client instance: %s', self._client, _target)
else: else:

6
hblink.py
View File

@ -190,10 +190,8 @@ class HBMASTER(DatagramProtocol):
def send_clients(self, _packet): def send_clients(self, _packet):
for _client in self._clients: for _client in self._clients:
#add destiantion re-writer here split _data and insert target client radio_id at: _data[11:15] self.send_packet(_client, _packet)
_tmp_packet = _packet[:11] + _client + _packet[15:] logger.debug('(%s) Packet sent to client %s', self._master, _client)
self.send_packet(_client, _tmp_packet)
logger.debug('(%s) Packet sent to all connected clients', self._master)
def send_packet(self, _client, _packet): def send_packet(self, _client, _packet):
_ip = self._clients[_client]['IP'] _ip = self._clients[_client]['IP']