Merge branch 'master' of https://github.com/n0mjs710/hblink3
This commit is contained in:
		
						commit
						c8e1d88ecc
					
				
							
								
								
									
										0
									
								
								.gitattributes
									
									
									
									
										vendored
									
									
										
										
										Normal file → Executable file
									
								
							
							
						
						
									
										0
									
								
								.gitattributes
									
									
									
									
										vendored
									
									
										
										
										Normal file → Executable file
									
								
							
							
								
								
									
										399
									
								
								bridge.py
									
									
									
									
									
								
							
							
						
						
									
										399
									
								
								bridge.py
									
									
									
									
									
								
							@ -67,6 +67,13 @@ __email__      = 'n0mjs@me.com'
 | 
			
		||||
 | 
			
		||||
# Module gobal varaibles
 | 
			
		||||
 | 
			
		||||
# Dictionary for dynamically mapping unit (subscriber) to a system.
 | 
			
		||||
# This is for pruning unit-to-uint calls to not broadcast once the
 | 
			
		||||
# target system for a unit is identified
 | 
			
		||||
# format 'unit_id': ('SYSTEM', time)
 | 
			
		||||
UNIT_MAP = {} 
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# Timed loop used for reporting HBP status
 | 
			
		||||
#
 | 
			
		||||
# REPORT BASED ON THE TYPE SELECTED IN THE MAIN CONFIG FILE
 | 
			
		||||
@ -116,6 +123,7 @@ def make_bridges(_rules):
 | 
			
		||||
 | 
			
		||||
# Run this every minute for rule timer updates
 | 
			
		||||
def rule_timer_loop():
 | 
			
		||||
    global UNIT_MAP
 | 
			
		||||
    logger.debug('(ROUTER) routerHBP Rule timer loop started')
 | 
			
		||||
    _now = time()
 | 
			
		||||
 | 
			
		||||
@ -144,6 +152,18 @@ def rule_timer_loop():
 | 
			
		||||
            else:
 | 
			
		||||
                logger.debug('(ROUTER) Conference Bridge NO ACTION: System: %s, Bridge: %s, TS: %s, TGID: %s', _system['SYSTEM'], _bridge, _system['TS'], int_id(_system['TGID']))
 | 
			
		||||
 | 
			
		||||
    _then = _now - 60
 | 
			
		||||
    remove_list = []
 | 
			
		||||
    for unit in UNIT_MAP:
 | 
			
		||||
        if UNIT_MAP[unit][1] < (_then):
 | 
			
		||||
            remove_list.append(unit)
 | 
			
		||||
 | 
			
		||||
    for unit in remove_list:
 | 
			
		||||
        del UNIT_MAP[unit]
 | 
			
		||||
 | 
			
		||||
    logger.debug('Removed unit(s) %s from UNIT_MAP', remove_list)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    if CONFIG['REPORTS']['REPORT']:
 | 
			
		||||
        report_server.send_clients(b'bridge updated')
 | 
			
		||||
 | 
			
		||||
@ -186,10 +206,14 @@ def stream_trimmer_loop():
 | 
			
		||||
                if stream_id in systems[system].STATUS:
 | 
			
		||||
                    _stream = systems[system].STATUS[stream_id]
 | 
			
		||||
                    _sysconfig = CONFIG['SYSTEMS'][system]
 | 
			
		||||
                    logger.info('(%s) *TIME OUT*   STREAM ID: %s SUB: %s PEER: %s TGID: %s TS 1 Duration: %.2f', \
 | 
			
		||||
                        system, int_id(stream_id), get_alias(int_id(_stream['RFS']), subscriber_ids), get_alias(int_id(_sysconfig['NETWORK_ID']), peer_ids), get_alias(int_id(_stream['TGID']), talkgroup_ids), _stream['LAST'] - _stream['START'])
 | 
			
		||||
                    if systems[system].STATUS[stream_id]['ACTIVE']:
 | 
			
		||||
                        logger.info('(%s) *TIME OUT*   STREAM ID: %s SUB: %s PEER: %s TYPE: %s DST ID: %s TS 1 Duration: %.2f', \
 | 
			
		||||
                        system, int_id(stream_id), get_alias(int_id(_stream['RFS']), subscriber_ids), get_alias(int_id(_sysconfig['NETWORK_ID']), peer_ids), _stream['TYPE'], get_alias(int_id(_stream['DST']), talkgroup_ids), _stream['LAST'] - _stream['START'])
 | 
			
		||||
                    if CONFIG['REPORTS']['REPORT']:
 | 
			
		||||
                            systems[system]._report.send_bridgeEvent('GROUP VOICE,END,RX,{},{},{},{},{},{},{:.2f}'.format(system, int_id(stream_id), int_id(_sysconfig['NETWORK_ID']), int_id(_stream['RFS']), 1, int_id(_stream['TGID']), _stream['LAST'] - _stream['START']).encode(encoding='utf-8', errors='ignore'))
 | 
			
		||||
                            if _stream['TYPE'] == 'GROUP':
 | 
			
		||||
                                systems[system]._report.send_bridgeEvent('GROUP VOICE,END,RX,{},{},{},{},{},{},{:.2f}'.format(system, int_id(stream_id), int_id(_sysconfig['NETWORK_ID']), int_id(_stream['RFS']), 1, int_id(_stream['DST']), _stream['LAST'] - _stream['START']).encode(encoding='utf-8', errors='ignore'))
 | 
			
		||||
                            elif _stream['TYPE'] == 'UNIT':
 | 
			
		||||
                                systems[system]._report.send_bridgeEvent('UNIT VOICE,END,RX,{},{},{},{},{},{},{:.2f}'.format(system, int_id(stream_id), int_id(_sysconfig['NETWORK_ID']), int_id(_stream['RFS']), 1, int_id(_stream['DST']), _stream['LAST'] - _stream['START']).encode(encoding='utf-8', errors='ignore'))
 | 
			
		||||
                    removed = systems[system].STATUS.pop(stream_id)
 | 
			
		||||
                else:
 | 
			
		||||
                    logger.error('(%s) Attemped to remove OpenBridge Stream ID %s not in the Stream ID list: %s', system, int_id(stream_id), [id for id in systems[system].STATUS])
 | 
			
		||||
@ -198,15 +222,17 @@ class routerOBP(OPENBRIDGE):
 | 
			
		||||
 | 
			
		||||
    def __init__(self, _name, _config, _report):
 | 
			
		||||
        OPENBRIDGE.__init__(self, _name, _config, _report)
 | 
			
		||||
        self.name = _name
 | 
			
		||||
        self.STATUS = {}
 | 
			
		||||
        
 | 
			
		||||
        # list of self._targets for unit (subscriber, private) calls
 | 
			
		||||
        self._targets = []
 | 
			
		||||
 | 
			
		||||
    def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data):
 | 
			
		||||
    def group_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data):
 | 
			
		||||
        pkt_time = time()
 | 
			
		||||
        dmrpkt = _data[20:53]
 | 
			
		||||
        _bits = _data[15]
 | 
			
		||||
        
 | 
			
		||||
        if _call_type == 'group':
 | 
			
		||||
        # Is this a new call stream?
 | 
			
		||||
        if (_stream_id not in self.STATUS):
 | 
			
		||||
            # This is a new call stream
 | 
			
		||||
@ -214,7 +240,9 @@ class routerOBP(OPENBRIDGE):
 | 
			
		||||
                'START':     pkt_time,
 | 
			
		||||
                'CONTENTION':False,
 | 
			
		||||
                'RFS':       _rf_src,
 | 
			
		||||
                    'TGID':      _dst_id,
 | 
			
		||||
                'TYPE':      'GROUP',
 | 
			
		||||
                'DST':       _dst_id,
 | 
			
		||||
                'ACTIVE':    True
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            # If we can, use the LC from the voice header as to keep all options intact
 | 
			
		||||
