From 056e55823e850ad4f8350e1b479ee919a1407814 Mon Sep 17 00:00:00 2001 From: Cort Buffington Date: Thu, 21 Nov 2013 18:50:01 -0600 Subject: [PATCH] Nat work --- bridge.py | 5 ++++- dmrlink.py | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/bridge.py b/bridge.py index c482cca..0fdf79b 100644 --- a/bridge.py +++ b/bridge.py @@ -19,6 +19,8 @@ import binascii import dmrlink from dmrlink import IPSC, UnauthIPSC, NETWORK, networks, int_id, send_to_ipsc, dmr_nat, logger +NAT = True + # Notes and pieces of next steps... # RPT_WAKE_UP = b'\x85' + NETWORK[_network]['LOCAL']['RADIO_ID] + b'\x00\x00\x00\x01' + b'\x01' + b'\x01' # TS1 = 0, TS2 = 1 @@ -43,6 +45,7 @@ class bridgeIPSC(IPSC): #************************************************ def group_voice(self, _network, _src_sub, _dst_sub, _ts, _end, _peerid, _data): + print('packet ', h(_src_sub)) if (_ts not in self.ACTIVE_CALLS): self.ACTIVE_CALLS.append(_ts) # send repeater wake up, but send them when a repeater is likely not TXing check time since end (see below) @@ -115,4 +118,4 @@ if __name__ == '__main__': else: networks[ipsc_network] = bridgeUnauthIPSC(ipsc_network) reactor.listenUDP(NETWORK[ipsc_network]['LOCAL']['PORT'], networks[ipsc_network]) - reactor.run() \ No newline at end of file + reactor.run() diff --git a/dmrlink.py b/dmrlink.py index b751e1d..9322af3 100644 --- a/dmrlink.py +++ b/dmrlink.py @@ -490,8 +490,8 @@ class IPSC(DatagramProtocol): def reporting_loop(self): # Right now, without this, we really dont' know anything is happening. - print_master(self._network) - print_peer_list(self._network) + #print_master(self._network) + #print_peer_list(self._network) logger.debug('(%s) Periodic Connection Maintenance Loop Started', self._network) pass @@ -791,4 +791,4 @@ if __name__ == '__main__': else: networks[ipsc_network] = UnauthIPSC(ipsc_network) reactor.listenUDP(NETWORK[ipsc_network]['LOCAL']['PORT'], networks[ipsc_network]) - reactor.run() \ No newline at end of file + reactor.run()