|
|
|
@ -1827,6 +1827,9 @@ class routerHBP(HBSYSTEM):
|
|
|
|
|
|
|
|
|
|
|
|
if _call_type == 'unit' and (_dtype_vseq == 6 or _dtype_vseq == 7 or (_stream_id != self.STATUS[_slot]['RX_STREAM_ID'] and _dtype_vseq == 3)):
|
|
|
|
if _call_type == 'unit' and (_dtype_vseq == 6 or _dtype_vseq == 7 or (_stream_id != self.STATUS[_slot]['RX_STREAM_ID'] and _dtype_vseq == 3)):
|
|
|
|
_data_call = True
|
|
|
|
_data_call = True
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SUB_MAP['_int_id'] = (_peer_id,_slot,pkt_time)
|
|
|
|
|
|
|
|
|
|
|
|
if _dtype_vseq == 3:
|
|
|
|
if _dtype_vseq == 3:
|
|
|
|
logger.info('(%s) *UNIT CSBK* STREAM ID: %s SUB: %s (%s) PEER: %s (%s) DST_ID %s (%s), TS %s', \
|
|
|
|
logger.info('(%s) *UNIT CSBK* STREAM ID: %s SUB: %s (%s) PEER: %s (%s) DST_ID %s (%s), TS %s', \
|
|
|
|
self._system, int_id(_stream_id), get_alias(_rf_src, subscriber_ids), int_id(_rf_src), get_alias(_peer_id, peer_ids), int_id(_peer_id), get_alias(_dst_id, talkgroup_ids), int_id(_dst_id), _slot)
|
|
|
|
self._system, int_id(_stream_id), get_alias(_rf_src, subscriber_ids), int_id(_rf_src), get_alias(_peer_id, peer_ids), int_id(_peer_id), get_alias(_dst_id, talkgroup_ids), int_id(_dst_id), _slot)
|
|
|
|
@ -1892,6 +1895,13 @@ class routerHBP(HBSYSTEM):
|
|
|
|
elif CONFIG['SYSTEMS'][CONFIG['GLOBAL']['DATA_GATEWAY']]['MODE'] != 'OPENBRIDGE':
|
|
|
|
elif CONFIG['SYSTEMS'][CONFIG['GLOBAL']['DATA_GATEWAY']]['MODE'] != 'OPENBRIDGE':
|
|
|
|
logger.warning('(%s) UNIT Data not Bridged - DATA_GATEWAY: %s not OPENBRIDGE. DST_ID: %s',self._system, CONFIG['GLOBAL']['DATA_GATEWAY'],_int_dst_id)
|
|
|
|
logger.warning('(%s) UNIT Data not Bridged - DATA_GATEWAY: %s not OPENBRIDGE. DST_ID: %s',self._system, CONFIG['GLOBAL']['DATA_GATEWAY'],_int_dst_id)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if _dst_id in SUB_MAP:
|
|
|
|
|
|
|
|
(_d_peer_id,_d_slot,_d_time) = SUB_MAP[_dst_id]:
|
|
|
|
|
|
|
|
_dst_slot = systems[system].STATUS[_d_slot]
|
|
|
|
|
|
|
|
#If slot is idle for RX and TX
|
|
|
|
|
|
|
|
#print("RX:"+str(_slot['RX_TYPE'])+" TX:"+str(_slot['TX_TYPE'])+" TIME:"+str(time() - _slot['TX_TIME']))
|
|
|
|
|
|
|
|
if (_dst_slot['RX_TYPE'] == HBPF_SLT_VTERM) and (_dst_slot['TX_TYPE'] == HBPF_SLT_VTERM) and (time() - _slot['TX_TIME'] > CONFIG['SYSTEMS'][system]['GROUP_HANGTIME']):
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|