@ -228,7 +256,7 @@ class routerOBP(OPENBRIDGE):
 | 
			
		||||
                self.STATUS[_stream_id]['LC'] = LC_OPT + _dst_id + _rf_src
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
                logger.info('(%s) *CALL START* STREAM ID: %s SUB: %s (%s) PEER: %s (%s) TGID %s (%s), TS %s', \
 | 
			
		||||
            logger.info('(%s) *GROUP CALL START* OBP 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,RX,{},{},{},{},{},{}'.format(self._system, int_id(_stream_id), int_id(_peer_id), int_id(_rf_src), _slot, int_id(_dst_id)).encode(encoding='utf-8', errors='ignore'))
 | 
			
		||||
@ -253,7 +281,9 @@ class routerOBP(OPENBRIDGE):
 | 
			
		||||
                                        'START':     pkt_time,
 | 
			
		||||
                                        'CONTENTION':False,
 | 
			
		||||
                                        'RFS':       _rf_src,
 | 
			
		||||
                                            'TGID':      _dst_id,
 | 
			
		||||
                                        'TYPE':      'GROUP',
 | 
			
		||||
                                        'DST':       _dst_id,
 | 
			
		||||
                                        'ACTIVE':    True
 | 
			
		||||
                                    }
 | 
			
		||||
                                    # Generate LCs (full and EMB) for the TX stream
 | 
			
		||||
                                    dst_lc = b''.join([self.STATUS[_stream_id]['LC'][0:3], _target['TGID'], _rf_src])
 | 
			
		||||
@ -286,6 +316,7 @@ class routerOBP(OPENBRIDGE):
 | 
			
		||||
                                    dmrbits = _target_status[_stream_id]['T_LC'][0:98] + dmrbits[98:166] + _target_status[_stream_id]['T_LC'][98:197]
 | 
			
		||||
                                    if CONFIG['REPORTS']['REPORT']:
 | 
			
		||||
                                        call_duration = pkt_time - _target_status[_stream_id]['START']
 | 
			
		||||
                                        _target_status[_stream_id]['ACTIVE'] = False
 | 
			
		||||
                                        systems[_target['SYSTEM']]._report.send_bridgeEvent('GROUP VOICE,END,TX,{},{},{},{},{},{},{:.2f}'.format(_target['SYSTEM'], int_id(_stream_id), int_id(_peer_id), int_id(_rf_src), _target['TS'], int_id(_target['TGID']), call_duration).encode(encoding='utf-8', errors='ignore'))              
 | 
			
		||||
                                # Create a Burst B-E packet (Embedded LC)
 | 
			
		||||
                                elif _dtype_vseq in [1,2,3,4]:
 | 
			
		||||
