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

Work on Private Playback

Browse Source 
Still not working… packets look good, something is missing.
This commit is contained in:
Cort Buffington 2014-08-04 21:43:58 -05:00
parent 132c1ece39
commit 9699fc18ef
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
playback_user.py
View File

@ -31,6 +31,7 @@ except ImportError:
sys.exit('Configuration file not found or invalid') sys.exit('Configuration file not found or invalid')
HEX_SUB = hex_str_3(SUB) HEX_SUB = hex_str_3(SUB)
BOGUS_SUB = '\xFF\xFF\xFF'
class playbackIPSC(IPSC): class playbackIPSC(IPSC):
@ -47,23 +48,27 @@ class playbackIPSC(IPSC):
if HEX_SUB == _dst_sub and TS == _ts: if HEX_SUB == _dst_sub and TS == _ts:
if not _end: if not _end:
if not self.CALL_DATA: if not self.CALL_DATA:
logger.info('(%s) Receiving transmission to be played back from subscriber: %s', _network, int_id(_src_sub)) logger.info('(%s) Receiving transmission to be played back from subscriber: %s, to subscriber: %s', _network, int_id(_src_sub), int_id(_dst_sub))
_tmp_data = _data _tmp_data = _data
#_tmp_data = dmr_nat(_data, _src_sub, NETWORK[_network]['LOCAL']['RADIO_ID']) #_tmp_data = dmr_nat(_data, _src_sub, NETWORK[_network]['LOCAL']['RADIO_ID'])
self.CALL_DATA.append(_tmp_data) self.CALL_DATA.append(_tmp_data)
if _end: if _end:
self.CALL_DATA.append(_data) self.CALL_DATA.append(_data)
time.sleep(2) time.sleep(5)
logger.info('(%s) Playing back transmission from subscriber: %s', _network, int_id(_src_sub)) logger.info('(%s) Playing back transmission from subscriber: %s, to subscriber %s', _network, int_id(_src_sub), int_id(_dst_sub))
_orig_src = _src_sub
_orig_dst = _dst_sub
for i in self.CALL_DATA: for i in self.CALL_DATA:
_tmp_data = i _tmp_data = i
#print(h(_tmp_data))
_tmp_data = _tmp_data.replace(_peerid, NETWORK[_network]['LOCAL']['RADIO_ID']) _tmp_data = _tmp_data.replace(_peerid, NETWORK[_network]['LOCAL']['RADIO_ID'])
_tmp_data = _tmp_data.replace(_src_sub, '\x00\x04\xd2') _tmp_data = _tmp_data.replace(_dst_sub, BOGUS_SUB)
_tmp_data = _tmp_data.replace(_dst_sub, _src_sub) _tmp_data = _tmp_data.replace(_src_sub, _orig_dst)
_tmp_data = _tmp_data.replace(BOGUS_SUB, _orig_src)
_tmp_data = self.hashed_packet(NETWORK[_network]['LOCAL']['AUTH_KEY'], _tmp_data) _tmp_data = self.hashed_packet(NETWORK[_network]['LOCAL']['AUTH_KEY'], _tmp_data)
# Send the packet to all peers in the target IPSC # Send the packet to all peers in the target IPSC
print(h(_src_sub)) #print(h(_tmp_data))
print(h(_tmp_data)) #print('')
send_to_ipsc(_network, _tmp_data) send_to_ipsc(_network, _tmp_data)
time.sleep(0.06) time.sleep(0.06)
self.CALL_DATA = [] self.CALL_DATA = []

2
playback_user_config.py
View File

@ -2,6 +2,6 @@
# #
# THESE ARE THE THINGS THAT YOU NEED TO CONFIGURE TO USE playback.py # THESE ARE THE THINGS THAT YOU NEED TO CONFIGURE TO USE playback.py
# TGID TO LISTEN FOR AND REPEAT ON # TGID TO LISTEN FOR AND REPEAT ON
SUB = 1234 SUB = 12345
# TIMESLOT TO LISTEN FOR AND REPEAT ON # TIMESLOT TO LISTEN FOR AND REPEAT ON
TS = 1 TS = 1