an OB to OB Support
This commit is contained in:
Cort Buffington
parent
57bfd9b203
commit
316b566b9d
182
hb_confbridge.py
182
hb_confbridge.py
@ -283,77 +283,129 @@ class routerOBP(OPENBRIDGE):
|
|||||||
_target_status = systems[_target['SYSTEM']].STATUS
|
_target_status = systems[_target['SYSTEM']].STATUS
|
||||||
_target_system = self._CONFIG['SYSTEMS'][_target['SYSTEM']]
|
_target_system = self._CONFIG['SYSTEMS'][_target['SYSTEM']]
|
||||||
|
|
||||||
# BEGIN CONTENTION HANDLING
|
if _target_system['MODE'] == 'OPENBRIDGE':
|
||||||
#
|
# Is this a new call stream on the target?
|
||||||
# The rules for each of the 4 "ifs" below are listed here for readability. The Frame To Send is:
|
if (_stream_id not in _target_status):
|
||||||
# From a different group than last RX from this HBSystem, but it has been less than Group Hangtime
|
# This is a new call stream on the target
|
||||||
# From a different group than last TX to this HBSystem, but it has been less than Group Hangtime
|
_target_status[_stream_id] = {
|
||||||
# From the same group as the last RX from this HBSystem, but from a different subscriber, and it has been less than stream timeout
|
'START': pkt_time,
|
||||||
# From the same group as the last TX to this HBSystem, but from a different subscriber, and it has been less than stream timeout
|
'CONTENTION':False,
|
||||||
# The "continue" at the end of each means the next iteration of the for loop that tests for matching rules
|
'RFS': _rf_src,
|
||||||
#
|
'TGID': _dst_id,
|
||||||
if ((_target['TGID'] != _target_status[_target['TS']]['RX_TGID']) and ((pkt_time - _target_status[_target['TS']]['RX_TIME']) < _target_system['GROUP_HANGTIME'])):
|
}
|
||||||
if self.STATUS[_stream_id]['CONTENTION'] == False:
|
# If we can, use the LC from the voice header as to keep all options intact
|
||||||
self.STATUS[_stream_id]['CONTENTION'] = True
|
if _frame_type == hb_const.HBPF_DATA_SYNC and _dtype_vseq == hb_const.HBPF_SLT_VHEAD:
|
||||||
self._logger.info('(%s) Call not routed to TGID %s, target active or in group hangtime: HBSystem: %s, TS: %s, TGID: %s', self._system, int_id(_target['TGID']), _target['SYSTEM'], _target['TS'], int_id(_target_status[_target['TS']]['RX_TGID']))
|
decoded = decode.voice_head_term(dmrpkt)
|
||||||
continue
|
_target_status[_stream_id]['LC'] = decoded['LC']
|
||||||
if ((_target['TGID'] != _target_status[_target['TS']]['TX_TGID']) and ((pkt_time - _target_status[_target['TS']]['TX_TIME']) < _target_system['GROUP_HANGTIME'])):
|
self._logger.debug('(%s) Created LC for OpenBridge destination: System: %s, TGID: %s', self._system, _target['SYSTEM'], int_id(_target['TGID']))
|
||||||
if self.STATUS[_stream_id]['CONTENTION'] == False:
|
|
||||||
self.STATUS[_stream_id]['CONTENTION'] = True
|
|
||||||
self._logger.info('(%s) Call not routed to TGID%s, target in group hangtime: HBSystem: %s, TS: %s, TGID: %s', self._system, int_id(_target['TGID']), _target['SYSTEM'], _target['TS'], int_id(_target_status[_target['TS']]['TX_TGID']))
|
|
||||||
continue
|
|
||||||
if (_target['TGID'] == _target_status[_target['TS']]['RX_TGID']) and ((pkt_time - _target_status[_target['TS']]['RX_TIME']) < hb_const.STREAM_TO):
|
|
||||||
if self.STATUS[_stream_id]['CONTENTION'] == False:
|
|
||||||
self.STATUS[_stream_id]['CONTENTION'] = True
|
|
||||||
self._logger.info('(%s) Call not routed to TGID%s, matching call already active on target: HBSystem: %s, TS: %s, TGID: %s', self._system, int_id(_target['TGID']), _target['SYSTEM'], _target['TS'], int_id(_target_status[_target['TS']]['RX_TGID']))
|
|
||||||
continue
|
|
||||||
if (_target['TGID'] == _target_status[_target['TS']]['TX_TGID']) and (_rf_src != _target_status[_target['TS']]['TX_RFS']) and ((pkt_time - _target_status[_target['TS']]['TX_TIME']) < hb_const.STREAM_TO):
|
|
||||||
if self.STATUS[_stream_id]['CONTENTION'] == False:
|
|
||||||
self.STATUS[_stream_id]['CONTENTION'] = True
|
|
||||||
self._logger.info('(%s) Call not routed for subscriber %s, call route in progress on target: HBSystem: %s, TS: %s, TGID: %s, SUB: %s', self._system, int_id(_rf_src), _target['SYSTEM'], _target['TS'], int_id(_target_status[_target['TS']]['TX_TGID']), int_id(_target_status[_target['TS']]['TX_RFS']))
|
|
||||||
continue
|
|
||||||
|
|
||||||
# Set values for the contention handler to test next time there is a frame to forward
|
# If we don't have a voice header then don't wait to decode the Embedded LC
|
||||||
_target_status[_target['TS']]['TX_TIME'] = pkt_time
|
# just make a new one from the HBP header. This is good enough, and it saves lots of time
|
||||||
|
else:
|
||||||
|
_target_status[_stream_id]['LC'] = const.LC_OPT + _dst_id + _rf_src
|
||||||
|
self._logger.info('(%s) Created LC with *LATE ENTRY* for OpenBridge destination: System: %s, TGID: %s', self._system, _target['SYSTEM'], int_id(_target['TGID']))
|
||||||
|
|
||||||
if (_target_status[_target['TS']]['TX_RFS'] != _rf_src) or (_target_status[_target['TS']]['TX_TGID'] != _target['TGID']):
|
_target_status[_stream_id]['H_LC'] = bptc.encode_header_lc(_target_status[_stream_id]['LC'])
|
||||||
# Record the DST TGID and Stream ID
|
_target_status[_stream_id]['T_LC'] = bptc.encode_terminator_lc(_target_status[_stream_id]['LC'])
|
||||||
_target_status[_target['TS']]['TX_TGID'] = _target['TGID']
|
_target_status[_stream_id]['EMB_LC'] = bptc.encode_emblc(_target_status[_stream_id]['LC'])
|
||||||
_target_status[_target['TS']]['TX_STREAM_ID'] = _stream_id
|
|
||||||
_target_status[_target['TS']]['TX_RFS'] = _rf_src
|
# Record the time of this packet so we can later identify a stale stream
|
||||||
# Generate LCs (full and EMB) for the TX stream
|
_target_status[_stream_id]['LAST'] = pkt_time
|
||||||
dst_lc = self.STATUS[_stream_id]['LC'][0:3] + _target['TGID'] + _rf_src
|
# Clear the TS bit -- all OpenBridge streams are effectively on TS1
|
||||||
_target_status[_target['TS']]['TX_H_LC'] = bptc.encode_header_lc(dst_lc)
|
_tmp_bits = _bits & ~(1 << 7)
|
||||||
_target_status[_target['TS']]['TX_T_LC'] = bptc.encode_terminator_lc(dst_lc)
|
|
||||||
_target_status[_target['TS']]['TX_EMB_LC'] = bptc.encode_emblc(dst_lc)
|
# Assemble transmit HBP packet header
|
||||||
self._logger.debug('(%s) Generating TX FULL and EMB LCs for destination: System: %s, TS: %s, TGID: %s', self._system, _target['SYSTEM'], _target['TS'], int_id(_target['TGID']))
|
_tmp_data = _data[:8] + _target['TGID'] + _data[11:15] + chr(_tmp_bits) + _data[16:20]
|
||||||
self._logger.info('(%s) Conference Bridge: %s, Call Bridged to: System: %s TS: %s, TGID: %s', self._system, _bridge, _target['SYSTEM'], _target['TS'], int_id(_target['TGID']))
|
|
||||||
|
# MUST TEST FOR NEW STREAM AND IF SO, RE-WRITE THE LC FOR THE TARGET
|
||||||
|
# MUST RE-WRITE DESTINATION TGID IF DIFFERENT
|
||||||
|
# if _dst_id != rule['DST_GROUP']:
|
||||||
|
dmrbits = bitarray(endian='big')
|
||||||
|
dmrbits.frombytes(dmrpkt)
|
||||||
|
# Create a voice header packet (FULL LC)
|
||||||
|
if _frame_type == hb_const.HBPF_DATA_SYNC and _dtype_vseq == hb_const.HBPF_SLT_VHEAD:
|
||||||
|
dmrbits = _target_status[_stream_id]['H_LC'][0:98] + dmrbits[98:166] + _target_status[_stream_id]['H_LC'][98:197]
|
||||||
|
# Create a voice terminator packet (FULL LC)
|
||||||
|
elif _frame_type == hb_const.HBPF_DATA_SYNC and _dtype_vseq == hb_const.HBPF_SLT_VTERM:
|
||||||
|
dmrbits = _target_status[_stream_id]['T_LC'][0:98] + dmrbits[98:166] + _target_status[_stream_id]['T_LC'][98:197]
|
||||||
|
# Create a Burst B-E packet (Embedded LC)
|
||||||
|
elif _dtype_vseq in [1,2,3,4]:
|
||||||
|
dmrbits = dmrbits[0:116] + _target_status[_stream_id]['EMB_LC'][_dtype_vseq] + dmrbits[148:264]
|
||||||
|
dmrpkt = dmrbits.tobytes()
|
||||||
|
_tmp_data = _tmp_data + dmrpkt #+ _data[53:55]
|
||||||
|
|
||||||
# Handle any necessary re-writes for the destination
|
|
||||||
if _system['TS'] != _target['TS']:
|
|
||||||
_tmp_bits = _bits ^ 1 << 7
|
|
||||||
else:
|
else:
|
||||||
_tmp_bits = _bits
|
# BEGIN CONTENTION HANDLING
|
||||||
|
#
|
||||||
|
# The rules for each of the 4 "ifs" below are listed here for readability. The Frame To Send is:
|
||||||
|
# From a different group than last RX from this HBSystem, but it has been less than Group Hangtime
|
||||||
|
# From a different group than last TX to this HBSystem, but it has been less than Group Hangtime
|
||||||
|
# From the same group as the last RX from this HBSystem, but from a different subscriber, and it has been less than stream timeout
|
||||||
|
# From the same group as the last TX to this HBSystem, but from a different subscriber, and it has been less than stream timeout
|
||||||
|
# The "continue" at the end of each means the next iteration of the for loop that tests for matching rules
|
||||||
|
#
|
||||||
|
if ((_target['TGID'] != _target_status[_target['TS']]['RX_TGID']) and ((pkt_time - _target_status[_target['TS']]['RX_TIME']) < _target_system['GROUP_HANGTIME'])):
|
||||||
|
if self.STATUS[_stream_id]['CONTENTION'] == False:
|
||||||
|
self.STATUS[_stream_id]['CONTENTION'] = True
|
||||||
|
self._logger.info('(%s) Call not routed to TGID %s, target active or in group hangtime: HBSystem: %s, TS: %s, TGID: %s', self._system, int_id(_target['TGID']), _target['SYSTEM'], _target['TS'], int_id(_target_status[_target['TS']]['RX_TGID']))
|
||||||
|
continue
|
||||||
|
if ((_target['TGID'] != _target_status[_target['TS']]['TX_TGID']) and ((pkt_time - _target_status[_target['TS']]['TX_TIME']) < _target_system['GROUP_HANGTIME'])):
|
||||||
|
if self.STATUS[_stream_id]['CONTENTION'] == False:
|
||||||
|
self.STATUS[_stream_id]['CONTENTION'] = True
|
||||||
|
self._logger.info('(%s) Call not routed to TGID%s, target in group hangtime: HBSystem: %s, TS: %s, TGID: %s', self._system, int_id(_target['TGID']), _target['SYSTEM'], _target['TS'], int_id(_target_status[_target['TS']]['TX_TGID']))
|
||||||
|
continue
|
||||||
|
if (_target['TGID'] == _target_status[_target['TS']]['RX_TGID']) and ((pkt_time - _target_status[_target['TS']]['RX_TIME']) < hb_const.STREAM_TO):
|
||||||
|
if self.STATUS[_stream_id]['CONTENTION'] == False:
|
||||||
|
self.STATUS[_stream_id]['CONTENTION'] = True
|
||||||
|
self._logger.info('(%s) Call not routed to TGID%s, matching call already active on target: HBSystem: %s, TS: %s, TGID: %s', self._system, int_id(_target['TGID']), _target['SYSTEM'], _target['TS'], int_id(_target_status[_target['TS']]['RX_TGID']))
|
||||||
|
continue
|
||||||
|
if (_target['TGID'] == _target_status[_target['TS']]['TX_TGID']) and (_rf_src != _target_status[_target['TS']]['TX_RFS']) and ((pkt_time - _target_status[_target['TS']]['TX_TIME']) < hb_const.STREAM_TO):
|
||||||
|
if self.STATUS[_stream_id]['CONTENTION'] == False:
|
||||||
|
self.STATUS[_stream_id]['CONTENTION'] = True
|
||||||
|
self._logger.info('(%s) Call not routed for subscriber %s, call route in progress on target: HBSystem: %s, TS: %s, TGID: %s, SUB: %s', self._system, int_id(_rf_src), _target['SYSTEM'], _target['TS'], int_id(_target_status[_target['TS']]['TX_TGID']), int_id(_target_status[_target['TS']]['TX_RFS']))
|
||||||
|
continue
|
||||||
|
|
||||||
# Assemble transmit HBP packet header
|
# Set values for the contention handler to test next time there is a frame to forward
|
||||||
_tmp_data = _data[:8] + _target['TGID'] + _data[11:15] + chr(_tmp_bits) + _data[16:20]
|
_target_status[_target['TS']]['TX_TIME'] = pkt_time
|
||||||
|
|
||||||
# MUST TEST FOR NEW STREAM AND IF SO, RE-WRITE THE LC FOR THE TARGET
|
if (_target_status[_target['TS']]['TX_RFS'] != _rf_src) or (_target_status[_target['TS']]['TX_TGID'] != _target['TGID']):
|
||||||
# MUST RE-WRITE DESTINATION TGID IF DIFFERENT
|
# Record the DST TGID and Stream ID
|
||||||
# if _dst_id != rule['DST_GROUP']:
|
_target_status[_target['TS']]['TX_TGID'] = _target['TGID']
|
||||||
dmrbits = bitarray(endian='big')
|
_target_status[_target['TS']]['TX_STREAM_ID'] = _stream_id
|
||||||
dmrbits.frombytes(dmrpkt)
|
_target_status[_target['TS']]['TX_RFS'] = _rf_src
|
||||||
# Create a voice header packet (FULL LC)
|
# Generate LCs (full and EMB) for the TX stream
|
||||||
if _frame_type == hb_const.HBPF_DATA_SYNC and _dtype_vseq == hb_const.HBPF_SLT_VHEAD:
|
dst_lc = self.STATUS[_stream_id]['LC'][0:3] + _target['TGID'] + _rf_src
|
||||||
dmrbits = _target_status[_target['TS']]['TX_H_LC'][0:98] + dmrbits[98:166] + _target_status[_target['TS']]['TX_H_LC'][98:197]
|
_target_status[_target['TS']]['TX_H_LC'] = bptc.encode_header_lc(dst_lc)
|
||||||
# Create a voice terminator packet (FULL LC)
|
_target_status[_target['TS']]['TX_T_LC'] = bptc.encode_terminator_lc(dst_lc)
|
||||||
elif _frame_type == hb_const.HBPF_DATA_SYNC and _dtype_vseq == hb_const.HBPF_SLT_VTERM:
|
_target_status[_target['TS']]['TX_EMB_LC'] = bptc.encode_emblc(dst_lc)
|
||||||
dmrbits = _target_status[_target['TS']]['TX_T_LC'][0:98] + dmrbits[98:166] + _target_status[_target['TS']]['TX_T_LC'][98:197]
|
self._logger.debug('(%s) Generating TX FULL and EMB LCs for destination: System: %s, TS: %s, TGID: %s', self._system, _target['SYSTEM'], _target['TS'], int_id(_target['TGID']))
|
||||||
# Create a Burst B-E packet (Embedded LC)
|
self._logger.info('(%s) Conference Bridge: %s, Call Bridged to: System: %s TS: %s, TGID: %s', self._system, _bridge, _target['SYSTEM'], _target['TS'], int_id(_target['TGID']))
|
||||||
elif _dtype_vseq in [1,2,3,4]:
|
|
||||||
dmrbits = dmrbits[0:116] + _target_status[_target['TS']]['TX_EMB_LC'][_dtype_vseq] + dmrbits[148:264]
|
# Handle any necessary re-writes for the destination
|
||||||
dmrpkt = dmrbits.tobytes()
|
if _system['TS'] != _target['TS']:
|
||||||
_tmp_data = _tmp_data + dmrpkt + _data[53:55]
|
_tmp_bits = _bits ^ 1 << 7
|
||||||
|
else:
|
||||||
|
_tmp_bits = _bits
|
||||||
|
|
||||||
|
# Assemble transmit HBP packet header
|
||||||
|
_tmp_data = _data[:8] + _target['TGID'] + _data[11:15] + chr(_tmp_bits) + _data[16:20]
|
||||||
|
|
||||||
|
# MUST TEST FOR NEW STREAM AND IF SO, RE-WRITE THE LC FOR THE TARGET
|
||||||
|
# MUST RE-WRITE DESTINATION TGID IF DIFFERENT
|
||||||
|
# if _dst_id != rule['DST_GROUP']:
|
||||||
|
dmrbits = bitarray(endian='big')
|
||||||
|
dmrbits.frombytes(dmrpkt)
|
||||||
|
# Create a voice header packet (FULL LC)
|
||||||
|
if _frame_type == hb_const.HBPF_DATA_SYNC and _dtype_vseq == hb_const.HBPF_SLT_VHEAD:
|
||||||
|
dmrbits = _target_status[_target['TS']]['TX_H_LC'][0:98] + dmrbits[98:166] + _target_status[_target['TS']]['TX_H_LC'][98:197]
|
||||||
|
# Create a voice terminator packet (FULL LC)
|
||||||
|
elif _frame_type == hb_const.HBPF_DATA_SYNC and _dtype_vseq == hb_const.HBPF_SLT_VTERM:
|
||||||
|
dmrbits = _target_status[_target['TS']]['TX_T_LC'][0:98] + dmrbits[98:166] + _target_status[_target['TS']]['TX_T_LC'][98:197]
|
||||||
|
# Create a Burst B-E packet (Embedded LC)
|
||||||
|
elif _dtype_vseq in [1,2,3,4]:
|
||||||
|
dmrbits = dmrbits[0:116] + _target_status[_target['TS']]['TX_EMB_LC'][_dtype_vseq] + dmrbits[148:264]
|
||||||
|
dmrpkt = dmrbits.tobytes()
|
||||||
|
_tmp_data = _tmp_data + dmrpkt + _data[53:55]
|
||||||
|
|
||||||
# Transmit the packet to the destination system
|
# Transmit the packet to the destination system
|
||||||
systems[_target['SYSTEM']].send_system(_tmp_data)
|
systems[_target['SYSTEM']].send_system(_tmp_data)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user