@ -380,23 +411,184 @@ class routerOBP(OPENBRIDGE):
 | 
			
		||||
                            #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']))
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        # Final actions - Is this a voice terminator?
 | 
			
		||||
        if (_frame_type == HBPF_DATA_SYNC) and (_dtype_vseq == HBPF_SLT_VTERM):
 | 
			
		||||
            call_duration = pkt_time - self.STATUS[_stream_id]['START']
 | 
			
		||||
                logger.info('(%s) *CALL END*   STREAM ID: %s SUB: %s (%s) PEER: %s (%s) TGID %s (%s), TS %s, Duration: %.2f', \
 | 
			
		||||
            logger.info('(%s) *GROUP CALL END*   STREAM ID: %s SUB: %s (%s) PEER: %s (%s) TGID %s (%s), TS %s, Duration: %.2f', \
 | 
			
		||||
                    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,RX,{},{},{},{},{},{},{:.2f}'.format(self._system, int_id(_stream_id), int_id(_peer_id), int_id(_rf_src), _slot, int_id(_dst_id), call_duration).encode(encoding='utf-8', errors='ignore'))
 | 
			
		||||
                removed = self.STATUS.pop(_stream_id)
 | 
			
		||||
            self.STATUS[_stream_id]['ACTIVE'] = False
 | 
			
		||||
            logger.debug('(%s) OpenBridge sourced call stream end, remove terminated Stream ID: %s', self._system, int_id(_stream_id))
 | 
			
		||||
                if not removed:
 | 
			
		||||
                    selflogger.error('(%s) *CALL END*   STREAM ID: %s NOT IN LIST -- THIS IS A REAL PROBLEM', self._system, int_id(_stream_id))
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    def unit_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data):
 | 
			
		||||
        global UNIT_MAP
 | 
			
		||||
        pkt_time = time()
 | 
			
		||||
        dmrpkt = _data[20:53]
 | 
			
		||||
        _bits = _data[15]
 | 
			
		||||
 
 | 
			
		||||
        # Make/update this unit in the UNIT_MAP cache
 | 
			
		||||
        UNIT_MAP[_rf_src] = (self.name, pkt_time)
 | 
			
		||||
        
 | 
			
		||||
        
 | 
			
		||||
        # Is this a new call stream?
 | 
			
		||||
        if (_stream_id not in self.STATUS):
 | 
			
		||||
            # This is a new call stream
 | 
			
		||||
            self.STATUS[_stream_id] = {
 | 
			
		||||
                'START':     pkt_time,
 | 
			
		||||
                'CONTENTION':False,
 | 
			
		||||
                'RFS':       _rf_src,
 | 
			
		||||
                'TYPE':      'UNIT',
 | 
			
		||||
                'DST':       _dst_id,
 | 
			
		||||
                'ACTIVE':    True
 | 
			
		||||
            }
 | 
			
		||||
                
 | 
			
		||||
            # Create a destination list for the call:                
 | 
			
		||||
            if _dst_id in UNIT_MAP:
 | 
			
		||||
                if UNIT_MAP[_dst_id][0] != self._system:
 | 
			
		||||
                    self._targets = [UNIT_MAP[_dst_id][0]]
 | 
			
		||||
                else:
 | 
			
		||||
                    self._targets = []
 | 
			
		||||
                    logger.error('UNIT call to a subscriber on the same system, send nothing')
 | 
			
		||||
            else:
 | 
			
		||||
                self._targets = list(UNIT)
 | 
			
		||||
                self._targets.remove(self._system)
 | 
			
		||||
            
 | 
			
		||||
            
 | 
			
		||||
            # This is a new call stream, so log & report
 | 
			
		||||
            logger.info('(%s) *UNIT CALL START* STREAM ID: %s SUB: %s (%s) PEER: %s (%s) UNIT: %s (%s), TS: %s, FORWARD: %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._targets)
 | 
			
		||||
            if CONFIG['REPORTS']['REPORT']:
 | 
			
		||||
                self._report.send_bridgeEvent('UNIT VOICE,START,RX,{},{},{},{},{},{},{}'.format(self._system, int_id(_stream_id), int_id(_peer_id), int_id(_rf_src), _slot, int_id(_dst_id), self._targets).encode(encoding='utf-8', errors='ignore'))
 | 
			
		||||
 | 
			
		||||
        # Record the time of this packet so we can later identify a stale stream
 | 
			
		||||
        self.STATUS[_stream_id]['LAST'] = pkt_time
 | 
			
		||||
 | 
			
		||||
        for _target in self._targets:
 | 
			
		||||
            _target_status = systems[_target].STATUS
 | 
			
		||||
            _target_system = self._CONFIG['SYSTEMS'][_target]
 | 
			
		||||
            
 | 
			
		||||
            if self._CONFIG['SYSTEMS'][_target]['MODE'] == 'OPENBRIDGE':
 | 
			
		||||
                if (_stream_id not in _target_status):
 | 
			
		||||
                    # This is a new call stream on the target
 | 
			
		||||
                    _target_status[_stream_id] = {
 | 
			
		||||
                        'START':     pkt_time,
 | 
			
		||||
                        'CONTENTION':False,
 | 
			
		||||
                        'RFS':       _rf_src,
 | 
			
		||||
                        'TYPE':      'UNIT',
 | 
			
		||||
                        'DST':      _dst_id,
 | 
			
		||||
                        'ACTIVE':   True
 | 
			
		||||
                    }
 | 
			
		||||
 | 
			
		||||
                    logger.info('(%s) Unit call bridged to OBP System: %s TS: %s, TGID: %s', self._system, _target, _slot if _target_system['BOTH_SLOTS'] else 1, int_id(_dst_id))
 | 
			
		||||
                    if CONFIG['REPORTS']['REPORT']:
 | 
			
		||||
                        systems[_target]._report.send_bridgeEvent('UNIT VOICE,START,TX,{},{},{},{},{},{}'.format(_target, int_id(_stream_id), int_id(_peer_id), int_id(_rf_src), _slot, int_id(_dst_id)).encode(encoding='utf-8', errors='ignore'))
 | 
			
		||||
 | 
			
		||||
                # Record the time of this packet so we can later identify a stale stream
 | 
			
		||||
                _target_status[_stream_id]['LAST'] = pkt_time
 | 
			
		||||
                # Clear the TS bit and follow propper OBP definition, unless "BOTH_SLOTS" is set. This only works for unit calls.
 | 
			
		||||
                if _target_system['BOTH_SLOTS']:
 | 
			
		||||
                    _tmp_bits = _bits
 | 
			
		||||
                else:
 | 
			
		||||
                    _tmp_bits = _bits & ~(1 << 7)
 | 
			
		||||
 | 
			
		||||
                # Assemble transmit HBP packet
 | 
			
		||||
                _tmp_data = b''.join([_data[:15], _tmp_bits.to_bytes(1, 'big'), _data[16:20]])
 | 
			
		||||
                _data = b''.join([_tmp_data, dmrpkt])
 | 
			
		||||
                
 | 
			
		||||
                if (_frame_type == HBPF_DATA_SYNC) and (_dtype_vseq == HBPF_SLT_VTERM):
 | 
			
		||||
                    _target_status[_stream_id]['ACTIVE'] = False
 | 
			
		||||
 | 
			
		||||
            else:
 | 
			
		||||
                # BEGIN STANDARD 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 ((_dst_id != _target_status[_slot]['RX_TGID']) and ((pkt_time - _target_status[_slot]['RX_TIME']) < _target_system['GROUP_HANGTIME'])):
 | 
			
		||||
                    if self.STATUS[_stream_id]['CONTENTION'] == False:
 | 
			
		||||
                        self.STATUS[_stream_id]['CONTENTION'] = True
 | 
			
		||||
                        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(_dst_id), _target, _slot, int_id(_target_status[_slot]['RX_TGID']))
 | 
			
		||||
                    continue
 | 
			
		||||
                if ((_dst_id != _target_status[_slot]['TX_TGID']) and ((pkt_time - _target_status[_slot]['TX_TIME']) < _target_system['GROUP_HANGTIME'])):
 | 
			
		||||
                    if self.STATUS[_stream_id]['CONTENTION'] == False:
 | 
			
		||||
                        self.STATUS[_stream_id]['CONTENTION'] = True
 | 
			
		||||
                        logger.info('(%s) Call not routed to TGID%s, target in group hangtime: HBSystem: %s, TS: %s, TGID: %s', self._system, int_id(_dst_id), _target, _slot, int_id(_target_status[_slot]['TX_TGID']))
 | 
			
		||||
                    continue
 | 
			
		||||
                '''
 | 
			
		||||
                if (_dst_id == _target_status[_slot]['RX_TGID']) and ((pkt_time - _target_status[_slot]['RX_TIME']) < STREAM_TO):
 | 
			
		||||
                    if self.STATUS[_stream_id]['CONTENTION'] == False:
 | 
			
		||||
                        self.STATUS[_stream_id]['CONTENTION'] = True
 | 
			
		||||
                        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(_dst_id), _target, _slot, int_id(_target_status[_slot]['RX_TGID']))
 | 
			
		||||
                    continue
 | 
			
		||||
                if (_dst_id == _target_status[_slot]['TX_TGID']) and (_rf_src != _target_status[_slot]['TX_RFS']) and ((pkt_time - _target_status[_slot]['TX_TIME']) < STREAM_TO):
 | 
			
		||||
                    if self.STATUS[_stream_id]['CONTENTION'] == False:
 | 
			
		||||
                        self.STATUS[_stream_id]['CONTENTION'] = True
 | 
			
		||||
                        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, _slot, int_id(_target_status[_slot]['TX_TGID']), int_id(_target_status[_slot]['TX_RFS']))
 | 
			
		||||
                    continue
 | 
			
		||||
 | 
			
		||||
                # Record target information if this is a new call stream?
 | 
			
		||||
                if (_stream_id not in self.STATUS):
 | 
			
		||||
                    # Record the DST TGID and Stream ID
 | 
			
		||||
                    _target_status[_slot]['TX_START'] = pkt_time
 | 
			
		||||
                    _target_status[_slot]['TX_TGID'] = _dst_id
 | 
			
		||||
                    _target_status[_slot]['TX_STREAM_ID'] = _stream_id
 | 
			
		||||
                    _target_status[_slot]['TX_RFS'] = _rf_src
 | 
			
		||||
                    _target_status[_slot]['TX_PEER'] = _peer_id
 | 
			
		||||
                    
 | 
			
		||||
                    logger.info('(%s) Unit call bridged to HBP System: %s TS: %s, UNIT: %s', self._system, _target, _slot, int_id(_dst_id))
 | 
			
		||||
                    if CONFIG['REPORTS']['REPORT']:
 | 
			
		||||
                       systems[_target]._report.send_bridgeEvent('UNIT VOICE,START,TX,{},{},{},{},{},{}'.format(_target, int_id(_stream_id), int_id(_peer_id), int_id(_rf_src), _slot, int_id(_dst_id)).encode(encoding='utf-8', errors='ignore'))
 | 
			
		||||
 | 
			
		||||
                # Set other values for the contention handler to test next time there is a frame to forward
 | 
			
		||||
                _target_status[_slot]['TX_TIME'] = pkt_time
 | 
			
		||||
                _target_status[_slot]['TX_TYPE'] = _dtype_vseq
 | 
			
		||||
 | 
			
		||||
            #send the call:
 | 
			
		||||
            systems[_target].send_system(_data)
 | 
			
		||||
            
 | 
			
		||||
            if _target_system['MODE'] == 'OPENBRIDGE':
 | 
			
		||||
                if (_frame_type == HBPF_DATA_SYNC) and (_dtype_vseq == HBPF_SLT_VTERM):
 | 
			
		||||
                    if (_stream_id in _target_status):
 | 
			
		||||
                        _target_status.pop(_stream_id)
 | 
			
		||||
 | 
			
		||||
        
 | 
			
		||||
        # Final actions - Is this a voice terminator?
 | 
			
		||||
        if (_frame_type == HBPF_DATA_SYNC) and (_dtype_vseq == HBPF_SLT_VTERM):
 | 
			
		||||
            self._targets = []
 | 
			
		||||
            call_duration = pkt_time - self.STATUS[_stream_id]['START']
 | 
			
		||||
            logger.info('(%s) *UNIT CALL END*   STREAM ID: %s SUB: %s (%s) PEER: %s (%s) UNIT %s (%s), TS %s, Duration: %.2f', \
 | 
			
		||||
                    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('UNIT VOICE,END,RX,{},{},{},{},{},{},{:.2f}'.format(self._system, int_id(_stream_id), int_id(_peer_id), int_id(_rf_src), _slot, int_id(_dst_id), call_duration).encode(encoding='utf-8', errors='ignore'))
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data):
 | 
			
		||||
 | 
			
		||||
        if _call_type == 'group':
 | 
			
		||||
            self.group_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data)
 | 
			
		||||
        elif _call_type == 'unit':
 | 
			
		||||
            self.unit_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data)
 | 
			
		||||
        elif _call_type == 'vscsbk':
 | 
			
		||||
            logger.debug('CSBK recieved, but HBlink does not process them currently')
 | 
			
		||||
        else:
 | 
			
		||||
            logger.error('Unknown call type recieved -- not processed')
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class routerHBP(HBSYSTEM):
 | 
			
		||||
 | 
			
		||||
    def __init__(self, _name, _config, _report):
 | 
			
		||||
        HBSYSTEM.__init__(self, _name, _config, _report)
 | 
			
		||||
        self.name = _name
 | 
			
		||||
 | 
			
		||||
        # list of self._targets for unit (subscriber, private) calls
 | 
			
		||||
        self._targets = []
 | 
			
		||||
 | 
			
		||||
        # Status information for the system, TS1 & TS2
 | 
			
		||||
        # 1 & 2 are "timeslot"
 | 
			
		||||
@ -456,12 +648,15 @@ class routerHBP(HBSYSTEM):
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
    def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data):
 | 
			
		||||
 | 
			
		||||
    def group_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data):
 | 
			
		||||
        global UNIT_MAP
 | 
			
		||||
        pkt_time = time()
 | 
			
		||||
        dmrpkt = _data[20:53]
 | 
			
		||||
        _bits = _data[15]
 | 
			
		||||
        
 | 
			
		||||
        if _call_type == 'group':
 | 
			
		||||
        # Make/update an entry in the UNIT_MAP for this subscriber
 | 
			
		||||
        UNIT_MAP[_rf_src] = (self.name, pkt_time)
 | 
			
		||||
 | 
			
		||||
        # Is this a new call stream?
 | 
			
		||||
        if (_stream_id != self.STATUS[_slot]['RX_STREAM_ID']):
 | 
			
		||||
@ -471,7 +666,7 @@ class routerHBP(HBSYSTEM):
 | 
			
		||||
 | 
			
		||||
            # This is a new call stream
 | 
			
		||||
            self.STATUS[_slot]['RX_START'] = pkt_time
 | 
			
		||||
                logger.info('(%s) *CALL START* STREAM ID: %s SUB: %s (%s) PEER: %s (%s) TGID %s (%s), TS %s', \
 | 
			
		||||
            logger.info('(%s) *GROUP 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,RX,{},{},{},{},{},{}'.format(self._system, int_id(_stream_id), int_id(_peer_id), int_id(_rf_src), _slot, int_id(_dst_id)).encode(encoding='utf-8', errors='ignore'))
 | 
			
		||||
@ -505,7 +700,9 @@ class routerHBP(HBSYSTEM):
 | 
			
		||||
                                            'START':     pkt_time,
 | 
			
		||||
                                            'CONTENTION':False,
 | 
			
		||||
                                            'RFS':       _rf_src,
 | 
			
		||||
                                                'TGID':      _dst_id,
 | 
			
		||||
                                            'TYPE':     'GROUP',
 | 
			
		||||
                                            'DST':      _dst_id,
 | 
			
		||||
                                            'ACTIVE':   True,
 | 
			
		||||
                                        }
 | 
			
		||||
                                        # Generate LCs (full and EMB) for the TX stream
 | 
			
		||||
                                        dst_lc = b''.join([self.STATUS[_slot]['RX_LC'][0:3], _target['TGID'], _rf_src])
 | 
			
		||||
@ -538,6 +735,7 @@ class routerHBP(HBSYSTEM):
 | 
			
		||||
                                        dmrbits = _target_status[_stream_id]['T_LC'][0:98] + dmrbits[98:166] + _target_status[_stream_id]['T_LC'][98:197]
 | 
			
		||||
                                        if CONFIG['REPORTS']['REPORT']:
 | 
			
		||||
                                            call_duration = pkt_time - _target_status[_stream_id]['START']
 | 
			
		||||
                                            _target_status[_stream_id]['ACTIVE'] = False
 | 
			
		||||
                                            systems[_target['SYSTEM']]._report.send_bridgeEvent('GROUP VOICE,END,TX,{},{},{},{},{},{},{:.2f}'.format(_target['SYSTEM'], int_id(_stream_id), int_id(_peer_id), int_id(_rf_src), _target['TS'], int_id(_target['TGID']), call_duration).encode(encoding='utf-8', errors='ignore'))
 | 
			
		||||
                                    # Create a Burst B-E packet (Embedded LC)
 | 
			
		||||
                                    elif _dtype_vseq in [1,2,3,4]:
 | 
			
		||||
@ -603,9 +801,6 @@ class routerHBP(HBSYSTEM):
 | 
			
		||||
                                    # Assemble transmit HBP packet header
 | 
			
		||||
                                    _tmp_data = b''.join([_data[:8], _target['TGID'], _data[11:15], _tmp_bits.to_bytes(1, 'big'), _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)
 | 
			
		||||
@ -627,12 +822,16 @@ class routerHBP(HBSYSTEM):
 | 
			
		||||
                                systems[_target['SYSTEM']].send_system(_tmp_data)
 | 
			
		||||
                                #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']))
 | 
			
		||||
                                
 | 
			
		||||
                                if _target_system['MODE'] == 'OPENBRIDGE':
 | 
			
		||||
                                    if (_frame_type == HBPF_DATA_SYNC) and (_dtype_vseq == HBPF_SLT_VTERM) and (self.STATUS[_slot]['RX_TYPE'] != HBPF_SLT_VTERM):
 | 
			
		||||
                                        if (_stream_id in _target_status):
 | 
			
		||||
                                            _target_status.pop(_stream_id)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        # Final actions - Is this a voice terminator?
 | 
			
		||||
        if (_frame_type == HBPF_DATA_SYNC) and (_dtype_vseq == HBPF_SLT_VTERM) and (self.STATUS[_slot]['RX_TYPE'] != HBPF_SLT_VTERM):
 | 
			
		||||
            call_duration = pkt_time - self.STATUS[_slot]['RX_START']
 | 
			
		||||
                logger.info('(%s) *CALL END*   STREAM ID: %s SUB: %s (%s) PEER: %s (%s) TGID %s (%s), TS %s, Duration: %.2f', \
 | 
			
		||||
            logger.info('(%s) *GROUP CALL END*   STREAM ID: %s SUB: %s (%s) PEER: %s (%s) TGID %s (%s), TS %s, Duration: %.2f', \
 | 
			
		||||
                    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,RX,{},{},{},{},{},{},{:.2f}'.format(self._system, int_id(_stream_id), int_id(_peer_id), int_id(_rf_src), _slot, int_id(_dst_id), call_duration).encode(encoding='utf-8', errors='ignore'))
 | 
			
		||||
@ -692,8 +891,147 @@ class routerHBP(HBSYSTEM):
 | 
			
		||||
        #
 | 
			
		||||
        # END IN-BAND SIGNALLING
 | 
			
		||||
        #
 | 
			
		||||
        # Mark status variables for use later
 | 
			
		||||
        self.STATUS[_slot]['RX_PEER']      = _peer_id
 | 
			
		||||
        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
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    def unit_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data):
 | 
			
		||||
        global UNIT_MAP
 | 
			
		||||
        pkt_time = time()
 | 
			
		||||
        dmrpkt = _data[20:53]
 | 
			
		||||
        _bits = _data[15]
 | 
			
		||||
 
 | 
			
		||||
        # Make/update this unit in the UNIT_MAP cache
 | 
			
		||||
        UNIT_MAP[_rf_src] = (self.name, pkt_time)
 | 
			
		||||
        
 | 
			
		||||
        
 | 
			
		||||
        # Is this a new call stream?
 | 
			
		||||
        if (_stream_id != self.STATUS[_slot]['RX_STREAM_ID']):
 | 
			
		||||
            
 | 
			
		||||
            # Collision in progress, bail out!
 | 
			
		||||
            if (self.STATUS[_slot]['RX_TYPE'] != HBPF_SLT_VTERM) and (pkt_time < (self.STATUS[_slot]['RX_TIME'] + STREAM_TO)) and (_rf_src != self.STATUS[_slot]['RX_RFS']):
 | 
			
		||||
                logger.warning('(%s) Packet received with STREAM ID: %s <FROM> SUB: %s PEER: %s <TO> UNIT %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)
 | 
			
		||||
                return
 | 
			
		||||
                
 | 
			
		||||
            # Create a destination list for the call:
 | 
			
		||||
            if _dst_id in UNIT_MAP:
 | 
			
		||||
                if UNIT_MAP[_dst_id][0] != self._system:
 | 
			
		||||
                    self._targets = [UNIT_MAP[_dst_id][0]]
 | 
			
		||||
                else:
 | 
			
		||||
                    self._targets = []
 | 
			
		||||
                    logger.error('UNIT call to a subscriber on the same system, send nothing')
 | 
			
		||||
            else:
 | 
			
		||||
                self._targets = list(UNIT)
 | 
			
		||||
                self._targets.remove(self._system)
 | 
			
		||||
            
 | 
			
		||||
            # This is a new call stream, so log & report
 | 
			
		||||
            self.STATUS[_slot]['RX_START'] = pkt_time
 | 
			
		||||
            logger.info('(%s) *UNIT CALL START* STREAM ID: %s SUB: %s (%s) PEER: %s (%s) UNIT: %s (%s), TS: %s, FORWARD: %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._targets)
 | 
			
		||||
            if CONFIG['REPORTS']['REPORT']:
 | 
			
		||||
                self._report.send_bridgeEvent('UNIT VOICE,START,RX,{},{},{},{},{},{},{}'.format(self._system, int_id(_stream_id), int_id(_peer_id), int_id(_rf_src), _slot, int_id(_dst_id), self._targets).encode(encoding='utf-8', errors='ignore'))
 | 
			
		||||
 | 
			
		||||
        for _target in self._targets:
 | 
			
		||||
                
 | 
			
		||||
            _target_status = systems[_target].STATUS
 | 
			
		||||
            _target_system = self._CONFIG['SYSTEMS'][_target]
 | 
			
		||||
            
 | 
			
		||||
            if self._CONFIG['SYSTEMS'][_target]['MODE'] == 'OPENBRIDGE':
 | 
			
		||||
                if (_stream_id not in _target_status):
 | 
			
		||||
                    # This is a new call stream on the target
 | 
			
		||||
                    _target_status[_stream_id] = {
 | 
			
		||||
                        'START':     pkt_time,
 | 
			
		||||
                        'CONTENTION':False,
 | 
			
		||||
                        'RFS':       _rf_src,
 | 
			
		||||
                        'TYPE':      'UNIT',
 | 
			
		||||
                        'DST':      _dst_id,
 | 
			
		||||
                        'ACTIVE':   True
 | 
			
		||||
                    }
 | 
			
		||||
 | 
			
		||||
                    logger.info('(%s) Unit call bridged to OBP System: %s TS: %s, UNIT: %s', self._system, _target, _slot if _target_system['BOTH_SLOTS'] else 1, int_id(_dst_id))
 | 
			
		||||
                    if CONFIG['REPORTS']['REPORT']:
 | 
			
		||||
                        systems[_target]._report.send_bridgeEvent('UNIT VOICE,START,TX,{},{},{},{},{},{}'.format(_target, int_id(_stream_id), int_id(_peer_id), int_id(_rf_src), _slot, int_id(_dst_id)).encode(encoding='utf-8', errors='ignore'))
 | 
			
		||||
 | 
			
		||||
                # Record the time of this packet so we can later identify a stale stream
 | 
			
		||||
                _target_status[_stream_id]['LAST'] = pkt_time
 | 
			
		||||
                # Clear the TS bit and follow propper OBP definition, unless "BOTH_SLOTS" is set. This only works for unit calls.
 | 
			
		||||
                if _target_system['BOTH_SLOTS']:
 | 
			
		||||
                    _tmp_bits = _bits
 | 
			
		||||
                else:
 | 
			
		||||
                    _tmp_bits = _bits & ~(1 << 7)
 | 
			
		||||
 | 
			
		||||
                # Assemble transmit HBP packet
 | 
			
		||||
                _tmp_data = b''.join([_data[:15], _tmp_bits.to_bytes(1, 'big'), _data[16:20]])
 | 
			
		||||
                _data = b''.join([_tmp_data, dmrpkt])
 | 
			
		||||
                
 | 
			
		||||
                if (_frame_type == HBPF_DATA_SYNC) and (_dtype_vseq == HBPF_SLT_VTERM):
 | 
			
		||||
                    _target_status[_stream_id]['ACTIVE'] = False
 | 
			
		||||
 | 
			
		||||
            else:
 | 
			
		||||
                # BEGIN STANDARD 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 ((_dst_id != _target_status[_slot]['RX_TGID']) and ((pkt_time - _target_status[_slot]['RX_TIME']) < _target_system['GROUP_HANGTIME'])):
 | 
			
		||||
                    if _frame_type == HBPF_DATA_SYNC and _dtype_vseq == HBPF_SLT_VHEAD and self.STATUS[_slot]['RX_STREAM_ID'] != _stream_id:
 | 
			
		||||
                        logger.info('(%s) Call not routed to destination %s, target active or in group hangtime: HBSystem: %s, TS: %s, DEST: %s', self._system, int_id(_dst_id), _target, _slot, int_id(_target_status[_slot]['RX_TGID']))
 | 
			
		||||
                    continue
 | 
			
		||||
                if ((_dst_id != _target_status[_slot]['TX_TGID']) and ((pkt_time - _target_status[_slot]['TX_TIME']) < _target_system['GROUP_HANGTIME'])):
 | 
			
		||||
                    if _frame_type == HBPF_DATA_SYNC and _dtype_vseq == HBPF_SLT_VHEAD and self.STATUS[_slot]['RX_STREAM_ID'] != _stream_id:
 | 
			
		||||
                        logger.info('(%s) Call not routed to destination %s, target in group hangtime: HBSystem: %s, TS: %s, DEST: %s', self._system, int_id(_dst_id), _target, _slot, int_id(_target_status[_slot]['TX_TGID']))
 | 
			
		||||
                    continue
 | 
			
		||||
                '''
 | 
			
		||||
                if (_dst_id == _target_status[_slot]['RX_TGID']) and ((pkt_time - _target_status[_slot]['RX_TIME']) < STREAM_TO):
 | 
			
		||||
                    if _frame_type == HBPF_DATA_SYNC and _dtype_vseq == HBPF_SLT_VHEAD and self.STATUS[_slot]['RX_STREAM_ID'] != _stream_id:
 | 
			
		||||
                        logger.info('(%s) Call not routed to destination %s, matching call already active on target: HBSystem: %s, TS: %s, DEST: %s', self._system, int_id(_dst_id), _target, _slot, int_id(_target_status[_slot]['RX_TGID']))
 | 
			
		||||
                    continue
 | 
			
		||||
                if (_dst_id == _target_status[_slot]['TX_TGID']) and (_rf_src != _target_status[_slot]['TX_RFS']) and ((pkt_time - _target_status[_slot]['TX_TIME']) < STREAM_TO):
 | 
			
		||||
                    if _frame_type == HBPF_DATA_SYNC and _dtype_vseq == HBPF_SLT_VHEAD and self.STATUS[_slot]['RX_STREAM_ID'] != _stream_id:
 | 
			
		||||
                        logger.info('(%s) Call not routed for subscriber %s, call route in progress on target: HBSystem: %s, TS: %s, DEST: %s, SUB: %s', self._system, int_id(_rf_src), _target, _slot, int_id(_target_status[_slot]['TX_TGID']), int_id(_target_status[_slot]['TX_RFS']))
 | 
			
		||||
                    continue
 | 
			
		||||
 | 
			
		||||
                # Record target information if this is a new call stream?
 | 
			
		||||
                if (_stream_id != self.STATUS[_slot]['RX_STREAM_ID']):
 | 
			
		||||
                    # Record the DST TGID and Stream ID
 | 
			
		||||
                    _target_status[_slot]['TX_START'] = pkt_time
 | 
			
		||||
                    _target_status[_slot]['TX_TGID'] = _dst_id
 | 
			
		||||
                    _target_status[_slot]['TX_STREAM_ID'] = _stream_id
 | 
			
		||||
                    _target_status[_slot]['TX_RFS'] = _rf_src
 | 
			
		||||
                    _target_status[_slot]['TX_PEER'] = _peer_id
 | 
			
		||||
                    
 | 
			
		||||
                    logger.info('(%s) Unit call bridged to HBP System: %s TS: %s, UNIT: %s', self._system, _target, _slot, int_id(_dst_id))
 | 
			
		||||
                    if CONFIG['REPORTS']['REPORT']:
 | 
			
		||||
                       systems[_target]._report.send_bridgeEvent('UNIT VOICE,START,TX,{},{},{},{},{},{}'.format(_target, int_id(_stream_id), int_id(_peer_id), int_id(_rf_src), _slot, int_id(_dst_id)).encode(encoding='utf-8', errors='ignore'))
 | 
			
		||||
 | 
			
		||||
                # Set other values for the contention handler to test next time there is a frame to forward
 | 
			
		||||
                _target_status[_slot]['TX_TIME'] = pkt_time
 | 
			
		||||
                _target_status[_slot]['TX_TYPE'] = _dtype_vseq
 | 
			
		||||
 | 
			
		||||
            #send the call:
 | 
			
		||||
            systems[_target].send_system(_data)
 | 
			
		||||
                        
 | 
			
		||||
        
 | 
			
		||||
        # Final actions - Is this a voice terminator?
 | 
			
		||||
        if (_frame_type == HBPF_DATA_SYNC) and (_dtype_vseq == HBPF_SLT_VTERM) and (self.STATUS[_slot]['RX_TYPE'] != HBPF_SLT_VTERM):
 | 
			
		||||
            self._targets = []
 | 
			
		||||
            call_duration = pkt_time - self.STATUS[_slot]['RX_START']
 | 
			
		||||
            logger.info('(%s) *UNIT CALL END*   STREAM ID: %s SUB: %s (%s) PEER: %s (%s) UNIT %s (%s), TS %s, Duration: %.2f', \
 | 
			
		||||
                    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('UNIT VOICE,END,RX,{},{},{},{},{},{},{:.2f}'.format(self._system, int_id(_stream_id), int_id(_peer_id), int_id(_rf_src), _slot, int_id(_dst_id), call_duration).encode(encoding='utf-8', errors='ignore'))
 | 
			
		||||
 | 
			
		||||
        # Mark status variables for use later
 | 
			
		||||
        self.STATUS[_slot]['RX_PEER']      = _peer_id
 | 
			
		||||
        self.STATUS[_slot]['RX_SEQ']       = _seq
 | 
			
		||||
@ -703,6 +1041,20 @@ class routerHBP(HBSYSTEM):
 | 
			
		||||
        self.STATUS[_slot]['RX_TIME']      = pkt_time
 | 
			
		||||
        self.STATUS[_slot]['RX_STREAM_ID'] = _stream_id
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data):
 | 
			
		||||
        if _call_type == 'group':
 | 
			
		||||
            self.group_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data)
 | 
			
		||||
        elif _call_type == 'unit':
 | 
			
		||||
            if self._system not in UNIT:
 | 
			
		||||
                logger.error('(%s) *UNIT CALL NOT FORWARDED* UNIT calling is disabled for this system (INGRESS)', self._system)
 | 
			
		||||
            else:
 | 
			
		||||
                self.unit_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data)
 | 
			
		||||
        elif _call_type == 'vscsbk':
 | 
			
		||||
            logger.debug('CSBK recieved, but HBlink does not process them currently')
 | 
			
		||||
        else:
 | 
			
		||||
            logger.error('Unknown call type recieved -- not processed')
 | 
			
		||||
 | 
			
		||||
