forward CSBK to destination TG

README.md

@@ -1,61 +1,3 @@
-![ ](https://raw.githubusercontent.com/kf7eel/hblink3/hbnet/HBNet.png  "Logo")
-
-HBNet is a fork of [HBlink3](https://github.com/HBLink-org/hblink3) that extends the functionality of HBLink through several features, making it more of a usable application and less of a framework. HBNet aims to be complete and ready to use application that can be used to build and run a DMR network.
-
-HBNet consists of 2 parts, HBNet Web Service and the actual DMR server, based on HBLink. The HBNet Web Service handles user administration, server configuration, and is a content management system for your DMR network.
-
-This project originally started as a not so simple set of scripts to decode GPS locations and generate APRS positions. Through other modifications and additions, it has grown into a fully featured fork.
-
-
-### User end features:
-
-* Handles user registration and email verification
-
-* Individual hotspot passphrases for each user
-
-* Automatic retrieval of DMR IDs on registration
-
-* Automatically generate talkgroup pages
-
-* Automatically generates a script for Pi-Star setup (WORK IN PROGRESS)
-
-* Map of currently connected peers
-
-
-### Administrative features:
-
-* Administrate multiple DMR servers through a single web service
-
-* Optional manual approval of new users
-
-* Multiple Admin user logins
-
-
-### OpenBridge additions
-
-* Enhanced unit call routing between connected servers. Every server known which server every subscribers is on.
-
-* Optionally encrypt data sent over OpenBridge
-
-
-### Data Gateway (APRS/SMS)
-
-* Compatable with HBNet and original HBLink.
-
-* Connect your server via OpenBridge or MMDVM.
-
-* Decodes GPS positions and generates APRS positions
-
-* Simple web dashboard
-
-
-
-### Other features
-
-* SQLite or MySQL backend
-
-* APRS and SMS features (WORK IN PROGRESS)
-
 ---
 ### FOR SUPPORT, DISCUSSION, GETTING INVOLVED ###
 
@@ -63,7 +5,7 @@ Please join the DVSwitch group at groups.io for online forum support, discussion
 
 DVSwitch@groups.io 
 
-A voluntary registry for HBlink systems with public access has been created at http://hblink-register.com.es Please consider listing your system if you allow open access.
+A voluntary registrty for HBlink systems with public access has been created at http://hblink-register.com.es Please consider listing your system if you allow open access.
 
 ---
 
@@ -84,6 +26,32 @@ None. The owners of this work make absolutely no warranty, express or implied. U
 **PRE-REQUISITE KNOWLEDGE:**  
 This document assumes the reader is familiar with Linux/UNIX, the Python programming language and DMR.  
 
+**Using docker version**
+
+To work with provided docker setup you will need:
+* A private repository with your configuration files (all .cfg files in repo will be copyed to the application root directory on start up)
+* A service user able to read your private repository (or be brave and publish your configuration, or be really brave and give your username and password to the docker)
+* A server with docker installed
+* Follow this simple steps:
+
+Build your own image from source
+
+```bash
+
+docker build . -t millaguie/hblink:3.0.0
+
+```
+
+Or user a prebuilt one in docker hub: millaguie/hblink:3.0.0
+
+Wake up your container
+
+```bash
+touch /var/log/hblink.log
+chown 65000  /var/log/hblink.log
+ run -v /var/log/hblink.log:/var/log/hblink.log -e GIT_USER=$USER -e GIT_PASSWORD=$PASSWORD -e GIT_REPO=$URL_TO_REPO_WITHOUT_HTTPS://  -p 54000:54000  millaguie/hblink:3.0.0
+ ```
+
 **MORE DOCUMENTATION TO COME**
 
 ***0x49 DE N0MJS***

app_template.py

@@ -1,150 +0,0 @@
-#!/usr/bin/env python
-#
-###############################################################################
-#   Copyright (C) 2016-2019 Cortney T. Buffington, N0MJS <n0mjs@me.com>
-#
-#   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
-###############################################################################
-
-# 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
-from twisted.internet.protocol import Factory, Protocol
-from twisted.protocols.basic import NetstringReceiver
-from twisted.internet import reactor, task
-
-# Things we import from the main hblink module
-from hblink import HBSYSTEM, OPENBRIDGE, systems, hblink_handler, reportFactory, REPORT_OPCODES, mk_aliases
-from dmr_utils3.utils import bytes_3, int_id, get_alias
-from dmr_utils3 import decode, bptc, const
-import config
-import log
-from const import *
-
-# Stuff for socket reporting
-import pickle
-# REMOVE LATER from datetime import datetime
-# The module needs logging, but handlers, etc. are controlled by the parent
-import logging
-logger = logging.getLogger(__name__)
-
-
-# Does anybody read this stuff? There's a PEP somewhere that says I should do this.
-__author__     = 'Cortney T. Buffington, N0MJS'
-__copyright__  = 'Copyright (c) 2016-2018 Cortney T. Buffington, N0MJS and the K0USY Group'
-__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'
-
-# Module gobal varaibles
-
-
-class OBP(OPENBRIDGE):
-
-    def __init__(self, _name, _config, _report):
-        OPENBRIDGE.__init__(self, _name, _config, _report)
-
-
-    def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data):
-        pass
-
-
-class HBP(HBSYSTEM):
-
-    def __init__(self, _name, _config, _report):
-        HBSYSTEM.__init__(self, _name, _config, _report)
-
-    def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data):
-        pass
-
-
-
-#************************************************
-#      MAIN PROGRAM LOOP STARTS HERE
-#************************************************
-
-if __name__ == '__main__':
-
-    import argparse
-    import sys
-    import os
-    import signal
-
-    # 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 = 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 = log.config_logging(CONFIG['LOGGER'])
-    logger.info('\n\nCopyright (c) 2013, 2014, 2015, 2016, 2018\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
-    def sig_handler(_signal, _frame):
-        logger.info('(GLOBAL) SHUTDOWN: CONFBRIDGE IS TERMINATING WITH SIGNAL %s', str(_signal))
-        hblink_handler(_signal, _frame)
-        logger.info('(GLOBAL) 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.SIGINT, signal.SIGTERM]:
-        signal.signal(sig, sig_handler)
-
-    # Create the name-number mapping dictionaries
-    peer_ids, subscriber_ids, talkgroup_ids = mk_aliases(CONFIG)
-
-    # INITIALIZE THE REPORTING LOOP
-    if CONFIG['REPORTS']['REPORT']:
-        report_server = config_reports(CONFIG, bridgeReportFactory)
-    else:
-        report_server = None
-        logger.info('(REPORT) TCP Socket reporting not configured')
-
-    # HBlink instance creation
-    logger.info('(GLOBAL) HBlink \'bridge.py\' -- SYSTEM STARTING...')
-    for system in CONFIG['SYSTEMS']:
-        if CONFIG['SYSTEMS'][system]['ENABLED']:
-            if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE':
-                systems[system] = OBP(system, CONFIG, report_server)
-            else:
-                systems[system] = HBP(system, CONFIG, report_server)
-            reactor.listenUDP(CONFIG['SYSTEMS'][system]['PORT'], systems[system], interface=CONFIG['SYSTEMS'][system]['IP'])
-            logger.debug('(GLOBAL) %s instance created: %s, %s', CONFIG['SYSTEMS'][system]['MODE'], system, systems[system])
-
-    def loopingErrHandle(failure):
-        logger.error('(GLOBAL) STOPPING REACTOR TO AVOID MEMORY LEAK: Unhandled error in timed loop.\n %s', failure)
-        reactor.stop()
-
-
-    reactor.run()

bridge.py

@@ -1,8 +1,7 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 #
 ###############################################################################
 #   Copyright (C) 2016-2019 Cortney T. Buffington, N0MJS <n0mjs@me.com>
-#   Copyright (C) 2020-2021 Eric, KF7EEL, <kf7eel@qsl.net>
 #
 #   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
@@ -43,13 +42,12 @@ from twisted.protocols.basic import NetstringReceiver
 from twisted.internet import reactor, task
 
 # Things we import from the main hblink module
-from hblink import HBSYSTEM, OPENBRIDGE, systems, hblink_handler, reportFactory, REPORT_OPCODES, mk_aliases, download_burnlist
+from hblink import HBSYSTEM, OPENBRIDGE, systems, hblink_handler, reportFactory, REPORT_OPCODES, mk_aliases
 from dmr_utils3.utils import bytes_3, int_id, get_alias
 from dmr_utils3 import decode, bptc, const
 import config
 import log
 from const import *
-from hashlib import sha256
 
 # Stuff for socket reporting
 import pickle
@@ -57,284 +55,24 @@ import pickle
 # The module needs logging, but handlers, etc. are controlled by the parent
 import logging
 logger = logging.getLogger(__name__)
-import os, ast
-import json, requests
-
-# User for different functions that need to be running: APRS, Proxy, etc
-import threading
-
-# Hotspot Proxy stuff
-from hotspot_proxy_v2 import Proxy
-
-# Used for converting time
-from datetime import datetime
-
-import re
-from socket import gethostbyname
-
 
 
 # Does anybody read this stuff? There's a PEP somewhere that says I should do this.
-__author__     = 'Cortney T. Buffington, N0MJS, Eric Craw, KF7EEL, kf7eel@qsl.net'
-__copyright__  = 'Copyright (c) 2016-2019 Cortney T. Buffington, N0MJS and the K0USY Group, Copyright (c) 2020-2021, Eric Craw, KF7EEL'
+__author__     = 'Cortney T. Buffington, N0MJS'
+__copyright__  = 'Copyright (c) 2016-2019 Cortney T. Buffington, N0MJS and the K0USY Group'
 __credits__    = 'Colin Durbridge, G4EML, Steve Zingman, N4IRS; Mike Zingman, N4IRR; Jonathan Naylor, G4KLX; Hans Barthen, DL5DI; Torsten Shultze, DG1HT'
 __license__    = 'GNU GPLv3'
-__maintainer__ = 'Eric Craw, KF7EEL'
-__email__      = 'kf7eel@qsl.net'
+__maintainer__ = 'Cort Buffington, N0MJS'
+__email__      = 'n0mjs@me.com'
 
-##import os, ast
-
-# Function to download rules
-def update_tg(CONFIG, mode, dmr_id, data):
-    user_man_url = CONFIG['WEB_SERVICE']['URL']
-    shared_secret = str(sha256(CONFIG['WEB_SERVICE']['SHARED_SECRET'].encode()).hexdigest())
-    update_srv = {
-    'update_tg':CONFIG['WEB_SERVICE']['THIS_SERVER_NAME'],
-    'secret':shared_secret,
-    'dmr_id': dmr_id,
-##    'ts1': data['ts1'],
-##    'ts2': data['ts2'],
-    'mode': mode,
-    'data': data
-    }
-##    print(rules_check)
-    json_object = json.dumps(update_srv, indent = 4)
-    
-    try:
-        req = requests.post(user_man_url, data=json_object, headers={'Content-Type': 'application/json'})
-##        resp = json.loads(req.text)
-##        print(resp)
-##        return resp['rules']
-    except requests.ConnectionError:
-        logger.error('Config server unreachable, defaulting to local config')
-##        return config.build_config(cli_file)
-
-
-def send_unit_table(CONFIG, _data):
-    user_man_url = CONFIG['WEB_SERVICE']['URL']
-    shared_secret = str(sha256(CONFIG['WEB_SERVICE']['SHARED_SECRET'].encode()).hexdigest())
-    sms_data = {
-    'unit_table': CONFIG['WEB_SERVICE']['THIS_SERVER_NAME'],
-    'secret':shared_secret,
-    'data': str(_data),
-
-    }
-    json_object = json.dumps(sms_data, indent = 4)
-    
-    try:
-        req = requests.post(user_man_url, data=json_object, headers={'Content-Type': 'application/json'})
-##        resp = json.loads(req.text)
-##        print(resp)
-##        return resp['rules']
-    except requests.ConnectionError:
-        logger.error('Config server unreachable')
-
-def ping(CONFIG):
-    user_man_url = CONFIG['WEB_SERVICE']['URL']
-    shared_secret = str(sha256(CONFIG['WEB_SERVICE']['SHARED_SECRET'].encode()).hexdigest())
-    ping_data = {
-    'ping': CONFIG['WEB_SERVICE']['THIS_SERVER_NAME'],
-    'secret':shared_secret
-
-    }
-##    print(rules_check)
-    json_object = json.dumps(ping_data, indent = 4)
-    
-    try:
-        req = requests.post(user_man_url, data=json_object, headers={'Content-Type': 'application/json'})
-##        resp = json.loads(req.text)
-##        print(resp)
-##        return resp['rules']
-    except requests.ConnectionError:
-        logger.error('Config server unreachable')
-##        return config.build_config(cli_file)
-
-
-# Function to download rules
-def download_rules(L_CONFIG_FILE, cli_file):
-    user_man_url = L_CONFIG_FILE['WEB_SERVICE']['URL']
-    shared_secret = str(sha256(L_CONFIG_FILE['WEB_SERVICE']['SHARED_SECRET'].encode()).hexdigest())
-    rules_check = {
-    'get_rules':L_CONFIG_FILE['WEB_SERVICE']['THIS_SERVER_NAME'],
-    'secret':shared_secret
-    }
-##    print(rules_check)
-    json_object = json.dumps(rules_check, indent = 4)
-    
-    try:
-        req = requests.post(user_man_url, data=json_object, headers={'Content-Type': 'application/json'})
-        resp = json.loads(req.text)
-##        print(resp)
-        return resp['rules']
-    except requests.ConnectionError:
-        logger.error('Config server unreachable, defaulting to local config')
-        return config.build_config(cli_file)
-
-
-# Function to download config
-def download_config(L_CONFIG_FILE, cli_file):
-    user_man_url = L_CONFIG_FILE['WEB_SERVICE']['URL']
-    shared_secret = str(sha256(L_CONFIG_FILE['WEB_SERVICE']['SHARED_SECRET'].encode()).hexdigest())
-    config_check = {
-    'get_config':L_CONFIG_FILE['WEB_SERVICE']['THIS_SERVER_NAME'],
-    'secret':shared_secret
-    }
-    json_object = json.dumps(config_check, indent = 4)
-    
-    try:
-        req = requests.post(user_man_url, data=json_object, headers={'Content-Type': 'application/json'})
-        resp = json.loads(req.text)
-        iterate_config = resp['peers'].copy()
-        corrected_config = resp['config'].copy()
-        corrected_config['SYSTEMS'] = {}
-        corrected_config['LOGGER'] = {}
-        iterate_config.update(resp['masters'].copy())
-        corrected_config['SYSTEMS'].update(iterate_config)
-        corrected_config['LOGGER'].update(L_CONFIG_FILE['LOGGER'])
-##        corrected_config['WEB_SERVICE'].update(resp['config']['WEB_SERVICE'])
-        corrected_config['WEB_SERVICE'] = {}
-        corrected_config['WEB_SERVICE']['THIS_SERVER_NAME'] = L_CONFIG_FILE['WEB_SERVICE']['THIS_SERVER_NAME']
-        corrected_config['WEB_SERVICE']['URL'] = L_CONFIG_FILE['WEB_SERVICE']['URL']
-        corrected_config['WEB_SERVICE']['SHARED_SECRET'] = L_CONFIG_FILE['WEB_SERVICE']['SHARED_SECRET']
-        corrected_config['WEB_SERVICE']['REMOTE_CONFIG_ENABLED'] = L_CONFIG_FILE['WEB_SERVICE']['REMOTE_CONFIG_ENABLED']
-        corrected_config['WEB_SERVICE'].update(resp['config']['WEB_SERVICE'])
-        corrected_config['GLOBAL']['TG1_ACL'] = config.acl_build(corrected_config['GLOBAL']['TG1_ACL'], 4294967295)
-        corrected_config['GLOBAL']['TG2_ACL'] = config.acl_build(corrected_config['GLOBAL']['TG2_ACL'], 4294967295)
-        corrected_config['GLOBAL']['REG_ACL'] = config.acl_build(corrected_config['GLOBAL']['REG_ACL'], 4294967295)
-        corrected_config['GLOBAL']['SUB_ACL'] = config.acl_build(corrected_config['GLOBAL']['SUB_ACL'], 4294967295)
-##        corrected_config['SYSTEMS'] = {}
-        for i in iterate_config:
-##            corrected_config['SYSTEMS'][i]['GROUP_HANGTIME'] = int(iterate_config[i]['GROUP_HANGTIME'])
-##            corrected_config['SYSTEMS'][i] = {}
-##            print(iterate_config[i])
-            if iterate_config[i]['MODE'] == 'MASTER' or iterate_config[i]['MODE'] == 'PROXY' or iterate_config[i]['MODE'] == 'OPENBRIDGE':
-##                print(iterate_config[i])
-                corrected_config['SYSTEMS'][i]['TG1_ACL'] = config.acl_build(iterate_config[i]['TG1_ACL'], 4294967295)
-                corrected_config['SYSTEMS'][i]['TG2_ACL'] = config.acl_build(iterate_config[i]['TG2_ACL'], 4294967295)
-                corrected_config['SYSTEMS'][i]['PASSPHRASE'] = bytes(iterate_config[i]['PASSPHRASE'], 'utf-8')
-                if iterate_config[i]['MODE'] == 'OPENBRIDGE':
-##                    corrected_config['SYSTEMS'][i]['NETWORK_ID'] = int(iterate_config[i]['NETWORK_ID']).to_bytes(4, 'big')
-                    corrected_config['SYSTEMS'][i]['NETWORK_ID'] = int(iterate_config[i]['NETWORK_ID']).to_bytes(4, 'big')
-                    corrected_config['SYSTEMS'][i]['PASSPHRASE'] = (iterate_config[i]['PASSPHRASE'] + b'\x00' * 30)[:20] #bytes(re.sub('', "b'|'", str(iterate_config[i]['PASSPHRASE'])).ljust(20, '\x00')[:20], 'utf-8') #bytes(iterate_config[i]['PASSPHRASE'].ljust(20,'\x00')[:20], 'utf-8')
-                    corrected_config['SYSTEMS'][i]['BOTH_SLOTS'] = iterate_config[i]['BOTH_SLOTS']
-                    corrected_config['SYSTEMS'][i]['TARGET_SOCK'] = (gethostbyname(iterate_config[i]['TARGET_IP']), iterate_config[i]['TARGET_PORT'])
-                    corrected_config['SYSTEMS'][i]['ENCRYPTION_KEY'] = bytes(iterate_config[i]['ENCRYPTION_KEY'], 'utf-8')
-                    corrected_config['SYSTEMS'][i]['USE_ENCRYPTION'] = iterate_config[i]['USE_ENCRYPTION']
-                    
-
-            if iterate_config[i]['MODE'] == 'PEER' or iterate_config[i]['MODE'] == 'XLXPEER':
-##                print(iterate_config[i])
-                corrected_config['SYSTEMS'][i]['GROUP_HANGTIME'] = int(iterate_config[i]['GROUP_HANGTIME'])
-                corrected_config['SYSTEMS'][i]['RADIO_ID'] = int(iterate_config[i]['RADIO_ID']).to_bytes(4, 'big')
-                corrected_config['SYSTEMS'][i]['TG1_ACL'] = config.acl_build(iterate_config[i]['TG1_ACL'], 4294967295)
-                corrected_config['SYSTEMS'][i]['TG2_ACL'] = config.acl_build(iterate_config[i]['TG2_ACL'], 4294967295)
-##                corrected_config['SYSTEMS'][i]['SUB_ACL'] = config.acl_build(iterate_config[i]['SUB_ACL'], 4294967295)
-                corrected_config['SYSTEMS'][i]['MASTER_SOCKADDR'] = tuple(iterate_config[i]['MASTER_SOCKADDR'])
-                corrected_config['SYSTEMS'][i]['SOCK_ADDR'] = tuple(iterate_config[i]['SOCK_ADDR'])
-                corrected_config['SYSTEMS'][i]['PASSPHRASE'] = bytes((iterate_config[i]['PASSPHRASE']), 'utf-8')
-                corrected_config['SYSTEMS'][i]['CALLSIGN'] = bytes((iterate_config[i]['CALLSIGN']).ljust(8)[:8], 'utf-8')
-                corrected_config['SYSTEMS'][i]['RX_FREQ'] = bytes((iterate_config[i]['RX_FREQ']).ljust(9)[:9], 'utf-8')
-                corrected_config['SYSTEMS'][i]['TX_FREQ'] = bytes((iterate_config[i]['TX_FREQ']).ljust(9)[:9], 'utf-8')
-                corrected_config['SYSTEMS'][i]['TX_POWER'] = bytes((iterate_config[i]['TX_POWER']).rjust(2,'0'), 'utf-8')
-                corrected_config['SYSTEMS'][i]['COLORCODE'] = bytes((iterate_config[i]['COLORCODE']).rjust(2,'0'), 'utf-8')
-                corrected_config['SYSTEMS'][i]['LATITUDE'] = bytes((iterate_config[i]['LATITUDE']).ljust(8)[:8], 'utf-8')
-                corrected_config['SYSTEMS'][i]['LONGITUDE'] = bytes((iterate_config[i]['LONGITUDE']).ljust(9)[:9], 'utf-8')
-                corrected_config['SYSTEMS'][i]['HEIGHT'] = bytes((iterate_config[i]['HEIGHT']).rjust(3,'0'), 'utf-8')
-                corrected_config['SYSTEMS'][i]['LOCATION'] = bytes((iterate_config[i]['LOCATION']).ljust(20)[:20], 'utf-8')
-                corrected_config['SYSTEMS'][i]['DESCRIPTION'] = bytes((iterate_config[i]['DESCRIPTION']).ljust(19)[:19], 'utf-8')
-                corrected_config['SYSTEMS'][i]['SLOTS'] = bytes((iterate_config[i]['SLOTS']), 'utf-8')
-                corrected_config['SYSTEMS'][i]['URL'] = bytes((iterate_config[i]['URL']).ljust(124)[:124], 'utf-8')
-                corrected_config['SYSTEMS'][i]['SOFTWARE_ID'] = bytes(('Development').ljust(40)[:40], 'utf-8')#bytes(('HBNet V1.0').ljust(40)[:40], 'utf-8')
-                corrected_config['SYSTEMS'][i]['PACKAGE_ID'] = bytes(('HBNet').ljust(40)[:40], 'utf-8')
-                corrected_config['SYSTEMS'][i]['OPTIONS'] = b''.join([b'Type=HBNet;', bytes(iterate_config[i]['OPTIONS'], 'utf-8')])
-
-
-
-            
-            if iterate_config[i]['MODE'] == 'PEER':
-                    corrected_config['SYSTEMS'][i].update({'STATS':{
-                        'CONNECTION': 'NO',             # NO, RTPL_SENT, AUTHENTICATED, CONFIG-SENT, YES 
-                        'CONNECTED': None,
-                        'PINGS_SENT': 0,
-                        'PINGS_ACKD': 0,
-                        'NUM_OUTSTANDING': 0,
-                        'PING_OUTSTANDING': False,
-                        'LAST_PING_TX_TIME': 0,
-                        'LAST_PING_ACK_TIME': 0,
-                    }})
-            if iterate_config[i]['MODE'] == 'XLXPEER':
-                corrected_config['SYSTEMS'][i].update({'XLXSTATS': {
-                    'CONNECTION': 'NO',             # NO, RTPL_SENT, AUTHENTICATED, CONFIG-SENT, YES 
-                    'CONNECTED': None,
-                    'PINGS_SENT': 0,
-                    'PINGS_ACKD': 0,
-                    'NUM_OUTSTANDING': 0,
-                    'PING_OUTSTANDING': False,
-                    'LAST_PING_TX_TIME': 0,
-                    'LAST_PING_ACK_TIME': 0,
-                }})
-            corrected_config['SYSTEMS'][i]['USE_ACL'] = iterate_config[i]['USE_ACL']
-            corrected_config['SYSTEMS'][i]['SUB_ACL'] = config.acl_build(iterate_config[i]['SUB_ACL'], 16776415)
-
-        return corrected_config
-    # For exception, write blank dict
-    except requests.ConnectionError:
-        logger.error('Config server unreachable, defaulting to local config')
-        return config.build_config(cli_file)
-
-    
-# From hotspot_proxy2, FreeDMR
-def hotspot_proxy(listen_port, port_start, port_stop):
-    Master = "127.0.0.1"
-    ListenPort = listen_port
-    DestportStart = port_start
-    DestPortEnd = port_stop
-    Timeout = 30
-    Stats = True
-    Debug = False
-    BlackList = [1234567]
-    
-   
-    CONNTRACK = {}
-
-    for port in range(DestportStart,DestPortEnd+1,1):
-        CONNTRACK[port] = False
-    
-
-    reactor.listenUDP(ListenPort,Proxy(Master,ListenPort,CONNTRACK,BlackList,Timeout,Debug,DestportStart,DestPortEnd))
-
-    def loopingErrHandle(failure):
-        logger.error('(GLOBAL) STOPPING REACTOR TO AVOID MEMORY LEAK: Unhandled error innowtimed loop.\n {}'.format(failure))
-        reactor.stop()
-        
-    def stats():        
-        count = 0
-        nowtime = time()
-        for port in CONNTRACK:
-            if CONNTRACK[port]:
-                count = count+1
-                
-        totalPorts = DestPortEnd - DestportStart
-        freePorts = totalPorts - count
-        
-        logger.info("{} ports out of {} in use ({} free)".format(count,totalPorts,freePorts))
-
-
-        
-    if Stats == True:
-        stats_task = task.LoopingCall(stats)
-        statsa = stats_task.start(30)
-        statsa.addErrback(loopingErrHandle)
-
-# Used to track if we have downloaded user custon rules
-user_rules = {}
+# 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 = {} 
-BRIDGES = {}
+
 
 # Timed loop used for reporting HBP status
 #
@@ -357,27 +95,6 @@ def config_reports(_config, _factory):
 
     return report_server
 
-# Send data to all OBP connections that have an encryption key. Data such as subscribers are sent to other HBNet servers.
-def svrd_send_all(_svrd_data):
-    _svrd_packet = SVRD
-    for system in CONFIG['SYSTEMS']:
-        if CONFIG['SYSTEMS'][system]['ENABLED']:
-                if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE':
-                    if CONFIG['SYSTEMS'][system]['ENCRYPTION_KEY'] != b'':
-                        systems[system].send_system(_svrd_packet + _svrd_data)
-                        
-# Send any data packets to connections with ALL_DATA specified in other options
-def mirror_traffic(_data):
-    for system in CONFIG['SYSTEMS']:
-        if CONFIG['SYSTEMS'][system]['ENABLED']:
-                if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE':
-                    print(CONFIG['SYSTEMS'][system]['OTHER_OPTIONS'])
-                    if 'MIRROR_ALL_TRAFFIC' in CONFIG['SYSTEMS'][system]['OTHER_OPTIONS']:
-                        print('mirrored to ' + system)
-                        print(_data)
-                        systems[system].send_system(SVRD + b'DATA' + _data)
-                    
-
 
 # Import Bridging rules
 # Note: A stanza *must* exist for any MASTER or CLIENT configured in the main
@@ -405,12 +122,11 @@ def make_bridges(_rules):
 
 
 # Run this every minute for rule timer updates
-def rule_timer_loop(unit_flood_time):
+def rule_timer_loop():
     global UNIT_MAP
     logger.debug('(ROUTER) routerHBP Rule timer loop started')
     _now = time()
-    #This is a good place to get and modify rules for users
-##    print(BRIDGES)
+
     for _bridge in BRIDGES:
         for _system in BRIDGES[_bridge]:
             if _system['TO_TYPE'] == 'ON':
@@ -418,10 +134,6 @@ def rule_timer_loop(unit_flood_time):
                     if _system['TIMER'] < _now:
                         _system['ACTIVE'] = False
                         logger.info('(ROUTER) Conference Bridge TIMEOUT: DEACTIVATE System: %s, Bridge: %s, TS: %s, TGID: %s', _system['SYSTEM'], _bridge, _system['TS'], int_id(_system['TGID']))
-                        # Send not active POST
-                        #update_tg(CONFIG, 'off', 0, [{'SYSTEM':_system['SYSTEM']}, {'ts':_system['TS']}, {'tg': int_id(_system['TGID'])}])
-
-##                        print(_system)
                     else:
                         timeout_in = _system['TIMER'] - _now
                         logger.info('(ROUTER) Conference Bridge ACTIVE (ON timer running): System: %s Bridge: %s, TS: %s, TGID: %s, Timeout in: %.2fs,', _system['SYSTEM'], _bridge, _system['TS'], int_id(_system['TGID']),  timeout_in)
@@ -432,22 +144,15 @@ def rule_timer_loop(unit_flood_time):
                     if _system['TIMER'] < _now:
                         _system['ACTIVE'] = True
                         logger.info('(ROUTER) Conference Bridge TIMEOUT: ACTIVATE System: %s, Bridge: %s, TS: %s, TGID: %s', _system['SYSTEM'], _bridge, _system['TS'], int_id(_system['TGID']))
-                        # POST ON
-##                        update_tg(CONFIG, 'on', 0, [{'SYSTEM':_system['SYSTEM']}, {'ts':_system['TS']}, {'tg': int_id(_system['TGID'])}])
                     else:
                         timeout_in = _system['TIMER'] - _now
                         logger.info('(ROUTER) Conference Bridge INACTIVE (OFF timer running): System: %s Bridge: %s, TS: %s, TGID: %s, Timeout in: %.2fs,', _system['SYSTEM'], _bridge, _system['TS'], int_id(_system['TGID']),  timeout_in)
                 elif _system['ACTIVE'] == True:
                     logger.debug('(ROUTER) Conference Bridge ACTIVE (no change): System: %s Bridge: %s, TS: %s, TGID: %s', _system['SYSTEM'], _bridge, _system['TS'], int_id(_system['TGID']))
-                    # POST on
-##                    print(_system)
-##                    update_tg(CONFIG, 'on', 0, [{'SYSTEM':_system['SYSTEM']}, {'ts':_system['TS']}, {'tg': int_id(_system['TGID'])}])
             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']))
 
-    for unit in UNIT_MAP:
-        svrd_send_all(b'UNIT' + unit)
-    _then = _now - unit_flood_time
+    _then = _now - 60
     remove_list = []
     for unit in UNIT_MAP:
         if UNIT_MAP[unit][1] < (_then):
@@ -455,7 +160,6 @@ def rule_timer_loop(unit_flood_time):
 
     for unit in remove_list:
         del UNIT_MAP[unit]
-    send_unit_table(CONFIG, UNIT_MAP)
 
     logger.debug('Removed unit(s) %s from UNIT_MAP', remove_list)
 
@@ -466,11 +170,9 @@ def rule_timer_loop(unit_flood_time):
 
 # run this every 10 seconds to trim orphaned stream ids
 def stream_trimmer_loop():
-    print(UNIT_MAP)
-    ping(CONFIG)
     logger.debug('(ROUTER) Trimming inactive stream IDs from system lists')
     _now = time()
-       
+
     for system in systems:
         # HBP systems, master and peer
         if CONFIG['SYSTEMS'][system]['MODE'] != 'OPENBRIDGE':
@@ -526,19 +228,6 @@ class routerOBP(OPENBRIDGE):
         # list of self._targets for unit (subscriber, private) calls
         self._targets = []
 
-    def svrd_received(self, _mode, _data):
-        print(UNIT_MAP)
-        logger.info('SVRD Received. Mode: ' + str(_mode) + ' Data: ' + str(_data))
-        if _mode == b'UNIT':
-            UNIT_MAP[_data] = (self._system, time())
-
-##    def mmdvm_cmd(self, _cmd):
-##        print('---')
-##        print(_cmd)
-##        print('---')
-##        pass
-
-
     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]
@@ -741,9 +430,6 @@ class routerOBP(OPENBRIDGE):
  
         # Make/update this unit in the UNIT_MAP cache
         UNIT_MAP[_rf_src] = (self.name, pkt_time)
-
-        # Send update to all OpenBridge connections
-##        svrd_send_all(b'UNIT' + _rf_src) # + b'TIME' + pkt_time)
         
         
         # Is this a new call stream?
@@ -889,17 +575,16 @@ class routerOBP(OPENBRIDGE):
             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 == 'vcsbk':
-            self.group_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data)
-            logger.debug('CSBK recieved, forwarded to destination TG.')
+        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)
-##        print(_config)
         self.name = _name
 
         # list of self._targets for unit (subscriber, private) calls
