From 56236ec6cda3165a5123008abfc113c6d16b325b Mon Sep 17 00:00:00 2001 From: Cort Buffington Date: Tue, 27 Aug 2013 10:23:53 -0500 Subject: [PATCH] Remove debugging items from TG forwarding --- ipsc.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ipsc.py b/ipsc.py index 6260f93..1bc96dd 100644 --- a/ipsc.py +++ b/ipsc.py @@ -105,9 +105,9 @@ def validate_auth(_key, _data): _log(' AUTH: Invalid - Payload: %s, Hash: %s', binascii.b2a_hex(_payload), binascii.b2a_hex(_hash)) return False + # Forward Group Voice Packet -# THIS IS BROKEN - BEGIN WORK HERE. REPLACING SEGMENTS ISN'T REFERENCING THE RIGHT SUBSTITUTE DATA AND -# I'M GOIGN TO BED NOW. +# def fwd_group_voice(_network, _data): _src_group = _data[9:12] _src_ipsc = _data[1:5] @@ -116,12 +116,9 @@ def fwd_group_voice(_network, _data): if source['SRC_GROUP'] == _src_group: _target = source['DST_NET'] _target_sock = NETWORK[_target]['MASTER']['IP'], NETWORK[_target]['MASTER']['PORT'] - print(binascii.b2a_hex(_data)) _data = _data.replace(_src_ipsc, NETWORK[_target]['LOCAL']['RADIO_ID']) _data = _data.replace(_src_group, source['DST_GROUP']) _data = hashed_packet(NETWORK[_target]['LOCAL']['AUTH_KEY'], _data) - print(binascii.b2a_hex(_data)) - print() networks[_target].transport.write(_data, (_target_sock))