#
 | 
			
		||||
# Socket-based reporting section
 | 
			
		||||
#
 | 
			
		||||
@ -754,7 +1106,7 @@ if __name__ == '__main__':
 | 
			
		||||
    if cli_args.LOG_LEVEL:
 | 
			
		||||
        CONFIG['LOGGER']['LOG_LEVEL'] = cli_args.LOG_LEVEL
 | 
			
		||||
    logger = log.config_logging(CONFIG['LOGGER'])
 | 
			
		||||
    logger.info('\n\nCopyright (c) 2013, 2014, 2015, 2016, 2018, 2019\n\tThe Regents of the K0USY Group. All rights reserved.\n')
 | 
			
		||||
    logger.info('\n\nCopyright (c) 2013, 2014, 2015, 2016, 2018, 2019, 2020\n\tThe Regents of the K0USY Group. All rights reserved.\n')
 | 
			
		||||
    logger.debug('(GLOBAL) Logging system started, anything from here on gets logged')
 | 
			
		||||
 | 
			
		||||
    # Set up the signal handler
 | 
			
		||||
@ -783,6 +1135,9 @@ if __name__ == '__main__':
 | 
			
		||||
    # Build the routing rules file
 | 
			
		||||
    BRIDGES = make_bridges(rules_module.BRIDGES)
 | 
			
		||||
    
 | 
			
		||||
    # Get rule parameter for private calls
 | 
			
		||||
    UNIT = rules_module.UNIT
 | 
			
		||||
 | 
			
		||||
    # INITIALIZE THE REPORTING LOOP
 | 
			
		||||
    if CONFIG['REPORTS']['REPORT']:
 | 
			
		||||
        report_server = config_reports(CONFIG, bridgeReportFactory)
 | 
			
		||||
 | 
			
		||||
