ShaYmez/HBLink
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
98298cfca1
HBLink/hb_confbridge.py

696 lines
44 KiB
Python
Raw Normal View History

NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
#!/usr/bin/env python
#
###############################################################################
INITIAL BRANCH COMMIT 0) CONFIGURATION FILES WILL NEED UPDATED TO CHANGE NAMING CONFIGURATIONS! 1) Updated use of socket address instead of discrete IP/port. This will be needed for socket address based validation and is faster… duh… should have done this in the beginning. 2) Changed all references to “clients” as HBP systems to “peers”. This sets the stage for having a peer_id and an originator_id for DMRD packets. 3) Found and squashed a number of other random bugs, including the registration ACL not working in confbridge or bridge_all. 4) router is now retired. confbridge is the future.
2018-08-07 18:05:27 -04:00
# Copyright (C) 2016-2018 Cortney T. Buffington, N0MJS <n0mjs@me.com>
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
###############################################################################
Descriptions added (below copyright and license area)
2016-12-19 09:36:17 -05:00
'''
This application, in conjuction with it's rule file (hb_confbridge_rules.py) will
work like a "conference bridge". This is similar to what most hams think of as a
reflector. You define conference bridges and any system joined to that conference
bridge will both receive traffic from, and send traffic to any other system
joined to the same conference bridge. It does not provide end-to-end connectivity
as each end system must individually be joined to a conference bridge (a name
you create in the configuraiton file) to pass traffic.
This program currently only works with group voice calls.
'''
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
from __future__ import print_function
# Python modules we need
import sys
from bitarray import bitarray
from time import time
from importlib import import_module
# Twisted is pretty important, so I keep it separate
Continued work on socket-based reporting Status table and bridge table now work. Log messages are sending, but formatting isn’t right yet, so they present as unknown messages.
2018-06-22 10:28:31 -04:00
from twisted.internet.protocol import Factory, Protocol
from twisted.protocols.basic import NetstringReceiver
from twisted.internet import reactor, task
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
# Things we import from the main hblink module
update
2018-10-08 23:14:50 -04:00
from hblink import HBSYSTEM, OPENBRIDGE, systems, hblink_handler, reportFactory, REPORT_OPCODES, config_reports, build_reg_acl
Move utilities to their own package
2016-12-15 13:10:29 -05:00
from dmr_utils.utils import hex_str_3, int_id, get_alias
from dmr_utils import decode, bptc, const
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
import hb_config
import hb_log
import hb_const
Continued work on socket-based reporting Status table and bridge table now work. Log messages are sending, but formatting isn’t right yet, so they present as unknown messages.
2018-06-22 10:28:31 -04:00
# Stuff for socket reporting
import cPickle as pickle
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
# Does anybody read this stuff? There's a PEP somewhere that says I should do this.
__author__ = 'Cortney T. Buffington, N0MJS'
INITIAL BRANCH COMMIT 0) CONFIGURATION FILES WILL NEED UPDATED TO CHANGE NAMING CONFIGURATIONS! 1) Updated use of socket address instead of discrete IP/port. This will be needed for socket address based validation and is faster… duh… should have done this in the beginning. 2) Changed all references to “clients” as HBP systems to “peers”. This sets the stage for having a peer_id and an originator_id for DMRD packets. 3) Found and squashed a number of other random bugs, including the registration ACL not working in confbridge or bridge_all. 4) router is now retired. confbridge is the future.
2018-08-07 18:05:27 -04:00
__copyright__ = 'Copyright (c) 2016-2018PEER Cortney T. Buffington, N0MJS and the K0USY Group'
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
__credits__ = 'Colin Durbridge, G4EML, Steve Zingman, N4IRS; Mike Zingman, N4IRR; Jonathan Naylor, G4KLX; Hans Barthen, DL5DI; Torsten Shultze, DG1HT'
__license__ = 'GNU GPLv3'
__maintainer__ = 'Cort Buffington, N0MJS'
__email__ = 'n0mjs@me.com'
__status__ = 'pre-alpha'
# Module gobal varaibles
# Import Bridging rules
# Note: A stanza *must* exist for any MASTER or CLIENT configured in the main
# configuration file and listed as "active". It can be empty,
# but it has to exist.
def make_bridges(_hb_confbridge_bridges):
try:
bridge_file = import_module(_hb_confbridge_bridges)
logger.info('Routing bridges file found and bridges imported')
except ImportError:
sys.exit('Routing bridges file not found or invalid')
# Convert integer GROUP ID numbers from the config into hex strings
# we need to send in the actual data packets.
for _bridge in bridge_file.BRIDGES:
for _system in bridge_file.BRIDGES[_bridge]:
if _system['SYSTEM'] not in CONFIG['SYSTEMS']:
sys.exit('ERROR: Conference bridges found for system not configured main configuration')
_system['TGID'] = hex_str_3(_system['TGID'])
for i, e in enumerate(_system['ON']):
_system['ON'][i] = hex_str_3(_system['ON'][i])
for i, e in enumerate(_system['OFF']):
_system['OFF'][i] = hex_str_3(_system['OFF'][i])
_system['TIMEOUT'] = _system['TIMEOUT']*60
_system['TIMER'] = time() + _system['TIMEOUT']
return bridge_file.BRIDGES
# Import subscriber ACL
# ACL may be a single list of subscriber IDs
# Global action is to allow or deny them. Multiple lists with different actions and ranges
# are not yet implemented.
Further Modularization
2016-11-26 15:36:24 -05:00
def build_acl(_sub_acl):
Fix problem of not starting up when a subscriber ACL is not defined
2018-08-23 15:13:33 -04:00
ACL = set()
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
try:
Further Modularization
2016-11-26 15:36:24 -05:00
acl_file = import_module(_sub_acl)
Fix problem of not starting up when a subscriber ACL is not defined
2018-08-23 15:13:33 -04:00
logger.info('ACL file found, importing entries. This will take about 1.5 seconds per 1 million IDs')
update ACL format and action to add "ranges"
2017-06-29 14:02:40 -04:00
sections = acl_file.ACL.split(':')
ACL_ACTION = sections[0]
entries_str = sections[1]
Fix problem of not starting up when a subscriber ACL is not defined
2018-08-23 15:13:33 -04:00
update ACL format and action to add "ranges"
2017-06-29 14:02:40 -04:00
for entry in entries_str.split(','):
if '-' in entry:
start,end = entry.split('-')
start,end = int(start), int(end)
for id in range(start, end+1):
ACL.add(hex_str_3(id))
else:
id = int(entry)
ACL.add(hex_str_3(id))
logger.info('ACL loaded: action "{}" for {:,} radio IDs'.format(ACL_ACTION, len(ACL)))
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
except ImportError:
Further Modularization
2016-11-26 15:36:24 -05:00
logger.info('ACL file not found or invalid - all subscriber IDs are valid')
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
ACL_ACTION = 'NONE'
# Depending on which type of ACL is used (PERMIT, DENY... or there isn't one)
# define a differnet function to be used to check the ACL
global allow_sub
update ACL format and action to add "ranges"
2017-06-29 14:02:40 -04:00
if ACL_ACTION == 'PERMIT':
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
def allow_sub(_sub):
if _sub in ACL:
return True
else:
return False
update ACL format and action to add "ranges"
2017-06-29 14:02:40 -04:00
elif ACL_ACTION == 'DENY':
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
def allow_sub(_sub):
if _sub not in ACL:
return True
else:
return False
else:
def allow_sub(_sub):
return True
Further Modularization
2016-11-26 15:36:24 -05:00
update ACL format and action to add "ranges"
2017-06-29 14:02:40 -04:00
return ACL
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
# Run this every minute for rule timer updates
def rule_timer_loop():
logger.info('(ALL HBSYSTEMS) Rule timer loop started')
_now = time()
for _bridge in BRIDGES:
for _system in BRIDGES[_bridge]:
if _system['TO_TYPE'] == 'ON':
if _system['ACTIVE'] == True:
if _system['TIMER'] < _now:
_system['ACTIVE'] = False
logger.info('Conference Bridge TIMEOUT: DEACTIVATE System: %s, Bridge: %s, TS: %s, TGID: %s', _system['SYSTEM'], _bridge, _system['TS'], int_id(_system['TGID']))
else:
timeout_in = _system['TIMER'] - _now
logger.info('Conference Bridge ACTIVE (ON timer running): System: %s Bridge: %s, TS: %s, TGID: %s, Timeout in: %ss,', _system['SYSTEM'], _bridge, _system['TS'], int_id(_system['TGID']), timeout_in)
elif _system['ACTIVE'] == False:
logger.debug('Conference Bridge INACTIVE (no change): System: %s Bridge: %s, TS: %s, TGID: %s', _system['SYSTEM'], _bridge, _system['TS'], int_id(_system['TGID']))
elif _system['TO_TYPE'] == 'OFF':
if _system['ACTIVE'] == False:
if _system['TIMER'] < _now:
_system['ACTIVE'] = True
logger.info('Conference Bridge TIMEOUT: ACTIVATE System: %s, Bridge: %s, TS: %s, TGID: %s', _system['SYSTEM'], _bridge, _system['TS'], int_id(_system['TGID']))
else:
timeout_in = _system['TIMER'] - _now
logger.info('Conference Bridge INACTIVE (OFF timer running): System: %s Bridge: %s, TS: %s, TGID: %s, Timeout in: %ss,', _system['SYSTEM'], _bridge, _system['TS'], int_id(_system['TGID']), timeout_in)
elif _system['ACTIVE'] == True:
logger.debug('Conference Bridge ACTIVE (no change): System: %s Bridge: %s, TS: %s, TGID: %s', _system['SYSTEM'], _bridge, _system['TS'], int_id(_system['TGID']))
else:
logger.debug('Conference Bridge NO ACTION: System: %s, Bridge: %s, TS: %s, TGID: %s', _system['SYSTEM'], _bridge, _system['TS'], int_id(_system['TGID']))
Continued work on socket-based reporting Status table and bridge table now work. Log messages are sending, but formatting isn’t right yet, so they present as unknown messages.
2018-06-22 10:28:31 -04:00
if CONFIG['REPORTS']['REPORT']:
report_server.send_clients('bridge updated')
PROGRESS - DOES NOT WORK this commit is to get the test code moved to the testing server. It is not intended for people to try and download to use
2018-10-12 15:20:05 -04:00
for system in CONFIG['SYSTEMS']:
if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE':
for stream_id in system['STATUS']:
if system['STATUS'][stream_id]['STREAM_START'] < _now + 1:
removed = system['STATUS'].pop(stream_id)
logger.warning('STALE OPENBRIDGE STREAM ID REMOVED FROM SYSTEM: %s, STREAM ID %s', system, int_id(stream_id))
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
update
2018-10-08 23:14:50 -04:00
class routerOBP(OPENBRIDGE):
def __init__(self, _name, _config, _logger, _report):
OPENBRIDGE.__init__(self, _name, _config, _logger, _report)
self.STATUS = {}
def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data):
pkt_time = time()
dmrpkt = _data[20:53]
_bits = int_id(_data[15])
if _call_type == 'group':
# Check for ACL match, and return if the subscriber is not allowed
if allow_sub(_rf_src) == False:
self._logger.warning('(%s) Group Voice Packet ***REJECTED BY ACL*** From: %s, HBP Peer %s, Destination TGID %s', self._system, int_id(_rf_src), int_id(_peer_id), int_id(_dst_id))
return
PROGRESS - DOES NOT WORK this commit is to get the test code moved to the testing server. It is not intended for people to try and download to use
2018-10-12 15:20:05 -04:00
# Is this a new call stream?
if (_stream_id not in self.STATUS):
update
2018-10-08 23:14:50 -04:00
# This is a new call stream
Update hb_confbridge.py
2018-10-12 17:19:02 -04:00
self.STATUS[_stream_id] = {}
PROGRESS - DOES NOT WORK this commit is to get the test code moved to the testing server. It is not intended for people to try and download to use
2018-10-12 15:20:05 -04:00
self.STATUS[_stream_id]['STREAM_START'] = pkt_time
self.STATUS[_stream_id]['PKT_COUNT'] = 0
self.STATUS[_stream_id]['CONTENTION'] = False
update
2018-10-08 23:14:50 -04:00
self._logger.info('(%s) *CALL START* STREAM ID: %s SUB: %s (%s) PEER: %s (%s) TGID %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)
if CONFIG['REPORTS']['REPORT']:
self._report.send_bridgeEvent('GROUP VOICE,START,{},{},{},{},{},{}'.format(self._system, int_id(_stream_id), int_id(_peer_id), int_id(_rf_src), _slot, int_id(_dst_id)))
# If we can, use the LC from the voice header as to keep all options intact
if _frame_type == hb_const.HBPF_DATA_SYNC and _dtype_vseq == hb_const.HBPF_SLT_VHEAD:
decoded = decode.voice_head_term(dmrpkt)
PROGRESS - DOES NOT WORK this commit is to get the test code moved to the testing server. It is not intended for people to try and download to use
2018-10-12 15:20:05 -04:00
self.STATUS[_stream_id]['LC'] = decoded['LC']
update
2018-10-08 23:14:50 -04:00
# If we don't have a voice header then don't wait to decode it from the Embedded LC
# just make a new one from the HBP header. This is good enough, and it saves lots of time
else:
PROGRESS - DOES NOT WORK this commit is to get the test code moved to the testing server. It is not intended for people to try and download to use
2018-10-12 15:20:05 -04:00
self.STATUS[_stream_id] = const.LC_OPT + _dst_id + _rf_src
update
2018-10-08 23:14:50 -04:00
for _bridge in BRIDGES:
for _system in BRIDGES[_bridge]:
if (_system['SYSTEM'] == self._system and _system['TGID'] == _dst_id and _system['TS'] == _slot and _system['ACTIVE'] == True):
for _target in BRIDGES[_bridge]:
Update hb_confbridge.py
2018-10-12 17:26:42 -04:00
print('_target[\'SYSTEM\']', _target['SYSTEM'])
Update hb_confbridge.py
2018-10-12 17:25:36 -04:00
print('self._system', self._system)
Update hb_confbridge.py
2018-10-12 17:33:21 -04:00
print('CONFIG[\'SYSTEMS\'][_target][\'ACTIVE\']', CONFIG['SYSTEMS']) #['SYSTEMS'][_target]['ACTIVE'])
Update hb_confbridge.py
2018-10-12 17:26:42 -04:00
print('CONFIG[\'SYSTEMS\'][_target][\'MODE\']', CONFIG['SYSTEMS'][_target]['MODE'])
Update hb_confbridge.py
2018-10-12 17:23:16 -04:00
if (_target['SYSTEM'] != self._system) and (CONFIG['SYSTEMS'][_target]['ACTIVE']) and (CONFIG['SYSTEMS'][_target]['MODE'] != 'OPENBRIDGE'):
PROGRESS - DOES NOT WORK this commit is to get the test code moved to the testing server. It is not intended for people to try and download to use
2018-10-12 15:20:05 -04:00
_target_status = systems[_target['SYSTEM']].STATUS
_target_system = self._CONFIG['SYSTEMS'][_target['SYSTEM']]
# 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
# Set values for the contention handler to test next time there is a frame to forward
_target_status[_target['TS']]['TX_TIME'] = pkt_time
if (_target_status[_target['TS']]['TX_RFS'] != _rf_src) or (_target_status[_target['TS']]['TX_TGID'] != _target['TGID']):
# Record the DST TGID and Stream ID
_target_status[_target['TS']]['TX_TGID'] = _target['TGID']
_target_status[_target['TS']]['TX_STREAM_ID'] = _stream_id
_target_status[_target['TS']]['TX_RFS'] = _rf_src
# Generate LCs (full and EMB) for the TX stream
dst_lc = self.STATUS[_stream_id]['LC'][0:3] + _target['TGID'] + _rf_src
_target_status[_target['TS']]['TX_H_LC'] = bptc.encode_header_lc(dst_lc)
_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)
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']))
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']))
# Handle any necessary re-writes for the destination
if _system['TS'] != _target['TS']:
_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
systems[_target['SYSTEM']].send_system(_tmp_data)
#self._logger.debug('(%s) Packet routed by bridge: %s to system: %s TS: %s, TGID: %s', self._system, _bridge, _target['SYSTEM'], _target['TS'], int_id(_target['TGID']))
update
2018-10-08 23:14:50 -04:00
# Final actions - Is this a voice terminator?
PROGRESS - DOES NOT WORK this commit is to get the test code moved to the testing server. It is not intended for people to try and download to use
2018-10-12 15:20:05 -04:00
if (_frame_type == hb_const.HBPF_DATA_SYNC) and (_dtype_vseq == hb_const.HBPF_SLT_VTERM):
call_duration = pkt_time - self.STATUS['STREAM_START']
update
2018-10-08 23:14:50 -04:00
self._logger.info('(%s) *CALL END* STREAM ID: %s SUB: %s (%s) PEER: %s (%s) TGID %s (%s), TS %s, Duration: %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, call_duration)
if CONFIG['REPORTS']['REPORT']:
self._report.send_bridgeEvent('GROUP VOICE,END,{},{},{},{},{},{},{:.2f}'.format(self._system, int_id(_stream_id), int_id(_peer_id), int_id(_rf_src), _slot, int_id(_dst_id), call_duration))
PROGRESS - DOES NOT WORK this commit is to get the test code moved to the testing server. It is not intended for people to try and download to use
2018-10-12 15:20:05 -04:00
removed = self.STATUS.pop(_stream_id)
if not removed:
self_logger.error('(%s) *CALL END* STREAM ID: %s NOT IN LIST -- THIS IS A REAL PROBLEM', self._system, int_id(_stream_id))
update
2018-10-08 23:14:50 -04:00
class routerHBP(HBSYSTEM):
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
Continued work on socket-based reporting Status table and bridge table now work. Log messages are sending, but formatting isn’t right yet, so they present as unknown messages.
2018-06-22 10:28:31 -04:00
def __init__(self, _name, _config, _logger, _report):
HBSYSTEM.__init__(self, _name, _config, _logger, _report)
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
# Status information for the system, TS1 & TS2
# 1 & 2 are "timeslot"
# In TX_EMB_LC, 2-5 are burst B-E
self.STATUS = {
1: {
'RX_START': time(),
'RX_SEQ': '\x00',
'RX_RFS': '\x00',
'TX_RFS': '\x00',
'RX_STREAM_ID': '\x00',
'TX_STREAM_ID': '\x00',
'RX_TGID': '\x00\x00\x00',
'TX_TGID': '\x00\x00\x00',
'RX_TIME': time(),
'TX_TIME': time(),
'RX_TYPE': hb_const.HBPF_SLT_VTERM,
'RX_LC': '\x00',
'TX_H_LC': '\x00',
'TX_T_LC': '\x00',
'TX_EMB_LC': {
1: '\x00',
2: '\x00',
3: '\x00',
4: '\x00',
}
},
2: {
'RX_START': time(),
'RX_SEQ': '\x00',
'RX_RFS': '\x00',
'TX_RFS': '\x00',
'RX_STREAM_ID': '\x00',
'TX_STREAM_ID': '\x00',
'RX_TGID': '\x00\x00\x00',
'TX_TGID': '\x00\x00\x00',
'RX_TIME': time(),
'TX_TIME': time(),
'RX_TYPE': hb_const.HBPF_SLT_VTERM,
'RX_LC': '\x00',
'TX_H_LC': '\x00',
'TX_T_LC': '\x00',
'TX_EMB_LC': {
1: '\x00',
2: '\x00',
3: '\x00',
4: '\x00',
}
}
}
INITIAL BRANCH COMMIT 0) CONFIGURATION FILES WILL NEED UPDATED TO CHANGE NAMING CONFIGURATIONS! 1) Updated use of socket address instead of discrete IP/port. This will be needed for socket address based validation and is faster… duh… should have done this in the beginning. 2) Changed all references to “clients” as HBP systems to “peers”. This sets the stage for having a peer_id and an originator_id for DMRD packets. 3) Found and squashed a number of other random bugs, including the registration ACL not working in confbridge or bridge_all. 4) router is now retired. confbridge is the future.
2018-08-07 18:05:27 -04:00
def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data):
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
pkt_time = time()
dmrpkt = _data[20:53]
_bits = int_id(_data[15])
if _call_type == 'group':
# Check for ACL match, and return if the subscriber is not allowed
if allow_sub(_rf_src) == False:
INITIAL BRANCH COMMIT 0) CONFIGURATION FILES WILL NEED UPDATED TO CHANGE NAMING CONFIGURATIONS! 1) Updated use of socket address instead of discrete IP/port. This will be needed for socket address based validation and is faster… duh… should have done this in the beginning. 2) Changed all references to “clients” as HBP systems to “peers”. This sets the stage for having a peer_id and an originator_id for DMRD packets. 3) Found and squashed a number of other random bugs, including the registration ACL not working in confbridge or bridge_all. 4) router is now retired. confbridge is the future.
2018-08-07 18:05:27 -04:00
self._logger.warning('(%s) Group Voice Packet ***REJECTED BY ACL*** From: %s, HBP Peer %s, Destination TGID %s', self._system, int_id(_rf_src), int_id(_peer_id), int_id(_dst_id))
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
return
# Is this a new call stream?
if (_stream_id != self.STATUS[_slot]['RX_STREAM_ID']):
if (self.STATUS[_slot]['RX_TYPE'] != hb_const.HBPF_SLT_VTERM) and (pkt_time < (self.STATUS[_slot]['RX_TIME'] + hb_const.STREAM_TO)) and (_rf_src != self.STATUS[_slot]['RX_RFS']):
INITIAL BRANCH COMMIT 0) CONFIGURATION FILES WILL NEED UPDATED TO CHANGE NAMING CONFIGURATIONS! 1) Updated use of socket address instead of discrete IP/port. This will be needed for socket address based validation and is faster… duh… should have done this in the beginning. 2) Changed all references to “clients” as HBP systems to “peers”. This sets the stage for having a peer_id and an originator_id for DMRD packets. 3) Found and squashed a number of other random bugs, including the registration ACL not working in confbridge or bridge_all. 4) router is now retired. confbridge is the future.
2018-08-07 18:05:27 -04:00
self._logger.warning('(%s) Packet received with STREAM ID: %s <FROM> SUB: %s PEER: %s <TO> TGID %s, SLOT %s collided with existing call', self._system, int_id(_stream_id), int_id(_rf_src), int_id(_peer_id), int_id(_dst_id), _slot)
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
return
# This is a new call stream
self.STATUS['RX_START'] = pkt_time
INITIAL BRANCH COMMIT 0) CONFIGURATION FILES WILL NEED UPDATED TO CHANGE NAMING CONFIGURATIONS! 1) Updated use of socket address instead of discrete IP/port. This will be needed for socket address based validation and is faster… duh… should have done this in the beginning. 2) Changed all references to “clients” as HBP systems to “peers”. This sets the stage for having a peer_id and an originator_id for DMRD packets. 3) Found and squashed a number of other random bugs, including the registration ACL not working in confbridge or bridge_all. 4) router is now retired. confbridge is the future.
2018-08-07 18:05:27 -04:00
self._logger.info('(%s) *CALL START* STREAM ID: %s SUB: %s (%s) PEER: %s (%s) TGID %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)
Continued work on socket-based reporting Status table and bridge table now work. Log messages are sending, but formatting isn’t right yet, so they present as unknown messages.
2018-06-22 10:28:31 -04:00
if CONFIG['REPORTS']['REPORT']:
INITIAL BRANCH COMMIT 0) CONFIGURATION FILES WILL NEED UPDATED TO CHANGE NAMING CONFIGURATIONS! 1) Updated use of socket address instead of discrete IP/port. This will be needed for socket address based validation and is faster… duh… should have done this in the beginning. 2) Changed all references to “clients” as HBP systems to “peers”. This sets the stage for having a peer_id and an originator_id for DMRD packets. 3) Found and squashed a number of other random bugs, including the registration ACL not working in confbridge or bridge_all. 4) router is now retired. confbridge is the future.
2018-08-07 18:05:27 -04:00
self._report.send_bridgeEvent('GROUP VOICE,START,{},{},{},{},{},{}'.format(self._system, int_id(_stream_id), int_id(_peer_id), int_id(_rf_src), _slot, int_id(_dst_id)))
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
# If we can, use the LC from the voice header as to keep all options intact
if _frame_type == hb_const.HBPF_DATA_SYNC and _dtype_vseq == hb_const.HBPF_SLT_VHEAD:
update
2016-12-17 12:40:43 -05:00
decoded = decode.voice_head_term(dmrpkt)
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
self.STATUS[_slot]['RX_LC'] = decoded['LC']
# If we don't have a voice header then don't wait to decode it from the Embedded LC
# just make a new one from the HBP header. This is good enough, and it saves lots of time
else:
update
2016-12-17 12:40:43 -05:00
self.STATUS[_slot]['RX_LC'] = const.LC_OPT + _dst_id + _rf_src
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
for _bridge in BRIDGES:
for _system in BRIDGES[_bridge]:
if (_system['SYSTEM'] == self._system and _system['TGID'] == _dst_id and _system['TS'] == _slot and _system['ACTIVE'] == True):
for _target in BRIDGES[_bridge]:
Fixed Bug - See Description There was missing logic to detect whether or not a target was active. This could cause one-way transmission and a system only being 1/2 disconnected from a conference bridge.
2016-12-21 21:58:18 -05:00
if _target['SYSTEM'] != self._system:
if _target['ACTIVE']:
_target_status = systems[_target['SYSTEM']].STATUS
_target_system = self._CONFIG['SYSTEMS'][_target['SYSTEM']]
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
Fixed Bug - See Description There was missing logic to detect whether or not a target was active. This could cause one-way transmission and a system only being 1/2 disconnected from a conference bridge.
2016-12-21 21:58:18 -05:00
# 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 _frame_type == hb_const.HBPF_DATA_SYNC and _dtype_vseq == hb_const.HBPF_SLT_VHEAD and self.STATUS[_slot]['RX_STREAM_ID'] != _seq:
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 _frame_type == hb_const.HBPF_DATA_SYNC and _dtype_vseq == hb_const.HBPF_SLT_VHEAD and self.STATUS[_slot]['RX_STREAM_ID'] != _seq:
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 _frame_type == hb_const.HBPF_DATA_SYNC and _dtype_vseq == hb_const.HBPF_SLT_VHEAD and self.STATUS[_slot]['RX_STREAM_ID'] != _seq:
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 _frame_type == hb_const.HBPF_DATA_SYNC and _dtype_vseq == hb_const.HBPF_SLT_VHEAD and self.STATUS[_slot]['RX_STREAM_ID'] != _seq:
Fixed subscriber ID display in 1 logging message
2018-06-20 17:21:05 -04:00
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']))
Fixed Bug - See Description There was missing logic to detect whether or not a target was active. This could cause one-way transmission and a system only being 1/2 disconnected from a conference bridge.
2016-12-21 21:58:18 -05:00
continue
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
Fixed Bug - See Description There was missing logic to detect whether or not a target was active. This could cause one-way transmission and a system only being 1/2 disconnected from a conference bridge.
2016-12-21 21:58:18 -05:00
# Set values for the contention handler to test next time there is a frame to forward
_target_status[_target['TS']]['TX_TIME'] = pkt_time
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
Fixed Bug - See Description There was missing logic to detect whether or not a target was active. This could cause one-way transmission and a system only being 1/2 disconnected from a conference bridge.
2016-12-21 21:58:18 -05:00
if (_stream_id != self.STATUS[_slot]['RX_STREAM_ID']) or (_target_status[_target['TS']]['TX_RFS'] != _rf_src) or (_target_status[_target['TS']]['TX_TGID'] != _target['TGID']):
# Record the DST TGID and Stream ID
_target_status[_target['TS']]['TX_TGID'] = _target['TGID']
_target_status[_target['TS']]['TX_STREAM_ID'] = _stream_id
_target_status[_target['TS']]['TX_RFS'] = _rf_src
# Generate LCs (full and EMB) for the TX stream
dst_lc = self.STATUS[_slot]['RX_LC'][0:3] + _target['TGID'] + _rf_src
_target_status[_target['TS']]['TX_H_LC'] = bptc.encode_header_lc(dst_lc)
_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)
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']))
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']))
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
Fixed Bug - See Description There was missing logic to detect whether or not a target was active. This could cause one-way transmission and a system only being 1/2 disconnected from a conference bridge.
2016-12-21 21:58:18 -05:00
# Handle any necessary re-writes for the destination
if _system['TS'] != _target['TS']:
_tmp_bits = _bits ^ 1 << 7
else:
_tmp_bits = _bits
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
Fixed Bug - See Description There was missing logic to detect whether or not a target was active. This could cause one-way transmission and a system only being 1/2 disconnected from a conference bridge.
2016-12-21 21:58:18 -05:00
# Assemble transmit HBP packet header
_tmp_data = _data[:8] + _target['TGID'] + _data[11:15] + chr(_tmp_bits) + _data[16:20]
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
Fixed Bug - See Description There was missing logic to detect whether or not a target was active. This could cause one-way transmission and a system only being 1/2 disconnected from a conference bridge.
2016-12-21 21:58:18 -05:00
# 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]
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
Fixed Bug - See Description There was missing logic to detect whether or not a target was active. This could cause one-way transmission and a system only being 1/2 disconnected from a conference bridge.
2016-12-21 21:58:18 -05:00
# Transmit the packet to the destination system
systems[_target['SYSTEM']].send_system(_tmp_data)
#self._logger.debug('(%s) Packet routed by bridge: %s to system: %s TS: %s, TGID: %s', self._system, _bridge, _target['SYSTEM'], _target['TS'], int_id(_target['TGID']))
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
# Final actions - Is this a voice terminator?
if (_frame_type == hb_const.HBPF_DATA_SYNC) and (_dtype_vseq == hb_const.HBPF_SLT_VTERM) and (self.STATUS[_slot]['RX_TYPE'] != hb_const.HBPF_SLT_VTERM):
call_duration = pkt_time - self.STATUS['RX_START']
INITIAL BRANCH COMMIT 0) CONFIGURATION FILES WILL NEED UPDATED TO CHANGE NAMING CONFIGURATIONS! 1) Updated use of socket address instead of discrete IP/port. This will be needed for socket address based validation and is faster… duh… should have done this in the beginning. 2) Changed all references to “clients” as HBP systems to “peers”. This sets the stage for having a peer_id and an originator_id for DMRD packets. 3) Found and squashed a number of other random bugs, including the registration ACL not working in confbridge or bridge_all. 4) router is now retired. confbridge is the future.
2018-08-07 18:05:27 -04:00
self._logger.info('(%s) *CALL END* STREAM ID: %s SUB: %s (%s) PEER: %s (%s) TGID %s (%s), TS %s, Duration: %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, call_duration)
Continued work on socket-based reporting Status table and bridge table now work. Log messages are sending, but formatting isn’t right yet, so they present as unknown messages.
2018-06-22 10:28:31 -04:00
if CONFIG['REPORTS']['REPORT']:
INITIAL BRANCH COMMIT 0) CONFIGURATION FILES WILL NEED UPDATED TO CHANGE NAMING CONFIGURATIONS! 1) Updated use of socket address instead of discrete IP/port. This will be needed for socket address based validation and is faster… duh… should have done this in the beginning. 2) Changed all references to “clients” as HBP systems to “peers”. This sets the stage for having a peer_id and an originator_id for DMRD packets. 3) Found and squashed a number of other random bugs, including the registration ACL not working in confbridge or bridge_all. 4) router is now retired. confbridge is the future.
2018-08-07 18:05:27 -04:00
self._report.send_bridgeEvent('GROUP VOICE,END,{},{},{},{},{},{},{:.2f}'.format(self._system, int_id(_stream_id), int_id(_peer_id), int_id(_rf_src), _slot, int_id(_dst_id), call_duration))
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
#
# Begin in-band signalling for call end. This has nothign to do with routing traffic directly.
#
# Iterate the rules dictionary
for _bridge in BRIDGES:
for _system in BRIDGES[_bridge]:
if _system['SYSTEM'] == self._system:
# TGID matches a rule source, reset its timer
if _slot == _system['TS'] and _dst_id == _system['TGID'] and ((_system['TO_TYPE'] == 'ON' and (_system['ACTIVE'] == True)) or (_system['TO_TYPE'] == 'OFF' and _system['ACTIVE'] == False)):
_system['TIMER'] = pkt_time + _system['TIMEOUT']
update
2016-12-17 12:40:43 -05:00
self._logger.info('(%s) Transmission match for Bridge: %s. Reset timeout to %s', self._system, _bridge, _system['TIMER'])
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
# TGID matches an ACTIVATION trigger
Update hb_confbridge.py to work like the DMRlink equivalent Improved rule activation to include timeslot and resets, as well as not activating rules already activated, etc.
2018-06-20 16:34:19 -04:00
if (_dst_id in _system['ON'] or _dst_id in _system['RESET']) and _slot == _system['TS']:
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
# Set the matching rule as ACTIVE
Update hb_confbridge.py to work like the DMRlink equivalent Improved rule activation to include timeslot and resets, as well as not activating rules already activated, etc.
2018-06-20 16:34:19 -04:00
if _dst_id in _system['ON']:
if _system['ACTIVE'] == False:
_system['ACTIVE'] = True
_system['TIMER'] = pkt_time + _system['TIMEOUT']
self._logger.info('(%s) Bridge: %s, connection changed to state: %s', self._system, _bridge, _system['ACTIVE'])
# Cancel the timer if we've enabled an "OFF" type timeout
if _system['TO_TYPE'] == 'OFF':
add triggering features of DMRlink version add resets, timeslot specification and not taking actions if they don’t change anything.
2018-06-20 16:41:37 -04:00
_system['TIMER'] = pkt_time
Update hb_confbridge.py to work like the DMRlink equivalent Improved rule activation to include timeslot and resets, as well as not activating rules already activated, etc.
2018-06-20 16:34:19 -04:00
self._logger.info('(%s) Bridge: %s set to "OFF" with an on timer rule: timeout timer cancelled', self._system, _bridge)
# Reset the timer for the rule
if _system['ACTIVE'] == True and _system['TO_TYPE'] == 'ON':
add triggering features of DMRlink version add resets, timeslot specification and not taking actions if they don’t change anything.
2018-06-20 16:41:37 -04:00
_system['TIMER'] = pkt_time + _system['TIMEOUT']
self._logger.info('(%s) Bridge: %s, timeout timer reset to: %s', self._system, _bridge, _system['TIMER'] - pkt_time)
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
# TGID matches an DE-ACTIVATION trigger
Update hb_confbridge.py to work like the DMRlink equivalent Improved rule activation to include timeslot and resets, as well as not activating rules already activated, etc.
2018-06-20 16:34:19 -04:00
if (_dst_id in _system['OFF'] or _dst_id in _system['RESET']) and _slot == _system['TS']:
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
# Set the matching rule as ACTIVE
Update hb_confbridge.py to work like the DMRlink equivalent Improved rule activation to include timeslot and resets, as well as not activating rules already activated, etc.
2018-06-20 16:34:19 -04:00
if _dst_id in _system['OFF']:
if _system['ACTIVE'] == True:
_system['ACTIVE'] = False
self._logger.info('(%s) Bridge: %s, connection changed to state: %s', self._system, _bridge, _system['ACTIVE'])
# Cancel the timer if we've enabled an "ON" type timeout
if _system['TO_TYPE'] == 'ON':
add triggering features of DMRlink version add resets, timeslot specification and not taking actions if they don’t change anything.
2018-06-20 16:41:37 -04:00
_system['TIMER'] = pkt_time
Update hb_confbridge.py to work like the DMRlink equivalent Improved rule activation to include timeslot and resets, as well as not activating rules already activated, etc.
2018-06-20 16:34:19 -04:00
self._logger.info('(%s) Bridge: %s set to ON with and "OFF" timer rule: timeout timer cancelled', self._system, _bridge)
# Reset the timer for the rule
if _system['ACTIVE'] == False and _system['TO_TYPE'] == 'OFF':
add triggering features of DMRlink version add resets, timeslot specification and not taking actions if they don’t change anything.
2018-06-20 16:41:37 -04:00
_system['TIMER'] = pkt_time + _system['TIMEOUT']
self._logger.info('(%s) Bridge: %s, timeout timer reset to: %s', self._system, _bridge, _system['TIMER'] - pkt_time)
Update hb_confbridge.py to work like the DMRlink equivalent Improved rule activation to include timeslot and resets, as well as not activating rules already activated, etc.
2018-06-20 16:34:19 -04:00
# Cancel the timer if we've enabled an "ON" type timeout
if _system['ACTIVE'] == True and _system['TO_TYPE'] == 'ON' and _dst_group in _system['OFF']:
add triggering features of DMRlink version add resets, timeslot specification and not taking actions if they don’t change anything.
2018-06-20 16:41:37 -04:00
_system['TIMER'] = pkt_time
Update hb_confbridge.py to work like the DMRlink equivalent Improved rule activation to include timeslot and resets, as well as not activating rules already activated, etc.
2018-06-20 16:34:19 -04:00
self._logger.info('(%s) Bridge: %s set to ON with and "OFF" timer rule: timeout timer cancelled', self._system, _bridge)
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
#
# END IN-BAND SIGNALLING
#
# Mark status variables for use later
self.STATUS[_slot]['RX_SEQ'] = _seq
self.STATUS[_slot]['RX_RFS'] = _rf_src
self.STATUS[_slot]['RX_TYPE'] = _dtype_vseq
self.STATUS[_slot]['RX_TGID'] = _dst_id
self.STATUS[_slot]['RX_TIME'] = pkt_time
self.STATUS[_slot]['RX_STREAM_ID'] = _stream_id
Continued work on socket-based reporting Status table and bridge table now work. Log messages are sending, but formatting isn’t right yet, so they present as unknown messages.
2018-06-22 10:28:31 -04:00
#
# Socket-based reporting section
#
class confbridgeReportFactory(reportFactory):
def send_bridge(self):
serialized = pickle.dumps(BRIDGES, protocol=pickle.HIGHEST_PROTOCOL)
self.send_clients(REPORT_OPCODES['BRIDGE_SND']+serialized)
def send_bridgeEvent(self, _data):
self.send_clients(REPORT_OPCODES['BRDG_EVENT']+_data)
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
#************************************************
# MAIN PROGRAM LOOP STARTS HERE
#************************************************
if __name__ == '__main__':
import argparse
import sys
import os
import signal
Move utilities to their own package
2016-12-15 13:10:29 -05:00
from dmr_utils.utils import try_download, mk_id_dict
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
# Change the current directory to the location of the application
os.chdir(os.path.dirname(os.path.realpath(sys.argv[0])))
# CLI argument parser - handles picking up the config file from the command line, and sending a "help" message
parser = argparse.ArgumentParser()
parser.add_argument('-c', '--config', action='store', dest='CONFIG_FILE', help='/full/path/to/config.file (usually hblink.cfg)')
parser.add_argument('-l', '--logging', action='store', dest='LOG_LEVEL', help='Override config file logging level.')
cli_args = parser.parse_args()
# Ensure we have a path for the config file, if one wasn't specified, then use the default (top of file)
if not cli_args.CONFIG_FILE:
cli_args.CONFIG_FILE = os.path.dirname(os.path.abspath(__file__))+'/hblink.cfg'
# Call the external routine to build the configuration dictionary
CONFIG = hb_config.build_config(cli_args.CONFIG_FILE)
# Start the system logger
if cli_args.LOG_LEVEL:
CONFIG['LOGGER']['LOG_LEVEL'] = cli_args.LOG_LEVEL
logger = hb_log.config_logging(CONFIG['LOGGER'])
logger.debug('Logging system started, anything from here on gets logged')
# Set up the signal handler
def sig_handler(_signal, _frame):
logger.info('SHUTDOWN: HBROUTER IS TERMINATING WITH SIGNAL %s', str(_signal))
hblink_handler(_signal, _frame, logger)
logger.info('SHUTDOWN: ALL SYSTEM HANDLERS EXECUTED - STOPPING REACTOR')
reactor.stop()
# Set signal handers so that we can gracefully exit if need be
for sig in [signal.SIGTERM, signal.SIGINT]:
signal.signal(sig, sig_handler)
Finish adding Registration ACL to all apps renamed build_acl and the associated ACL to build_reg_acl and REG_ACL to disambiguate from bridge_all and confbridge subscriber ACLs. Added the registration ACL feature to all applications.
2018-08-23 20:34:31 -04:00
# Build the Access Control List
REG_ACL = build_reg_acl('reg_acl', logger)
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
# ID ALIAS CREATION
# Download
if CONFIG['ALIASES']['TRY_DOWNLOAD'] == True:
# Try updating peer aliases file
result = try_download(CONFIG['ALIASES']['PATH'], CONFIG['ALIASES']['PEER_FILE'], CONFIG['ALIASES']['PEER_URL'], CONFIG['ALIASES']['STALE_TIME'])
logger.info(result)
# Try updating subscriber aliases file
result = try_download(CONFIG['ALIASES']['PATH'], CONFIG['ALIASES']['SUBSCRIBER_FILE'], CONFIG['ALIASES']['SUBSCRIBER_URL'], CONFIG['ALIASES']['STALE_TIME'])
logger.info(result)
# Make Dictionaries
peer_ids = mk_id_dict(CONFIG['ALIASES']['PATH'], CONFIG['ALIASES']['PEER_FILE'])
if peer_ids:
logger.info('ID ALIAS MAPPER: peer_ids dictionary is available')
subscriber_ids = mk_id_dict(CONFIG['ALIASES']['PATH'], CONFIG['ALIASES']['SUBSCRIBER_FILE'])
if subscriber_ids:
logger.info('ID ALIAS MAPPER: subscriber_ids dictionary is available')
talkgroup_ids = mk_id_dict(CONFIG['ALIASES']['PATH'], CONFIG['ALIASES']['TGID_FILE'])
if talkgroup_ids:
logger.info('ID ALIAS MAPPER: talkgroup_ids dictionary is available')
# Build the routing rules file
BRIDGES = make_bridges('hb_confbridge_rules')
# Build the Access Control List
Further Modularization
2016-11-26 15:36:24 -05:00
ACL = build_acl('sub_acl')
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
INITIAL BRANCH COMMIT 0) CONFIGURATION FILES WILL NEED UPDATED TO CHANGE NAMING CONFIGURATIONS! 1) Updated use of socket address instead of discrete IP/port. This will be needed for socket address based validation and is faster… duh… should have done this in the beginning. 2) Changed all references to “clients” as HBP systems to “peers”. This sets the stage for having a peer_id and an originator_id for DMRD packets. 3) Found and squashed a number of other random bugs, including the registration ACL not working in confbridge or bridge_all. 4) router is now retired. confbridge is the future.
2018-08-07 18:05:27 -04:00
# Build the Registration Access Control List
REG_ACL = build_reg_acl('reg_acl', logger)
Continued work on socket-based reporting Status table and bridge table now work. Log messages are sending, but formatting isn’t right yet, so they present as unknown messages.
2018-06-22 10:28:31 -04:00
# INITIALIZE THE REPORTING LOOP
report_server = config_reports(CONFIG, logger, confbridgeReportFactory)
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
# HBlink instance creation
logger.info('HBlink \'hb_router.py\' (c) 2016 N0MJS & the K0USY Group - SYSTEM STARTING...')
for system in CONFIG['SYSTEMS']:
if CONFIG['SYSTEMS'][system]['ENABLED']:
update
2018-10-08 23:14:50 -04:00
if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE':
systems[system] = routerOBP(system, CONFIG, logger, report_server)
else:
systems[system] = routerHBP(system, CONFIG, logger, report_server)
NEW CONFERENCE BRIDGE APP!!! This is what most of you wanted – and the call router isn’t.
2016-11-26 13:10:03 -05:00
reactor.listenUDP(CONFIG['SYSTEMS'][system]['PORT'], systems[system], interface=CONFIG['SYSTEMS'][system]['IP'])
logger.debug('%s instance created: %s, %s', CONFIG['SYSTEMS'][system]['MODE'], system, systems[system])
# Initialize the rule timer -- this if for user activated stuff
rule_timer = task.LoopingCall(rule_timer_loop)
rule_timer.start(60)
reactor.run()
Reference in New Issue Copy Permalink