@@ -962,18 +647,17 @@ class routerHBP(HBSYSTEM):
                     }
                 }
             }
+
+
     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]
-
+        
         # Make/update an entry in the UNIT_MAP for this subscriber
         UNIT_MAP[_rf_src] = (self.name, pkt_time)
 
-        # Update other servers via OBP
-##        svrd_send_all(b'UNIT' + _rf_src) # + b'TIME' + pkt_time)
-
         # Is this a new call stream?
         if (_stream_id != self.STATUS[_slot]['RX_STREAM_ID']):
             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']):
@@ -981,10 +665,6 @@ class routerHBP(HBSYSTEM):
                 return
 
             # This is a new call stream
-
-            # Send subscriber ID over OBP
-            svrd_send_all(b'UNIT' + _rf_src)
-            
             self.STATUS[_slot]['RX_START'] = pkt_time
             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)
@@ -1000,22 +680,10 @@ class routerHBP(HBSYSTEM):
             # just make a new one from the HBP header. This is good enough, and it saves lots of time
             else:
                 self.STATUS[_slot]['RX_LC'] = LC_OPT + _dst_id + _rf_src
-        # Download rules
-        if _rf_src not in user_rules:
-            user_rules[_rf_src] = self.name
-        if _rf_src in user_rules:
-##            print('in')
-            if user_rules[_rf_src] != self.name:
-                user_rules[_rf_src] = self.name
-##                print('updated')
-##        print(user_rules)
+
         for _bridge in BRIDGES:
-##            print(BRIDGES)
-##            print(_bridge)
-            # Match bridge name here
             for _system in BRIDGES[_bridge]:
-##                print(_system)
-                # Modify rule here for indiv system
+
                 if (_system['SYSTEM'] == self._system and _system['TGID'] == _dst_id and _system['TS'] == _slot and _system['ACTIVE'] == True):
 
                     for _target in BRIDGES[_bridge]:
@@ -1177,10 +845,6 @@ class routerHBP(HBSYSTEM):
             for _bridge in BRIDGES:
                 for _system in BRIDGES[_bridge]:
                     if _system['SYSTEM'] == self._system:
-##                        # Insert POST for TG timer update?
-##                        print(_system)
-##                        print()
-##                        print(datetime.fromtimestamp(_system['TIMER']).strftime('%H:%M:%S - %m/%d/%y'))
 
                         # 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)):
@@ -1189,17 +853,11 @@ class routerHBP(HBSYSTEM):
 
                         # TGID matches an ACTIVATION trigger
                         if (_dst_id in _system['ON'] or _dst_id in _system['RESET']) and _slot == _system['TS']:
-                            # POST update TG for self care
-                            update_tg(CONFIG, 'on', int(str(int_id(self.STATUS[2]['RX_PEER']))[:7]), [{'SYSTEM':_system['SYSTEM']}, {'ts1':int_id(self.STATUS[1]['RX_TGID'])}, {'ts2':int_id(self.STATUS[2]['RX_TGID'])}])
-##                            print(datetime.fromtimestamp(_system['TIMER']).strftime('%H:%M:%S - %m/%d/%y'))
-
-##                            update_tg(CONFIG, mode, dmr_id, data)
                             # Set the matching rule as ACTIVE
                             if _dst_id in _system['ON']:
                                 if _system['ACTIVE'] == False:
                                     _system['ACTIVE'] = True
                                     _system['TIMER'] = pkt_time + _system['TIMEOUT']
-
                                     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':
@@ -1217,9 +875,6 @@ class routerHBP(HBSYSTEM):
                                 if _system['ACTIVE'] == True:
                                     _system['ACTIVE'] = False
                                     logger.info('(%s) Bridge: %s, connection changed to state: %s', self._system, _bridge, _system['ACTIVE'])
-                                    # POST off
-                                    update_tg(CONFIG, 'off', 0, [{'SYSTEM':_system['SYSTEM']}, {'ts':_system['TS']}, {'tg': int_id(_system['TGID'])}])
-##                                    update_tg(CONFIG, 'on', int(str(int_id(self.STATUS[2]['RX_PEER']))[:7]), [{'SYSTEM':_system['SYSTEM']}, {'ts1':int_id(self.STATUS[1]['RX_TGID'])}, {'ts2':int_id(self.STATUS[2]['RX_TGID'])}])
                                     # Cancel the timer if we've enabled an "ON" type timeout
                                     if _system['TO_TYPE'] == 'ON':
                                         _system['TIMER'] = pkt_time
@@ -1254,9 +909,6 @@ class routerHBP(HBSYSTEM):
  
         # Make/update this unit in the UNIT_MAP cache
         UNIT_MAP[_rf_src] = (self.name, pkt_time)
-
-        # Update other servers via OBP
-##        svrd_send_all(b'UNIT' + _rf_src) # + b'TIME' + pkt_time)
         
         
         # Is this a new call stream?
@@ -1279,7 +931,6 @@ class routerHBP(HBSYSTEM):
                 self._targets.remove(self._system)
             
             # This is a new call stream, so log & report
-            svrd_send_all(b'UNIT' + _rf_src)
             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)
@@ -1390,23 +1041,21 @@ 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)
-            mirror_traffic(_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)
-                mirror_traffic(_data)
         elif _call_type == 'vcsbk':
+            #logger.debug('CSBK recieved, but HBlink does not process them currently')
+            logger.debug('CSBK recieved, routing to ' + str(int_id(_dst_id)))
             self.group_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data)
-            logger.debug('CSBK recieved, forwarded to destination TG.')
-            mirror_traffic(_data)
         else:
             logger.error('Unknown call type recieved -- not processed')
-            mirror_traffic(_data)
 
 #
 # Socket-based reporting section
@@ -1434,30 +1083,22 @@ if __name__ == '__main__':
     import os
     import signal
 
-##    global unit_flood_time
-
     # 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 hbnet.cfg)')
+    parser.add_argument('-c', '--config', action='store', dest='CONFIG_FILE', help='/full/path/to/config.file (usually hblink.cfg)')
     parser.add_argument('-r', '--rules', action='store', dest='RULES_FILE', help='/full/path/to/rules.file (usually rules.py)')
     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__))+'/hbnet.cfg'
+        cli_args.CONFIG_FILE = os.path.dirname(os.path.abspath(__file__))+'/hblink.cfg'
 
     # Call the external routine to build the configuration dictionary
-    LOCAL_CONFIG = config.build_config(cli_args.CONFIG_FILE)
-    if LOCAL_CONFIG['WEB_SERVICE']['REMOTE_CONFIG_ENABLED']:
-        CONFIG = download_config(LOCAL_CONFIG, cli_args.CONFIG_FILE)
-##        print(CONFIG['SYSTEMS'])
-##        print('enabled')
-    else:
-        CONFIG = config.build_config(cli_args.CONFIG_FILE)
+    CONFIG = config.build_config(cli_args.CONFIG_FILE)
 
     # Ensure we have a path for the rules file, if one wasn't specified, then use the default (top of file)
     if not cli_args.RULES_FILE:
@@ -1467,7 +1108,6 @@ 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) 2020, 2021\n\tKF7EEL - Eric, kf7eel@qsl.net -  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')
 
@@ -1485,6 +1125,20 @@ if __name__ == '__main__':
     # Create the name-number mapping dictionaries
     peer_ids, subscriber_ids, talkgroup_ids = mk_aliases(CONFIG)
     
+    # Import the ruiles file as a module, and create BRIDGES from it
+    spec = importlib.util.spec_from_file_location("module.name", cli_args.RULES_FILE)
+    rules_module = importlib.util.module_from_spec(spec)
+    try:
+        spec.loader.exec_module(rules_module)
+        logger.info('(ROUTER) Routing bridges file found and bridges imported: %s', cli_args.RULES_FILE)
+    except (ImportError, FileNotFoundError):
+        sys.exit('(ROUTER) TERMINATING: Routing bridges file not found or invalid: {}'.format(cli_args.RULES_FILE))
+
+    # 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']:
@@ -1494,92 +1148,7 @@ if __name__ == '__main__':
         logger.info('(REPORT) TCP Socket reporting not configured')
 
     # HBlink instance creation
-    logger.info('(GLOBAL) HBNet \'hbnet.py\' -- SYSTEM STARTING...')
-
-    # Generate list of Enabled MODE: PROXY masters
-    proxy_master_list = []
-    for i in CONFIG['SYSTEMS']:
-        if CONFIG['SYSTEMS'][i]['ENABLED'] == True:
-            if CONFIG['SYSTEMS'][i]['MODE'] == 'PROXY':
-                proxy_master_list.append(i)
-    # Start proxy as a thread (if enabled in config) for each set of MASTERs
-    for m in proxy_master_list:
-        if CONFIG['SYSTEMS'][m]['EXTERNAL_PROXY_SCRIPT'] == False:
-            proxy_thread = threading.Thread(target=hotspot_proxy, args=(CONFIG['SYSTEMS'][m]['EXTERNAL_PORT'],CONFIG['SYSTEMS'][m]['INTERNAL_PORT_START'],CONFIG['SYSTEMS'][m]['INTERNAL_PORT_STOP'],))
-            proxy_thread.daemon = True
-            proxy_thread.start()
-            logger.info('Started thread for PROXY for MASTER set: ' + m)
-                
-    #Build Master configs from list
-    for i in proxy_master_list:
-        n_systems = CONFIG['SYSTEMS'][i]['INTERNAL_PORT_STOP'] - CONFIG['SYSTEMS'][i]['INTERNAL_PORT_START']
-        n_count = 0
-        while n_count < n_systems:
-            CONFIG['SYSTEMS'].update({i + '-' + str(n_count): {
-            'MODE': 'MASTER',
-            'ENABLED': True,
-            'STATIC_APRS_POSITION_ENABLED': CONFIG['SYSTEMS'][i]['STATIC_APRS_POSITION_ENABLED'],
-            'USE_USER_MAN': CONFIG['SYSTEMS'][i]['USE_USER_MAN'],
-            'REPEAT': CONFIG['SYSTEMS'][i]['REPEAT'],
-            'MAX_PEERS': 1,
-            'IP': '127.0.0.1',
-            'PORT': CONFIG['SYSTEMS'][i]['INTERNAL_PORT_START'] + n_count,
-            'PASSPHRASE': CONFIG['SYSTEMS'][i]['PASSPHRASE'],
-            'GROUP_HANGTIME': CONFIG['SYSTEMS'][i]['GROUP_HANGTIME'],
-            'USE_ACL': CONFIG['SYSTEMS'][i]['USE_ACL'],
-            'REG_ACL': CONFIG['SYSTEMS'][i]['REG_ACL'],
-            'SUB_ACL': CONFIG['SYSTEMS'][i]['SUB_ACL'],
-            'TG1_ACL': CONFIG['SYSTEMS'][i]['TG1_ACL'],
-            'TG2_ACL': CONFIG['SYSTEMS'][i]['TG2_ACL']
-            }})
-            CONFIG['SYSTEMS'][i + '-' + str(n_count)].update({'PEERS': {}})
-            systems[i + '-' + str(n_count)] = routerHBP(i + '-' + str(n_count), CONFIG, report_server)
-            n_count = n_count + 1
-        # Remove original MASTER stanza to prevent errors
-        CONFIG['SYSTEMS'].pop(i)
-        logger.info('Generated MASTER instances for proxy set: ' + i)
-
-    # Attempt to use downloaded rules    
-    if LOCAL_CONFIG['WEB_SERVICE']['REMOTE_CONFIG_ENABLED']:
-        try:
-            remote_config = download_rules(LOCAL_CONFIG, cli_args.CONFIG_FILE)
-            # Build the routing rules file
-            BRIDGES = make_bridges(remote_config[1]) #make_bridges(rules_module.BRIDGES)
-            # Get rule parameter for private calls
-            UNIT = remote_config[0]
-            unit_flood_time = CONFIG['OTHER']['UNIT_TIME']
-        except:
-            logger.error('Control server unreachable or other error. Using local config.')
-            spec = importlib.util.spec_from_file_location("module.name", cli_args.RULES_FILE)
-            rules_module = importlib.util.module_from_spec(spec)
-            try:
-                spec.loader.exec_module(rules_module)
-                logger.info('(ROUTER) Routing bridges file found and bridges imported: %s', cli_args.RULES_FILE)
-            except (ImportError, FileNotFoundError):
-                sys.exit('(ROUTER) TERMINATING: Routing bridges file not found or invalid: {}'.format(cli_args.RULES_FILE))
-            # Build the routing rules file
-            BRIDGES = make_bridges(rules_module.BRIDGES)
-            # Get rule parameter for private calls
-            UNIT = rules_module.UNIT
-            unit_flood_time = rules_module.FLOOD_TIMEOUT
-
-    else:
-        spec = importlib.util.spec_from_file_location("module.name", cli_args.RULES_FILE)
-        rules_module = importlib.util.module_from_spec(spec)
-        try:
-            spec.loader.exec_module(rules_module)
-            logger.info('(ROUTER) Routing bridges file found and bridges imported: %s', cli_args.RULES_FILE)
-        except (ImportError, FileNotFoundError):
-            sys.exit('(ROUTER) TERMINATING: Routing bridges file not found or invalid: {}'.format(cli_args.RULES_FILE))
-            spec = importlib.util.spec_from_file_location("module.name", cli_args.RULES_FILE)
-##        print('--------')
-##        print(rules_module.BRIDGES)
-        # Build the routing rules file
-        BRIDGES = make_bridges(rules_module.BRIDGES)
-        # Get rule parameter for private calls
-        UNIT = rules_module.UNIT
-        unit_flood_time = rules_module.FLOOD_TIMEOUT
-
+    logger.info('(GLOBAL) HBlink \'bridge.py\' -- SYSTEM STARTING...')
     for system in CONFIG['SYSTEMS']:
         if CONFIG['SYSTEMS'][system]['ENABLED']:
             if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE':
@@ -1593,9 +1162,8 @@ if __name__ == '__main__':
         logger.error('(GLOBAL) STOPPING REACTOR TO AVOID MEMORY LEAK: Unhandled error in timed loop.\n %s', failure)
         reactor.stop()
 
-    
     # Initialize the rule timer -- this if for user activated stuff
-    rule_timer_task = task.LoopingCall(rule_timer_loop, unit_flood_time)
+    rule_timer_task = task.LoopingCall(rule_timer_loop)
     rule_timer = rule_timer_task.start(60)
     rule_timer.addErrback(loopingErrHandle)
 