@ -228,6 +228,7 @@ def build_config(_config_file):
 | 
			
		||||
                        'TARGET_SOCK': (gethostbyname(config.get(section, 'TARGET_IP')), config.getint(section, 'TARGET_PORT')),
 | 
			
		||||
                        'TARGET_IP': gethostbyname(config.get(section, 'TARGET_IP')),
 | 
			
		||||
                        'TARGET_PORT': config.getint(section, 'TARGET_PORT'),
 | 
			
		||||
                        'BOTH_SLOTS': config.getboolean(section, 'BOTH_SLOTS'),
 | 
			
		||||
                        'USE_ACL': config.getboolean(section, 'USE_ACL'),
 | 
			
		||||
                        'SUB_ACL': config.get(section, 'SUB_ACL'),
 | 
			
		||||
                        'TG1_ACL': config.get(section, 'TGID_ACL'),
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										127
									
								
								hblink-750.cfg
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										127
									
								
								hblink-750.cfg
									
									
									
									
									
										Executable file
									
								
							@ -0,0 +1,127 @@
 | 
			
		||||
[GLOBAL]
 | 
			
		||||
PATH: ./
 | 
			
		||||
PING_TIME: 5
 | 
			
		||||
MAX_MISSED: 3
 | 
			
		||||
USE_ACL: False
 | 
			
		||||
