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

Bridging Additions

Browse Source
This commit is contained in:
Cort Buffington 2013-11-05 19:40:28 -06:00
parent 10f73545ad
commit f3f103fca8
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
bridge.py
View File

@ -18,16 +18,38 @@ from dmrlink import IPSC, UnauthIPSC, NETWORK, networks, int_id, send_to_ipsc, d
RULES = { RULES = {
'K0USY': { 'K0USY': {
'GROUP_VOICE': [ 'GROUP_VOICE': [
{'SRC_GROUP': b'\x00\x0C\x30', 'DST_NET': 'LAWRENCE', 'DST_GROUP': b'\x00\x0C\x30'} {'SRC_GROUP': b'\x00\x0C\x30', 'DST_NET': 'LAWRENCE', 'DST_GROUP': b'\x00\x0C\x30'},
{'SRC_GROUP': b'\x00\x0C\x30', 'DST_NET': 'TEST', 'DST_GROUP': b'\x00\x00\xD2'}
], ],
'PRIVATE_VOICE': [ 'PRIVATE_VOICE': [
],
'GROUP_DATA': [
],
'PRIVATE_DATA': [
] ]
}, },
'LAWRENCE': { 'LAWRENCE': {
'GROUP_VOICE': [ 'GROUP_VOICE': [
{'SRC_GROUP': b'\x00\x0C\x30', 'DST_NET': 'K0USY', 'DST_GROUP': b'\x00\x0C\x30'} {'SRC_GROUP': b'\x00\x0C\x30', 'DST_NET': 'K0USY', 'DST_GROUP': b'\x00\x0C\x30'},
{'SRC_GROUP': b'\x00\x0C\x30', 'DST_NET': 'TEST', 'DST_GROUP': b'\x00\x00\xD2'}
], ],
'PRIVATE_VOICE': [ 'PRIVATE_VOICE': [
],
'GROUP_DATA': [
],
'PRIVATE_DATA': [
]
},
'TEST': {
'GROUP_VOICE': [
{'SRC_GROUP': b'\x00\x00\xD2', 'DST_NET': 'K0USY', 'DST_GROUP': b'\x00\x0C\x30'},
{'SRC_GROUP': b'\x00\x00\xD2', 'DST_NET': 'LAWRENCE', 'DST_GROUP': b'\x00\x0C\x30'}
],
'PRIVATE_VOICE': [
],
'GROUP_DATA': [
],
'PRIVATE_DATA': [
] ]
} }
} }
@ -56,7 +78,6 @@ class bridgeIPSC(IPSC):
_data = _data.replace(_peerid, NETWORK[_target]['LOCAL']['RADIO_ID']) _data = _data.replace(_peerid, NETWORK[_target]['LOCAL']['RADIO_ID'])
# Re-Write the destinaion Group ID # Re-Write the destinaion Group ID
_data = _data.replace(_dst_sub, source['DST_GROUP']) _data = _data.replace(_dst_sub, source['DST_GROUP'])
_data = dmr_nat(_data, '\x00\x0C\x30')
# Calculate and append the authentication hash for the target network... if necessary # Calculate and append the authentication hash for the target network... if necessary
if NETWORK[_target]['LOCAL']['AUTH_ENABLED'] == True: if NETWORK[_target]['LOCAL']['AUTH_ENABLED'] == True:
_data = self.hashed_packet(NETWORK[_target]['LOCAL']['AUTH_KEY'], _data) _data = self.hashed_packet(NETWORK[_target]['LOCAL']['AUTH_KEY'], _data)