From 8e79cf8f8d3f4ea7c26a00765cbc30c12c6e475c Mon Sep 17 00:00:00 2001 From: Cort Buffington Date: Fri, 16 Aug 2013 14:30:20 -0500 Subject: [PATCH] Create Named "Labels" For Each IPSC Obejct names for each IPSC class instantiation, so bridging code can identify a target IPSC (class instantiaion) to call packet transmit methods on. --- ipsc.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ipsc.py b/ipsc.py index 0473d98..7793e22 100644 --- a/ipsc.py +++ b/ipsc.py @@ -115,10 +115,10 @@ def fwd_group_voice(_network, _data): print(binascii.b2a_hex(_src_group), ' ', binascii.b2a_hex(source['SRC_GROUP'])) if source['SRC_GROUP'] == _src_group: print(binascii.b2a_hex(_src_ipsc), ' ', binascii.b2a_hex(source['DST_NET'])) - # _data.replace(_src_ipsc, NETWORK[source]['DST_NET']['LOCAL']['RADIO_ID']) - # _data.replace(_src_group, source['DST_GROUP']) - # _data = hashed_packet(NETWORK[source]['DST_NET']['LOCAL']['AUTH_KEY'], _data) - # print(binascii.b2a_hex(_data)) + _data.replace(_src_ipsc, NETWORK[source]['DST_NET']['LOCAL']['RADIO_ID']) + _data.replace(_src_group, source['DST_GROUP']) + _data = hashed_packet(NETWORK[source]['DST_NET']['LOCAL']['AUTH_KEY'], _data) + print(binascii.b2a_hex(_data)) # Match source group to a rule # Write destination group to packet # Hash packet @@ -487,7 +487,9 @@ class IPSC(DatagramProtocol): #************************************************ if __name__ == '__main__': + networks = {} for ipsc_network in NETWORK: - if (NETWORK[ipsc_network]['LOCAL']['ENABLED']): - reactor.listenUDP(NETWORK[ipsc_network]['LOCAL']['PORT'], IPSC(ipsc_network)) + networks[ipsc_network] = IPSC(ipsc_network) + if (NETWORK[ipsc_network]['LOCAL']['ENABLED']): + reactor.listenUDP(NETWORK[ipsc_network]['LOCAL']['PORT'], networks[ipsc_network]) reactor.run() \ No newline at end of file