REG_ACL: DENY:1
 | 
			
		||||
SUB_ACL: DENY:1
 | 
			
		||||
TGID_TS1_ACL: PERMIT:ALL
 | 
			
		||||
TGID_TS2_ACL: PERMIT:ALL
 | 
			
		||||
 | 
			
		||||
[REPORTS]
 | 
			
		||||
REPORT: False
 | 
			
		||||
REPORT_INTERVAL: 60
 | 
			
		||||
REPORT_PORT: 4321
 | 
			
		||||
REPORT_CLIENTS: 127.0.0.1
 | 
			
		||||
 | 
			
		||||
[LOGGER]
 | 
			
		||||
LOG_FILE: /tmp/hblink.log
 | 
			
		||||
LOG_HANDLERS: console-timed
 | 
			
		||||
LOG_LEVEL: INFO
 | 
			
		||||
LOG_NAME: 444.750
 | 
			
		||||
 | 
			
		||||
[ALIASES]
 | 
			
		||||
TRY_DOWNLOAD: False
 | 
			
		||||
PATH: ./
 | 
			
		||||
PEER_FILE: peer_ids.json
 | 
			
		||||
SUBSCRIBER_FILE: subscriber_ids.json
 | 
			
		||||
TGID_FILE: talkgroup_ids.json
 | 
			
		||||
PEER_URL: https://www.radioid.net/static/rptrs.json
 | 
			
		||||
SUBSCRIBER_URL: https://www.radioid.net/static/users.json
 | 
			
		||||
STALE_DAYS: 7
 | 
			
		||||
 | 
			
		||||
[OBP]
 | 
			
		||||
MODE: OPENBRIDGE
 | 
			
		||||
ENABLED: True
 | 
			
		||||
IP:
 | 
			
		||||
PORT: 50100
 | 
			
		||||
NETWORK_ID: 1
 | 
			
		||||
PASSPHRASE: deadbeef
 | 
			
		||||
#TARGET_IP: olympic.k0usy.org
 | 
			
		||||
TARGET_IP: 127.0.0.1
 | 
			
		||||
#TARGET_PORT: 50666
 | 
			
		||||
TARGET_PORT: 50101
 | 
			
		||||
BOTH_SLOTS: True
 | 
			
		||||
USE_ACL: False
 | 
			
		||||
SUB_ACL: DENY:1
 | 
			
		||||
TGID_ACL: PERMIT:ALL
 | 
			
		||||
 | 
			
		||||
[444.750]
 | 
			
		||||
MODE: MASTER
 | 
			
		||||
ENABLED: True
 | 
			
		||||
REPEAT: True
 | 
			
		||||
MAX_PEERS: 5
 | 
			
		||||
EXPORT_AMBE: False
 | 
			
		||||
IP:
 | 
			
		||||
PORT: 50001
 | 
			
		||||
PASSPHRASE: jimmy
 | 
			
		||||
GROUP_HANGTIME: 10
 | 
			
		||||
USE_ACL: False
 | 
			
		||||
REG_ACL: DENY:1
 | 
			
		||||
SUB_ACL: DENY:1
 | 
			
		||||
TGID_TS1_ACL: DENY:8
 | 
			
		||||
TGID_TS2_ACL: PERMIT:3120
 | 
			
		||||
 | 
			
		||||
[TWO]
 | 
			
		||||
MODE: MASTER
 | 
			
		||||
ENABLED: False
 | 
			
		||||
REPEAT: True
 | 
			
		||||
MAX_PEERS: 5
 | 
			
		||||
EXPORT_AMBE: False
 | 
			
		||||
IP:
 | 
			
		||||
PORT:50002
 | 
			
		||||
PASSPHRASE: jimmy
 | 
			
		||||
GROUP_HANGTIME: 10
 | 
			
		||||
USE_ACL: False
 | 
			
		||||
REG_ACL: DENY:1
 | 
			
		||||
SUB_ACL: DENY:1
 | 
			
		||||
TGID_TS1_ACL: DENY:8
 | 
			
		||||
TGID_TS2_ACL: PERMIT:3120
 | 
			
		||||
 | 
			
		||||
[THREE]
 | 
			
		||||
MODE: MASTER
 | 
			
		||||
ENABLED: False
 | 
			
		||||
REPEAT: True
 | 
			
		||||
MAX_PEERS: 5
 | 
			
		||||
EXPORT_AMBE: False
 | 
			
		||||
IP:
 | 
			
		||||