@@ -1604,10 +1172,4 @@ if __name__ == '__main__':
     stream_trimmer = stream_trimmer_task.start(5)
     stream_trimmer.addErrback(loopingErrHandle)
 
-    logger.info('UNIT calls will be bridged to: ' + str(UNIT))
-    
-    # Download burn list
-    if LOCAL_CONFIG['WEB_SERVICE']['REMOTE_CONFIG_ENABLED']:
-        with open(CONFIG['WEB_SERVICE']['BURN_FILE'], 'w') as f:
-            f.write(str(download_burnlist(CONFIG)))
     reactor.run()

config.py

@@ -68,8 +68,6 @@ def acl_build(_acl, _max):
         return(True, set((const.ID_MIN, _max)))
 
     acl = [] #set()
-    if type(_acl) == tuple:
-        _acl = ''.join(_acl)
     sections = _acl.split(':')
 
     if sections[0] == 'PERMIT':
@@ -109,7 +107,6 @@ def build_config(_config_file):
     CONFIG['REPORTS'] = {}
     CONFIG['LOGGER'] = {}
     CONFIG['ALIASES'] = {}
-    CONFIG['WEB_SERVICE'] = {}
     CONFIG['SYSTEMS'] = {}
 
     try:
@@ -156,26 +153,6 @@ def build_config(_config_file):
                     'STALE_TIME': config.getint(section, 'STALE_DAYS') * 86400,
                 })
 
-            elif section == 'WEB_SERVICE':
-                CONFIG['WEB_SERVICE'].update({
-                    'THIS_SERVER_NAME': config.get(section, 'THIS_SERVER_NAME'),
-                    'URL': config.get(section, 'URL'),
-                    'REMOTE_CONFIG_ENABLED': config.getboolean(section, 'REMOTE_CONFIG_ENABLED'),
-                    'APPEND_INT': config.getint(section, 'APPEND_INT'),
-                    'EXTRA_INT_1': config.getint(section, 'EXTRA_INT_1'),
-                    'EXTRA_INT_2': config.getint(section, 'EXTRA_INT_2'),
-                    'EXTRA_1': config.get(section, 'EXTRA_1'),
-                    'EXTRA_2': config.get(section, 'EXTRA_2'),
-                    'SHARED_SECRET': config.get(section, 'SHARED_SECRET'),
-                    'SHORTEN_PASSPHRASE': config.getboolean(section, 'SHORTEN_PASSPHRASE'),
-                    'SHORTEN_SAMPLE': config.get(section, 'SHORTEN_SAMPLE'),
-                    'SHORTEN_LENGTH': config.get(section, 'SHORTEN_LENGTH'),
-                    'BURN_FILE': config.get(section, 'BURN_FILE'),
-                    'BURN_INT': config.getint(section, 'BURN_INT'),
-
-
-                })
-
             elif config.getboolean(section, 'ENABLED'):
                 if config.get(section, 'MODE') == 'PEER':
                     CONFIG['SYSTEMS'].update({section: {
@@ -205,13 +182,11 @@ def build_config(_config_file):
                         'SOFTWARE_ID': bytes(config.get(section, 'SOFTWARE_ID').ljust(40)[:40], 'utf-8'),
                         'PACKAGE_ID': bytes(config.get(section, 'PACKAGE_ID').ljust(40)[:40], 'utf-8'),
                         'GROUP_HANGTIME': config.getint(section, 'GROUP_HANGTIME'),
-                        'OPTIONS': b''.join([b'Type=HBNet;', bytes(config.get(section, 'OPTIONS'), 'utf-8')]),
+                        'OPTIONS': b''.join([b'Type=HBlink;', bytes(config.get(section, 'OPTIONS'), 'utf-8')]),
                         'USE_ACL': config.getboolean(section, 'USE_ACL'),
                         'SUB_ACL': config.get(section, 'SUB_ACL'),
                         'TG1_ACL': config.get(section, 'TGID_TS1_ACL'),
-                        'TG2_ACL': config.get(section, 'TGID_TS2_ACL'),
-                        'OTHER_OPTIONS': config.get(section, 'OTHER_OPTIONS'),
-
+                        'TG2_ACL': config.get(section, 'TGID_TS2_ACL')
                     }})
                     CONFIG['SYSTEMS'][section].update({'STATS': {
                         'CONNECTION': 'NO',             # NO, RTPL_SENT, AUTHENTICATED, CONFIG-SENT, YES 
@@ -257,9 +232,7 @@ def build_config(_config_file):
                         'USE_ACL': config.getboolean(section, 'USE_ACL'),
                         'SUB_ACL': config.get(section, 'SUB_ACL'),
                         'TG1_ACL': config.get(section, 'TGID_TS1_ACL'),
-                        'TG2_ACL': config.get(section, 'TGID_TS2_ACL'),
-                        'OTHER_OPTIONS': config.get(section, 'OTHER_OPTIONS'),
-
+                        'TG2_ACL': config.get(section, 'TGID_TS2_ACL')
                     }})
                     CONFIG['SYSTEMS'][section].update({'XLXSTATS': {
                         'CONNECTION': 'NO',             # NO, RTPL_SENT, AUTHENTICATED, CONFIG-SENT, YES 
@@ -276,7 +249,6 @@ def build_config(_config_file):
                     CONFIG['SYSTEMS'].update({section: {
                         'MODE': config.get(section, 'MODE'),
                         'ENABLED': config.getboolean(section, 'ENABLED'),
-                        'USE_USER_MAN': config.getboolean(section, 'USE_USER_MAN'),
                         'REPEAT': config.getboolean(section, 'REPEAT'),
                         'MAX_PEERS': config.getint(section, 'MAX_PEERS'),
                         'IP': gethostbyname(config.get(section, 'IP')),
@@ -287,8 +259,7 @@ def build_config(_config_file):
                         'REG_ACL': config.get(section, 'REG_ACL'),
                         'SUB_ACL': config.get(section, 'SUB_ACL'),
                         'TG1_ACL': config.get(section, 'TGID_TS1_ACL'),
-                        'TG2_ACL': config.get(section, 'TGID_TS2_ACL'),
-                        'OTHER_OPTIONS': config.get(section, 'OTHER_OPTIONS'),
+                        'TG2_ACL': config.get(section, 'TGID_TS2_ACL')
                     }})
                     CONFIG['SYSTEMS'][section].update({'PEERS': {}})
                     
@@ -307,32 +278,9 @@ def build_config(_config_file):
                         'USE_ACL': config.getboolean(section, 'USE_ACL'),
                         'SUB_ACL': config.get(section, 'SUB_ACL'),
                         'TG1_ACL': config.get(section, 'TGID_ACL'),
-                        'TG2_ACL': 'PERMIT:ALL',
-                        'USE_ENCRYPTION': config.getboolean(section, 'USE_ENCRYPTION'),
-                        'ENCRYPTION_KEY': bytes(config.get(section, 'ENCRYPTION_KEY'), 'utf-8'),
-                        'OTHER_OPTIONS': config.get(section, 'OTHER_OPTIONS'),
+                        'TG2_ACL': 'PERMIT:ALL'
                     }})
-                elif config.get(section, 'MODE') == 'PROXY':
-                    CONFIG['SYSTEMS'].update({section: {
-                        'MODE': config.get(section, 'MODE'),
-                        'ENABLED': config.getboolean(section, 'ENABLED'),
-                        'EXTERNAL_PROXY_SCRIPT': config.getboolean(section, 'EXTERNAL_PROXY_SCRIPT'),
-                        'STATIC_APRS_POSITION_ENABLED': config.getboolean(section, 'STATIC_APRS_POSITION_ENABLED'),
-                        'USE_USER_MAN': config.getboolean(section, 'USE_USER_MAN'),
-                        'REPEAT': config.getboolean(section, 'REPEAT'),
-                        'PASSPHRASE': bytes(config.get(section, 'PASSPHRASE'), 'utf-8'),
-                        'EXTERNAL_PORT': config.getint(section, 'EXTERNAL_PORT'),
-                        'INTERNAL_PORT_START': config.getint(section, 'INTERNAL_PORT_START'),
-                        'INTERNAL_PORT_STOP': config.getint(section, 'INTERNAL_PORT_STOP'),
-                        'GROUP_HANGTIME': config.getint(section, 'GROUP_HANGTIME'),
-                        'USE_ACL': config.getboolean(section, 'USE_ACL'),
-                        'REG_ACL': config.get(section, 'REG_ACL'),
-                        'SUB_ACL': config.get(section, 'SUB_ACL'),
-                        'TG1_ACL': config.get(section, 'TG1_ACL'),
-                        'TG2_ACL': config.get(section, 'TG2_ACL'),
-                        'OTHER_OPTIONS': config.get(section, 'OTHER_OPTIONS'),
-                    }})
-                    CONFIG['SYSTEMS'][section].update({'PEERS': {}})
+                    
     
     except configparser.Error as err:
         sys.exit('Error processing configuration file -- {}'.format(err))

const.py

@@ -69,10 +69,6 @@ RPTP    = b'RPTP'
 RPTA    = b'RPTA'
 RPTO    = b'RPTO'
 
-# Sever Data and Encrypted OBP
-SVRD    = b'SVRD'
-EOBP    = b'EOBP'
-
 
 # Higheset peer ID permitted by HBP
 PEER_MAX = 4294967295

data_gateway-SAMPLE.cfg

@@ -1,363 +0,0 @@
-# PROGRAM-WIDE PARAMETERS GO HERE
-# PATH - working path for files, leave it alone unless you NEED to change it
-# PING_TIME - the interval that peers will ping the master, and re-try registraion
-#           - how often the Master maintenance loop runs
-# MAX_MISSED - how many pings are missed before we give up and re-register
-#           - number of times the master maintenance loop runs before de-registering a peer
-#
-# ACLs:
-#
-# Access Control Lists are a very powerful tool for administering your system.
-# But they consume packet processing time. Disable them if you are not using them.
-# But be aware that, as of now, the configuration stanzas still need the ACL
-# sections configured even if you're not using them.
-#
-# REGISTRATION ACLS ARE ALWAYS USED, ONLY SUBSCRIBER AND TGID MAY BE DISABLED!!!
-#
-# The 'action' May be PERMIT|DENY
-# Each entry may be a single radio id, or a hypenated range (e.g. 1-2999)
-# Format:
-# 	ACL = 'action:id|start-end|,id|start-end,....'
-#		--for example--
-#	SUB_ACL: DENY:1,1000-2000,4500-60000,17
-#
-# ACL Types:
-# 	REG_ACL: peer radio IDs for registration (only used on HBP master systems)
-# 	SUB_ACL: subscriber IDs for end-users
-# 	TGID_TS1_ACL: destination talkgroup IDs on Timeslot 1
-# 	TGID_TS2_ACL: destination talkgroup IDs on Timeslot 2
-#
-# ACLs may be repeated for individual systems if needed for granularity
-# Global ACLs will be processed BEFORE the system level ACLs
-# Packets will be matched against all ACLs, GLOBAL first. If a packet 'passes'
-# All elements, processing continues. Packets are discarded at the first
-# negative match, or 'reject' from an ACL element.
-#
-# If you do not wish to use ACLs, set them to 'PERMIT:ALL'
-# TGID_TS1_ACL in the global stanza is used for OPENBRIDGE systems, since all
-# traffic is passed as TS 1 between OpenBridges
-[GLOBAL]
-PATH: ./
-PING_TIME: 5
-MAX_MISSED: 3
-USE_ACL: True
-REG_ACL: PERMIT:ALL
-SUB_ACL: DENY:1
-TGID_TS1_ACL: PERMIT:ALL
-TGID_TS2_ACL: PERMIT:ALL
-
-
-# NOT YET WORKING: NETWORK REPORTING CONFIGURATION
-#   Enabling "REPORT" will configure a socket-based reporting
-#   system that will send the configuration and other items
-#   to a another process (local or remote) that may process
-#   the information for some useful purpose, like a web dashboard.
-#
-#   REPORT - True to enable, False to disable
-#   REPORT_INTERVAL - Seconds between reports
-#   REPORT_PORT - TCP port to listen on if "REPORT_NETWORKS" = NETWORK
-#   REPORT_CLIENTS - comma separated list of IPs you will allow clients
-#       to connect on. Entering a * will allow all.
-#
-# ****FOR NOW MUST BE TRUE - USE THE LOOPBACK IF YOU DON'T USE THIS!!!****
-[REPORTS]
-REPORT: True
-REPORT_INTERVAL: 60
-REPORT_PORT: 4329
-REPORT_CLIENTS: 127.0.0.1
-
-
-# SYSTEM LOGGER CONFIGURAITON
-#   This allows the logger to be configured without chaning the individual
-#   python logger stuff. LOG_FILE should be a complete path/filename for *your*
-#   system -- use /dev/null for non-file handlers.
-#   LOG_HANDLERS may be any of the following, please, no spaces in the
-#   list if you use several:
-#       null
-#       console
-#       console-timed
-#       file
-#       file-timed
-#       syslog
-#   LOG_LEVEL may be any of the standard syslog logging levels, though
-#   as of now, DEBUG, INFO, WARNING and CRITICAL are the only ones
-#   used.
-#
-[LOGGER]
-LOG_FILE: /tmp/hblink.log
-LOG_HANDLERS: console-timed
-LOG_LEVEL: DEBUG
-LOG_NAME: HBlink
-
-# DOWNLOAD AND IMPORT SUBSCRIBER, PEER and TGID ALIASES
-# Ok, not the TGID, there's no master list I know of to download
-# This is intended as a facility for other applcations built on top of
-# HBlink to use, and will NOT be used in HBlink directly.
-# STALE_DAYS is the number of days since the last download before we
-# download again. Don't be an ass and change this to less than a few days.
-[ALIASES]
-TRY_DOWNLOAD: True
-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
-
-# USER MANAGER
-# This is where to configure the details for use with a user managment script
-[WEB_SERVICE]
-THIS_SERVER_NAME: DATA_GATEWAY
-REMOTE_CONFIG_ENABLED: False
-# URL of the user managment server
-URL: http://localhost:8080/svr
-# Integer appended to DMR ID during the generation of a passphrase
-APPEND_INT: 1
-EXTRA_INT_1: 5
-EXTRA_INT_2: 8
-EXTRA_1: TeSt
-EXTRA_2: DmR4
-# Secret used to authenticate with user managment server, before checking if user login is approved
-SHARED_SECRET: test
-# Shorten passphrases
-SHORTEN_PASSPHRASE: True
-SHORTEN_SAMPLE: 4
-SHORTEN_LENGTH: 4
-BURN_FILE: ./burn_ids.txt
-BURN_INT: 5
-
-[DATA_CONFIG]
-DATA_DMR_ID: 9099
-CALL_TYPE: both
-UNIT_SMS_TS: 2
-
-USER_APRS_SSID: 5
-USER_APRS_COMMENT: HBNet APRS Gateway
-APRS_SERVER: hbl.ink
-APRS_PORT: 14580
-APRS_LOGIN_CALL: N0CALL
-APRS_LOGIN_PASSCODE: 12345
-APRS_FILTER: r/47/-120/500 t/m
-
-# The following settings are only applicable if you are using the gps_data_beacon_igate script.
-# They do not affect the operation gps_data itself.
-# Time in minutes.
-IGATE_BEACON_TIME = 45
-IGATE_BEACON_COMMENT = HBLink3 D-APRS Gateway
-IGATE_BEACON_ICON = /I
-IGATE_LATITUDE = 4730.  N
-IGATE_LONGITUDE = 11930.  W
-
-# The following settings are for the static positions only, for hotspots or repeaters connected to MASTER stanzas.
-# Implementation by IU7IGU
-# REPORT_INTERVAL in Minute (ALLOW only > 3 Minutes)
-# MESSAGE: This message will print on APRS description together RX and TX Frequency
-APRS_STATIC_REPORT_INTERVAL: 15
-APRS_STATIC_MESSAGE:Connected to HBLink
-
-# The options below are required for operation of the dashboard and will cause errors in gps_data.py
-# if configured wrong. Leave them as default unless you know what you are doing.
-# If you do change, you must use absolute paths.
-LOCATION_FILE: /tmp/gps_data_user_loc.txt
-BULLETIN_BOARD_FILE: /tmp/gps_data_user_bb.txt
-MAILBOX_FILE: /tmp/gps_data_user_mailbox.txt
-EMERGENCY_SOS_FILE: /tmp/gps_data_user_sos.txt
-SMS_FILE: /tmp/gps_data_user_sms.txt
-
-# User settings file, MUST configure using absolute path.
-USER_SETTINGS_FILE: /tmp/user_settings.txt
-
-# API settings
-# Authorized Apps file - data used for the dashboard API
-USE_API: True
-AUTHORIZED_APPS_FILE: /tmp/authorized_apps.txt
-AUTHORIZED_TOKENS_FILE: /tmp/hblink_auth_tokens.txt
-AUTHORIZED_USERS_FILE: /home/eric/Sync/hblink3_sms_dev/authorized_users.txt
-ACCESS_SYSTEMS_FILE: /home/eric/Sync/hblink3_sms_dev/access_systems.txt
-MY_SERVER_SHORTCUT: XYZ
-SERVER_NAME: Test HBLink Network
-USE_PUBLIC_APPS: True
-PUBLIC_APPS_LIST: https://raw.githubusercontent.com/kf7eel/hblink_sms_external_apps/main/public_systems.txt
-RULES_PATH: /home/eric/Sync/hblink3_sms_dev/rules.py
-
-# The following options are used for the dashboard. The dashboard is optional.
-# Title of the Dashboard
-DASHBOARD_TITLE: HBNet D-APRS Dashboard
-# Used for API, RSS feed link, etc
-DASHBOARD_URL: http://localhost:8092
-
-# Logo used on dashboard page
-LOGO: https://raw.githubusercontent.com/kf7eel/hblink3/gps/HBlink.png
-
-# Port to run server
-DASH_PORT: 8092
-
-# IP to run server on
-DASH_HOST: 127.0.0.1
-
-#Description of dashboard to show on main page
-DESCRIPTION: Welcome to the dashboard.
-
-# Gateway contact info displayed on about page.
-CONTACT_NAME: your name
-CONTACT_CALL: N0CALL
-CONTACT_EMAIL: email@example.org
-CONTACT_WEBSITE: https://hbl.ink
-
-# Time format for display
-TIME_FORMAT: %%H:%%M:%%S - %%m/%%d/%%y
-
-# Center dashboard map over these coordinates
-MAP_CENTER_LAT: 47.00
-MAP_CENTER_LON: -120.00
-ZOOM_LEVEL: 7
-
-# List and preview of some map themes at http://leaflet-extras.github.io/leaflet-providers/preview/
-# The following are options for map themes and just work, you should use one of these: “OpenStreetMap”, “Stamen” (Terrain, Toner, and Watercolor),
-MAP_THEME: Stamen Toner
-
-
-# OPENBRIDGE INSTANCES - DUPLICATE SECTION FOR MULTIPLE CONNECTIONS
-# OpenBridge is a protocol originall created by DMR+ for connection between an
-# IPSC2 server and Brandmeister. It has been implemented here at the suggestion
-# of the Brandmeister team as a way to legitimately connect HBlink to the
-# Brandemiester network.
-# It is recommended to name the system the ID of the Brandmeister server that
-# it connects to, but is not necessary. TARGET_IP and TARGET_PORT are of the
-# Brandmeister or IPSC2 server you are connecting to. PASSPHRASE is the password
-# that must be agreed upon between you and the operator of the server you are
-# connecting to. NETWORK_ID is a number in the format of a DMR Radio ID that
-# will be sent to the other server to identify this connection.
-# other parameters follow the other system types.
-#
-# ACLs:
-# OpenBridge does not 'register', so registration ACL is meaningless.
-# 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
-ENABLED: True
-IP:
-PORT: 62036
-NETWORK_ID: 1234
-PASSPHRASE: passw0rd
-TARGET_IP: 127.0.0.1
-TARGET_PORT: 62037
-BOTH_SLOTS: True
-USE_ACL: True
-SUB_ACL: DENY:1
-TGID_ACL: PERMIT:ALL
-USE_ENCRYPTION: False
-ENCRYPTION_KEY: 
-
-# MASTER INSTANCES - DUPLICATE SECTION FOR MULTIPLE MASTERS
-# HomeBrew Protocol Master instances go here.
-# IP may be left blank if there's one interface on your system.
-# Port should be the port you want this master to listen on. It must be unique
-# and unused by anything else.
-# Repeat - if True, the master repeats traffic to peers, False, it does nothing.
-#
-# MAX_PEERS -- maximun number of peers that may be connect to this master
-# at any given time. This is very handy if you're allowing hotspots to
-# connect, or using a limited computer like a Raspberry Pi.
-#
-# ACLs:
-# See comments in the GLOBAL stanza
-[MASTER-1]
-MODE: MASTER
-ENABLED: True
-
-# Use the user manager? If False, MASTER instance will operate as normal.
-USE_USER_MAN: False
-
-REPEAT: True
-MAX_PEERS: 3
-EXPORT_AMBE: False
-IP:
-PORT: 62033
-PASSPHRASE: passw0rd
-GROUP_HANGTIME: 5
-USE_ACL: True
-REG_ACL: DENY:1
-SUB_ACL: DENY:1
-TGID_TS1_ACL: PERMIT:ALL
-TGID_TS2_ACL: PERMIT:ALL
-
-# PEER INSTANCES - DUPLICATE SECTION FOR MULTIPLE PEERS
-# There are a LOT of errors in the HB Protocol specifications on this one!
-# MOST of these items are just strings and will be properly dealt with by the program
-# The TX & RX Frequencies are 9-digit numbers, and are the frequency in Hz.
-# Latitude is an 8-digit unsigned floating point number.
-# Longitude is a 9-digit signed floating point number.
-# Height is in meters
-# Setting Loose to True relaxes the validation on packets received from the master.
-# This will allow HBlink to connect to a non-compliant system such as XLXD, DMR+ etc.
-#
-# ACLs:
-# See comments in the GLOBAL stanza
-[REPEATER-1]
-MODE: PEER
-ENABLED: False
-LOOSE: False
-EXPORT_AMBE: False
-IP: 
-PORT: 54001
-MASTER_IP: 172.16.1.1
-MASTER_PORT: 54000
-PASSPHRASE: homebrew
-CALLSIGN: W1ABC
-RADIO_ID: 312000
-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
-
-[XLX-1]
-MODE: XLXPEER
-ENABLED: False
-LOOSE: True
-EXPORT_AMBE: False
-IP: 
-PORT: 54002
-MASTER_IP: 172.16.1.1
-MASTER_PORT: 62030
-PASSPHRASE: passw0rd
-CALLSIGN: W1ABC
-RADIO_ID: 312000
-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
-XLXMODULE: 4004
-USE_ACL: True
-SUB_ACL: DENY:1
-TGID_TS1_ACL: PERMIT:ALL
-TGID_TS2_ACL: PERMIT:ALL

data_gateway_config.py

