KB8PMY
/
ADN-DMR-Peer-Server
mirror of https://github.com/Amateur-Digital-Network/ADN-DMR-Peer-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into proto_v4

Browse Source
ta
Simon 4 years ago
parent 005fa88de9 323be20ecf
commit 5739a58ede
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File

5
bridge_master.py
Unescape View File

@ -1568,7 +1568,8 @@ class routerOBP(OPENBRIDGE):
if system == self._system: if system == self._system:
continue continue
#We only want to send data calls to individual IDs via OpenBridge #We only want to send data calls to individual IDs via OpenBridge
if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE' and (_int_dst_id >= 1000000): #Only send if proto ver for bridge is > 1
if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE' and CONFIG['SYSTEMS'][system]['VER'] > 1 and (_int_dst_id >= 1000000):
self.sendDataToOBP(system,_data,dmrpkt,pkt_time,_stream_id,_dst_id,_peer_id,_rf_src,_bits,_slot,_hops) self.sendDataToOBP(system,_data,dmrpkt,pkt_time,_stream_id,_dst_id,_peer_id,_rf_src,_bits,_slot,_hops)
#If destination ID is in the Subscriber Map #If destination ID is in the Subscriber Map
@ -2152,7 +2153,7 @@ class routerHBP(HBSYSTEM):
if system == self._system: if system == self._system:
continue continue
#We only want to send data calls to individual IDs via OpenBridge #We only want to send data calls to individual IDs via OpenBridge
if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE' and (_int_dst_id >= 1000000): if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE' and CONFIG['SYSTEMS'][system]['VER'] > 1 and (_int_dst_id >= 1000000):
self.sendDataToOBP(system,_data,dmrpkt,pkt_time,_stream_id,_dst_id,_peer_id,_rf_src,_bits,_slot) self.sendDataToOBP(system,_data,dmrpkt,pkt_time,_stream_id,_dst_id,_peer_id,_rf_src,_bits,_slot)

19
hblink.py
Unescape View File

@ -144,7 +144,7 @@ class OPENBRIDGE(DatagramProtocol):
def dereg(self): def dereg(self):
logger.info('(%s) is mode OPENBRIDGE. No De-Registration required, continuing shutdown', self._system) logger.info('(%s) is mode OPENBRIDGE. No De-Registration required, continuing shutdown', self._system)
def send_system(self, _packet,_hops = b''): def send_system(self, _packet,_hops = b'', _source_server = b'\x00\x00\x00\x00'):
#Don't do anything if we are STUNned #Don't do anything if we are STUNned
if 'STUN' in self._CONFIG: if 'STUN' in self._CONFIG:
logger.info('(%s) Bridge STUNned, discarding', self._system) logger.info('(%s) Bridge STUNned, discarding', self._system)
@ -156,16 +156,17 @@ class OPENBRIDGE(DatagramProtocol):
if _packet[:3] == DMR and self._config['TARGET_IP']: if _packet[:3] == DMR and self._config['TARGET_IP']:
if 'VER' in self._config and self._config['VER'] > 3: if 'VER' in self._config and self._config['VER'] > 3:
_packet = b''.join([DMRF,_packet[4:11], self._CONFIG['GLOBAL']['SERVER_ID'],_packet[15:]]) _ver = VER.to_bytes(1,'big')
_packet = b''.join([DMRE,_ver,_packet[4:11], self._CONFIG['GLOBAL']['SERVER_ID'],_packet[15:],time_ns().to_bytes(8,'big'), _source_server, _hops])
_h = blake2b(key=self._config['PASSPHRASE'], digest_size=16) _h = blake2b(key=self._config['PASSPHRASE'], digest_size=16)
_h.update(_packet) _h.update(_packet)
_hash = _h.digest() _hash = _h.digest()
_packet = b''.join([_packet,time_ns().to_bytes(8,'big'), _hops, _hash]) _packet = b''.join([_packet, _hash])
self.transport.write(_packet, (self._config['TARGET_IP'], self._config['TARGET_PORT'])) self.transport.write(_packet, (self._config['TARGET_IP'], self._config['TARGET_PORT']))
if 'VER' in self._config and self._config['VER'] == 3: elif 'VER' in self._config and self._config['VER'] == 3:
_packet = b''.join([DMRF,_packet[4:11], self._CONFIG['GLOBAL']['SERVER_ID'],_packet[15:]]) _packet = b''.join([DMRF,_packet[4:11], self._CONFIG['GLOBAL']['SERVER_ID'],_packet[15:]])
_h = blake2b(key=self._config['PASSPHRASE'], digest_size=16) _h = blake2b(key=self._config['PASSPHRASE'], digest_size=16)
_h.update(_packet) _h.update(_packet)
@ -242,11 +243,14 @@ class OPENBRIDGE(DatagramProtocol):
if _packet[:3] == DMR: # DMRData -- encapsulated DMR data frame if _packet[:3] == DMR: # DMRData -- encapsulated DMR data frame
if _packet[:4] == DMRD: if _packet[:4] == DMRD:
_data = _packet[:53]
_stream_id = _data[16:20]
if self._config['VER'] > 1: if self._config['VER'] > 1:
logger.warning('(%s) *ProtoControl* Version 1 protocol prohibited by PROTO_VER, Ver: %s',self._system,self._config['VER']) if _stream_id not in self._laststrid:
logger.warning('(%s) *ProtoControl* Version 1 protocol prohibited by PROTO_VER, Ver: %s',self._system,self._config['VER'])
self._laststrid.append(_stream_id)
self.send_bcve() self.send_bcve()
return return
_data = _packet[:53]
_hash = _packet[53:] _hash = _packet[53:]
_ckhs = hmac_new(self._config['PASSPHRASE'],_data,sha1).digest() _ckhs = hmac_new(self._config['PASSPHRASE'],_data,sha1).digest()
@ -269,7 +273,6 @@ class OPENBRIDGE(DatagramProtocol):
_call_type = 'group' _call_type = 'group'
_frame_type = (_bits & 0x30) >> 4 _frame_type = (_bits & 0x30) >> 4
_dtype_vseq = (_bits & 0xF) # data, 1=voice header, 2=voice terminator; voice, 0=burst A ... 5=burst F _dtype_vseq = (_bits & 0xF) # data, 1=voice header, 2=voice terminator; voice, 0=burst A ... 5=burst F
_stream_id = _data[16:20]
#logger.debug('(%s) DMRD - Seqence: %s, RF Source: %s, Destination ID: %s', self._system, int_id(_seq), int_id(_rf_src), int_id(_dst_id)) #logger.debug('(%s) DMRD - Seqence: %s, RF Source: %s, Destination ID: %s', self._system, int_id(_seq), int_id(_rf_src), int_id(_dst_id))

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.