PORT:50003
 | 
			
		||||
PASSPHRASE: jimmy
 | 
			
		||||
GROUP_HANGTIME: 10
 | 
			
		||||
USE_ACL: False
 | 
			
		||||
REG_ACL: DENY:1
 | 
			
		||||
SUB_ACL: DENY:1
 | 
			
		||||
TGID_TS1_ACL: DENY:8
 | 
			
		||||
TGID_TS2_ACL: PERMIT:3120
 | 
			
		||||
 | 
			
		||||
[KS-DMR]
 | 
			
		||||
MODE: PEER
 | 
			
		||||
ENABLED: False
 | 
			
		||||
LOOSE: False
 | 
			
		||||
EXPORT_AMBE: False
 | 
			
		||||
IP: 
 | 
			
		||||
PORT: 54001
 | 
			
		||||
MASTER_IP: olympic.k0usy.org
 | 
			
		||||
MASTER_PORT: 62071
 | 
			
		||||
PASSPHRASE: c0ffee
 | 
			
		||||
CALLSIGN: W1ABC
 | 
			
		||||
RADIO_ID: 312312
 | 
			
		||||
RX_FREQ: 449000000
 | 
			
		||||
TX_FREQ: 444000000
 | 
			
		||||
TX_POWER: 25
 | 
			
		||||
COLORCODE: 1
 | 
			
		||||
SLOTS: 1
 | 
			
		||||
LATITUDE: 38.0000
 | 
			
		||||
LONGITUDE: -095.0000
 | 
			
		||||
HEIGHT: 75
 | 
			
		||||
LOCATION: Anywhere, USA
 | 
			
		||||
DESCRIPTION: This is a cool repeater
 | 
			
		||||
URL: www.w1abc.org
 | 
			
		||||
SOFTWARE_ID: 20170620
 | 
			
		||||
PACKAGE_ID: MMDVM_HBlink
 | 
			
		||||
GROUP_HANGTIME: 5
 | 
			
		||||
OPTIONS:
 | 
			
		||||
USE_ACL: True
 | 
			
		||||
SUB_ACL: DENY:1
 | 
			
		||||
TGID_TS1_ACL: PERMIT:ALL
 | 
			
		||||
TGID_TS2_ACL: PERMIT:ALL
 | 
			
		||||
							
								
								
									
										127
									
								
								hblink-800.cfg
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										127
									
								
								hblink-800.cfg
									
									
									
									
									
										Executable file
									
								
							@ -0,0 +1,127 @@
 | 
			
		||||
[GLOBAL]
 | 
			
		||||
PATH: ./
 | 
			
		||||
PING_TIME: 5
 | 
			
		||||
MAX_MISSED: 3
 | 
			
		||||
USE_ACL: False
 | 
			
		||||
REG_ACL: DENY:1
 | 
			
		||||
SUB_ACL: DENY:1
 | 
			
		||||
TGID_TS1_ACL: PERMIT:ALL
 | 
			
		||||
TGID_TS2_ACL: PERMIT:ALL
 | 
			
		||||
 | 
			
		||||
[REPORTS]
 | 
			
		||||
REPORT: False
 | 
			
		||||
REPORT_INTERVAL: 60
 | 
			
		||||
REPORT_PORT: 4321
 | 
			
		||||
REPORT_CLIENTS: 127.0.0.1
 | 
			
		||||
 | 
			
		||||
[LOGGER]
 | 
			
		||||
LOG_FILE: /tmp/hblink.log
 | 
			
		||||
LOG_HANDLERS: console-timed
 | 
			
		||||
LOG_LEVEL: INFO
 | 
			
		||||
LOG_NAME: 444.800
 | 
			
		||||
 | 
			
		||||
[ALIASES]
 | 
			
		||||
TRY_DOWNLOAD: False
 | 
			
		||||
PATH: ./
 | 
			
		||||
PEER_FILE: peer_ids.json
 | 
			
		||||
SUBSCRIBER_FILE: subscriber_ids.json
 | 
			
		||||
TGID_FILE: talkgroup_ids.json
 | 
			
		||||
PEER_URL: https://www.radioid.net/static/rptrs.json
 | 
			
		||||
SUBSCRIBER_URL: https://www.radioid.net/static/users.json
 | 
			
		||||
STALE_DAYS: 7
 | 
			
		||||
 | 
			
		||||
[OBP]
 | 
			
		||||
MODE: OPENBRIDGE
 | 
			
		||||
ENABLED: True
 | 
			
		||||
IP:
 | 
			
		||||
PORT: 50101
 | 
			
		||||
NETWORK_ID: 2
 | 
			
		||||
PASSPHRASE: deadbeef
 | 
			
		||||
#TARGET_IP: olympic.k0usy.org
 | 
			
		||||
TARGET_IP: 127.0.0.1
 | 
			
		||||
#TARGET_PORT: 50666
 | 
			
		||||
TARGET_PORT: 50100
 | 
			
		||||
BOTH_SLOTS: True
 | 
			
		||||
USE_ACL: False
 | 
			
		||||
SUB_ACL: DENY:1
 | 
			
		||||
TGID_ACL: PERMIT:ALL
 | 
			
		||||
 | 
			
		||||
[444.800]
 | 
			
		||||
MODE: MASTER
 | 
			
		||||
ENABLED: True
 | 
			
		||||
REPEAT: True
 | 
			
		||||
MAX_PEERS: 5
 | 
			
		||||
EXPORT_AMBE: False
 | 
			
		||||
IP:
 | 
			
		||||
PORT: 50011
 | 
			
		||||
PASSPHRASE: jimmy
 | 
			
		||||
GROUP_HANGTIME: 10
 | 
			
		||||
USE_ACL: False
 | 
			
		||||
REG_ACL: DENY:1
 | 
			
		||||
SUB_ACL: DENY:1
 | 
			
		||||
TGID_TS1_ACL: DENY:8
 | 
			
		||||
TGID_TS2_ACL: PERMIT:3120
 | 
			
		||||
 | 
			
		||||
[TWO]
 | 
			
		||||
MODE: MASTER
 | 
			
		||||
ENABLED: False
 | 
			
		||||
REPEAT: True
 | 
			
		||||
MAX_PEERS: 5
 | 
			
		||||
EXPORT_AMBE: False
 | 
			
		||||
IP:
 | 
			
		||||
PORT:50012
 | 
			
		||||
PASSPHRASE: jimmy
 | 
			
		||||
GROUP_HANGTIME: 10
 | 
			
		||||
USE_ACL: False
 | 
			
		||||
REG_ACL: DENY:1
 | 
			
		||||
SUB_ACL: DENY:1
 | 
			
		||||
TGID_TS1_ACL: DENY:8
 | 
			
		||||
TGID_TS2_ACL: PERMIT:3120
 | 
			
		||||
 | 
			
		||||
[THREE]
 | 
			
		||||
MODE: MASTER
 | 
			
		||||
ENABLED: False
 | 
			
		||||
REPEAT: True
 | 
			
		||||
MAX_PEERS: 5
 | 
			
		||||
EXPORT_AMBE: False
 | 
			
		||||
IP:
 | 
			
		||||
PORT:50013
 | 
			
		||||
PASSPHRASE: jimmy
 | 
			
		||||
GROUP_HANGTIME: 10
 | 
			
		||||
USE_ACL: False
 | 
			
		||||
REG_ACL: DENY:1
 | 
			
		||||
SUB_ACL: DENY:1
 | 
			
		||||
TGID_TS1_ACL: DENY:8
 | 
			
		||||
TGID_TS2_ACL: PERMIT:3120
 | 
			
		||||
 | 
			
		||||
[KS-DMR]
 | 
			
		||||
MODE: PEER
 | 
			
		||||
ENABLED: False
 | 
			
		||||
LOOSE: False
 | 
			
		||||
EXPORT_AMBE: False
 | 
			
		||||
IP: 
 | 
			
		||||
PORT: 54011
 | 
			
		||||
MASTER_IP: olympic.k0usy.org
 | 
			
		||||
MASTER_PORT: 62071
 | 
			
		||||
PASSPHRASE: c0ffee
 | 
			
		||||
CALLSIGN: W1ABC
 | 
			
		||||
RADIO_ID: 312312
 | 
			
		||||
RX_FREQ: 449000000
 | 
			
		||||
TX_FREQ: 444000000
 | 
			
		||||
TX_POWER: 25
 | 
			
		||||
COLORCODE: 1
 | 
			
		||||
SLOTS: 1
 | 
			
		||||