@@ -1,404 +0,0 @@
-#!/usr/bin/env python
-#
-###############################################################################
-#   Copyright (C) 2016-2018 Cortney T. Buffington, N0MJS <n0mjs@me.com>
-#
-#   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
-###############################################################################
-
-'''
-This module generates the configuration data structure for hblink.py and
-assoicated programs that use it. It has been seaparated into a different
-module so as to keep hblink.py easeier to navigate. This file only needs
-updated if the items in the main configuraiton file (usually hblink.cfg)
-change.
-'''
-
-import configparser
-import sys
-import const
-
-from socket import gethostbyname
-
-# Does anybody read this stuff? There's a PEP somewhere that says I should do this.
-__author__     = 'Cortney T. Buffington, N0MJS'
-__copyright__  = 'Copyright (c) 2016-2018 Cortney T. Buffington, N0MJS and the K0USY Group'
-__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'
-
-# Processing of ALS goes here. It's separated from the acl_build function because this
-# code is hblink config-file format specific, and acl_build is abstracted
-def process_acls(_config):
-    # Global registration ACL
-    _config['GLOBAL']['REG_ACL'] = acl_build(_config['GLOBAL']['REG_ACL'], const.PEER_MAX)
-
-    # Global subscriber and TGID ACLs
-    for acl in ['SUB_ACL', 'TG1_ACL', 'TG2_ACL']:
-        _config['GLOBAL'][acl] = acl_build(_config['GLOBAL'][acl], const.ID_MAX)
-
-    # System level ACLs
-    for system in _config['SYSTEMS']:
-        # Registration ACLs (which make no sense for peer systems)
-        if _config['SYSTEMS'][system]['MODE'] == 'MASTER':
-            _config['SYSTEMS'][system]['REG_ACL'] = acl_build(_config['SYSTEMS'][system]['REG_ACL'], const.PEER_MAX)
-
-        # Subscriber and TGID ACLs (valid for all system types)
-        for acl in ['SUB_ACL', 'TG1_ACL', 'TG2_ACL']:
-            _config['SYSTEMS'][system][acl] = acl_build(_config['SYSTEMS'][system][acl], const.ID_MAX)
-
-# Create an access control list that is programatically useable from human readable:
-# ORIGINAL:  'DENY:1-5,3120101,3120124'
-# PROCESSED: (False, set([(1, 5), (3120124, 3120124), (3120101, 3120101)]))
-def acl_build(_acl, _max):
-    if not _acl:
-        return(True, set((const.ID_MIN, _max)))
-
-    acl = [] #set()
-    if type(_acl) == tuple:
-        _acl = ''.join(_acl)
-    sections = _acl.split(':')
-
-    if sections[0] == 'PERMIT':
-        action = True
-    else:
-        action = False
-
-    for entry in sections[1].split(','):
-        if entry == 'ALL':
-            acl.append((const.ID_MIN, _max))
-            break
-
-        elif '-' in entry:
-            start,end = entry.split('-')
-            start,end = int(start), int(end)
-            if (const.ID_MIN <= start <= _max) or (const.ID_MIN <= end <= _max):
-                acl.append((start, end))
-            else:
-                sys.exit('ACL CREATION ERROR, VALUE OUT OF RANGE ({} - {})IN RANGE-BASED ENTRY: {}'.format(const.ID_MIN, _max, entry))
-        else:
-            id = int(entry)
-            if (const.ID_MIN <= id <= _max):
-                acl.append((id, id))
-            else:
-                 sys.exit('ACL CREATION ERROR, VALUE OUT OF RANGE ({} - {}) IN SINGLE ID ENTRY: {}'.format(const.ID_MIN, _max, entry))
-
-    return (action, acl)
-
-def build_config(_config_file):
-    config = configparser.ConfigParser()
-
-    if not config.read(_config_file):
-        sys.exit('Configuration file \''+_config_file+'\' is not a valid configuration file! Exiting...')        
-
-    CONFIG = {}
-    CONFIG['GLOBAL'] = {}
-    CONFIG['REPORTS'] = {}
-    CONFIG['LOGGER'] = {}
-    CONFIG['ALIASES'] = {}
-    CONFIG['WEB_SERVICE'] = {}
-    CONFIG['DATA_CONFIG'] = {}
-    CONFIG['SYSTEMS'] = {}
-
-    try:
-        for section in config.sections():
-            if section == 'GLOBAL':
-                CONFIG['GLOBAL'].update({
-                    'PATH': config.get(section, 'PATH'),
-                    'PING_TIME': config.getint(section, 'PING_TIME'),
-                    'MAX_MISSED': config.getint(section, 'MAX_MISSED'),
-                    'USE_ACL': config.get(section, 'USE_ACL'),
-                    'REG_ACL': config.get(section, 'REG_ACL'),
-                    'SUB_ACL': config.get(section, 'SUB_ACL'),
-                    'TG1_ACL': config.get(section, 'TGID_TS1_ACL'),
-                    'TG2_ACL': config.get(section, 'TGID_TS2_ACL')
-                })
-
-            elif section == 'REPORTS':
-                CONFIG['REPORTS'].update({
-                    'REPORT': config.getboolean(section, 'REPORT'),
-                    'REPORT_INTERVAL': config.getint(section, 'REPORT_INTERVAL'),
-                    'REPORT_PORT': config.getint(section, 'REPORT_PORT'),
-                    'REPORT_CLIENTS': config.get(section, 'REPORT_CLIENTS').split(',')
-                })
-
-            elif section == 'LOGGER':
-                CONFIG['LOGGER'].update({
-                    'LOG_FILE': config.get(section, 'LOG_FILE'),
-                    'LOG_HANDLERS': config.get(section, 'LOG_HANDLERS'),
-                    'LOG_LEVEL': config.get(section, 'LOG_LEVEL'),
-                    'LOG_NAME': config.get(section, 'LOG_NAME')
-                })
-                if not CONFIG['LOGGER']['LOG_FILE']:
-                    CONFIG['LOGGER']['LOG_FILE'] = '/dev/null'
-
-            elif section == 'ALIASES':
-                CONFIG['ALIASES'].update({
-                    'TRY_DOWNLOAD': config.getboolean(section, 'TRY_DOWNLOAD'),
-                    'PATH': config.get(section, 'PATH'),
-                    'PEER_FILE': config.get(section, 'PEER_FILE'),
-                    'SUBSCRIBER_FILE': config.get(section, 'SUBSCRIBER_FILE'),
-                    'TGID_FILE': config.get(section, 'TGID_FILE'),
-                    'PEER_URL': config.get(section, 'PEER_URL'),
-                    'SUBSCRIBER_URL': config.get(section, 'SUBSCRIBER_URL'),
-                    'STALE_TIME': config.getint(section, 'STALE_DAYS') * 86400,
-                })
-
-            elif section == 'WEB_SERVICE':
-                CONFIG['WEB_SERVICE'].update({
-                    'THIS_SERVER_NAME': config.get(section, 'THIS_SERVER_NAME'),
-                    'URL': config.get(section, 'URL'),
-                    'REMOTE_CONFIG_ENABLED': config.getboolean(section, 'REMOTE_CONFIG_ENABLED'),
-                    'SHARED_SECRET': config.get(section, 'SHARED_SECRET'),
-                })
-
-            elif section == 'DATA_CONFIG':
-                CONFIG['DATA_CONFIG'].update({
-                    'DATA_DMR_ID': config.get(section, 'DATA_DMR_ID'),
-                    'USER_APRS_SSID': config.get(section, 'USER_APRS_SSID'),
-                    'CALL_TYPE': config.get(section, 'CALL_TYPE'),
-##                    'UNIT_SMS_TS': config.get(section, 'UNIT_SMS_TS'),
-                    'USER_APRS_COMMENT': config.get(section, 'USER_APRS_COMMENT'),
-                    'APRS_LOGIN_CALL': config.get(section, 'APRS_LOGIN_CALL'),
-                    'APRS_LOGIN_PASSCODE': config.get(section, 'APRS_LOGIN_PASSCODE'),
-                    'APRS_SERVER': config.get(section, 'APRS_SERVER'),
-                    'APRS_PORT': config.get(section, 'APRS_PORT'),
-                    'APRS_FILTER': config.get(section, 'APRS_FILTER'),
-                    'IGATE_BEACON_TIME': config.get(section, 'IGATE_BEACON_TIME'),
-                    'IGATE_BEACON_ICON': config.get(section, 'IGATE_BEACON_ICON'),
-                    'IGATE_BEACON_COMMENT': config.get(section, 'IGATE_BEACON_COMMENT'),
-                    'IGATE_LATITUDE': config.get(section, 'IGATE_LATITUDE'),
-                    'IGATE_LONGITUDE': config.get(section, 'IGATE_LONGITUDE'),
-                    'APRS_STATIC_REPORT_INTERVAL': config.get(section, 'APRS_STATIC_REPORT_INTERVAL'),
-                    'APRS_STATIC_MESSAGE': config.get(section, 'APRS_STATIC_MESSAGE'),
-##                    'EMAIL_SENDER': config.get(section, 'EMAIL_SENDER'),
-##                    'EMAIL_PASSWORD': config.get(section, 'EMAIL_PASSWORD'),
-##                    'SMTP_SERVER': config.get(section, 'SMTP_SERVER'),
-##                    'SMTP_PORT': config.get(section, 'SMTP_PORT'),
-                    'LOCATION_FILE': config.get(section, 'LOCATION_FILE'),
-                    'BULLETIN_BOARD_FILE': config.get(section, 'BULLETIN_BOARD_FILE'),
-                    'MAILBOX_FILE': config.get(section, 'MAILBOX_FILE'),
-                    'SMS_FILE': config.get(section, 'SMS_FILE'),
-                    'EMERGENCY_SOS_FILE': config.get(section, 'EMERGENCY_SOS_FILE'),
-                    'USER_SETTINGS_FILE': config.get(section, 'USER_SETTINGS_FILE'),
-##                    'USE_API': config.getboolean(section, 'USE_API'),
-##                    'AUTHORIZED_TOKENS_FILE': config.get(section, 'AUTHORIZED_TOKENS_FILE'),
-##                    'USE_PUBLIC_APPS': config.getboolean(section, 'USE_PUBLIC_APPS'),
-##                    'PUBLIC_APPS_LIST': config.get(section, 'PUBLIC_APPS_LIST'),
-##                    'MY_SERVER_SHORTCUT': config.get(section, 'MY_SERVER_SHORTCUT'),
-##                    'DASHBOARD_URL': config.get(section, 'DASHBOARD_URL'),
-##                    'SERVER_NAME': config.get(section, 'SERVER_NAME'),
-##                    'RULES_PATH': config.get(section, 'RULES_PATH'),
-
-
-                })
-
-
-            elif config.getboolean(section, 'ENABLED'):
-                if config.get(section, 'MODE') == 'PEER':
-                    CONFIG['SYSTEMS'].update({section: {
-                        'MODE': config.get(section, 'MODE'),
-                        'ENABLED': config.getboolean(section, 'ENABLED'),
-                        'LOOSE': config.getboolean(section, 'LOOSE'),
-                        'SOCK_ADDR': (gethostbyname(config.get(section, 'IP')), config.getint(section, 'PORT')),
-                        'IP': gethostbyname(config.get(section, 'IP')),
-                        'PORT': config.getint(section, 'PORT'),
-                        'MASTER_SOCKADDR': (gethostbyname(config.get(section, 'MASTER_IP')), config.getint(section, 'MASTER_PORT')),
-                        'MASTER_IP': gethostbyname(config.get(section, 'MASTER_IP')),
-                        'MASTER_PORT': config.getint(section, 'MASTER_PORT'),
-                        'PASSPHRASE': bytes(config.get(section, 'PASSPHRASE'), 'utf-8'),
-                        'CALLSIGN': bytes(config.get(section, 'CALLSIGN').ljust(8)[:8], 'utf-8'),
-                        'RADIO_ID': config.getint(section, 'RADIO_ID').to_bytes(4, 'big'),
-                        'RX_FREQ': bytes(config.get(section, 'RX_FREQ').ljust(9)[:9], 'utf-8'),
-                        'TX_FREQ': bytes(config.get(section, 'TX_FREQ').ljust(9)[:9], 'utf-8'),
-                        'TX_POWER': bytes(config.get(section, 'TX_POWER').rjust(2,'0'), 'utf-8'),
-                        'COLORCODE': bytes(config.get(section, 'COLORCODE').rjust(2,'0'), 'utf-8'),
-                        'LATITUDE': bytes(config.get(section, 'LATITUDE').ljust(8)[:8], 'utf-8'),
-                        'LONGITUDE': bytes(config.get(section, 'LONGITUDE').ljust(9)[:9], 'utf-8'),
-                        'HEIGHT': bytes(config.get(section, 'HEIGHT').rjust(3,'0'), 'utf-8'),
-                        'LOCATION': bytes(config.get(section, 'LOCATION').ljust(20)[:20], 'utf-8'),
-                        'DESCRIPTION': bytes(config.get(section, 'DESCRIPTION').ljust(19)[:19], 'utf-8'),
-                        'SLOTS': bytes(config.get(section, 'SLOTS'), 'utf-8'),
-                        'URL': bytes(config.get(section, 'URL').ljust(124)[:124], 'utf-8'),
-                        'SOFTWARE_ID': bytes(config.get(section, 'SOFTWARE_ID').ljust(40)[:40], 'utf-8'),
-                        'PACKAGE_ID': bytes(config.get(section, 'PACKAGE_ID').ljust(40)[:40], 'utf-8'),
-                        'GROUP_HANGTIME': config.getint(section, 'GROUP_HANGTIME'),
-                        'OPTIONS': b''.join([b'Type=HBlink;', bytes(config.get(section, 'OPTIONS'), 'utf-8')]),
-                        'USE_ACL': config.getboolean(section, 'USE_ACL'),
-                        'SUB_ACL': config.get(section, 'SUB_ACL'),
-                        'TG1_ACL': config.get(section, 'TGID_TS1_ACL'),
-                        'TG2_ACL': config.get(section, 'TGID_TS2_ACL'),
-                        'OTHER_OPTIONS': config.get(section, 'OTHER_OPTIONS'),
-                    }})
-                    CONFIG['SYSTEMS'][section].update({'STATS': {
-                        'CONNECTION': 'NO',             # NO, RTPL_SENT, AUTHENTICATED, CONFIG-SENT, YES 
-                        'CONNECTED': None,
-                        'PINGS_SENT': 0,
-                        'PINGS_ACKD': 0,
-                        'NUM_OUTSTANDING': 0,
-                        'PING_OUTSTANDING': False,
-                        'LAST_PING_TX_TIME': 0,
-                        'LAST_PING_ACK_TIME': 0,
-                    }})
-
-                if config.get(section, 'MODE') == 'XLXPEER':
-                    CONFIG['SYSTEMS'].update({section: {
-                        'MODE': config.get(section, 'MODE'),
-                        'ENABLED': config.getboolean(section, 'ENABLED'),
-                        'LOOSE': config.getboolean(section, 'LOOSE'),
-                        'SOCK_ADDR': (gethostbyname(config.get(section, 'IP')), config.getint(section, 'PORT')),
-                        'IP': gethostbyname(config.get(section, 'IP')),
-                        'PORT': config.getint(section, 'PORT'),
-                        'MASTER_SOCKADDR': (gethostbyname(config.get(section, 'MASTER_IP')), config.getint(section, 'MASTER_PORT')),
-                        'MASTER_IP': gethostbyname(config.get(section, 'MASTER_IP')),
-                        'MASTER_PORT': config.getint(section, 'MASTER_PORT'),
-                        'PASSPHRASE': bytes(config.get(section, 'PASSPHRASE'), 'utf-8'),
-                        'CALLSIGN': bytes(config.get(section, 'CALLSIGN').ljust(8)[:8], 'utf-8'),
-                        'RADIO_ID': config.getint(section, 'RADIO_ID').to_bytes(4, 'big'),
-                        'RX_FREQ': bytes(config.get(section, 'RX_FREQ').ljust(9)[:9], 'utf-8'),
-                        'TX_FREQ': bytes(config.get(section, 'TX_FREQ').ljust(9)[:9], 'utf-8'),
-                        'TX_POWER': bytes(config.get(section, 'TX_POWER').rjust(2,'0'), 'utf-8'),
-                        'COLORCODE': bytes(config.get(section, 'COLORCODE').rjust(2,'0'), 'utf-8'),
-                        'LATITUDE': bytes(config.get(section, 'LATITUDE').ljust(8)[:8], 'utf-8'),
-                        'LONGITUDE': bytes(config.get(section, 'LONGITUDE').ljust(9)[:9], 'utf-8'),
-                        'HEIGHT': bytes(config.get(section, 'HEIGHT').rjust(3,'0'), 'utf-8'),
-                        'LOCATION': bytes(config.get(section, 'LOCATION').ljust(20)[:20], 'utf-8'),
-                        'DESCRIPTION': bytes(config.get(section, 'DESCRIPTION').ljust(19)[:19], 'utf-8'),
-                        'SLOTS': bytes(config.get(section, 'SLOTS'), 'utf-8'),
-                        'URL': bytes(config.get(section, 'URL').ljust(124)[:124], 'utf-8'),
-                        'SOFTWARE_ID': bytes(config.get(section, 'SOFTWARE_ID').ljust(40)[:40], 'utf-8'),
-                        'PACKAGE_ID': bytes(config.get(section, 'PACKAGE_ID').ljust(40)[:40], 'utf-8'),
-                        'GROUP_HANGTIME': config.getint(section, 'GROUP_HANGTIME'),
-                        'XLXMODULE': config.getint(section, 'XLXMODULE'),
-                        'OPTIONS': '',
-                        'USE_ACL': config.getboolean(section, 'USE_ACL'),
-                        'SUB_ACL': config.get(section, 'SUB_ACL'),
-                        'TG1_ACL': config.get(section, 'TGID_TS1_ACL'),
-                        'TG2_ACL': config.get(section, 'TGID_TS2_ACL'),
-                        'OTHER_OPTIONS': config.get(section, 'OTHER_OPTIONS'),
-                    }})
-                    CONFIG['SYSTEMS'][section].update({'XLXSTATS': {
-                        'CONNECTION': 'NO',             # NO, RTPL_SENT, AUTHENTICATED, CONFIG-SENT, YES 
-                        'CONNECTED': None,
-                        'PINGS_SENT': 0,
-                        'PINGS_ACKD': 0,
-                        'NUM_OUTSTANDING': 0,
-                        'PING_OUTSTANDING': False,
-                        'LAST_PING_TX_TIME': 0,
-                        'LAST_PING_ACK_TIME': 0,
-                    }})
-
-                elif config.get(section, 'MODE') == 'MASTER':
-                    CONFIG['SYSTEMS'].update({section: {
-                        'MODE': config.get(section, 'MODE'),
-                        'ENABLED': config.getboolean(section, 'ENABLED'),
-                        'USE_USER_MAN': config.getboolean(section, 'USE_USER_MAN'),
-                        'REPEAT': config.getboolean(section, 'REPEAT'),
-                        'MAX_PEERS': config.getint(section, 'MAX_PEERS'),
-                        'IP': gethostbyname(config.get(section, 'IP')),
-                        'PORT': config.getint(section, 'PORT'),
-                        'PASSPHRASE': bytes(config.get(section, 'PASSPHRASE'), 'utf-8'),
-                        'GROUP_HANGTIME': config.getint(section, 'GROUP_HANGTIME'),
-                        'USE_ACL': config.getboolean(section, 'USE_ACL'),
-                        'REG_ACL': config.get(section, 'REG_ACL'),
-                        'SUB_ACL': config.get(section, 'SUB_ACL'),
-                        'TG1_ACL': config.get(section, 'TGID_TS1_ACL'),
-                        'TG2_ACL': config.get(section, 'TGID_TS2_ACL'),
-                        'OTHER_OPTIONS': config.get(section, 'OTHER_OPTIONS'),
-                    }})
-                    CONFIG['SYSTEMS'][section].update({'PEERS': {}})
-                    
-                elif config.get(section, 'MODE') == 'OPENBRIDGE':
-                    CONFIG['SYSTEMS'].update({section: {
-                        'MODE': config.get(section, 'MODE'),
-                        'ENABLED': config.getboolean(section, 'ENABLED'),
-                        'NETWORK_ID': config.getint(section, 'NETWORK_ID').to_bytes(4, 'big'),
-                        'IP': gethostbyname(config.get(section, 'IP')),
-                        'PORT': config.getint(section, 'PORT'),
-                        'PASSPHRASE': bytes(config.get(section, 'PASSPHRASE').ljust(20,'\x00')[:20], 'utf-8'),
-                        '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'),
-                        'TG2_ACL': 'PERMIT:ALL',
-                        'USE_ENCRYPTION': config.getboolean(section, 'USE_ENCRYPTION'),
-                        'ENCRYPTION_KEY': bytes(config.get(section, 'ENCRYPTION_KEY'), 'utf-8'),
-                        'OTHER_OPTIONS': config.get(section, 'OTHER_OPTIONS'),
-                    }})
-                elif config.get(section, 'MODE') == 'PROXY':
-                    CONFIG['SYSTEMS'].update({section: {
-                        'MODE': config.get(section, 'MODE'),
-                        'ENABLED': config.getboolean(section, 'ENABLED'),
-                        'EXTERNAL_PROXY_SCRIPT': config.getboolean(section, 'EXTERNAL_PROXY_SCRIPT'),
-                        'STATIC_APRS_POSITION_ENABLED': config.getboolean(section, 'STATIC_APRS_POSITION_ENABLED'),
-                        'REPEAT': config.getboolean(section, 'REPEAT'),
-                        'PASSPHRASE': bytes(config.get(section, 'PASSPHRASE'), 'utf-8'),
-                        'EXTERNAL_PORT': config.getint(section, 'EXTERNAL_PORT'),
-                        'INTERNAL_PORT_START': config.getint(section, 'INTERNAL_PORT_START'),
-                        'INTERNAL_PORT_STOP': config.getint(section, 'INTERNAL_PORT_STOP'),
-                        'GROUP_HANGTIME': config.getint(section, 'GROUP_HANGTIME'),
-                        'USE_ACL': config.getboolean(section, 'USE_ACL'),
-                        'REG_ACL': config.get(section, 'REG_ACL'),
-                        'SUB_ACL': config.get(section, 'SUB_ACL'),
-                        'TG1_ACL': config.get(section, 'TG1_ACL'),
-                        'TG2_ACL': config.get(section, 'TG2_ACL'),
-                        'OTHER_OPTIONS': config.get(section, 'OTHER_OPTIONS'),
-                    }})
-                    CONFIG['SYSTEMS'][section].update({'PEERS': {}})
-    
-    except configparser.Error as err:
-        sys.exit('Error processing configuration file -- {}'.format(err))
-        
-    process_acls(CONFIG)
-    
-    return CONFIG
-
-# Used to run this file direclty and print the config,
-# which might be useful for debugging
-if __name__ == '__main__':
-    import sys
-    import os
-    import argparse
-    from pprint import pprint
-    from dmr_utils3.utils import int_id
-    
-    # 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)')
-    cli_args = parser.parse_args()
-
-
-    # Ensure we have a path for the config file, if one wasn't specified, then use the execution directory
-    if not cli_args.CONFIG_FILE:
-        cli_args.CONFIG_FILE = os.path.dirname(os.path.abspath(__file__))+'/hblink.cfg'
-    
-    CONFIG = build_config(cli_args.CONFIG_FILE)
-    pprint(CONFIG)
-    
-    def acl_check(_id, _acl):
-        id = int_id(_id)
-        for entry in _acl[1]:
-            if entry[0] <= id <= entry[1]:
-                return _acl[0]
-        return not _acl[0]
-        
-    print(acl_check(b'\x00\x01\x37', CONFIG['GLOBAL']['TG1_ACL']))

hblink-SAMPLE.cfg

@@ -105,29 +105,6 @@ PEER_URL: https://www.radioid.net/static/rptrs.json
 SUBSCRIBER_URL: https://www.radioid.net/static/users.json
 STALE_DAYS: 7
 
