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

NAT Work

Browse Source
This commit is contained in:
Cort Buffington 2013-11-21 18:38:15 -06:00
parent a46a35dbd1
commit b0175dbbbf
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bridge.py
View File

@ -13,6 +13,8 @@ from twisted.internet import task
from binascii import b2a_hex as h from binascii import b2a_hex as h
from time import time from time import time
import os
import sys
import binascii import binascii
import dmrlink import dmrlink
from dmrlink import IPSC, UnauthIPSC, NETWORK, networks, int_id, send_to_ipsc, dmr_nat, logger from dmrlink import IPSC, UnauthIPSC, NETWORK, networks, int_id, send_to_ipsc, dmr_nat, logger
@ -59,6 +61,8 @@ class bridgeIPSC(IPSC):
# Re-Write the destinaion Group ID # Re-Write the destinaion Group ID
_tmp_data = _tmp_data.replace(_dst_sub, source['DST_GROUP']) _tmp_data = _tmp_data.replace(_dst_sub, source['DST_GROUP'])
# 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 NAT:
_tmp_data = dmr_nat(_tmp_data, _src_sub, '\x00\x0C\x30')
if NETWORK[_target]['LOCAL']['AUTH_ENABLED'] == True: if NETWORK[_target]['LOCAL']['AUTH_ENABLED'] == True:
_tmp_data = self.hashed_packet(NETWORK[_target]['LOCAL']['AUTH_KEY'], _tmp_data) _tmp_data = self.hashed_packet(NETWORK[_target]['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

1
dmrlink.py
View File

@ -20,7 +20,6 @@ import hmac
import hashlib import hashlib
import socket import socket
import csv import csv
import re
#************************************************ #************************************************
# IMPORTING OTHER FILES - '#include' # IMPORTING OTHER FILES - '#include'