LATITUDE: 38.0000
 | 
			
		||||
LONGITUDE: -095.0000
 | 
			
		||||
HEIGHT: 75
 | 
			
		||||
LOCATION: Anywhere, USA
 | 
			
		||||
DESCRIPTION: This is a cool repeater
 | 
			
		||||
URL: www.w1abc.org
 | 
			
		||||
SOFTWARE_ID: 20170620
 | 
			
		||||
PACKAGE_ID: MMDVM_HBlink
 | 
			
		||||
GROUP_HANGTIME: 5
 | 
			
		||||
OPTIONS:
 | 
			
		||||
USE_ACL: True
 | 
			
		||||
SUB_ACL: DENY:1
 | 
			
		||||
TGID_TS1_ACL: PERMIT:ALL
 | 
			
		||||
TGID_TS2_ACL: PERMIT:ALL
 | 
			
		||||
@ -120,7 +120,9 @@ STALE_DAYS: 7
 | 
			
		||||
#
 | 
			
		||||
# ACLs:
 | 
			
		||||
# OpenBridge does not 'register', so registration ACL is meaningless.
 | 
			
		||||
# OpenBridge passes all traffic on TS1, so there is only 1 TGID ACL.
 | 
			
		||||
# Proper OpenBridge passes all traffic on TS1.
 | 
			
		||||
# HBlink can extend OPB to use both slots for unit calls only.
 | 
			
		||||
# Setting "BOTH_SLOTS" True ONLY affects unit traffic!
 | 
			
		||||
# Otherwise ACLs work as described in the global stanza
 | 
			
		||||
[OBP-1]
 | 
			
		||||
MODE: OPENBRIDGE
 | 
			
		||||
@ -131,6 +133,7 @@ NETWORK_ID: 3129100
 | 
			
		||||
PASSPHRASE: password
 | 
			
		||||
TARGET_IP: 1.2.3.4
 | 
			
		||||
TARGET_PORT: 62035
 | 
			
		||||
BOTH_SLOTS: True
 | 
			
		||||
USE_ACL: True
 | 
			
		||||
SUB_ACL: DENY:1
 | 
			
		||||
TGID_ACL: PERMIT:ALL
 | 
			
		||||
 | 
			
		||||
@ -160,8 +160,8 @@ class OPENBRIDGE(DatagramProtocol):
 | 
			
		||||
                _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))
 | 
			
		||||
 | 
			
		||||
                # Sanity check for OpenBridge -- all calls must be on Slot 1
 | 
			
		||||
                if _slot != 1:
 | 
			
		||||
                # Sanity check for OpenBridge -- all calls must be on Slot 1 for Brandmeister or DMR+. Other HBlinks can process timeslot on OPB if the flag is set
 | 
			
		||||
                if _slot != 1 and not self._config['BOTH_SLOTS'] and not _call_type == 'unit':
 | 
			
		||||
                    logger.error('(%s) OpenBridge packet discarded because it was not received on slot 1. SID: %s, TGID %s', self._system, int_id(_rf_src), int_id(_dst_id))
 | 
			
		||||
                    return
 | 
			
		||||
 | 
			
		||||
@ -755,7 +755,7 @@ if __name__ == '__main__':
 | 
			
		||||
    if cli_args.LOG_LEVEL:
 | 
			
		||||
        CONFIG['LOGGER']['LOG_LEVEL'] = cli_args.LOG_LEVEL
 | 
			
		||||
    logger = log.config_logging(CONFIG['LOGGER'])
 | 
			
		||||
    logger.info('\n\nCopyright (c) 2013, 2014, 2015, 2016, 2018, 2019\n\tThe Regents of the K0USY Group. All rights reserved.\n')
 | 
			
		||||
    logger.info('\n\nCopyright (c) 2013, 2014, 2015, 2016, 2018, 2019, 2020\n\tThe Regents of the K0USY Group. All rights reserved.\n')
 | 
			
		||||
    logger.debug('(GLOBAL) Logging system started, anything from here on gets logged')
 | 
			
		||||
 | 
			
		||||
    # Set up the signal handler
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										16
									
								
								rules-750.py
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										16
									
								
								rules-750.py
									
									
									
									
									
										Executable file
									
								
							@ -0,0 +1,16 @@
 | 
			
		||||
BRIDGES = {
 | 
			
		||||
    '1/2': [
 | 
			
		||||
            {'SYSTEM': '444.750',    'TS': 1, 'TGID': 2,    'ACTIVE': True, 'TIMEOUT': 5,'TO_TYPE': 'NONE',   'ON': [], 'OFF': [], 'RESET': []},
 | 
			
		||||
            {'SYSTEM': 'OBP',        'TS': 1, 'TGID': 2,    'ACTIVE': True, 'TIMEOUT': 5,'TO_TYPE': 'NONE',   'ON': [], 'OFF': [], 'RESET': []}
 | 
			
		||||
        ],
 | 
			
		||||
    'KANSAS': [
 | 
			
		||||
            {'SYSTEM': '444.750',    'TS': 2, 'TGID': 3120, 'ACTIVE': True, 'TIMEOUT': 5,'TO_TYPE': 'NONE',   'ON': [], 'OFF': [], 'RESET': []},
 | 
			
		||||
            {'SYSTEM': 'OBP',        'TS': 1, 'TGID': 3120, 'ACTIVE': True, 'TIMEOUT': 5,'TO_TYPE': 'NONE',   'ON': [], 'OFF': [], 'RESET': []}
 | 
			
		||||
        ]
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
UNIT = ['444.750', 'OBP']
 | 
			
		||||
 | 
			
		||||
if __name__ == '__main__':
 | 
			
		||||
    from pprint import pprint
 | 
			
		||||
    pprint(BRIDGES)
 | 
			
		||||
							
								
								
									
										16
									
								
								rules-800.py
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										16
									
								
								rules-800.py
									
									
									
									
									
										Executable file
									
								
							@ -0,0 +1,16 @@
 | 
			
		||||
BRIDGES = {
 | 
			
		||||
    '1/2': [
 | 
			
		||||
            {'SYSTEM': '444.800',    'TS': 1, 'TGID': 2,    'ACTIVE': True, 'TIMEOUT': 5,'TO_TYPE': 'NONE',   'ON': [], 'OFF': [], 'RESET': []},
 | 
			
		||||
            {'SYSTEM': 'OBP',        'TS': 1, 'TGID': 2,    'ACTIVE': True, 'TIMEOUT': 5,'TO_TYPE': 'NONE',   'ON': [], 'OFF': [], 'RESET': []}
 | 
			
		||||
        ],
 | 
			
		||||
    'KANSAS': [
 | 
			
		||||
            {'SYSTEM': '444.800',    'TS': 2, 'TGID': 3120, 'ACTIVE': True, 'TIMEOUT': 5,'TO_TYPE': 'NONE',   'ON': [], 'OFF': [], 'RESET': []},
 | 
			
		||||
            {'SYSTEM': 'OBP',        'TS': 1, 'TGID': 3120, 'ACTIVE': True, 'TIMEOUT': 5,'TO_TYPE': 'NONE',   'ON': [], 'OFF': [], 'RESET': []}
 | 
			
		||||
        ]
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
UNIT = ["444.800", "OBP"]
 | 
			
		||||
 | 
			
		||||
if __name__ == '__main__':
 | 
			
		||||
    from pprint import pprint
 | 
			
		||||
    pprint(BRIDGES)
 | 
			
		||||
@ -47,6 +47,18 @@ BRIDGES = {
 | 
			
		||||
        ]
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
'''
 | 
			
		||||
list the names of each system that should bridge unit to unit (individual) calls.
 | 
			
		||||
'''
 | 
			
		||||
 | 
			
		||||
UNIT = ['ONE', 'TWO']
 | 
			
		||||
 | 
			
		||||
'''
 | 
			
		||||
This is for testing the syntax of the file. It won't eliminate all errors, but running this file
 | 
			
		||||
like it were a Python program itself will tell you if the syntax is correct!
 | 
			
		||||
'''
 | 
			
		||||
 | 
			
		||||
if __name__ == '__main__':
 | 
			
		||||
    from pprint import pprint
 | 
			
		||||
    pprint(BRIDGES)
 | 
			
		||||
    print(UNIT)
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										0
									
								
								voice_lib.py
									
									
									
									
									
										
										
										Normal file → Executable file
									
								
							
							
						
						
									
										0
									
								
								voice_lib.py
									
									
									
									
									
										
										
										Normal file → Executable file
									
								
							
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user