-# USER MANAGER
-# This is where to configure the details for use with a user managment script
-[WEB_SERVICE]
-THIS_SERVER_NAME: MMDVM_Server
-REMOTE_CONFIG_ENABLED: True
-# URL of the user managment server
-URL: http://localhost:8080/svr
-# Integer appended to DMR ID during the generation of a passphrase
-APPEND_INT: 1
-EXTRA_INT_1: 5
-EXTRA_INT_2: 8
-EXTRA_1: TeSt
-EXTRA_2: DmR4
-# Secret used to authenticate with user managment server, before checking if user login is approved
-SHARED_SECRET: test
-# Shorten passphrases
-SHORTEN_PASSPHRASE: True
-SHORTEN_SAMPLE: 4
-SHORTEN_LENGTH: 4
-BURN_FILE: ./burn_ids.txt
-BURN_INT: 5
-
-
 # OPENBRIDGE INSTANCES - DUPLICATE SECTION FOR MULTIPLE CONNECTIONS
 # OpenBridge is a protocol originall created by DMR+ for connection between an
 # IPSC2 server and Brandmeister. It has been implemented here at the suggestion
@@ -149,7 +126,7 @@ BURN_INT: 5
 # Otherwise ACLs work as described in the global stanza
 [OBP-1]
 MODE: OPENBRIDGE
-ENABLED: False
+ENABLED: True
 IP:
 PORT: 62035
 NETWORK_ID: 3129100
@@ -160,9 +137,6 @@ BOTH_SLOTS: True
 USE_ACL: True
 SUB_ACL: DENY:1
 TGID_ACL: PERMIT:ALL
-# Experimental encryption
-ENCRYPTION_KEY:
-USE_ENCRYPTION: False
 
 # MASTER INSTANCES - DUPLICATE SECTION FOR MULTIPLE MASTERS
 # HomeBrew Protocol Master instances go here.
@@ -180,10 +154,6 @@ USE_ENCRYPTION: False
 [MASTER-1]
 MODE: MASTER
 ENABLED: True
-
-# Use the user manager? If False, MASTER instance will operate as normal.
-USE_USER_MAN: False
-
 REPEAT: True
 MAX_PEERS: 10
 EXPORT_AMBE: False
@@ -211,7 +181,7 @@ TGID_TS2_ACL: PERMIT:ALL
 # See comments in the GLOBAL stanza
 [REPEATER-1]
 MODE: PEER
-ENABLED: False
+ENABLED: True
 LOOSE: False
 EXPORT_AMBE: False
 IP: 
@@ -243,7 +213,7 @@ TGID_TS2_ACL: PERMIT:ALL
 
 [XLX-1]
 MODE: XLXPEER
-ENABLED: False
+ENABLED: True
 LOOSE: True
 EXPORT_AMBE: False
 IP: 

hblink.py

@@ -44,7 +44,6 @@ from twisted.internet import reactor, task
 # Other files we pull from -- this is mostly for readability and segmentation
 import log
 import config
-from config import acl_build
 from const import *
 from dmr_utils3.utils import int_id, bytes_4, try_download, mk_id_dict
 
@@ -56,17 +55,6 @@ from reporting_const import *
 import logging
 logger = logging.getLogger(__name__)
 
-# Used for user auth
-import os, ast
-import requests, json
-import base64
-import libscrc
-import re
-
-# Encryption library
-from cryptography.fernet import Fernet
-
-
 # Does anybody read this stuff? There's a PEP somewhere that says I should do this.
 __author__     = 'Cortney T. Buffington, N0MJS'
 __copyright__  = 'Copyright (c) 2016-2019 Cortney T. Buffington, N0MJS and the K0USY Group'
@@ -78,19 +66,6 @@ __email__      = 'n0mjs@me.com'
 # Global variables used whether we are a module or __main__
 systems = {}
 
-# Functions that provide a basic symetrical encryption using Fernet
-def encrypt_packet(key, message):
-    f = Fernet(key)
-    token = f.encrypt(message)
-
-    return token
-
-def decrypt_packet(key, message):
-    f = Fernet(key)
-    token = f.decrypt(message, ttl=1)
-
-    return token
-
 # Timed loop used for reporting HBP status
 def config_reports(_config, _factory):
     def reporting_loop(_logger, _server):
@@ -119,34 +94,12 @@ def hblink_handler(_signal, _frame):
 # on matching and the action specified.
 def acl_check(_id, _acl):
     id = int_id(_id)
-
-    # if acl string, build tuple
-    if type(_acl) == str:
-        _acl = acl_build(_acl, 4294967295)
-    
     for entry in _acl[1]:
         if entry[0] <= id <= entry[1]:
             return _acl[0]
     return not _acl[0]
 
 
-def download_burnlist(_CONFIG):
-    user_man_url = _CONFIG['WEB_SERVICE']['URL']
-    shared_secret = str(sha256(_CONFIG['WEB_SERVICE']['SHARED_SECRET'].encode()).hexdigest())
-    burn_check = {
-    'burn_list':True,
-    'secret':shared_secret
-    }
-    json_object = json.dumps(burn_check, indent = 4)
-    try:
-        req = requests.post(user_man_url, data=json_object, headers={'Content-Type': 'application/json'})
-        resp = json.loads(req.text)
-        return resp['burn_list']
-    # For exception, write blank dict
-    except requests.ConnectionError:
-        return {}
-
-   
 #************************************************
 #    OPENBRIDGE CLASS
 #************************************************
@@ -164,142 +117,84 @@ class OPENBRIDGE(DatagramProtocol):
         logger.info('(%s) is mode OPENBRIDGE. No De-Registration required, continuing shutdown', self._system)
 
     def send_system(self, _packet):
-        if _packet[:4] == DMRD or _packet[:4] == EOBP:
+        if _packet[:4] == DMRD:
             #_packet = _packet[:11] + self._config['NETWORK_ID'] + _packet[15:]
             _packet = b''.join([_packet[:11], self._config['NETWORK_ID'], _packet[15:]])
             #_packet += hmac_new(self._config['PASSPHRASE'],_packet,sha1).digest()
             _packet = b''.join([_packet, (hmac_new(self._config['PASSPHRASE'],_packet,sha1).digest())])
-            if self._config['USE_ENCRYPTION'] == True or _packet[:4] == EOBP:
-                _enc_pkt = encrypt_packet(self._config['ENCRYPTION_KEY'], _packet)
-                _packet = b'EOBP' + _enc_pkt
             self.transport.write(_packet, (self._config['TARGET_IP'], self._config['TARGET_PORT']))
             # KEEP THE FOLLOWING COMMENTED OUT UNLESS YOU'RE DEBUGGING DEEPLY!!!!
             # logger.debug('(%s) TX Packet to OpenBridge %s:%s -- %s', self._system, self._config['TARGET_IP'], self._config['TARGET_PORT'], ahex(_packet))
-        # Special Server Data packet, encrypted using frenet, send
-        elif _packet[:4] == SVRD:
-            _enc_pkt = encrypt_packet(self._config['ENCRYPTION_KEY'], _packet)
-            _packet = b'SVRD' + _enc_pkt
-            self.transport.write(_packet, (self._config['TARGET_IP'], self._config['TARGET_PORT']))
-            logger.info('SVRD packet')
         else:
             logger.error('(%s) OpenBridge system was asked to send non DMRD packet: %s', self._system, _packet)
 
     def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data):
         pass
-
-    def svrd_received(self, _mode, _data):
-        pass
+        #print(int_id(_peer_id), int_id(_rf_src), int_id(_dst_id), int_id(_seq), _slot, _call_type, _frame_type, repr(_dtype_vseq), int_id(_stream_id))
 
     def datagramReceived(self, _packet, _sockaddr):
-##        print(_packet[:4])
         # Keep This Line Commented Unless HEAVILY Debugging!
-##        logger.debug('(%s) RX packet from %s -- %s', self._system, _sockaddr, ahex(_packet))
-        if _packet[:4] == DMRD or _packet[:4] == EOBP:
-            if _packet[:4] == EOBP:
-                _d_pkt = decrypt_packet(self._config['ENCRYPTION_KEY'], _packet[4:])
-                _packet = _d_pkt
+        #logger.debug('(%s) RX packet from %s -- %s', self._system, _sockaddr, ahex(_packet))
 
-            # DMRData -- encapsulated DMR data frame
-            if _packet[:4] == DMRD:
-                _data = _packet[:53]
-                _hash = _packet[53:]
-                _ckhs = hmac_new(self._config['PASSPHRASE'],_data,sha1).digest()
+        if _packet[:4] == DMRD:    # DMRData -- encapsulated DMR data frame
+            _data = _packet[:53]
+            _hash = _packet[53:]
+            _ckhs = hmac_new(self._config['PASSPHRASE'],_data,sha1).digest()
 
-##                print(compare_digest(_hash, _ckhs))
-##                print(_sockaddr == self._config['TARGET_SOCK'])
-##                print(ahex(_ckhs))
-##                print(ahex(_hash))
+            if compare_digest(_hash, _ckhs) and _sockaddr == self._config['TARGET_SOCK']:
+                _peer_id = _data[11:15]
+                _seq = _data[4]
+                _rf_src = _data[5:8]
+                _dst_id = _data[8:11]
+                _bits = _data[15]
+                _slot = 2 if (_bits & 0x80) else 1
+                #_call_type = 'unit' if (_bits & 0x40) else 'group'
+                if _bits & 0x40:
+                    _call_type = 'unit'
+                elif (_bits & 0x23) == 0x23:
+                    _call_type = 'vcsbk'
+                else:
+                    _call_type = 'group'
+                _frame_type = (_bits & 0x30) >> 4
+                _dtype_vseq = (_bits & 0xF) # data, 1=voice header, 2=voice terminator; voice, 0=burst A ... 5=burst F
+                _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))
 
-                if compare_digest(_hash, _ckhs) and _sockaddr == self._config['TARGET_SOCK']:
-                    _peer_id = _data[11:15]
-                    _seq = _data[4]
-                    _rf_src = _data[5:8]
-                    _dst_id = _data[8:11]
-                    _bits = _data[15]
-                    _slot = 2 if (_bits & 0x80) else 1
-                    #_call_type = 'unit' if (_bits & 0x40) else 'group'
-                    if _bits & 0x40:
-                        _call_type = 'unit'
-                    elif (_bits & 0x23) == 0x23:
-                        _call_type = 'vcsbk'
-                    else:
-                        _call_type = 'group'
-                    _frame_type = (_bits & 0x30) >> 4
-                    _dtype_vseq = (_bits & 0xF) # data, 1=voice header, 2=voice terminator; voice, 0=burst A ... 5=burst F
-                    _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 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
 
-                    # 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))
+                # ACL Processing
+                if self._CONFIG['GLOBAL']['USE_ACL']:
+                    if not acl_check(_rf_src, self._CONFIG['GLOBAL']['SUB_ACL']):
+                        if _stream_id not in self._laststrid:
+                            logger.info('(%s) CALL DROPPED WITH STREAM ID %s FROM SUBSCRIBER %s BY GLOBAL ACL', self._system, int_id(_stream_id), int_id(_rf_src))
+                            self._laststrid.append(_stream_id)
+                        return
+                    if _slot == 1 and not acl_check(_dst_id, self._CONFIG['GLOBAL']['TG1_ACL']):
+                        if _stream_id not in self._laststrid:
+                            logger.info('(%s) CALL DROPPED WITH STREAM ID %s ON TGID %s BY GLOBAL TS1 ACL', self._system, int_id(_stream_id), int_id(_dst_id))
+                            self._laststrid.append(_stream_id)
+                        return
+                if self._config['USE_ACL']:
+                    if not acl_check(_rf_src, self._config['SUB_ACL']):
+                        if _stream_id not in self._laststrid:
+                            logger.info('(%s) CALL DROPPED WITH STREAM ID %s FROM SUBSCRIBER %s BY SYSTEM ACL', self._system, int_id(_stream_id), int_id(_rf_src))
+                            self._laststrid.append(_stream_id)
+                        return
+                    if not acl_check(_dst_id, self._config['TG1_ACL']):
+                        if _stream_id not in self._laststrid:
+                            logger.info('(%s) CALL DROPPED WITH STREAM ID %s ON TGID %s BY SYSTEM ACL', self._system, int_id(_stream_id), int_id(_dst_id))
+                            self._laststrid.append(_stream_id)
                         return
 
-                    # ACL Processing
-                    if self._CONFIG['GLOBAL']['USE_ACL']:
-                        if not acl_check(_rf_src, self._CONFIG['GLOBAL']['SUB_ACL']):
-                            if _stream_id not in self._laststrid:
-                                logger.info('(%s) CALL DROPPED WITH STREAM ID %s FROM SUBSCRIBER %s BY GLOBAL ACL', self._system, int_id(_stream_id), int_id(_rf_src))
-                                self._laststrid.append(_stream_id)
-                            return
-                        if _slot == 1 and not acl_check(_dst_id, self._CONFIG['GLOBAL']['TG1_ACL']):
-                            if _stream_id not in self._laststrid:
-                                logger.info('(%s) CALL DROPPED WITH STREAM ID %s ON TGID %s BY GLOBAL TS1 ACL', self._system, int_id(_stream_id), int_id(_dst_id))
-                                self._laststrid.append(_stream_id)
-                            return
-                    if self._config['USE_ACL']:
-                        if not acl_check(_rf_src, self._config['SUB_ACL']):
-                            if _stream_id not in self._laststrid:
-                                logger.info('(%s) CALL DROPPED WITH STREAM ID %s FROM SUBSCRIBER %s BY SYSTEM ACL', self._system, int_id(_stream_id), int_id(_rf_src))
-                                self._laststrid.append(_stream_id)
-                            return
-                        if not acl_check(_dst_id, self._config['TG1_ACL']):
-                            if _stream_id not in self._laststrid:
-                                logger.info('(%s) CALL DROPPED WITH STREAM ID %s ON TGID %s BY SYSTEM ACL', self._system, int_id(_stream_id), int_id(_dst_id))
-                                self._laststrid.append(_stream_id)
-                            return
+                # Userland actions -- typically this is the function you subclass for an application
+                self.dmrd_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data)
+            else:
+                logger.info('(%s) OpenBridge HMAC failed, packet discarded - OPCODE: %s DATA: %s HMAC LENGTH: %s HMAC: %s', self._system, _packet[:4], repr(_packet[:53]), len(_packet[53:]), repr(_packet[53:])) 
 
-                    # Userland actions -- typically this is the function you subclass for an application
-                    self.dmrd_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data)
-                else:
-                    if not compare_digest(_hash, _ckhs):
-                        logger.info('(%s) OpenBridge HMAC failed, packet discarded - OPCODE: %s DATA: %s HMAC LENGTH: %s HMAC: %s', self._system, _packet[:4], repr(_packet[:53]), len(_packet[53:]), repr(_packet[53:]))
 
-                    if not _sockaddr == self._config['TARGET_SOCK']:
-                         logger.info('(%s) OpenBridge socket mismatch, packet discarded - OPCODE: %s DATA: %s ', self._system, _packet[:4], repr(_packet[:53]))
-
-            
-        # Server Data packet, decrypt and process it.
-        elif _packet[:4] == SVRD:
-            _d_pkt = decrypt_packet(self._config['ENCRYPTION_KEY'], _packet[4:])
-##            logger.info('SVRD Received: ' + str(_d_pkt))
-            # DMR Data packet, sent via SVRD
-##            if _d_pkt[4:8] == b'DATA':
-##                print('----------------------')
-##                _data = _d_pkt[4:]
-##                _peer_id = _data[11:15]
-##                _seq = _data[4]
-##                _rf_src = _data[5:8]
-##                _dst_id = _data[8:11]
-##                _bits = _data[15]
-##                _slot = 2 if (_bits & 0x80) else 1
-##                #_call_type = 'unit' if (_bits & 0x40) else 'group'
-##                if _bits & 0x40:
-##                    _call_type = 'unit'
-##                elif (_bits & 0x23) == 0x23:
-##                    _call_type = 'vcsbk'
-##                else:
-##                    _call_type = 'group'
-##                _frame_type = (_bits & 0x30) >> 4
-##                _dtype_vseq = (_bits & 0xF) # data, 1=voice header, 2=voice terminator; voice, 0=burst A ... 5=burst F
-##                _stream_id = _data[16:20]
-##                print(_stream_id)
-##
-##                print(_call_type)
-##                self.dmrd_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data)
-##            else:
-               
-            self.svrd_received(_d_pkt[4:8], _d_pkt[8:]) 
-                
 #************************************************
 #     HB MASTER CLASS
 #************************************************
@@ -334,122 +229,6 @@ class HBSYSTEM(DatagramProtocol):
             self.maintenance_loop = self.peer_maintenance_loop
             self.datagramReceived = self.peer_datagramReceived
             self.dereg = self.peer_dereg
