|
|
|
|
@ -1729,7 +1729,6 @@ class routerOBP(OPENBRIDGE):
|
|
|
|
|
logger.warning("(%s) *PacketControl* RATE DROP! Stream ID:, %s TGID: %s",self._system,int_id(_stream_id),int_id(_dst_id))
|
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#Duplicate handling#
|
|
|
|
|
#Handle inbound duplicates
|
|
|
|
|
#Duplicate complete packet
|
|
|
|
|
@ -2079,7 +2078,7 @@ class routerHBP(HBSYSTEM):
|
|
|
|
|
#Assemble transmit HBP packet header
|
|
|
|
|
_tmp_data = b''.join([_data[:15], _tmp_bits.to_bytes(1, 'big'), _data[16:20]])
|
|
|
|
|
_tmp_data = b''.join([_tmp_data, dmrpkt])
|
|
|
|
|
systems[_target].send_system(_tmp_data,b'',ber,_rssi,_source_server)
|
|
|
|
|
systems[_target].send_system(_tmp_data,b'',_ber,_rssi,_source_server)
|
|
|
|
|
logger.info('(%s) UNIT Data Bridged to OBP System: %s DST_ID: %s', self._system, _target,_int_dst_id)
|
|
|
|
|
if CONFIG['REPORTS']['REPORT']:
|
|
|
|
|
systems[system]._report.send_bridgeEvent('UNIT DATA,START,TX,{},{},{},{},{},{}'.format(_target, int_id(_stream_id), int_id(_peer_id), int_id(_rf_src), 1, _int_dst_id).encode(encoding='utf-8', errors='ignore'))
|
|
|
|
|
|