-            
-    def check_user_man(self, _id, server_name, peer_ip, _system):
-        #Change this to a config value
-        user_man_url = self._CONFIG['WEB_SERVICE']['URL']
-        shared_secret = str(sha256(self._CONFIG['WEB_SERVICE']['SHARED_SECRET'].encode()).hexdigest())
-##        print(int(str(int_id(_id))[:7]))
-        auth_check = {
-        'secret':shared_secret,
-        'login_id':int(str(int_id(_id))[:7]),
-        'login_ip': peer_ip,
-        'login_server': server_name,
-        'system': _system
-        }
-        json_object = json.dumps(auth_check, indent = 4)
-        try:
-            req = requests.post(user_man_url, data=json_object, headers={'Content-Type': 'application/json'})
-            resp = json.loads(req.text)
-            print(resp)
-            return resp
-        except requests.ConnectionError:
-            return {'allow':True}
-        
-# Sends login confirmation for log
-    def send_login_conf(self, _id, server_name, peer_ip, old_auth):
-        #Change this to a config value
-        user_man_url = self._CONFIG['WEB_SERVICE']['URL']
-        shared_secret = str(sha256(self._CONFIG['WEB_SERVICE']['SHARED_SECRET'].encode()).hexdigest())
-        #print(int(str(int_id(_id))[:7]))
-        auth_conf = {
-        'secret':shared_secret,
-        'login_id':int(str(int_id(_id))[:7]),
-        'login_ip': peer_ip,
-        'login_server': server_name,
-        'login_confirmed': True,
-        'old_auth': old_auth
-        }
-##        print(auth_conf)
-        json_object = json.dumps(auth_conf, indent = 4)
-        try:
-            req = requests.post(user_man_url, data=json_object, headers={'Content-Type': 'application/json'})
-        #    resp = json.loads(req.text)
-        #return resp
-        except Exception as e:
-            logger.info(e)
-# Sends PEER info for map and other stuff            
-    def send_peer_loc(self, _id, call, lat, lon, url, description, loc, soft):
-        #Change this to a config value
-        user_man_url = self._CONFIG['WEB_SERVICE']['URL']
-        shared_secret = str(sha256(self._CONFIG['WEB_SERVICE']['SHARED_SECRET'].encode()).hexdigest())
-        peer_loc_conf = {
-        'secret':shared_secret,
-        'loc_callsign':re.sub("b'|'|\s\s+", '', str(call)),
-        'dmr_id' : int(str(int_id(_id))),
-        'lat': re.sub("b'|'|\s\s\s+", '', str(lat)),
-        'lon': re.sub("b'|'|\s\s\s+", '', str(lon)),
-        'url': re.sub("b'|'|\s\s\s+", '', str(url)),
-        'description': re.sub("b'|'|\s\s+", '', str(description)),
-        'loc' : re.sub("b'|'|\s\s+", '', str(loc)),
-        'software': re.sub("b'|'|\s\s+", '', str(soft))
-        }
-        json_object = json.dumps(peer_loc_conf, indent = 4)
-        print(json_object)
-        try:
-            req = requests.post(user_man_url, data=json_object, headers={'Content-Type': 'application/json'})
-        #    resp = json.loads(req.text)
-        #return resp
-        except Exception as e:
-            logger.info(e)
-
-    def calc_passphrase(self, peer_id, _salt_str):
-        burn_id = ast.literal_eval(os.popen('cat ' + self._CONFIG['WEB_SERVICE']['BURN_FILE']).read())
-        peer_id_trimmed = int(str(int_id(peer_id))[:7])
-        try:
-##            print(self.ums_response)
-            if self.ums_response['mode'] == 'legacy':
-                _calc_hash = bhex(sha256(_salt_str+self._config['PASSPHRASE']).hexdigest())
-                calc_passphrase = self._config['PASSPHRASE']
-            if self.ums_response['mode'] == 'override':
-                _calc_hash = bhex(sha256(_salt_str+str.encode(self.ums_response['value'])).hexdigest())
-            if self.ums_response['mode'] == 'normal':
-                _new_peer_id = bytes_4(int(str(int_id(peer_id))[:7]))
-                peer_id_trimmed = str(peer_id_trimmed)
-                try:
-                    if burn_id[peer_id_trimmed]:
-                        logger.info('User ID has been burned. Requiring passphrase version: ' + str(burn_id[peer_id_trimmed]))
-                        calc_passphrase = sha256(str(self._CONFIG['WEB_SERVICE']['EXTRA_1']).encode() + str(self._CONFIG['WEB_SERVICE']['EXTRA_INT_1']).encode() + str(_new_peer_id).encode()[-3:]).hexdigest().upper().encode()[::14] + base64.b64encode(bytes.fromhex(str(hex(libscrc.ccitt((_new_peer_id) + burn_id[peer_id_trimmed].to_bytes(2, 'big') + self._CONFIG['WEB_SERVICE']['BURN_INT'].to_bytes(2, 'big') + self._CONFIG['WEB_SERVICE']['APPEND_INT'].to_bytes(2, 'big') + bytes.fromhex(str(hex(libscrc.posix((_new_peer_id) + burn_id[peer_id_trimmed].to_bytes(2, 'big') + self._CONFIG['WEB_SERVICE']['BURN_INT'].to_bytes(2, 'big') + self._CONFIG['WEB_SERVICE']['APPEND_INT'].to_bytes(2, 'big'))))[2:].zfill(8)))))[2:].zfill(4)) + (_new_peer_id) + burn_id[peer_id_trimmed].to_bytes(2, 'big') + self._CONFIG['WEB_SERVICE']['BURN_INT'].to_bytes(2, 'big') + self._CONFIG['WEB_SERVICE']['APPEND_INT'].to_bytes(2, 'big') + bytes.fromhex(str(hex(libscrc.posix((_new_peer_id) + burn_id[peer_id_trimmed].to_bytes(2, 'big') + self._CONFIG['WEB_SERVICE']['BURN_INT'].to_bytes(2, 'big') + self._CONFIG['WEB_SERVICE']['APPEND_INT'].to_bytes(2, 'big'))))[2:].zfill(8)))+ sha256(str(self._CONFIG['WEB_SERVICE']['EXTRA_2']).encode() + str(self._CONFIG['WEB_SERVICE']['EXTRA_INT_2']).encode() + str(_new_peer_id).encode()[-3:]).hexdigest().upper().encode()[::14]
-                except:
-                    # + base64.b64encode(str.encode(str(_new_peer_id) + self._CONFIG['WEB_SERVICE']['EXTRA_3'] + str(self._CONFIG['WEB_SERVICE']['EXTRA_INT_1'] - self._CONFIG['WEB_SERVICE']['APPEND_INT'])  + str(_new_peer_id) + self._CONFIG['WEB_SERVICE']['EXTRA_2']))
-                    calc_passphrase = sha256(str(self._CONFIG['WEB_SERVICE']['EXTRA_1']).encode() + str(self._CONFIG['WEB_SERVICE']['EXTRA_INT_1']).encode() + str(_new_peer_id).encode()[-3:]).hexdigest().upper().encode()[::14] + base64.b64encode(bytes.fromhex(str(hex(libscrc.ccitt((_new_peer_id) + self._CONFIG['WEB_SERVICE']['APPEND_INT'].to_bytes(2, 'big') + bytes.fromhex(str(hex(libscrc.posix((_new_peer_id) + self._CONFIG['WEB_SERVICE']['APPEND_INT'].to_bytes(2, 'big'))))[2:].zfill(8)))))[2:].zfill(4)) + (_new_peer_id) + self._CONFIG['WEB_SERVICE']['APPEND_INT'].to_bytes(2, 'big') + bytes.fromhex(str(hex(libscrc.posix((_new_peer_id) + self._CONFIG['WEB_SERVICE']['APPEND_INT'].to_bytes(2, 'big'))))[2:].zfill(8))) + sha256(str(self._CONFIG['WEB_SERVICE']['EXTRA_2']).encode() + str(self._CONFIG['WEB_SERVICE']['EXTRA_INT_2']).encode() + str(_new_peer_id).encode()[-3:]).hexdigest().upper().encode()[::14]
-##                    print(base64.b64encode(calc_passphrase))
-                if self._CONFIG['WEB_SERVICE']['SHORTEN_PASSPHRASE'] == True:
-##                    print(calc_passphrase)
-                    calc_passphrase = calc_passphrase[::int(self._CONFIG['WEB_SERVICE']['SHORTEN_SAMPLE'])][-int(self._CONFIG['WEB_SERVICE']['SHORTEN_LENGTH']):]
-                if self._CONFIG['WEB_SERVICE']['SHORTEN_PASSPHRASE'] == False:
-                    pass
-                _calc_hash = bhex(sha256(_salt_str+calc_passphrase).hexdigest())
-        #If exception, assume UMS down and default to calculated passphrase
-        except Exception as e:
-            logger.info('Execption, Web Service possibly down')
-            _new_peer_id = bytes_4(int(str(int_id(peer_id))[:7]))
-            if peer_id_trimmed in burn_id:
-                logger.info('User ID has been burned. Requiring passphrase version: ' + str(burn_id[peer_id_trimmed]))
-                calc_passphrase = sha256(str(self._CONFIG['WEB_SERVICE']['EXTRA_1']).encode() + str(self._CONFIG['WEB_SERVICE']['EXTRA_INT_1']).encode() + str(_new_peer_id).encode()[-3:]).hexdigest().upper().encode()[::14] + base64.b64encode(bytes.fromhex(str(hex(libscrc.ccitt((_new_peer_id) + burn_id[peer_id_trimmed].to_bytes(2, 'big') + self._CONFIG['WEB_SERVICE']['BURN_INT'].to_bytes(2, 'big') + self._CONFIG['WEB_SERVICE']['APPEND_INT'].to_bytes(2, 'big') + bytes.fromhex(str(hex(libscrc.posix((_new_peer_id) + burn_id[peer_id_trimmed].to_bytes(2, 'big') + self._CONFIG['WEB_SERVICE']['BURN_INT'].to_bytes(2, 'big') + self._CONFIG['WEB_SERVICE']['APPEND_INT'].to_bytes(2, 'big'))))[2:].zfill(8)))))[2:].zfill(4)) + (_new_peer_id) + burn_id[peer_id_trimmed].to_bytes(2, 'big') + self._CONFIG['WEB_SERVICE']['BURN_INT'].to_bytes(2, 'big') + self._CONFIG['WEB_SERVICE']['APPEND_INT'].to_bytes(2, 'big') + bytes.fromhex(str(hex(libscrc.posix((_new_peer_id) + burn_id[peer_id_trimmed].to_bytes(2, 'big') + self._CONFIG['WEB_SERVICE']['BURN_INT'].to_bytes(2, 'big') + self._CONFIG['WEB_SERVICE']['APPEND_INT'].to_bytes(2, 'big'))))[2:].zfill(8))) + sha256(str(self._CONFIG['WEB_SERVICE']['EXTRA_2']).encode() + str(self._CONFIG['WEB_SERVICE']['EXTRA_INT_2']).encode() + str(_new_peer_id).encode()[-3:]).hexdigest().upper().encode()[::14]
-            else:
-                calc_passphrase = sha256(str(self._CONFIG['WEB_SERVICE']['EXTRA_1']).encode() + str(self._CONFIG['WEB_SERVICE']['EXTRA_INT_1']).encode() + str(_new_peer_id).encode()[-3:]).hexdigest().upper().encode()[::14] + base64.b64encode(bytes.fromhex(str(hex(libscrc.ccitt((_new_peer_id) + self._CONFIG['WEB_SERVICE']['APPEND_INT'].to_bytes(2, 'big') + bytes.fromhex(str(hex(libscrc.posix((_new_peer_id) + self._CONFIG['WEB_SERVICE']['APPEND_INT'].to_bytes(2, 'big'))))[2:].zfill(8)))))[2:].zfill(4)) + (_new_peer_id) + self._CONFIG['WEB_SERVICE']['APPEND_INT'].to_bytes(2, 'big') + bytes.fromhex(str(hex(libscrc.posix((_new_peer_id) + self._CONFIG['WEB_SERVICE']['APPEND_INT'].to_bytes(2, 'big'))))[2:].zfill(8))) + sha256(str(self._CONFIG['WEB_SERVICE']['EXTRA_2']).encode() + str(self._CONFIG['WEB_SERVICE']['EXTRA_INT_2']).encode() + str(_new_peer_id).encode()[-3:]).hexdigest().upper().encode()[::14]
-
-            #calc_passphrase = base64.b64encode(bytes.fromhex(str(hex(libscrc.ccitt((_new_peer_id) + self._CONFIG['WEB_SERVICE']['APPEND_INT'].to_bytes(2, 'big') + bytes.fromhex(str(hex(libscrc.posix((_new_peer_id) + self._CONFIG['WEB_SERVICE']['APPEND_INT'].to_bytes(2, 'big'))))[2:].zfill(8)))))[2:].zfill(4)) + (_new_peer_id) + self._CONFIG['WEB_SERVICE']['APPEND_INT'].to_bytes(2, 'big') + bytes.fromhex(str(hex(libscrc.posix((_new_peer_id) + self._CONFIG['WEB_SERVICE']['APPEND_INT'].to_bytes(2, 'big'))))[2:].zfill(8)))
-            if self._CONFIG['WEB_SERVICE']['SHORTEN_PASSPHRASE'] == True:
-                calc_passphrase = calc_passphrase[::int(self._CONFIG['WEB_SERVICE']['SHORTEN_SAMPLE'])][-int(self._CONFIG['WEB_SERVICE']['SHORTEN_LENGTH']):]
-            if self._CONFIG['WEB_SERVICE']['SHORTEN_PASSPHRASE'] == False:
-                pass
-            _calc_hash = bhex(sha256(_salt_str+calc_passphrase).hexdigest())
-##        print(calc_passphrase)
-        #    print(_calc_hash)
-        return _calc_hash
-
 
     def startProtocol(self):
         # Set up periodic loop for tracking pings from peers. Run every 'PING_TIME' seconds
@@ -536,9 +315,6 @@ class HBSYSTEM(DatagramProtocol):
     def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data):
         pass
 
-    def mmdvm_cmd(self, _cmd):
-        pass
-
     def master_dereg(self):
         for _peer in self._peers:
             self.send_peer(_peer, MSTCL + _peer)
@@ -555,7 +331,6 @@ class HBSYSTEM(DatagramProtocol):
 
         # Extract the command, which is various length, all but one 4 significant characters -- RPTCL
         _command = _data[:4]
-##        print(self._config)
 
         if _command == DMRD:    # DMRData -- encapsulated DMR data frame
             _peer_id = _data[11:15]
@@ -627,39 +402,11 @@ class HBSYSTEM(DatagramProtocol):
 
         elif _command == RPTL:    # RPTLogin -- a repeater wants to login
             _peer_id = _data[4:8]
-            print()
-            print((self._config['REG_ACL']))
-            print()
             # Check to see if we've reached the maximum number of allowed peers
             if len(self._peers) < self._config['MAX_PEERS']:
                 # Check for valid Radio ID
-                #print(self.check_user_man(_peer_id))
-                if self._config['USE_USER_MAN'] == True:
-                    self.ums_response = self.check_user_man(_peer_id, self._CONFIG['WEB_SERVICE']['THIS_SERVER_NAME'], _sockaddr[0], self._system)
-##                    print(self.ums_response)
-                    #Will allow anyone to attempt authentication, used for a transition period
-##                    if acl_check(_peer_id, self._CONFIG['GLOBAL']['REG_ACL']) and self.ums_response['allow'] or acl_check(_peer_id, self._CONFIG['GLOBAL']['REG_ACL']) and acl_check(_peer_id, self._config['REG_ACL']):
-                    if acl_check(_peer_id, self._CONFIG['GLOBAL']['REG_ACL']) and self.ums_response['allow']:
-                        user_auth = self.ums_response['allow']
-                    else:
-                        user_auth = False
-                elif self._config['USE_USER_MAN'] == False:
-                    print('False')
-                    b_acl = self._config['REG_ACL']
-                    if self._CONFIG['WEB_SERVICE']['REMOTE_CONFIG_ENABLED'] == True:
-                        # If UMS is False, and Rmote Confir True
-                        if acl_check(_peer_id, self._CONFIG['GLOBAL']['REG_ACL']) and acl_check(_peer_id, self._config['REG_ACL']):
-                            user_auth = True
-                            print(self._CONFIG['GLOBAL']['REG_ACL'])
-                        else:
-                            user_auth = False
-                    #If UMS and Remot Config False        
-                    elif self._CONFIG['WEB_SERVICE']['REMOTE_CONFIG_ENABLED'] == False:
-                        user_auth = False
-                        if acl_check(_peer_id, self._CONFIG['GLOBAL']['REG_ACL']) and acl_check(_peer_id, b_acl):#acl_check(_peer_id, b_acl):
-                            user_auth = True
-                if user_auth == True:
-                # Build the configuration data strcuture for the peer
+                if acl_check(_peer_id, self._CONFIG['GLOBAL']['REG_ACL']) and acl_check(_peer_id, self._config['REG_ACL']):
+                    # Build the configuration data strcuture for the peer
                     self._peers.update({_peer_id: {
                         'CONNECTION': 'RPTL-RECEIVED',
                         'CONNECTED': time(),
@@ -690,7 +437,6 @@ class HBSYSTEM(DatagramProtocol):
                     self.send_peer(_peer_id, b''.join([RPTACK, _salt_str]))
                     self._peers[_peer_id]['CONNECTION'] = 'CHALLENGE_SENT'
                     logger.info('(%s) Sent Challenge Response to %s for login: %s', self._system, int_id(_peer_id), self._peers[_peer_id]['SALT'])
-##                    print(self._peers)
                 else:
                     self.transport.write(b''.join([MSTNAK, _peer_id]), _sockaddr)
                     logger.warning('(%s) Invalid Login from %s Radio ID: %s Denied by Registation ACL', self._system, _sockaddr[0], int_id(_peer_id))
@@ -707,27 +453,11 @@ class HBSYSTEM(DatagramProtocol):
                 _this_peer['LAST_PING'] = time()
                 _sent_hash = _data[8:]
                 _salt_str = bytes_4(_this_peer['SALT'])
-                # Used to allow config passphrase AND calculated.
-                _ocalc_hash = bhex(sha256(_salt_str+self._config['PASSPHRASE']).hexdigest())
-                
-                #print(self.ums_response)
-                if self._config['USE_USER_MAN'] == True:
-                   # print(self.calc_passphrase(_peer_id, _salt_str))
-                    _calc_hash = self.calc_passphrase(_peer_id, _salt_str)
-                if self._config['USE_USER_MAN'] == False:
-                    _calc_hash = bhex(sha256(_salt_str+self._config['PASSPHRASE']).hexdigest())
-                # Uncomment below to only accept calculated passphrase
+                _calc_hash = bhex(sha256(_salt_str+self._config['PASSPHRASE']).hexdigest())
                 if _sent_hash == _calc_hash:
-                # Condition below accepts either calculated passphrase or config passphrase
-##                if _sent_hash == _calc_hash or _sent_hash == _ocalc_hash:
                     _this_peer['CONNECTION'] = 'WAITING_CONFIG'
                     self.send_peer(_peer_id, b''.join([RPTACK, _peer_id]))
                     logger.info('(%s) Peer %s has completed the login exchange successfully', self._system, _this_peer['RADIO_ID'])
-                    self.send_login_conf(_peer_id, self._CONFIG['WEB_SERVICE']['THIS_SERVER_NAME'], _sockaddr[0], False)
-##                    if _sent_hash == _ocalc_hash:
-##                        self.send_login_conf(_peer_id, self._CONFIG['WEB_SERVICE']['THIS_SERVER_NAME'], _sockaddr[0], True)
-##                    else:
-##                        self.send_login_conf(_peer_id, self._CONFIG['WEB_SERVICE']['THIS_SERVER_NAME'], _sockaddr[0], False)
                 else:
                     logger.info('(%s) Peer %s has FAILED the login exchange successfully', self._system, _this_peer['RADIO_ID'])
                     self.transport.write(b''.join([MSTNAK, _peer_id]), _sockaddr)
@@ -744,7 +474,6 @@ class HBSYSTEM(DatagramProtocol):
                             and self._peers[_peer_id]['SOCKADDR'] == _sockaddr:
                     logger.info('(%s) Peer is closing down: %s (%s)', self._system, self._peers[_peer_id]['CALLSIGN'], int_id(_peer_id))
                     self.transport.write(b''.join([MSTNAK, _peer_id]), _sockaddr)
-                    self.send_peer_loc(_peer_id, self._peers[_peer_id]['CALLSIGN'], '*', '*', '*', '*', '*', '*')
                     del self._peers[_peer_id]
 
             else:
@@ -773,12 +502,6 @@ class HBSYSTEM(DatagramProtocol):
 
                     self.send_peer(_peer_id, b''.join([RPTACK, _peer_id]))
                     logger.info('(%s) Peer %s (%s) has sent repeater configuration', self._system, _this_peer['CALLSIGN'], _this_peer['RADIO_ID'])
-                    if 'NO_MAP' in str(_this_peer['LOCATION']):
-                        self.send_peer_loc(_peer_id, self._peers[_peer_id]['CALLSIGN'], '*', '*', '*', '*', '*', '*')
-##                        print(_this_peer['LOCATION'])
-##                        pass
-                    else:
-                        self.send_peer_loc(_peer_id, _this_peer['CALLSIGN'], _this_peer['LATITUDE'], _this_peer['LONGITUDE'], _this_peer['URL'], _this_peer['DESCRIPTION'], _this_peer['LOCATION'], str(_this_peer['PACKAGE_ID']) + ' - ' + str(_this_peer['SOFTWARE_ID']))
                 else:
                     self.transport.write(b''.join([MSTNAK, _peer_id]), _sockaddr)
                     logger.warning('(%s) Peer info from Radio ID that has not logged in: %s', self._system, int_id(_peer_id))
@@ -802,10 +525,6 @@ class HBSYSTEM(DatagramProtocol):
                         and self._peers[_peer_id]['CONNECTION'] == 'YES' \
                         and self._peers[_peer_id]['SOCKADDR'] == _sockaddr:
                 logger.info('(%s) Peer %s (%s) has send options: %s', self._system, self._peers[_peer_id]['CALLSIGN'], int_id(_peer_id), _data[8:])
-                # Send remove from map command
-##                self.mmdvm_cmd(_data)
-                if 'NO_MAP' in str(_data[8:]):
-                    self.send_peer_loc(_peer_id, self._peers[_peer_id]['CALLSIGN'], '*', '*', '*', '*', '*', '*')
                 self.transport.write(b''.join([RPTACK, _peer_id]), _sockaddr)
 
         elif _command == DMRA:
@@ -1099,7 +818,6 @@ if __name__ == '__main__':
 
     peer_ids, subscriber_ids, talkgroup_ids = mk_aliases(CONFIG)
 
-
     # INITIALIZE THE REPORTING LOOP
     if CONFIG['REPORTS']['REPORT']:
         report_server = config_reports(CONFIG, reportFactory)
@@ -1118,8 +836,4 @@ if __name__ == '__main__':
             reactor.listenUDP(CONFIG['SYSTEMS'][system]['PORT'], systems[system], interface=CONFIG['SYSTEMS'][system]['IP'])
             logger.debug('(GLOBAL) %s instance created: %s, %s', CONFIG['SYSTEMS'][system]['MODE'], system, systems[system])
 
-    # Download burn list
-    with open(CONFIG['WEB_SERVICE']['BURN_FILE'], 'w') as f:
-        f.write(str(download_burnlist(CONFIG)))
-
     reactor.run()

hotspot_proxy_v2.py

@@ -1,214 +0,0 @@
-from twisted.internet.protocol import DatagramProtocol
-from twisted.internet import reactor, task
-from time import time
-from resettabletimer import ResettableTimer
-from dmr_utils3.utils import int_id
-import random
-
-# Does anybody read this stuff? There's a PEP somewhere that says I should do this.
-__author__     = 'Simon Adlem - G7RZU'
-__copyright__  = 'Copyright (c) Simon Adlem, G7RZU 2020,2021'
-__credits__    = 'Jon Lee, G4TSN; Norman Williams, M6NBP'
-__license__    = 'GNU GPLv3'
-__maintainer__ = 'Simon Adlem G7RZU'
-__email__      = 'simon@gb7fr.org.uk'
-
-class Proxy(DatagramProtocol):
-
-    def __init__(self,Master,ListenPort,connTrack,blackList,Timeout,Debug,DestportStart,DestPortEnd):
-        self.master = Master
-        self.connTrack = connTrack
-        self.peerTrack = {}
-        self.timeout = Timeout
-        self.debug = Debug
-        self.blackList = blackList
-        self.destPortStart = DestportStart
-        self.destPortEnd = DestPortEnd
-        self.numPorts = DestPortEnd - DestportStart
-        
-        
-    def reaper(self,_peer_id):
-        if self.debug:
-            print("dead",_peer_id)
-        self.transport.write(b'RPTCL'+_peer_id, ('127.0.0.1',self.peerTrack[_peer_id]['dport']))
-        self.connTrack[self.peerTrack[_peer_id]['dport']] = False
-        del self.peerTrack[_peer_id]
-        
-
-    def datagramReceived(self, data, addr):
-        
-        # HomeBrew Protocol Commands
-        DMRD    = b'DMRD'
-        DMRA    = b'DMRA'
-        MSTCL   = b'MSTCL'
-        MSTNAK  = b'MSTNAK'
-        MSTPONG = b'MSTPONG'
-        MSTN    = b'MSTN'
-        MSTP    = b'MSTP'
-        MSTC    = b'MSTC'
-        RPTL    = b'RPTL'
-        RPTPING = b'RPTPING'
-        RPTCL   = b'RPTCL'
-        RPTL    = b'RPTL'
-        RPTACK  = b'RPTACK'
-        RPTK    = b'RPTK'
-        RPTC    = b'RPTC'
-        RPTP    = b'RPTP'
-        RPTA    = b'RPTA'
-        RPTO    = b'RPTO'
-        
-        host,port = addr
-        
-        nowtime = time()
-        
-        Debug = self.debug
-        
-        #If the packet comes from the master
-        if host == self.master:
-            _command = data[:4]
-            _lng_command = data[:6]
-####            print(_lng_command)
-
-            
-            if _command == DMRD:
-                _peer_id = data[11:15]
-##                print(self.peerTrack[_peer_id]['timer'])
-            elif  _command == RPTA:
-                    if data[6:10] in self.peerTrack:
-                        _peer_id = data[6:10]
-                    else:
-                        _peer_id = self.connTrack[port]
-            elif _lng_command == MSTNAK:
-                _peer_id = data[6:10]
-
-            elif _command == MSTN and MSTNAK not in _lng_command:
-                    _peer_id = data[6:10]
-
-                    self.peerTrack[_peer_id]['timer'].cancel()
-                    self.reaper(_peer_id)
-                    return
-            elif _command == MSTP:
-                    _peer_id = data[7:11]
-##                    print(self.peerTrack)
-            elif _command == MSTC:
-                    _peer_id = data[5:9]
-                    self.peerTrack[_peer_id]['timer'].cancel()
-                    self.reaper(_peer_id)
-                    return
-                
-          #  _peer_id = self.connTrack[port]
-            if self.debug:
-                print(data)
-            if _peer_id and _peer_id in self.peerTrack:
-                self.transport.write(data,(self.peerTrack[_peer_id]['shost'],self.peerTrack[_peer_id]['sport']))
-                #self.peerTrack[_peer_id]['timer'].reset()
-            return
-            
-                
-            
-        else:
-            _command = data[:4]
-            
-            if _command == DMRD:                # DMRData -- encapsulated DMR data frame
-                _peer_id = data[11:15]
-            elif _command == DMRA:              # DMRAlias -- Talker Alias information
-                _peer_id = _data[4:8]
-            elif _command == RPTL:              # RPTLogin -- a repeater wants to login
-                _peer_id = data[4:8]
-            elif _command == RPTK:              # Repeater has answered our login challenge
-                _peer_id = data[4:8]
-            elif _command == RPTC:              # Repeater is sending it's configuraiton OR disconnecting
-                if data[:5] == RPTCL:          # Disconnect command
-                    _peer_id = data[5:9]
-                else:
-                    _peer_id = data[4:8]       # Configure Command
-            elif _command == RPTO:              # options
-                _peer_id = data[4:8]
-            elif _command == RPTP:              # RPTPing -- peer is pinging us
-                _peer_id = data[7:11]
-            else:
-                return
-            
-            if _peer_id in self.peerTrack:
-                _dport = self.peerTrack[_peer_id]['dport']
-                self.peerTrack[_peer_id]['sport'] = port
-                self.peerTrack[_peer_id]['shost'] = host
-                self.transport.write(data, ('127.0.0.1',_dport))
-                self.peerTrack[_peer_id]['timer'].reset()
-                if self.debug:
-                    print(data)
-                    print(_dport)
-                return
-            else:
-                
-                if int_id(_peer_id) in self.blackList:
-                    return
-                #for _dport in self.connTrack:
-                while True:
-                    _dport = random.randint(1,(self.numPorts - 1))
-                    _dport = _dport + self.destPortStart
-                    if not self.connTrack[_dport]:
-                        break
-                self.connTrack[_dport] = _peer_id
-                self.peerTrack[_peer_id] = {}
-                self.peerTrack[_peer_id]['dport'] = _dport
-                self.peerTrack[_peer_id]['sport'] = port
-                self.peerTrack[_peer_id]['shost'] = host
-                self.peerTrack[_peer_id]['timer'] = ResettableTimer(self.timeout,self.reaper,[_peer_id])
-                self.peerTrack[_peer_id]['timer'].start()
-                self.transport.write(data, (self.master,_dport))
-                if self.debug:
-                    print(data)
-
-                return
-
-
-if __name__ == '__main__':
-
-#*** CONFIG HERE ***
-    
-    Master = "127.0.0.1"
-    ListenPort = 62031
-    DestportStart = 54100
-    DestPortEnd = 54102
-    Timeout = 30
-    Stats = True
-    Debug = True
-    BlackList = [1234567]
-    
-#*******************
-
-    
-    CONNTRACK = {}
-
-    for port in range(DestportStart,DestPortEnd+1,1):
-        CONNTRACK[port] = False
-    
-
-    reactor.listenUDP(ListenPort,Proxy(Master,ListenPort,CONNTRACK,BlackList,Timeout,Debug,DestportStart,DestPortEnd))
-
-    def loopingErrHandle(failure):
-        print('(GLOBAL) STOPPING REACTOR TO AVOID MEMORY LEAK: Unhandled error innowtimed loop.\n {}'.format(failure))
-        reactor.stop()
-        
-    def stats():        
-        count = 0
-        nowtime = time()
-        for port in CONNTRACK:
-            if CONNTRACK[port]:
-                count = count+1
-                
-        totalPorts = DestPortEnd - DestportStart
-        freePorts = totalPorts - count
-        
-        print("{} ports out of {} in use ({} free)".format(count,totalPorts,freePorts))
-
-
-        
-    if Stats == True:
-        stats_task = task.LoopingCall(stats)
-        statsa = stats_task.start(30)
-        statsa.addErrback(loopingErrHandle)
-
-    reactor.run()
-    

obp_generate_key.py

@@ -1,10 +0,0 @@
-# Script to generate a key for Encrypted OpenBridge
-
-from cryptography.fernet import Fernet
-import re
-
-def gen_key():
-    key = Fernet.generate_key()
-    return key
-
-print('Key: ' + str(gen_key())[2:-1])

requirements.txt

@@ -3,11 +3,3 @@ bitarray>=0.8.1
 Twisted>=16.3.0
 dmr_utils3>=0.1.19
 configparser>=3.0.0
-aprslib>=0.6.42
-pynmea2
-maidenhead
-requests
-libscrc
-resettabletimer
-cryptography
-

web/config-SAMPLE.py

@@ -1,91 +0,0 @@
-
-'''
-Settings for HBNet Web Server.
-'''
-# Database options
-# Using SQLite is simple and easiest. Comment out this line and uncomment the MySQL
-# line to use a MySQL/MariaDB server.
-db_location = 'sqlite:///hbnet.sqlite'
-
-# Uncomment and change this line to use a MySQL DB. It is best to start with a fresh
-# DB without data in it.
-
-#db_location = 'mysql+pymysql://DB_USERNAME:DB_PASSWORD@DB_HOST:MySQL_PORT/DB_NAME'
-
-
-# Title of the HBNet Web Service/DMR network
-title = 'HBNet Web Service'
-# Port to run server
-hws_port = 8080
-# IP to run server on
-hws_host = '127.0.0.1'
-# Publicly accessible URL of the web server. THIS IS REQUIRED AND MUST BE CORRECT.
-url = 'http://localhost:8080'
-# Replace below with some random string such as an SHA256
-secret_key = 'SUPER SECRET LONG KEY'
-
-# Default state for newly created user accounts. Setting to False will require
-# the approval of an admin user before the user can login.
-default_account_state = True
-
-# Legacy passphrase used in hblink.cfg
-legacy_passphrase = 'passw0rd'
-
-# Coordinates to center map over
-center_map = [45.372, -121.6972]
-# Default map zoom level
-map_zoom = 5
-
-# Passphrase calculation config. If REMOTE_CONFIG is not used in your DMR server config
-# (hblink.cfg), then the values in section [USER_MANAGER] MUST match the values below.
-# If REMOTE_CONFIG is enabled, the DMR server (hblink) will automatically use the values below.
-# These config options affect the generation of user passphrases.
-
-# Set to a value between 1 - 99. This value is used in the normal calculation.
-append_int = 1
-
-# Set to a value between 1 - 99. This value is used for compromised passphrases.
-burn_int = 5
-
-# Set to a value between 1 - 99 This value is used in the normal calculation.
-extra_int_1 = 5
-
-# Set to a value between 1 - 99 This value is used in the normal calculation.
-extra_int_2 = 8
-
-# Set to a length of about 10 characters.
-extra_1 = 'TeSt'
-extra_2 = 'DmR4'
-
-# Shorten generated passphrases
-use_short_passphrase = True
-
-# Character length of shortened passphrase
-shorten_length = 6
-# How often to pick character from long passphrase when shortening.
-shorten_sample = 4
-
-# Email settings
-MAIL_SERVER = 'smtp.gmail.com'
-MAIL_PORT = 465
-MAIL_USE_SSL = True
-MAIL_USE_TLS = False
-MAIL_USERNAME = 'app@gmail.com'
-MAIL_PASSWORD = 'password'
-MAIL_DEFAULT_SENDER = '"' + title + '" <app@gmail.com>'
-
-# User settings settings
-USER_ENABLE_EMAIL = True
-USER_ENABLE_USERNAME = True    
-USER_REQUIRE_RETYPE_PASSWORD = True 
-USER_ENABLE_CHANGE_USERNAME = False
-USER_ENABLE_MULTIPLE_EMAILS = True
-USER_ENABLE_CONFIRM_EMAIL = True
-USER_ENABLE_REGISTER = True
-USER_AUTO_LOGIN_AFTER_CONFIRM = False
-USER_SHOW_USERNAME_DOES_NOT_EXIST = True
-
-
-# Time format for display on some pages
-time_format = '%H:%M:%S - %m/%d/%y'
-

web/gen_script_template-SAMPLE.py

@@ -1,5 +0,0 @@
-def gen_script(dmr_id, passphrase):
-    script = '''
-DMR ID: ''' + str(dmr_id) + ''' \n Passphrase: ''' + str(passphrase) + '''
-'''
-    return script

web/gen_script_template.py

@@ -1,43 +0,0 @@
-# Function to generate a script for Pi-Star that adds MASTER instances and generated passphrases to DMR_Hosts.txt.
-
-def gen_script(dmr_id, svr_lst):
-    auth_contents = ''
-    header = '''
-## DMR_hosts.txt, generated by HBNet.
-
-########################################################################################################
-### Name				DMR-ID	IP/Hostname				Password	Port #
-########################################################################################################
-\n'''
-    for i in svr_lst:
-##        print(i[1])
-        auth_contents = auth_contents + str(i[0]) + '''\t\t\t\t''' + str(dmr_id) + '''\t''' + i[1] + '''\t\t\t\t''' + i[2] + '''\t\t''' + str(i[3]) + '\n'
-##        print(header)
-##        print(auth_contents)
-
-        
-##    return header + auth_contents
-
-    output = '''
-#!/usr/bin/python3
-
-import os
-from pathlib import Path
-
-os.chdir('/root')
-if Path('/root/DMR_Hosts.txt').is_file():
-     print('DMR_Hosts.txt exists, adding entries...')
-     with open('/root/DMR_Hosts.txt', 'a') as dmr_hosts:
-        dmr_hosts.write("""''' + auth_contents + '''""")
-        dmr_hosts.close()
-
-else:
-    Path('/root/DMR_Hosts.txt').touch()
-    print('DMR_Hosts.txt does not exist, creating...')
-    with open('/root/DMR_Hosts.txt', 'w') as dmr_hosts:
-        dmr_hosts.write("""''' + header + auth_contents + '""")' + '''
-        dmr_hosts.close()
-print('DMR Host file updates.')'''
-    print(output)
-    return output
-

web/requirements.txt

@@ -1,13 +0,0 @@
-configparser>=3.0.0
-flask
-flask_user
-flask_sqlalchemy
-email_validator
-flask_babelex
-pymysql
-folium
-requests
-libscrc
-dmr_utils3
-cryptography
-uwsgi

web/templates/all_mail.html

@@ -1,70 +0,0 @@
-{% extends 'flask_user/_public_base.html' %}
-{% block content %}
-
-  <h1 style="text-align: center;">Manage Mail</h1>
-
-  Use <strong>*all</strong> to send an internal message to all users. To send a message to multiple users, use a comma (<strong>,</strong>) to separate usernames.
-
-
-
-<div id="compose" class="collapse">
-
-<div class="card">
-  <div class="card-header">Send internal message to another user</div>
-  <div class="card-body">
-  
-  <form action="{{ current_user.username or current_user.email }}?send_mail=true" method="post">
-
-<div class="input-group mb-3">
-  <span class="input-group-text" id="basic-addon1">Username</span>
-  <input type="text" id="username" name="username" class="form-control" aria-label="Username" aria-describedby="basic-addon1">
-</div>
-
-<div class="input-group">
-  <span class="input-group-text">Message</span>
-  <textarea id="message" name="message" class="form-control" aria-label="Message"></textarea>
-</div>
-
-<br />  
-  <p style="text-align: center;"><input class="btn btn-primary" type="submit" value="Send" /></form></p>
-
-  </div>
-</div>
-
-</div> 
-
-{% if show_mail %}
-<div class="row">
-  <div class="col-lg-12">
-<p style="text-align: right;"><button data-bs-toggle="collapse" data-bs-target="#compose" class="btn btn-primary">Compose</button></p>
-
-  <table data-toggle="table" data-pagination="true" data-search="true" >
-  <thead>
-    <tr>
-      <th>From</th>
-      <th>Message</th>
-      <th>Time</th>
-      <th>Options</th>
-    </tr>
-  </thead>
-  <tbody>
-
-  {{markup_content}}
-
-  </tbody></table>
-
-
-  </div>
-</div>
-{% endif %}
-
-{% if not show_mail %}
-  {{markup_content}}
-
-{% endif %}
-
-
-
-
-<p>&nbsp;</p>
-{% endblock %}

web/templates/aprs_page.html

@@ -1,25 +0,0 @@
-{% extends 'flask_user/_public_base.html' %}
-{% block content %}
-
-<p>&nbsp;</p>
-  <h1 style="text-align: center;">Last Known Location</h1>
-
-<div class="row container-fluid" >
-  <div class="col-sm-12">
-<table data-toggle="table" data-pagination="true" data-search="true" >
-  <thead>
-    <tr>
-      <th>Callsign</th>
-      <th>Latitude</th>
-      <th>Longitude</th>
-      <th>Time</th>
-    </tr>
-  </thead>
-  <tbody>
-  {{markup_content}}
-
-    </tbody>
-</table>
-
-<p>&nbsp;</p>
-{% endblock %}

web/templates/bb.html

@@ -1,31 +0,0 @@
-{% extends 'flask_user/_public_base.html' %}
-{% block content %}
-
-  <h1 style="text-align: center;">Bulletin Board</h1>
-  <p style="text-align: center;"><a href="bulletin_rss.xml"><em>RSS Feed</em></a><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAB3RJTUUH5QIcFBAOXAevLAAAAZZJREFUSMftlbtKA0EUhj8jWhi8gaIEC29oxEoRFESLgIXYiWVSKoj6CCrBBwj6CBHNE1hEWy21ETQqiIW1wXhPo81ZOBw2apbdVPvDsDPnP8M/5zKzECJEQKivYO8DFoAYEAGKtTpQEvhW4w3IA+tAVy2F9fgEskA8COHUL8LOKAMZoMmLQF0FewcwImmNAzPANBB18b0BFoGroNLfBiyLgI2+BMwF3XgNwCrwYsQ//BBPSRPdAoeybjE+A8ClS+Sjfnf1E5A2dW4FzoxfwWvD/XWd7oAxI24jz3gVnpS7eiEpt+KvQEL5D5qal/245zFgU+pnXzMd+Zrh9/3q5l7g3CXtTs0bgWvFffn5vDa7iKcVv2K4DS8i3cAOsAuMm8h12ovqqrVL/R3upFrRKPBgHgctvm0iSynuWNnf5bf6byy5dPKe4nukhg6XU9yW2TfsJlDpNCUX27OaP8pD4WBCzQtmX381EUeAI3Xqe6m5xoHpYAezJuJkNb9Fh0tI4+SlXhpTwJBaZ+XbCcwr+6kcPESI2uAHmAijFaMnEmYAAAAASUVORK5CYII=" /></p>
-
-
-<div class="row">
-  <div class="col-lg-12">
-
-  <table data-toggle="table" data-pagination="true" data-search="true" >
-  <thead>
-    <tr>
-      <th>Callsign</th>
-      <th>Bulltein</th>
-      <th>Time</th>
-      <th>Server</th>
-    </tr>
-  </thead>
-  <tbody>
-
-  {{markup_content}}
-
-  </tbody></table>
-
-
-  </div>
-</div>
-
-<p>&nbsp;</p>
-{% endblock %}

web/templates/flask_user/edit_user_profile.html

@@ -1,31 +0,0 @@
-{% extends 'flask_user/_authorized_base.html' %}
-
-{% block content %}
-{% from "flask_user/_macros.html" import render_field, render_checkbox_field, render_submit_field %}
-<h1>{%trans%}User profile{%endtrans%}</h1>
-
-<form action="" method="POST" class="form" role="form">
-    {{ form.hidden_tag() }}
-    {% for field in form %}
-        {% if not field.flags.hidden %}
-            {% if field.type=='SubmitField' %}
-                {{ render_submit_field(field, tabindex=loop.index*10) }}
-            {% else %}
-                {{ render_field(field, tabindex=loop.index*10) }}
-            {% endif %}
-        {% endif %}
-    {% endfor %}
-</form>
-<br/>
-{% if not user_manager.USER_ENABLE_AUTH0 %}
-    {% if user_manager.USER_ENABLE_CHANGE_USERNAME %}
-        <p><a href="{{ url_for('user.change_username') }}">{%trans%}Change username{%endtrans%}</a></p>
-    {% endif %}
-    {% if user_manager.USER_ENABLE_CHANGE_PASSWORD %}
-        <p><a href="{{ url_for('user.change_password') }}">{%trans%}<button type="button" class="btn btn-warning">Change Portal Passord</button>{%endtrans%}</a></p>
-    {% endif %}
-    <p><a href="../update_ids"><strong><button type="button" class="btn btn-danger">Update your information from RadioID.net</button></strong></a></p>
-
-{% endif %}
-
-{% endblock %}

web/templates/flask_user/emails/base_message.html

@@ -1,8 +0,0 @@
-<p>Dear {{ user.email }} - {{ user.username }},</p>
-
-{% block message %}
-{% endblock %}
-
-<p>Sincerely,<br/>
-{{ app_name }}
-</p>

web/templates/flask_user/login.html

@@ -1,74 +0,0 @@
-{% extends 'flask_user/_public_base.html' %}
-
-{% block content %}
-{% from "flask_user/_macros.html" import render_field, render_checkbox_field, render_submit_field %}
-<h1>{%trans%}Sign in{%endtrans%}</h1>
-<p>&nbsp;</p>
-
-<strong>Your username MUST be your callsign or email address.</strong>
-<p>&nbsp;</p>
-
-<form action="" method="POST" class="form" role="form">
-    {{ form.hidden_tag() }}
-
-    {# Username or Email field #}
-    {% set field = form.username if user_manager.USER_ENABLE_USERNAME else form.email %}
-    <div class="form-group {% if field.errors %}has-error{% endif %}">
-        {# Label on left, "New here? Register." on right #}
-        <div class="row">
-            <div class="col-xs-6">
-                <label for="{{ field.id }}" class="control-label"><strong>{{ field.label.text }}</strong></label>
-            </div>
-            <div class="col-xs-6 text-right">
-                {% if user_manager.USER_ENABLE_REGISTER and not user_manager.USER_REQUIRE_INVITATION %}
-                    <a href="{{ url_for('user.register') }}" tabindex='190'>
-                        {%trans%}New here? Register.{%endtrans%}</a>
-                {% endif %}
-            </div>
-        </div>
-        {{ field(class_='form-control', tabindex=110) }}
-        {% if field.errors %}
-            {% for e in field.errors %}
-                &nbsp;
-
-                <p class="help-block"><strong>{{ e }}</strong></p>
-            {% endfor %}
-        {% endif %}
-    </div>
-        &nbsp;
-
-    {# Password field #}
-    {% set field = form.password %}
-    <div class="form-group {% if field.errors %}has-error{% endif %}">
-        {# Label on left, "Forgot your Password?" on right #}
-        <div class="row">
-            <div class="col-xs-6">
-                <label for="{{ field.id }}" class="control-label"><strong>{{ field.label.text }}</strong></label>
-            </div>
-            <div class="col-xs-6 text-right">
-                {% if user_manager.USER_ENABLE_FORGOT_PASSWORD %}
-                    <a href="{{ url_for('user.forgot_password') }}" tabindex='195'>
-                        {%trans%}Forgot your Password?{%endtrans%}</a>
-                {% endif %}
-            </div>
-        </div>
-        {{ field(class_='form-control', tabindex=120) }}
-        {% if field.errors %}
-            {% for e in field.errors %}
-        &nbsp;
-
-                <p class="help-block"><strong>{{ e }}</strong></p>
-            {% endfor %}
-        {% endif %}
-    </div>
-&nbsp;
-    {# Remember me #}
-    {% if user_manager.USER_ENABLE_REMEMBER_ME %}
-    {{ render_checkbox_field(login_form.remember_me, tabindex=130) }}
-    {% endif %}
-
-    {# Submit button #}
-    {{ render_submit_field(form.submit, tabindex=180) }}
-</form>
-
-{% endblock %}

web/templates/flask_user/register.html

@@ -1,66 +0,0 @@
-{% extends 'flask_user/_public_base.html' %}
-
-{% block content %}
-{% from "flask_user/_macros.html" import render_field, render_submit_field %}
-<h1>{%trans%}Register{%endtrans%}</h1>
-<p>&nbsp;</p>
-
-<strong>Your username MUST be your callsign.</strong> After filling out the fields, a confirmation link may be emailed to you.
-<hr />
-<p>&nbsp;</p>
-By registering, you acknowledge that you agree to the Terms of Use.
-<p>&nbsp;</p>
-
-<p style="text-align: center;"><a href="/tos"><button type="button" class="btn btn-primary">Terms of Use</button></a></p>
-<p>&nbsp;</p>
-<hr />
-<p>&nbsp;</p>
-
-<form action="" method="POST" novalidate formnovalidate class="form" role="form">
-    {{ form.hidden_tag() }}
-
-    {# Username or Email #}
-    {% set field = form.username if user_manager.USER_ENABLE_USERNAME else form.email %}
-    <div class="form-group {% if field.errors %}has-error{% endif %}">
-        {# Label on left, "Already registered? Sign in." on right #}
-        <div class="row">
-            <div class="col-xs-6">
-                <label for="{{ field.id }}" class="control-label"><strong>{{ field.label.text }}</strong></label>
-            </div>
-            <div class="col-xs-6 text-right">
-                {% if user_manager.USER_ENABLE_REGISTER %}
-                    <a href="{{ url_for('user.login') }}" tabindex='290'>
-                        {%trans%}Already registered? Sign in.{%endtrans%}</a>
-                {% endif %}
-            </div>
-        </div>
-        
-        {{ field(class_='form-control', tabindex=210) }}
-        {% if field.errors %}
-            {% for e in field.errors %}
-                &nbsp;
-
-                <p class="help-block"><strong>{{ e }}</strong></p>
-            {% endfor %}
-        {% endif %}
-    </div>
-        &nbsp;
-
-    {% if user_manager.USER_ENABLE_EMAIL and user_manager.USER_ENABLE_USERNAME %}
-        {{ render_field(form.email, tabindex=220) }}
-        &nbsp;
-    {% endif %}
-
-    {{ render_field(form.password, tabindex=230) }}
-
-    {% if user_manager.USER_REQUIRE_RETYPE_PASSWORD %}
-        {{ render_field(form.retype_password, tabindex=240) }}
-    {% endif %}
-        
-    {{ render_submit_field(form.submit, tabindex=280) }}
-</form>
-
-<p>&nbsp;</p>
-
-
-{% endblock %}

web/templates/flask_user_layout.html

@@ -1,182 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>{{ user_manager.USER_APP_NAME }}</title>
-
-    <!-- Bootstrap -->
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
-    <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.15.5/dist/bootstrap-table.min.css">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.5.0/font/bootstrap-icons.css">
-
-
-    <!-- In-lining styles to avoid needing a separate .css file -->
-    <style>
-        hr { border-color: #cccccc; margin: 0; }
-        .no-margins { margin: 0px; }
-        .with-margins { margin: 10px; }
-        .col-centered { float: none; margin: 0 auto; }
-    </style>
-
-    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-    <!--[if lt IE 9]>
-      <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7/html5shiv.js"></script>
-      <script src="//cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.js"></script>
-    <![endif]-->
-
-    {# *** Allow sub-templates to insert extra html to the head section *** #}
-    {% block extra_css %}{% endblock %}
-  </head>
-
-
-<body>
-
-<p><img class="img-responsive" style="display: block; margin-left: auto; margin-right: auto;" src="{{ url_for('static', filename='HBnet.png') }}" alt="Logo" width="300" height="144" /></p>
-    <h2 class="card-body" style="text-align: center;">{{ user_manager.USER_APP_NAME }}</h2>
-<hr />
-
- <!-- A grey horizontal navbar that becomes vertical on small screens -->
-<nav class="navbar navbar-expand-sm bg-light">
-
-  <div class="container-fluid">
-
-    <!-- Links -->
-    <ul class="navbar-nav">
-      <li class="nav-item">
-        <a class="nav-link" href="{{url}}/"><i class="bi bi-house-fill"></i> Home </a>
-      </li>
-      <li class="nav-item">
-        <a class="nav-link" href="{{url}}/talkgroups"><i class="bi bi-card-list"></i> Talkgroups </a>
-    <li class="nav-item">
-        <a class="nav-link" href="{{url}}/map"><i class="bi bi-map"></i> Map </a>
-      </li>
-    <li class="nav-item dropdown">
-          <a class="nav-link dropdown-toggle" href="#" id="aprs_menu" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-           <i class="bi bi-hash"></i> Data 
-          </a>
-          <ul class="dropdown-menu" aria-labelledby="aprs_menu">
-            <li><a class="dropdown-item" href="{{url}}/aprs"><i class="bi bi-geo"></i> APRS Dashboard </a></li>
-            <li><a class="dropdown-item" href="{{url}}/sms"><i class="bi bi-chat-right-text"></i> SMS Log </a></li>
-            <li><a class="dropdown-item" href="{{url}}/bb"><i class="bi bi-clipboard"></i> Bulletin Board </a></li>
-            <li><a class="dropdown-item" href="{{url}}/ss"><i class="bi bi-people"></i> Social Status </a></li>
-          </ul>
-        </li>
-    
-    <li class="nav-item">
-        <a class="nav-link" href="{{url}}/news"><i class="bi bi-newspaper"></i> News </a>
-      </li>
-    <li class="nav-item">
-        <a class="nav-link" href="{{url}}/help"><i class="bi bi-question-square"></i> Help </a>
-      </li>
-    </ul>
-  
-
-        <ul class="navbar-nav">
-    {% if not call_or_get(current_user.is_authenticated) %}
-        <li class="nav-item">
-        <a class="nav-link" href="{{ url_for('user.login') }}"><i class="bi bi-door-open"></i> Sign In </a>
-      </li>
-    <li class="nav-item">
-        <a class="nav-link" href="{{ url_for('user.register') }}"><i class="bi bi-person-plus"></i> Register </a>
-      </li>
-      {% endif %}
-    
-    {% if call_or_get(current_user.is_authenticated) %}
-        <!--Admin Menu -->
-            {% if call_or_get(current_user.has_roles('Admin')) %}
-    <li class="nav-item dropdown">
-          <a class="nav-link dropdown-toggle" href="#" id="aprs_menu" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-            <i class="bi bi-tools"></i> Admin
-          </a>
-          <ul class="dropdown-menu" aria-labelledby="mmdvm_admin">
-            <li><a class="dropdown-item" href="{{url}}/manage_servers">Manage Servers</a></li>
-            <li><a class="dropdown-item" href="{{url}}/manage_peers">Manage Peers</a></li>
-            <li><a class="dropdown-item" href="{{url}}/manage_masters">Manage Masters</a></li>
-            <li><a class="dropdown-item" href="{{url}}/manage_rules">Manage Rules</a></li>
-      <li><hr class="dropdown-divider"></li>
-            <li><a class="dropdown-item" href="{{url}}/add_user">Add User</a></li>
-            <li><a class="dropdown-item" href="{{url}}/list_users">Manage Users</a></li>
-            <li><a class="dropdown-item" href="{{url}}/approve_users">Waiting Approval</a></li>
-      <li><hr class="dropdown-divider"></li>
-            <li><a class="dropdown-item" href="{{url}}/manage_news">Manage News</a></li>
-            <li><a class="dropdown-item" href="{{url}}/misc_settings">Misc Options</a></li>
-            <li><a class="dropdown-item" href="{{url}}/auth_log">Authorization Log</a></li>
-            <a class="dropdown-item" href="{{url}}/all_mail/{{ current_user.username or current_user.email }}">Manage Mail</a>
-
-
-          </ul>
-        </li>
-        {% endif %}
-
-            <li class="nav-item">
-        <a class="nav-link" href="{{url}}/mail/{{ current_user.username or current_user.email }}"><i class="bi bi-mailbox"></i> Mailbox </a>
-      </li>
-            <li class="nav-item">
-        <a class="nav-link" href="{{url}}/generate_passphrase"><i class="bi bi-info-square"></i> Passphrase(s) </a>
-      </li>
-                <li class="nav-item">
-        <a class="nav-link" href="{{ url_for('user.edit_user_profile') }}"><i class="bi bi-file-person"></i> Change {{ current_user.username or current_user.email }} </a>
-      </li>
-           <li class="nav-item">
-        <a class="nav-link" href="{{ url_for('user.logout') }}"><i class="bi bi-door-closed"></i> Sign Out </a>
-      </li>
-          {% endif %}
-
-    </ul>
-    
-  </div>
-
-</nav> 
-
-   
-    {% block body %}
-
-    <hr class="no-margins"/>
-
-    <div id="main-div" class="with-margins">
-    {# One-time system messages called Flash messages #}
-    {% block flash_messages %}
-        {%- with messages = get_flashed_messages(with_categories=true) -%}
-            {% if messages %}
-                {% for category, message in messages %}
-                    {% if category=='error' %}
-                        {% set category='danger' %}
-                    {% endif %}
-                    <div class="alert alert-{{category}}">{{ message|safe }}</div>
-                {% endfor %}
-            {% endif %}
-        {%- endwith %}
-    {% endblock %}
-    {% block main %}
-        {% block content %}
-
-                {{markup_content}}
-
-    {% endblock %}
-    {% endblock %}
-    </div>
-
-    <br/>
-    <hr class="no-margins"/>
-    <div id="footer-div" class="clearfix with-margins">
-    <p style="text-align: center;"><strong>{{ user_manager.USER_APP_NAME }}<br /></strong><a href="https://hbnet.xyz">HBNet Project</a><br />V. <strong>Dev</strong>&nbsp;</p>
-
-    </div>
-    {% endblock %}
-
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <!-- Bootstrap -->
-
-    <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/js/bootstrap.bundle.min.js" integrity="sha384-ygbV9kiqUc6oa4msXn9868pTtWMgiQaeYH7/t7LECLbyPA2x65Kgf80OJFdroafW" crossorigin="anonymous"></script>
-    <script src="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.js"></script>
-
-
-    {# *** Allow sub-templates to insert extra html to the bottom of the body *** #}
-    {% block extra_js %}{% endblock %}
-
-  </body>
-</html>

web/templates/help.html

@@ -1,37 +0,0 @@
-{% extends 'flask_user/_public_base.html' %}
-{% block content %}
-
-<h3 style="text-align: center;">Registration</h3>
-<p>To register for access , click the <a href="/user/register">Register</a> link. <strong>Your username MUST be your callsign. </strong>Information for you account is pulled from <a href="https://www.radioid.net/">RadioID.net</a>, including all associated DMR IDs with your callsign. After filling out the fields, a confirmation link may be emailed to you. After confirming your email address, your account may be reviewed and approved by an administrator. You may receive an email when your account is approved.</p>
-<p>&nbsp;</p>
-<h3 style="text-align: center;">Hotspot/Repeater Login</h3>
-<p>To find your passphrase(s) for use with the MMDVM server(s), click on the <a href="/generate_passphrase">Passphrase(s)</a> link. This page will display a unique passphrase for each of your DMR IDs. Use the desired DMR ID and passphrase in your hotspot/repeater configuration. Each passphrase is also spelled phonetically for ease of manual entry. A special script to automatically add our MMDVM servers to Pi-Star is available by clicking on link provided on the View Passphrase(s) page (also available <a href="/generate_passphrase/pi-star">here</a>).</p>
-<p>&nbsp;</p>
-<h3 style="text-align: center;">Updating DMR ID Information</h3>
-<p>If you recently added a DMR ID to <a href="https://www.radioid.net/">RadioID.net</a>, or made any change, you can update your account by clicking on the <a href="/update_ids">update link</a> on the <a href="/user/edit_user_profile">user profile settings</a> page.</p>
-<p>&nbsp;</p>
-<h3 style="text-align: center;">Talkgroups</h3>
-<p>You may view a list of all talkgroups by going to the <a href="talkgroups">Talkgroups</a> page. Click on the talkgroup name for more information. A CSV file is available for download and may be used in the CPS of some radios. Talkgroups listed there may not be available on all servers if there are multiple. You may find a list of talkgroups available on each server by going to the <a href="/generate_passphrase">Passphrase(s)</a> page.</p>
-<p>&nbsp;</p>
-<h3 style="text-align: center;">MMDVM Options</h3>
-<p>Options are like a type of command that your hotspot/repeater sends to the server for various functions. The following options are supported:</p>
-<div class="container-fluid">          
-  <table class="table table-striped">
-    <thead>
-      <tr>
-        <th>Option</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td>NO_MAP</td>
-        <td>This option will prevent your hotspot/repeater from plotting on the map. <strong>This option may also be entered into the Location field of your hotspot, if your hotspot doesn't have an options field.</strong></td>
-      </tr>
-     
-    </tbody>
-  </table>
-</div>
-<p>You can add multiple options by separating them using a semicolon (<strong>;</strong>). <br />
-Example: <pre>OPTION_1;OPTION_2</pre>
-{% endblock %}

web/templates/index.html

@@ -1,29 +0,0 @@
-{% extends 'flask_user/_public_base.html' %}
-{% block content %}
-<p>&nbsp;</p>
-
-<div class="row">
-
-
-{{content_block}}
-
-
-<div class="col-lg-6">
-
-<p>&nbsp;</p>
-<table style="margin-left: auto; margin-right: auto;">
-<tbody>
-<tr>
-<td style="text-align: center;">
-<h4>Latest News:</h4>
-{{news}}
-</td>
-</tr>
-</tbody>
-</table>
-
-</div>
-</div>
-
-<p>&nbsp;</p>
-{% endblock %}

web/templates/mail.html

@@ -1,68 +0,0 @@
-{% extends 'flask_user/_public_base.html' %}
-{% block content %}
-
-  <h1 style="text-align: center;">Mail</h1>
-
-
-
-<div id="compose" class="collapse">
-
-<div class="card">
-  <div class="card-header">Send internal message to another user</div>
-  <div class="card-body">
-  
-  <form action="{{ current_user.username or current_user.email }}?send_mail=true" method="post">
-
-<div class="input-group mb-3">
-  <span class="input-group-text" id="basic-addon1">Username</span>
-  <input type="text" id="username" name="username" class="form-control" aria-label="Username" aria-describedby="basic-addon1">
-</div>
-
-<div class="input-group">
-  <span class="input-group-text">Message</span>
-  <textarea id="message" name="message" class="form-control" aria-label="Message"></textarea>
-</div>
-
-<br />  
-  <p style="text-align: center;"><input class="btn btn-primary" type="submit" value="Send" /></form></p>
-
-  </div>
-</div>
-
-</div> 
-
-{% if show_mail %}
-<div class="row">
-  <div class="col-lg-12">
-<p style="text-align: right;"><button data-bs-toggle="collapse" data-bs-target="#compose" class="btn btn-primary">Compose</button></p>
-
-  <table data-toggle="table" data-pagination="true" data-search="true" >
-  <thead>
-    <tr>
-      <th>From</th>
-      <th>Message</th>
-      <th>Time</th>
-      <th>Options</th>
-    </tr>
-  </thead>
-  <tbody>
-
-  {{markup_content}}
-
-  </tbody></table>
-
-
-  </div>
-</div>
-{% endif %}
-
-{% if not show_mail %}
-  {{markup_content}}
-
-{% endif %}
-
-
-
-
-<p>&nbsp;</p>
-{% endblock %}

web/templates/map.html

@@ -1,28 +0,0 @@
-{% extends 'flask_user/_public_base.html' %}
-{% block content %}
-
-<p>&nbsp;</p>
- <div class="well">Map of connected peers and GPS locations. <br />
- To diasble map plotting for your hotspot or repeater, see the <strong>MMDVM Options</strong> section in <a href="/help"><strong>Help</strong></a>.
-<p>&nbsp;</p>
-
-<table  border="1">
-<tbody>
-<tr>
-<td><span style="color: #ff0000;"><strong>Red</strong></span> = Peer location (no APRS)</td>
-<td><span style="color: #0000ff;"><strong>Blue</strong></span> = GPS location (APRS)</td>
-<td><strong><span style="color: #00ff00;">Green</span></strong> = Peer location (APRS)</td>
-</tr>
-</tbody>
-</table>
- 
-</div>
-<div class="row container-fluid" >
-  <div class="col-xs-12">
-  {{markup_content}}
-
-</div>
-</div>
-
-<p>&nbsp;</p>
-{% endblock %}

web/templates/news.html

@@ -1,9 +0,0 @@
-{% extends 'flask_user/_public_base.html' %}
-{% block content %}
- <p style="text-align: center;"><a href="/news?all_news=true"><strong><button type="button" class="btn btn-primary">View All News</button></strong></a></p>
-<div class="row">
-  <div class="col-lg-12">{{markup_content}}</div>
-</div>
-
-<p>&nbsp;</p>
-{% endblock %}

web/templates/pi-star_gen.html

@@ -1,34 +0,0 @@
-{% extends 'flask_user/_public_base.html' %}
-{% block content %}
-
-
-<div class="card" >
-  <div class="panel-heading" style="text-align: center;"><h4>Pi-Star Instructions</h4></div>
-  <div class="panel-body">
-<p>&nbsp;</p>
-A script to enable the use of this network on a Pi-Star device is available. This script will automatically add information, including your generated passphrase and each Master/Proxy instance
-on this network, to your device's DMR_Hosts.txt. This will allow you to connect to this network in the Pi-Star configuration page.
-<p>&nbsp;</p>
-
-A script(s) is generated for each of your DMR IDs when you load this page. Each link/command is valid for only one use. If you need execute a command again,
-simply reload the page to get a fresh link.
-<p>&nbsp;</p>
-<hr />
-<p>&nbsp;</p>
-
-<p><strong>1</strong>: Log into your Pi-Star device via SSH. <br />
-<strong>2</strong>: Become <strong>root</strong> user. DMR_Hosts.txt is stored in /root, thus you need to be root to modify it.
-<pre>sudo su</pre><br />
-<strong>3</strong>: Decide which DMR ID you want Pi-Star to login with. Copy and past one of the commands below to update DMR_Hosts.txt. Each command is specific to a DMR ID.<br />
-
-<p>&nbsp;</p>
-
-{{markup_content}}
-<p>&nbsp;</p>
-
-If you were sucessful, you can now go into the Pi-Star configuration and select this network from the dropdown list.
-  </div>
-</div>
-<p>&nbsp;</p>
-
-{% endblock %}

web/templates/single_map_peer.html

@@ -1,14 +0,0 @@
-{% extends 'flask_user/_public_base.html' %}
-{% block content %}
-
-<p>&nbsp;</p>
-
-<div class="row container-fluid" >
-  <div class="col-xs-12">
-  {{markup_content}}
-
-</div>
-</div>
-
-<p>&nbsp;</p>
-{% endblock %}

web/templates/sms.html

@@ -1,31 +0,0 @@
-{% extends 'flask_user/_public_base.html' %}
-{% block content %}
-
-  <h1 style="text-align: center;">SMS Log</h1>
-      <p style="text-align: center;"><a href="/sms.xml"><em>RSS Feed</em></a><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAB3RJTUUH5QIcFBAOXAevLAAAAZZJREFUSMftlbtKA0EUhj8jWhi8gaIEC29oxEoRFESLgIXYiWVSKoj6CCrBBwj6CBHNE1hEWy21ETQqiIW1wXhPo81ZOBw2apbdVPvDsDPnP8M/5zKzECJEQKivYO8DFoAYEAGKtTpQEvhW4w3IA+tAVy2F9fgEskA8COHUL8LOKAMZoMmLQF0FewcwImmNAzPANBB18b0BFoGroNLfBiyLgI2+BMwF3XgNwCrwYsQ//BBPSRPdAoeybjE+A8ClS+Sjfnf1E5A2dW4FzoxfwWvD/XWd7oAxI24jz3gVnpS7eiEpt+KvQEL5D5qal/245zFgU+pnXzMd+Zrh9/3q5l7g3CXtTs0bgWvFffn5vDa7iKcVv2K4DS8i3cAOsAuMm8h12ovqqrVL/R3upFrRKPBgHgctvm0iSynuWNnf5bf6byy5dPKe4nukhg6XU9yW2TfsJlDpNCUX27OaP8pD4WBCzQtmX381EUeAI3Xqe6m5xoHpYAezJuJkNb9Fh0tI4+SlXhpTwJBaZ+XbCcwr+6kcPESI2uAHmAijFaMnEmYAAAAASUVORK5CYII=" /></p>
-
-
-<div class="row">
-  <div class="col-lg-12">
-
-  <table data-toggle="table" data-pagination="true" data-search="true" >
-  <thead>
-    <tr>
-      <th>Sender</th>
-      <th>Receiver</th>
-      <th>Message</th>
-      <th>Server</th>
-    </tr>
-  </thead>
-  <tbody>
-
-  {{markup_content}}
-
-  </tbody></table>
-
-
-  </div>
-</div>
-
-<p>&nbsp;</p>
-{% endblock %}

web/templates/ss.html

@@ -1,34 +0,0 @@
-{% extends 'flask_user/_public_base.html' %}
-{% block content %}
-
-  <h1 style="text-align: center;">Social Status</h1>
-    <p style="text-align: center;"><a href="/ss/{{user_id}}.xml"><em>RSS Feed</em></a><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAB3RJTUUH5QIcFBAOXAevLAAAAZZJREFUSMftlbtKA0EUhj8jWhi8gaIEC29oxEoRFESLgIXYiWVSKoj6CCrBBwj6CBHNE1hEWy21ETQqiIW1wXhPo81ZOBw2apbdVPvDsDPnP8M/5zKzECJEQKivYO8DFoAYEAGKtTpQEvhW4w3IA+tAVy2F9fgEskA8COHUL8LOKAMZoMmLQF0FewcwImmNAzPANBB18b0BFoGroNLfBiyLgI2+BMwF3XgNwCrwYsQ//BBPSRPdAoeybjE+A8ClS+Sjfnf1E5A2dW4FzoxfwWvD/XWd7oAxI24jz3gVnpS7eiEpt+KvQEL5D5qal/245zFgU+pnXzMd+Zrh9/3q5l7g3CXtTs0bgWvFffn5vDa7iKcVv2K4DS8i3cAOsAuMm8h12ovqqrVL/R3upFrRKPBgHgctvm0iSynuWNnf5bf6byy5dPKe4nukhg6XU9yW2TfsJlDpNCUX27OaP8pD4WBCzQtmX381EUeAI3Xqe6m5xoHpYAezJuJkNb9Fh0tI4+SlXhpTwJBaZ+XbCcwr+6kcPESI2uAHmAijFaMnEmYAAAAASUVORK5CYII=" /></p>
-
-
-<div class="row">
-  <div class="col-lg-12">
-
-  {{markup_content}}
-
-<p style="text-align: center;">Post History</p>
-
-<table data-toggle="table" data-pagination="true" data-search="true" >
-  <thead>
-    <tr>
-      <th>Post</th>
-      <th>Time</th>
-    </tr>
-  </thead>
-  <tbody>
-
-      {{all_post}}
-
-  </tbody>
-  </table>
-
-  
-  
-  </div>
-</div>
-
-{% endblock %}

web/templates/ss_all.html

@@ -1,33 +0,0 @@
-{% extends 'flask_user/_public_base.html' %}
-{% block content %}
-
-  <h1 style="text-align: center;">Social Status List</h1>
-
-<div class="row">
-  <div class="col-lg-12">
-    <div class="card">
-       <div class="card-header">Last Known Status</div>
-  <div class="card-body">
-
-  <table data-toggle="table" data-pagination="true" data-search="true" >
-  <thead>
-    <tr>
-      <th>User</th>
-      <th>Post</th>
-    </tr>
-  </thead>
-  <tbody>
-
-      {{markup_content}}
-
-  </tbody>
-  </table>
-
-  </div>
-  <div class="card-footer">Footer</div>
-</div>
- 
- </div>
-</div>
-
-{% endblock %}

web/templates/tg.html

@@ -1,9 +0,0 @@
-{% extends 'flask_user/_public_base.html' %}
-{% block content %}
-<p style="text-align: center;"><a href="/talkgroups"><strong><button type="button" class="btn btn-primary">All Talkgroups</button></strong></a></p>
-<div class="row">
-  <div class="col-lg-12">{{markup_content}}</div>
-</div>
-
-<p>&nbsp;</p>
-{% endblock %}

web/templates/tg_all.html

@@ -1,36 +0,0 @@
-{% extends 'flask_user/_public_base.html' %}
-{% block content %}
-<style>
-
-</style>
-<p>&nbsp;</p>
-<p style="text-align: center;"><strong>Note:</strong> Talkgroups listed here may not be available on all servers. See <a href="/generate_passphrase">Passphrase(s)</a> for complete list of talkgroup availability per server.</p>
-<p style="text-align: center;"><a href="hbnet_tg.csv"><strong>Download talkgroup CSV</strong></a> | <a href="hbnet_tg_anytone.csv"><strong>Download talkgroup CSV (Anytone format)</strong></a></p>
-<div class="container-fluid">          
-
-<!--  <table class="table table-striped table-bordered" style="width:100%" id="all_tg"> -->
-
-  <table data-toggle="table" data-pagination="true" data-search="true">
-    <thead>
-      <tr>
-        <th style="width: 146.1px; text-align: center;">Name</th>
-        <th style="width: 89.9px; text-align: center;">TG</th>
-        <th style="width: 339px; text-align: center;">Description</th>
-      </tr>
-    </thead>
-    <tbody>
-
-  {{markup_content}}
-
-</tbody>
-  </table>
-</div>
-
-<div class="row container-fluid" >
-  <div class="col-xs-12">
-</div>
-</div>
-
-<p>&nbsp;</p>
-
-{% endblock %}

web/templates/tp_add.html

@@ -1,30 +0,0 @@
-{% extends 'flask_user/_public_base.html' %}
-{% block content %}
-
-  <h1 style="text-align: center;">Tiny Pages</h1>
-
-
-<div class="row">
-  <div class="col-lg-12">
-
-  
-<form action="?add_page=true" method="post">
-
-<div class="input-group mb-3">
-  <span class="input-group-text" id="basic-addon1"><strong>?</strong></span>
-  <input type="text" id="username" placeholder="Query" name="query" class="form-control" aria-label="Query" aria-describedby="basic-addon1">
-</div>
-
-<div class="input-group">
-  <span class="input-group-text">Content</span>
-  <textarea id="message" name="content" class="form-control" aria-label="Content"></textarea>
-</div>
-
-<br />  
-  <p style="text-align: center;"><input class="btn btn-primary" type="submit" value="Add" /></form></p>
-
-  </div>
-</div>
-
-<p>&nbsp;</p>
-{% endblock %}

web/templates/tp_all.html

@@ -1,32 +0,0 @@
-{% extends 'flask_user/_public_base.html' %}
-{% block content %}
-
-  <h1 style="text-align: center;">Tiny Pages</h1>
-
-
-<div class="row">
-  <div class="col-lg-12">
-  {% if call_or_get(current_user.is_authenticated) %}
-<button type="button" class="btn btn-primary">Add Tiny Page</button>
-{% endif %}
-  <table data-toggle="table" data-pagination="true" data-search="true" >
-  <thead>
-    <tr>
-      <th>Query</th>
-      <th>Content</th>
-      <th>Author</th>
-      <th>Options</th>
-    </tr>
-  </thead>
-  <tbody>
-
-  {{markup_content}}
-
-  </tbody></table>
-
-
-  </div>
-</div>
-
-<p>&nbsp;</p>
-{% endblock %}

web/templates/view_passphrase.html

@@ -1,64 +0,0 @@
-{% extends 'flask_user/_public_base.html' %}
-{% block content %}
-<p>&nbsp;</p>
-<div class="card bg-light card-body mb-3">
-    <h4 style="text-align: center;"><a href="/generate_passphrase/pi-star"><button type="button" class="btn btn-warning">Automatic Pi-Star Setup Script</button></a> </h4>
-    <br>
-    
-<h4 style="text-align: center;"><button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#options_modal">
-  MMDVM Options
-</button></h4>
-</div>
-
-<div class="row">
-  <div class="col-sm-6">{{server_content}}</div>
-  <div class="col-sm-6">{{passphrase_content}}</div>
-</div>
-
-
-<!-- Options Modal -->
-<div class="modal fade" id="options_modal">
-  <div class="modal-dialog">
-    <div class="modal-content">
-
-      <!-- Modal Header -->
-      <div class="modal-header">
-        <h4 class="modal-title">Modal Heading</h4>
-        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-      </div>
-
-      <!-- Modal body -->
-      <div class="modal-body">
-
-
-<div class="container-fluid">          
-  <table class="table table-striped">
-    <thead>
-      <tr>
-        <th>Option</th>
-        <th>Description</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td>NO_MAP</td>
-        <td>This option will prevent your hotspot/repeater from plotting on the map. <strong>This option may also be entered into the Location field of your hotspot, if your hotspot doesn't have an options field.</strong></td>
-      </tr>
-     
-    </tbody>
-  </table>
-</div>
-
-
-      </div>
-
-      <!-- Modal footer -->
-      <div class="modal-footer">
-        <button type="button" class="btn btn-danger" data-bs-dismiss="modal">Close</button>
-      </div>
-
-    </div>
-  </div>
-</div>
-<p>&nbsp;</p>
-{% endblock %}

web/wsgi.ini

@@ -1,11 +0,0 @@
-[uwsgi]
-module = wsgi:app
-
-master = true
-processes = 2
-
-socket = /tmp/hbnet_web_service.sock
-chmod-socket = 666
-vacuum = true
-
-die-on-term = true

web/wsgi.py

@@ -1,11 +0,0 @@
-from app import hbnet_web_service
-
-app = hbnet_web_service()
-
-
-if __name__ == "__main__":
-#    app = create_app()
-
-    app.run()
-
-