fix bug in rules-SAMPLE.py

fix bugs
rewrite PROXY master instance
2021-06-06 11:45:12 -07:00 · 2021-06-05 16:46:20 -07:00 · 2021-06-05 16:25:08 -07:00 · 2021-06-04 21:23:49 -07:00 · 2021-06-04 20:06:52 -07:00 · 2021-05-30 19:36:23 -07:00
74 changed files with 11108 additions and 10614 deletions
@@ -1,2 +1,3 @@
 # Auto detect text files and perform LF normalization
 * text=auto
+*.html ident
@@ -1,60 +1,197 @@
-![ ](https://raw.githubusercontent.com/kf7eel/hblink3/hbnet/HBNet.png  "Logo")
+##### This is the development version that supports the sending of SMS. This is a work in progress and is not meant to be used in production at this time. This will become the 2nd genreation of the project.

-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.
+# HBLink3 with APRS/SMS Features

-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 is a **fork** of the [HBLink project](https://hblink-org.github.io/) that supports APRS and DMR SMS functions.

-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.
+This repository contains everything needed to setup an HBLink server with APRS/SMS features.
+
+The development server can be found at [https://hbl.ink](https://hbl.ink).
+
+## Features
+
+* Decode GPS locations and upload APRS position packets
+* Each user/DMR ID can customize APRS options (SSID, icon, comment)
+* Send and receive APRS messages as DMR SMS
+* Ability to receive data as a private call or group call
+* Trigger a command or script via DMR SMS
+* Optional web dashboard to show APRS packets uploaded
+* See location of radios on dashboard map
+* Use built in API to send SMS to other HBLink servers
+* Ability to disable APRS and just use dashboard map
+* Use [external applications](https://github.com/kf7eel/hblink_sms_external_apps) (see [API Documentation](https://kf7eel.github.io/hblink3/api_doc.html)) for weather reports, email, and other information.
+
+#### Required modules
+
+* pynmea2
+* aprslib
+* maidenhead
+* libscrc
+
+#### Optional Modules
+* Flask - Required for dashboard
+* folium - Required for mapping on dashboard.
+
+# Radio Compatibility
+
+## Confirmed working:
+Actually tested
+
+ | Radio | GPS | SMS Decode | SMS Encode |
+ |-------|:---:|:---:|:---:|
+ | Anytone D878| YES | YES | YES |
+ | Anytone D578| YES | YES | Most Likely |
+ | BTech DMR-6x2 | YES | Most likely | Not Tested |
+ | MD-380 (MD380tools, no GPS) | - | YES | WIP |
+ | MD-380 (stock firmware, GPS) | YES | Most likely | Not Tested |
+ | MD-390 (stock firmware) | YES | YES |  Not Tested |
+ | Retevis RT73* | YES | YES |  Not Tested |
+ | Ailunce HD1 | YES | YES |  Not Tested |
+ 
+ *RT73 must have unconfirmed data setting enabled.
+
+## Highly suspected to work:
+Not tested yet, but will most likely work.
+
+ | Radio | GPS | SMS Decode | SMS Encode |
+ |-------|:---:|:---:|:---:|
+ | Anytone D868 | Most likely | Most Likely | Most Likely |
+ | TYT MD-2017 | Most likely | Likely | Unknown |
+ | TYT MD-9600 | Most likely | Likely | Unknown |
+ | Retevis RT8 | Most likely | Likely | Unknown |
+ 
+ 
+## Tested, but with issues.
+  Tested, but with bugs present.
+  
+ | Radio | GPS | SMS Decode | SMS Encode 
+ |-------|:---:|:---:|:---:|
+ | Alinco DJ-MD5TGP | WIP | Most likely | Not Tested |
+ | Motorola DP3601| WIP | WIP | Not Tested |


-### User end features:
+## Would like to test:

-* Handles user registration and email verification
+Connect Systems GPS enabled radios

-* Individual hotspot passphrases for each user
+## How it works

-* Automatic retrieval of DMR IDs on registration
+A user should configure their radio for the DMR ID of the application and private or group call. When a position is received by the application, it will extract the coordinates and create an APRS position packet. The application will find the callsign of the user based on the sending radio's DMR ID. It is essential to have an up to date subscriber_ids file for this to work. A predefined APRS SSID is appended to the callsign. The APRS location packet is then uploaded to APRS-IS. No setup is required beforehand on the part of the user. This is pretty much "plug and play."

-* Automatically generate talkgroup pages
+For example, N0CALL has a DMR ID of 1234567. N0CALL's radio sends a position to the application. The application will query the subscriber_ids file for DMR ID 1234567. The result will be N0CALL. An APRS location pack is created and uploaded to APRS-IS.

-* Automatically generates a script for Pi-Star setup (WORK IN PROGRESS)
+## Individual user/DMR ID APRS settings

-* Map of currently connected peers
+By default, all APRS positions will have an SSID of 15, a default comment, and the callsign of the DMR user. These default settings can be changed. 

+The comment, SSID, and icon can be set for each individual user/DMR ID the application sees. The application stores all the setting in a file. You may have different SSIDs, icons, and comments for different DMR IDs. This is done via DMR SMS using the following commands:

-### 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
+ | Command | Description | Example |
+ |-------|:---:|:---:|
+|**SSID**|Change SSID of user callsign.|`SSID 7`|
+|**ICON**|Change the icon of the APRS position. *See [http://aprs.net/vm/DOS/SYMBOLS.HTM](http://aprs.net/vm/DOS/SYMBOLS.HTM) for icon list.|`icon /p`|
+|**COM**|Change the comment of the APRS.|`COM This is a test comment.`|
+|**MH**|Set you location by maidenhead grid square. Designed for radios with no GPS or that are not compatable yet.|`MH DN97uk`| 
+|**BB**|Post a bulliten to the web dashboard.|`BB This is a test bulletin.`|
+|**@[CALLSIGN W/ SSID] [MESSAGE]**|Send a message to another station via APRS.|`@N0CALL-15 This is a test.`|
+|**[EMAIL ADDRESS] [MESSAGE]**|Send an email to an email address.|`test@example.org This is a test.`| 
+|**REM MAIL**|Remove all mail (APRS messages, SMS, etc) addressed to you.|`REM MAIL`|
+**@NOTICE**|Used to prominantly display a notice, similar to EMERGENCY activation.|`@NOTICE Server going down at 1800`|
+|**@SOS**|EMERGENCY activation displays a banner on the main dashboard page.|`THIS IS AN EMERGENCY. @SOS`|
+|**REM SOS**|Removes an EMERGENCY or notice.|`REM SOS`|
+|**ID**|Responds by send an SMS containing your DMR ID.|`ID`|
+|**TEST**| Responds with "This is a test." as an SMS.|`TEST`|
+|**?[Network Shortcut] [DMR ID] [Message]**| Send an SMS to a user on another network.|`?XYZ 123456789 This is a test`|
+|**?[App Shortcut] [Input]**|Send SMS to an external application.|`?BBD This is a test post.`|
+|**APRS ON**|Enable sending and receiving of APRS messages.|`@APRS ON`|
+|**APRS OFF**|Disable sending and receiving of APRS messages.|`@APRS OFF`|



-### Other features
+Send a DMR SMS to the configured dmr_data_id in the application with the desired command followed by the value. For example, to change your icon to a dog, the command would be `@ICON /p` (see the icon table for values). Changing your SSID is as simple as `@SSID 7`, and `@COM Testing 123` will change the comment. 

-* SQLite or MySQL backend
+Sending `@BB Test` will result in a post to the bulletin board with the message of "Test".

-* APRS and SMS features (WORK IN PROGRESS)
+
+**To remove any of the stored values, just send the appropriate command without any input.** `@COM` will remove the stored comment, `@ICON` will remove the stored icon, and `@COM` will remove the stored comment. Any position now reports sent will have the default settings.
+
+## API
+The API built in to the dashboard can be used to exchange SMS with other HBLink servers/networks or be used to access external applications that provide functionality via SMS. Multiple servers/networks can share a single external application.
+
+See [hbl.ink](https://hbl.ink) for publicly accessible external applications that you can use.
+
+See [API documentation](https://kf7eel.github.io/hblink3/).
+
+Repository for [external applications](https://github.com/kf7eel/hblink_sms_external_apps), if you want to host your own.
+
+
+## Web Dashboard
+
+The web dashboard is completely optional. Python module flask is required for this to work. The web dashboard will display the last 15 positions of radios sent to APRS-IS. The dashboard will also sh user bulletin. A bulletin is a message sent via SMS that will display on the web dashboard. There are several uses for this, including: testing SMS functionality of radio, announcements, and moire. It is a novel feature. The page will automatically reload every 2 minutes. Setup is rather simple. Just modify the example config in the dashboard directory and rename it to dashboard_settings.py. Then start dashboard.py. 
+
+## APRS messaging
+
+You can send and receive APRS messages via DMR SMS. APRS messages received by the gateway are automatically sent to your DMR ID as a private SMS.
+
+## APRS TOCALL
+
+The project was granted a [tocall](http://www.aprs.org/aprs11/tocalls.txt) of **APHBLx** by Bob Bruniga, WB4APR. This will identify that your APRS position came from HBLink. The x on the end can be any letter/number. Here are the current designations of APHBLx:
+
+* **APHBL3** - HBlink3 D-APRS gateway
+* **APHBLD** - DMRlink D-APRS gateway (the IPSC version of the project)
+
+
+## Configuration
+
+See hblink_SAMPLE.cfg, rules_SAMPLE.py, and gps_data_SAMPLE.cfg for examples.
+
+## Special thanks to:
+
+**N0MJS** - For creating HBLink and dmr_utils. This project not possible without him.
+
+**IU7IGU** - For creating APRS position beaconing for PEER connections.
+
+**IV3JDV** - For helping debug SMS in Anytone radios.
+
+**KD7LMN** - For pointing out a critical bug.
+
+**KB5PBM** - For helping implement support for MD-380 type radios.
+
+**EI7IG** - For writing the page explaining MD-380 type GPS packets.
+
+**M0GLJ** - For assisting with Motorola testing.
+
+**W4DBG** - For early testing.
+
+**IW7EDX** - For contributing code.
+
+**Xavier FRS2013** - For contributing and cleaning up code.
+
+## Resources for DMR data
+
+I spent many hours looking at the following for this project. You may find these links useful.
+
+https://github.com/travisgoodspeed/md380tools/issues/160
+
+https://jpronans.github.io/ei7ig/dmr.html
+
+http://cloud.dstar.su/files/G4KLX/MMDVM/MMDVM%20Specification%2020150922.pdf
+
+https://wiki.brandmeister.network/index.php/NMEA_Location_Reporting
+
+https://forums.radioreference.com/threads/motorola-lrrp-protocol.370081/
+
+https://forums.radioreference.com/threads/lrrp-decoding.359575/
+
+https://github.com/polkabana/go-dmr
+
+https://github.com/nonoo/dmrshark
+
+https://wiki.brandmeister.network/index.php/Compressed_Location_Reporting
+
+All of the ETSI DMR documents (ETSI 102 361-1 through 361-4).
+
+The Shark RF forums.

 ---
 ### FOR SUPPORT, DISCUSSION, GETTING INVOLVED ###
@@ -63,7 +200,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 +221,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***
@@ -1,8 +1,8 @@
-#!/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>
+#   Copyright 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 +43,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 +56,35 @@ 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

+# Import UNIT time from rules.py
+from rules import UNIT_TIME, STATIC_UNIT


 # 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 = {}
+
+# UNIX time for end of year 2060. This is used to keep subscribers in UNIT_MAP indefinitely to accomplish static routes for unit calls
+#time_2060 = 2871763199.0000000
+# 20 years in seconds. added to current at time of start to keep static units from being trimmed.
+time_20 = 630720000
+
+# Build a UNIT_MAP based on values in STATIC_MAP.
+for i in STATIC_UNIT:
+	UNIT_MAP[bytes_3(i[0])] = i[1], time() + time_20

 # Timed loop used for reporting HBP status
 #
@@ -357,27 +107,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 +134,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 +146,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,30 +156,23 @@ 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 * UNIT_TIME
    remove_list = []
+    #logger.info(UNIT_MAP)
    for unit in UNIT_MAP:
-        if UNIT_MAP[unit][1] < (_then):
-            remove_list.append(unit)
+       if UNIT_MAP[unit][1] < (_then):
+           remove_list.append(unit)

    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 +183,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 +241,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]
@@ -738,12 +440,18 @@ class routerOBP(OPENBRIDGE):
        pkt_time = time()
        dmrpkt = _data[20:53]
        _bits = _data[15]
- 
-        # Make/update this unit in the UNIT_MAP cache
-        UNIT_MAP[_rf_src] = (self.name, pkt_time)

-        # Send update to all OpenBridge connections
-##        svrd_send_all(b'UNIT' + _rf_src) # + b'TIME' + pkt_time)
+        # Check if subscriber is in STATIC_UNIT
+        for i in STATIC_UNIT:
+            # Subscriber is static. Add 20 years of time.
+            if i[0] == int_id(_rf_src):
+                map_time = pkt_time + time_20
+                logger.debug('Static Unit, update time.')
+            # Proceed as normal
+            else:
+                map_time = pkt_time        
+        # Make/update this unit in the UNIT_MAP cache
+        UNIT_MAP[_rf_src] = (self.name, map_time)
        
        
        # Is this a new call stream?
@@ -890,16 +598,18 @@ class routerOBP(OPENBRIDGE):
        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':
+            # Route CSBK packets to destination TG. Necessary for group data to work with GPS/Data decoder.
            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.')
+            logger.debug('CSBK recieved, but HBlink does not process them currently. Packets routed to talkgroup.')
+
        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 +672,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 +690,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 +705,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 +870,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 +878,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 +900,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
@@ -1251,12 +931,20 @@ class routerHBP(HBSYSTEM):
        pkt_time = time()
        dmrpkt = _data[20:53]
        _bits = _data[15]
- 
-        # Make/update this unit in the UNIT_MAP cache
-        UNIT_MAP[_rf_src] = (self.name, pkt_time)

-        # Update other servers via OBP
-##        svrd_send_all(b'UNIT' + _rf_src) # + b'TIME' + pkt_time)
+        # Check if subscriber is in STATIC_UNIT
+        for i in STATIC_UNIT:
+            # Subscriber is static. Add 20 years of time.
+            if i[0] == int_id(_rf_src):
+                map_time = pkt_time + time_20
+                logger.debug('Static Unit, update time.')
+            # Proceed as normal
+            else:
+                map_time = pkt_time
+ 
+
+        # Make/update this unit in the UNIT_MAP cache
+        UNIT_MAP[_rf_src] = (self.name, map_time)
        
        
        # Is this a new call stream?
@@ -1279,7 +967,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 +1077,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':
+            # Route CSBK packets to destination TG. Necessary for group data to work with GPS/Data decoder.
            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)
+            logger.debug('CSBK recieved, but HBlink does not process them currently. Packets routed to talkgroup.')
        else:
            logger.error('Unknown call type recieved -- not processed')
-            mirror_traffic(_data)

 #
 # Socket-based reporting section
@@ -1434,30 +1119,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 +1144,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 +1161,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 +1184,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 +1198,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 +1208,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()
@@ -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))
@@ -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
@@ -0,0 +1,138 @@
+# Types: App, msg_xfer, raw
+# Auth: public, private
+
+import json
+
+
+msg_xfer = {
+    'mode':'msg_xfer',
+    'system_shortcut':'ABC',
+    'server_name':'Test HBlink Network',
+    'response_url':'http://localhost:8093/api/',
+    'auth_type':'private',
+    'credentials': {
+        'user':'test_name',
+        'password':'passw0rd',
+        },
+    'data':{
+        1:{'source_id':1234,
+            'destination_id':3153591,
+            'slot':2,
+            'msg_type':'unit',
+            'msg_format':'motorola',
+            'message':'text of the message'
+              },
+        2:{'source_id':1234,
+            'destination_id':3153591,
+            'slot':2,
+            'msg_type':'unit',
+            'msg_format':'motorola',
+            'message':'text of the 2nd message'
+              }
+
+    }
+
+}
+
+json_object = json.dumps(msg_xfer, indent = 4)
+print('-----------------------------------------')
+print('msg_xfer')
+print(json_object) 
+print('-----------------------------------------')
+
+##msg_xfer_public = {
+##    'mode':'msg_xfer',
+##    'system_shortcut':'ABC',
+##    'server_name':'Test HBlink Network',
+##    'response_url':'http://localhost:8093/api/',
+##    'auth_type':'public',
+##    'auth_token':'1234567899',
+##    'data':{
+##        1:{'source_id':1234,
+##            'destination_id':3153591,
+##            'slot':2,
+##            'msg_type':'unit',
+##            'msg_format':'motorola',
+##            'message':'text of the message'
+##              },
+##        2:{'source_id':1234,
+##            'destination_id':3153591,
+##            'slot':2,
+##            'msg_type':'unit',
+##            'msg_format':'motorola',
+##            'message':'text of the 2nd message'
+##              }
+##
+##    }
+##
+##}
+##
+##json_object = json.dumps(msg_xfer_public, indent = 4)
+##print('-----------------------------------------')
+##print('msg_xfer public')
+##print(json_object) 
+##print('-----------------------------------------')
+
+app_request = {
+    'mode':'app',
+    'system_shortcut':'ABC',
+    'server_name':'Test HBlink Network',
+    'response_url':'http://localhost:8093/api/',
+    'auth_token':'1234567899',
+    'data':{
+            'source_id':1234,
+            'slot':2,
+            'msg_type':'unit',
+            'msg_format':'motorola',
+            'message':'text of the message'
+            }
+}
+
+json_object = json.dumps(app_request, indent = 4)
+print('-----------------------------------------')
+print('app, request, sent to the APP server')
+print(json_object)
+print('-----------------------------------------')
+
+app_response = {
+    'mode':'app',
+    'app_name':'Test HBlink App',
+    'app_shortcut':'APP',
+    'auth_token':'736a9ced7e7688c951490a7f8e1ebdd4',
+    'data':{
+        1:{ 'destination_id':3153591,
+            'slot':2,
+            'msg_type':'unit',
+            'msg_format':'motorola',
+            'message':'text of the message'
+              },
+        2:{ 'destination_id':3153591,
+            'slot':2,
+            'msg_type':'unit',
+            'msg_format':'motorola',
+            'message':'text of the 2nd message'
+              }
+        }
+}
+
+json_object = json.dumps(app_response, indent = 4)
+print('-----------------------------------------')
+print('app, response, sent to your dashboard')
+print(json_object)
+print('-----------------------------------------')
+raw_msg_xfer = {
+    'mode':'raw',
+    'system_shortcut':'ABC',
+    'response_url':'http://localhost:8093/api/',
+    'auth_type':'private',
+    'credentials': {
+        'user':'test_name',
+        'password':'passw0rd',
+        },
+    'data':{
+        1:{'MMDVM Packet 1'},
+        2:{'MMDVM Packet 2'}
+
+    }
+
+}
@@ -0,0 +1,334 @@
+# Functions to encode DMR and MMDVM
+from dmr_utils3 import bptc, decode
+from bitarray import bitarray
+from binascii import b2a_hex as ahex
+from bitarray.util import hex2ba as hex2bits
+import random
+from dmr_utils3.utils import bytes_3, int_id, get_alias, bytes_2, bytes_4
+import re
+import libscrc
+from pathlib import Path
+
+def create_crc16(fragment_input):
+    crc16 = libscrc.gsm16(bytearray.fromhex(fragment_input))
+    return fragment_input + re.sub('x', '0', str(hex(crc16 ^ 0xcccc))[-4:])
+
+def create_crc32(fragment_input):
+    # Create and append CRC32 to data 
+    # Create list of hex
+    word_list = []
+    count_index = 0
+    while count_index < len(fragment_input):
+        word_list.append((fragment_input[count_index:count_index + 2]))
+        count_index = count_index + 2
+    # Create string of rearranged word_list to match ETSI 102 361-1 pg 141
+    lst_index = 0
+    crc_string = ''
+    for i in (word_list):
+        #print(lst_index)
+        if lst_index % 2 == 0:
+            crc_string =  crc_string + word_list[lst_index + 1]
+            #print(crc_string)
+        if lst_index % 2 == 1:
+            crc_string = crc_string + word_list[lst_index - 1]
+            #print(crc_string)
+        lst_index = lst_index + 1
+    # Create bytearray of word_list_string
+   # print(crc_string)
+    word_array = libscrc.posix(bytearray.fromhex(crc_string))
+    # XOR to get almost final CRC
+    pre_crc = str(hex(word_array ^ 0xffffffff))[2:]
+    # Rearrange pre_crc for transmission
+    crc = ''
+    c = 8
+    while c > 0:
+        crc = crc + pre_crc[c-2:c]
+        c = c - 2
+    crc = crc.ljust(8, '0')
+    print(crc)
+    # Return original data and append CRC32
+    print('Output: ' + fragment_input + crc)
+    #print(len(crc.zfill(9)))
+    return fragment_input + crc
+def create_crc16_csbk(fragment_input):
+    crc16_csbk = libscrc.gsm16(bytearray.fromhex(fragment_input))
+    return fragment_input + re.sub('x', '0', str(hex(crc16_csbk ^ 0xa5a5))[-4:])
+def csbk_gen(to_id, from_id):
+    csbk_lst = ['BD00801a', 'BD008019', 'BD008018', 'BD008017', 'BD008016']
+
+    send_seq_list = ''
+    for block in csbk_lst:
+        block = block + to_id + from_id
+        block  = create_crc16_csbk(block)
+        print(block)
+        send_seq_list = send_seq_list + block
+        print(send_seq_list)
+    return send_seq_list
+def mmdvm_encapsulate(dst_id, src_id, peer_id, _seq, _slot, _call_type, _dtype_vseq, _stream_id, _dmr_data):
+    signature = 'DMRD'
+    # needs to be in bytes
+    frame_type = 0x10 #bytes_2(int(10))
+    #print((frame_type))
+    dest_id = bytes_3(int(dst_id, 16))
+#    print((dest_id))
+
+    #print(ahex(dest_id))
+    source_id = bytes_3(int(src_id, 16))
+    via_id = bytes_4(int(peer_id, 16))
+   # print((source_id))
+    #print(ahex(via_id))
+    seq = int(_seq).to_bytes(1, 'big')
+    #print(ahex(seq))
+    # Binary, 0 for 1, 1 for 2
+    slot = bitarray(str(_slot))
+    #print(slot)
+    # binary, 0 for group, 1 for unit, bin(1)
+   # print(_call_type)
+    call_type = bitarray(str(_call_type))
+    #print(call_type)
+    #0x00 for voice, 0x01 for voice sync, 0x10 for data 
+    #frame_type = int(16).to_bytes(1, 'big')
+    frame_type = bitarray('10')
+    #print(frame_type)
+    # Observed to be always 7, int. Will be 6 for header
+    #dtype_vseq = hex(int(_dtype_vseq)).encode()
+    if _dtype_vseq == 6:
+        dtype_vseq = bitarray('0110')
+    if _dtype_vseq == 7:
+        dtype_vseq = bitarray('0111')
+    if _dtype_vseq == 3:
+        dtype_vseq = bitarray('0011')
+    # 9 digit integer in hex
+    stream_id = bytes_4(_stream_id)
+    #print(ahex(stream_id))
+
+    middle_guts = slot + call_type + frame_type + dtype_vseq
+    #print(middle_guts)
+    dmr_data = str(_dmr_data)[2:-1] #str(re.sub("b'|'", '', str(_dmr_data)))
+    complete_packet = signature.encode() + seq + dest_id + source_id + via_id + middle_guts.tobytes() + stream_id + bytes.fromhex((dmr_data)) + bitarray('0000000000101111').tobytes()#bytes.fromhex(dmr_data)
+    #print('Complete: ' + type(ahex(complete_packet)))
+##    #print(hex2bits(ahex(complete_packet))[119:120])
+    #print(bitarray.frombytes(ahex(complete_packet)))
+    return complete_packet
+
+
+### Sequence MMDVM packets from encoded DMR
+##def seq_mmdvm(dmr_list):
+##    cap_in = 0
+##    mmdvm_send_seq = []
+##    for i in dmr_list:
+##        if cap_in < 8:
+##            
+##        if cap_in == 8:
+##            #print('header')
+##            the_mmdvm_pkt = mmdvm_encapsulate(3153597, 3153591, 9099, cap_in, 1, 1, 6, rand_seq, i) #(bytes.fromhex(re.sub("b'|'", '', str(orig_cap[cap_in][20:-4])))))
+##        else:
+##            #print('block')
+##            the_mmdvm_pkt = mmdvm_encapsulate(3153597, 3153591, 9099, cap_in, 1, 1, 7, rand_seq, i)#(bytes.fromhex(re.sub("b'|'", '', str(orig_cap[cap_in][20:-4])))))
+##        new_send_seq.append(ahex(the_mmdvm_pkt))
+##        cap_in = cap_in + 1
+
+# Break long string into block sequence
+def block_sequence(input_string):
+    seq_blocks = len(input_string)/24
+    n = 0
+    block_seq = []
+    while n < seq_blocks:
+        if n == 0:
+            block_seq.append(bytes.fromhex(input_string[:24].ljust(24,'0')))
+            n = n + 1
+        else:
+            block_seq.append(bytes.fromhex(input_string[n*24:n*24+24].ljust(24,'0')))
+            n = n + 1
+    return block_seq
+
+# Takes list of DMR packets, 12 bytes, then encodes them
+def dmr_encode(packet_list, _slot):
+    send_seq = []
+    for i in packet_list:
+        stitched_pkt = bptc.interleave_19696(bptc.encode_19696(i))
+        l_slot = bitarray('0111011100')
+        #MS
+        #sync_data = bitarray('110101011101011111110111011111111101011101010111')
+        if _slot == 0:
+            # TS1 - F7FDD5DDFD55
+            sync_data = bitarray('111101111111110111010101110111011111110101010101')
+        if _slot == 1:
+            #TS2 - D7557F5FF7F5
+            sync_data = bitarray('110101110101010101111111010111111111011111110101')
+        if _slot == 3:
+            sync_data = bitarray('110101011101011111110111011111111101011101010111')
+        # TS1
+        #sync_data = bitarray('111101111111110111010101110111011111110101010101')
+        #TS2
+        #sync_data = bitarray('110101110101010101111111010111111111011111110101')
+        r_slot = bitarray('1101110001')
+        # Data sync? 110101011101011111110111011111111101011101010111 - D5D7F77FD757
+        new_pkt = ahex(stitched_pkt[:98] + l_slot + sync_data + r_slot + stitched_pkt[98:])
+        send_seq.append(new_pkt)
+    return send_seq
+
+
+def create_sms_seq(dst_id, src_id, peer_id, _slot, _call_type, dmr_string):
+    rand_seq = random.randint(1, 999999)
+    block_seq = block_sequence(dmr_string)
+    dmr_list = dmr_encode(block_seq, _slot)
+    cap_in = 0
+    mmdvm_send_seq = []
+    for i in dmr_list:
+        #print(i)
+        if use_csbk == True:
+            if cap_in < 5:
+                the_mmdvm_pkt = mmdvm_encapsulate(dst_id, src_id, peer_id, cap_in, _slot, _call_type, 3, rand_seq, i)
+                #print(block_seq[cap_in])
+                #print(3)
+            if cap_in == 5:
+                #print(block_seq[cap_in])
+                #print(6)
+                the_mmdvm_pkt = mmdvm_encapsulate(dst_id, src_id, peer_id, cap_in, _slot, _call_type, 6, rand_seq, i) #(bytes.fromhex(re.sub("b'|'", '', str(orig_cap[cap_in][20:-4])))))
+            if cap_in > 5:
+                #print(block_seq[cap_in])
+                #print(7)
+                the_mmdvm_pkt = mmdvm_encapsulate(dst_id, src_id, peer_id, cap_in, _slot, _call_type, 7, rand_seq, i)#(bytes.fromhex(re.sub("b'|'", '', str(orig_cap[cap_in][20:-4])))))
+            mmdvm_send_seq.append(ahex(the_mmdvm_pkt))
+            cap_in = cap_in + 1
+        if use_csbk == False:
+            if cap_in == 0:
+                the_mmdvm_pkt = mmdvm_encapsulate(dst_id, src_id, peer_id, cap_in, _slot, _call_type, 6, rand_seq, i) #(bytes.fromhex(re.sub("b'|'", '', str(orig_cap[cap_in][20:-4])))))
+            else:
+                the_mmdvm_pkt = mmdvm_encapsulate(dst_id, src_id, peer_id, cap_in, _slot, _call_type, 7, rand_seq, i)#(bytes.fromhex(re.sub("b'|'", '', str(orig_cap[cap_in][20:-4])))))
+            mmdvm_send_seq.append(ahex(the_mmdvm_pkt))
+            cap_in = cap_in + 1
+    with open('/tmp/.hblink_data_que/' + str(random.randint(1000, 9999)) + '.mmdvm_seq', "w") as packet_write_file:
+                packet_write_file.write(str(mmdvm_send_seq))
+
+    return mmdvm_send_seq
+try:
+    Path('/tmp/.hblink_data_que/').mkdir(parents=True, exist_ok=True)
+except:
+    pass
+
+# Built for max length msg
+def sms_headers(to_id, from_id):
+##    #ETSI 102 361-2 uncompressed ipv4
+##    # UDP header, src and dest ports are 4007, 0fa7
+##    udp_ports = '0fa70fa7'
+##    # Length, of what?
+##    udp_length = '00da'
+##    # Checksum
+##    udp_checksum = '4b37'
+##
+##    # IPV4
+##    #IPV4 version and header length, always 45
+##    ipv4_v_l = '45'
+##    #Type of service, always 00
+##    ipv4_svc = '00'
+##    #length, always 00ee
+##    ipv4_len = '00ee'
+##    #ID always 000d
+##    ipv4_id = '000d'
+##    #Flags and offset always0
+##    ipv4_flag_off = '0000'
+##    #TTL and Protocol always 4011, no matter what
+##    ipv4_ttl_proto = '4011'
+    #ipv4 = '450000ee000d0000401100000c' + from_id + '0c' + to_id
+    #ipv4 = '450000ee00000000401100000c' + from_id + '0c' + to_id
+    ipv4 = '450000ee00000000401100000c' + from_id + '0c' + to_id
+    print(from_id)
+    print(to_id)
+    count_index = 0
+    hdr_lst = []
+    while count_index < len(ipv4):
+        hdr_lst.append((ipv4[count_index:count_index + 4]))
+        count_index = count_index + 4
+    sum = 0
+    for i in hdr_lst:
+        sum = sum + int(i, 16)
+    flipped = ''
+    for i in str(bin(sum))[2:]:
+        if i == '1':
+            flipped = flipped + '0'
+        if i == '0':
+            flipped = flipped + '1'
+    ipv4_chk_sum = str(hex(int(flipped, 2)))[2:]
+    print(ipv4_chk_sum)
+
+
+    
+                                                    #'0fa70fa7001a8b810010e0008f040d000a'
+                                                    #'0fa70fa7001a5b810010e00090040d000a'
+                                                    #'0fa70fa7001a5a810010e00091040d000a'
+    header = ipv4[:20] + ipv4_chk_sum + ipv4[24:] +  '0fa70fa700da583100d0a00081040d000a'
+    return header
+
+def format_sms(msg, to_id, from_id):
+    msg_bytes = str.encode(msg)
+    encoded = "".join([str('00' + x) for x in re.findall('..',bytes.hex(msg_bytes))] )
+    final = encoded
+    while len(final) < 400:
+        final = final + '002e'
+    final = final + '0000000000000000000000'
+    headers = sms_headers(to_id, from_id)
+    return headers + final
+
+def gen_header(to_id, from_id, call_type):
+    #print(call_type)
+    if call_type == 1:
+        seq_header = '024A' + to_id + from_id + '9550'
+    if call_type == 0:
+        seq_header = '824A' + to_id + from_id + '9550'
+    return seq_header
+
+def send_sms(csbk, to_id, from_id, peer_id, call_type, slot, msg):
+    global use_csbk
+    #to_id = str(hex(to_id))[2:].zfill(6)
+    #from_id = str(hex(from_id))[2:].zfill(6)
+    to_id = str(hex(to_id))[2:].zfill(6)
+    from_id = str(hex(from_id))[2:].zfill(6)
+    peer_id = str(hex(peer_id))[2:].zfill(8)
+    # Weird fix for redio not decoding, will fix later
+    if len(str(int(cli_args.SRC))) >= 4 and len(str(int(cli_args.SRC))) <= 6:
+        from_id = str('000000')
+    if call_type == 'unit':
+        new_call_type = 1
+    if call_type == 'group':
+        new_call_type = 0
+    if csbk == 'yes':
+        use_csbk = True
+        create_sms_seq(to_id, from_id, peer_id, int(slot), new_call_type, csbk_gen(to_id, from_id) + create_crc16(gen_header(to_id, from_id, new_call_type)) + create_crc32(format_sms(msg, to_id, from_id)))
+    else:
+        use_csbk = False
+        create_sms_seq(to_id, from_id, peer_id, int(slot), new_call_type, create_crc16(gen_header(to_id, from_id, new_call_type)) + create_crc32(format_sms(msg, to_id, from_id)))
+    print('Call type: ' + call_type)
+    print('Destination: ' + str(to_id))
+    print('Source: ' + str(from_id))
+    print('Message: ' + msg)
+    print('Use CSBK: ' + str(use_csbk))
+#send_sms(1234567, 1234, 0000, 'unit', '...............................................................................................')
+
+
+#create_sms_seq('301ebd', '301eb7', '0000', 1, 1, '024A301EBD301EB7851093184500003400020000401124e40c301eb70c301ebd0fa70fa70020326f0016a00083040d000a00540045005300540049004e00470000000000c3d8b05d')
+
+if __name__ == '__main__':
+    import argparse
+    import sys
+
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-d', '--dest', action='store', dest='DEST', help='Destination DMR ID')
+    parser.add_argument('-s', '--src', action='store', dest='SRC', help='Source DMR ID (Sender)')
+    parser.add_argument('-m', '--msg', action='store', dest='MSG', help='Message to be sent')
+    parser.add_argument('-t', '--type', action='store', dest='TYPE', help='Unit (private) or Group message')
+    parser.add_argument('-ts', '--slot', action='store', dest='TS', help='Unit (private) or Group message')
+    parser.add_argument('-c', '--csbk', dest='CSBK', action="store_true", help='Send CSBK Preambles')
+    cli_args = parser.parse_args()
+
+    if not cli_args.SRC:
+        cli_args.SRC = 0000
+    if cli_args.CSBK:
+        cli_args.CSBK = "yes"
+    if not cli_args.CSBK:
+        cli_args.CSBK = "no"
+    send_sms(cli_args.CSBK, int(cli_args.DEST), int(cli_args.SRC), 0000, str(cli_args.TYPE), int(cli_args.TS), str(cli_args.MSG)[:100])
+    
+    
+
@@ -0,0 +1,439 @@
+# 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: 4321
+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/gps_data.log
+LOG_HANDLERS: console-timed
+LOG_LEVEL: DEBUG
+LOG_NAME: HBlink3 GPS/Data
+
+# 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: 1
+
+#####################################################################
+# GPS/Data Application - by KF7EEL
+# Configure the settings for the DMR GPS to APRS position application here.
+#
+# DATA_DMR_ID - This is the DMR ID that users send SMS and GPS data.
+# CALL_TYPE - group, unit, or both. Group if you want users to send data to a talkgroup,
+# unit if you want users to send data as a private call, or both if you want both options.
+# UNIT_SMS_TS - Default timeslot for private SMS, where the subscriber's last TS is not known.
+# UNIT_SMS_TS can be 1 or 2
+[GPS_DATA]
+DATA_DMR_ID: 9099
+CALL_TYPE: unit
+UNIT_SMS_TS: 2
+
+# APRS configuration
+# This section contains APRS configuration for the gateway.
+# USER_APRS_SSID - Default APRS SSID assigned to user APRS positions.
+# USER_APRS_COMMENT - Default Comment attached to user APRS positions.
+# APRS_LOGIN_CALL, PASSCODE, SERVER, and PORT - Gateway login settings for APRS-IS.
+USER_APRS_SSID: 15
+USER_APRS_COMMENT: HBLink3 D-APRS -
+# Setting APRS_LOGIN_CALL to N0CALL will cause the gateway to not upload packets to APRS server.
+# Set to N0CALL if you wish to disable APRS.
+APRS_LOGIN_CALL: N0CALL
+APRS_LOGIN_PASSCODE: 12345
+APRS_SERVER: rotate.aprs2.net
+APRS_PORT: 14580
+
+# The APRS filter below is used for receiving messages.
+#See http://www.aprs-is.net/javAPRSFilter.aspx for details about APRS filters.
+APRS_FILTER: r/47/-120/500 t/m
+
+# The following configuration options are for uploading a position of the gateway itself.
+# When the gateway uploads a position, APRS software such as aprs.fi will see it as an Igate,
+# this is useful if you want aprs.fi to keep statistics.
+# Time in minutes. Set IGATE_BEACON_TIME to 0 to disable Igate beaconing.
+IGATE_BEACON_TIME = 45
+IGATE_BEACON_COMMENT = HBLink3 D-APRS Gateway
+IGATE_BEACON_ICON = /I
+IGATE_LATITUDE = 0000.00N
+IGATE_LONGITUDE = 00000.00W
+
+# 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
+
+
+###### Removing Soon ###################
+# The email gateway settingns below are OPTIONAL. They are NOT REQUIRED if you don't want
+# http://www.aprs-is.net/javAPRSFilter.aspx# to enable the email gateway. Leave as is to disable.
+EMAIL_SENDER: test@example.org
+EMAIL_PASSWORD: letmein
+SMTP_SERVER: smtp.gmail.com
+SMTP_PORT: 465
+########################################
+
+
+# The options below are required for operation of the dashboard and will cause errors if configures incorrectly.
+# 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
+
+# REQUIRED TO CHANGE
+# User settings file, MUST configure using absolute path.
+USER_SETTINGS_FILE: /path/to/user_settings.txt
+
+# API Configuration
+# MY_SERVER_SHORTCUT - Short abbreviation, must match other users access.
+# Server name - can be different than dashboard title, used to identify this network/server.
+# AUTHORIZED_TOKENS_FILE, OK to leave as default. This is the file where one time tokens are saved.
+# MY_SERVER_SHORTCUT, should be something short, ideally 3 or 4 letters. This is used in the authentication and
+# sending process. Should be unique from other servers, especially if you plan on allowing public access.
+# SERVER_NAME, the name of your server or network. This is used to identify your server with some external applications.
+# USE_PUBLIC_APPS, Allow your users to use publically accessible external applications.
+# PUBLIC_APPS_LIST, URL to list of public external applications. Leave as default.
+USE_API: True
+AUTHORIZED_TOKENS_FILE: /tmp/hblink_auth_tokens.txt
+MY_SERVER_SHORTCUT: ABC
+SERVER_NAME: Regional HBLink3 Server
+USE_PUBLIC_APPS: True
+PUBLIC_APPS_LIST: https://raw.githubusercontent.com/kf7eel/hblink_sms_external_apps/main/public_systems.txt
+
+# REQUIRED TO CHANGE
+RULES_PATH: /path/to/rules.py
+
+
+# The following options are used for the dashboard. The dashboard is optional.
+# Title of the Dashboard
+DASHBOARD_TITLE: HBLink3 D-APRS Dashboard
+
+# Used for API, RSS feed link, etc. This MUST be accessible.
+# Do not add a trailing /
+# You must set this if you are using the API.
+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: 62035
+NETWORK_ID: 3129100
+PASSPHRASE: password
+TARGET_IP: 1.2.3.4
+TARGET_PORT: 62035
+BOTH_SLOTS: True
+USE_ACL: True
+SUB_ACL: DENY:1
+TGID_ACL: PERMIT:ALL
+
+# 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: False
+STATIC_APRS_POSITION_ENABLED: False
+REPEAT: True
+MAX_PEERS: 10
+EXPORT_AMBE: False
+IP:
+PORT: 54000
+PASSPHRASE: password
+GROUP_HANGTIME: 5
+USE_ACL: True
+REG_ACL: DENY:1
+SUB_ACL: DENY:1
+TGID_TS1_ACL: PERMIT:ALL
+TGID_TS2_ACL: PERMIT:ALL
+
+
+# Utilizing the hotspot proxy modified and used from FreeDMR
+[HOTSPOT]
+MODE: PROXY
+ENABLED: False
+# Configure as you would for a normal MASTER. These options will apply to all connected peers.
+STATIC_APRS_POSITION_ENABLED: False
+REPEAT: True
+EXPORT_AMBE: False
+PASSPHRASE: passw0rd
+GROUP_HANGTIME: 5
+USE_ACL: True
+REG_ACL: DENY:1
+SUB_ACL: DENY:1
+TG1_ACL: PERMIT:ALL
+TG2_ACL: PERMIT:ALL
+# Use the provided proxy script as opposed to starting a new thread at start.
+# Set to False if you are not worried about performance issues.
+EXTERNAL_PROXY_SCRIPT: False
+# Port that peers will connect on. This port should be opened in your firewall.
+EXTERNAL_PORT: 62028
+# Internal ports used for generated master instances. Peers shouldn't connect directly to these ports.
+# There is no need to open these ports in your server's firewall. A MASTER instance will be generated for each port in the range below.
+INTERNAL_PORT_START: 58000
+INTERNAL_PORT_STOP: 58005
+
+
+# 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
+
+[ECHO]
+MODE: PEER
+ENABLED: True
+LOOSE: False
+EXPORT_AMBE: False
+IP: 
+PORT: 54073
+MASTER_IP: localhost
+MASTER_PORT: 54072
+passphrase: passw0rd
+CALLSIGN: ECHO
+RADIO_ID: 9999
+RX_FREQ: 000000000
+TX_FREQ: 000000000
+TX_POWER: 0
+COLORCODE: 1
+SLOTS: 1
+LATITUDE: 00.0000
+LONGITUDE: 000.0000
+HEIGHT: 0
+LOCATION: This Server
+DESCRIPTION: Echo Server
+URL: www.github.com/kf7eel/hblink3
+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
+
@@ -0,0 +1,307 @@
+# 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: 4323
+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/gps_data.log
+LOG_HANDLERS: console-timed
+LOG_LEVEL: DEBUG
+LOG_NAME: HBlink3 GPS/Data
+
+# 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: 1
+
+#####################################################################
+# GPS/Data Application - by KF7EEL
+# Configure the settings for the DMR GPS to APRS position application here.
+#
+# DATA_DMR_ID - This is the DMR ID that users send DMR GPS data.
+# CALL_TYPE - group, unit, or both. Group if you want users to send data to a talkgroup,
+# unit if you want users to send data as a private call, or both if you want both options.
+# USER_APRS_SSID - Default APRS SSID assigned to user APRS positions.
+# USER_APRS_COMMENT - Default Comment attached to user APRS positions.
+# APRS_LOGIN_CALL, PASSCODE, SERVER, and PORT - Login settings for APRS-IS.
+[GPS_DATA]
+DATA_DMR_ID: 9099
+CALL_TYPE: unit
+USER_APRS_SSID: 15
+USER_APRS_COMMENT: HBLink3 D-APRS -
+
+# Setting APRS_LOGIN_CALL to N0CALL will cause the gateway to not upload packets to APRS server.
+APRS_LOGIN_CALL: N0CALL
+APRS_LOGIN_PASSCODE: 12345
+APRS_SERVER: rotate.aprs2.net
+APRS_PORT: 14580
+
+# The APRS filter below is used for the message received script. See http://www.aprs-is.net/javAPRSFilter.aspx for details
+# about APRS filters.
+APRS_RECEIVE_LOGIN_CALL: N0CALL-1
+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 = 0000.00N
+IGATE_LONGITUDE = 00000.00W
+
+# User settings file, MUST configure using absolute path.
+USER_SETTINGS_FILE: /path/to/user_settings.txt
+
+# The email gateway settingns below are OPTIONAL. They are NOT REQUIRED if you don't want
+http://www.aprs-is.net/javAPRSFilter.aspx# to enable the email gateway. Leave as is to disable.
+EMAIL_SENDER: test@example.org
+EMAIL_PASSWORD: letmein
+SMTP_SERVER: smtp.gmail.com
+SMTP_PORT: 465
+
+# 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
+
+# The following options are used for the dashboard. The dashboard is optional.
+# Title of the Dashboard
+DASHBOARD_TITLE: HBLink3 D-APRS Dashboard
+
+# 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
+
+# RSS feed link, shows in the link section of each RSS item.
+RSS_LINK: http://localhost:8092
+
+#####################################################################
+# 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: 62035
+##NETWORK_ID: 3129100
+##PASSPHRASE: password
+##TARGET_IP: 1.2.3.4
+##TARGET_PORT: 62035
+##BOTH_SLOTS: True
+##USE_ACL: True
+##SUB_ACL: DENY:1
+##TGID_ACL: PERMIT:ALL
+
+# 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: False
+REPEAT: True
+MAX_PEERS: 10
+EXPORT_AMBE: False
+IP:
+PORT: 54000
+PASSPHRASE: password
+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
+
+[D-APRS]
+MODE: PEER
+ENABLED: True
+LOOSE: True
+EXPORT_AMBE: False
+IP: 
+PORT: 54071
+MASTER_IP: localhost
+MASTER_PORT: 54070
+PASSPHRASE: passw0rd
+CALLSIGN: D-APRS
+RADIO_ID: 9099
+RX_FREQ: 000000000
+TX_FREQ: 000000000
+TX_POWER: 0
+COLORCODE: 1
+SLOTS: 1
+LATITUDE: 00.0000
+LONGITUDE: 000.0000
+HEIGHT: 0
+LOCATION: This Server
+DESCRIPTION: GPS to APRS
+URL: www.github.com/kf7eel/hblink3
+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
+
@@ -0,0 +1,820 @@
+#!/usr/bin/env python3
+#
+###############################################################################
+#   HBLink - Copyright (C) 2020 Cortney T. Buffington, N0MJS <n0mjs@me.com>
+#   GPS/Data - Copyright (C) 2020 Eric Craw, KF7EEL <kf7eel@qsl.net>
+#   Annotated modifications Copyright (C) 2021 Xavier FRS2013
+#
+#   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 is a GPS and Data application. It decodes and reassambles DMR GPS packets and
+uploads them th APRS-IS.
+'''
+
+# Python modules we need
+import sys
+from bitarray import bitarray
+from time import time
+from importlib import import_module
+from types import ModuleType
+
+# 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, config_reports, mk_aliases, acl_check
+from dmr_utils3.utils import bytes_3, int_id, get_alias
+from dmr_utils3 import decode, bptc, const
+import config
+import log
+import const
+
+# The module needs logging logging, but handlers, etc. are controlled by the parent
+import logging
+logger = logging.getLogger(__name__)
+import traceback
+
+# Other modules we need for data and GPS
+from bitarray import bitarray
+from binascii import b2a_hex as ahex
+import re
+##from binascii import a2b_hex as bhex
+import aprslib
+import datetime
+from bitarray.util import ba2int as ba2num
+from bitarray.util import ba2hex as ba2hx
+import codecs
+import time
+#Needed for working with NMEA
+import pynmea2
+
+# Modules for executing commands/scripts
+import os
+from gps_functions import cmd_list
+
+# Module for maidenhead grids
+try:
+    import maidenhead as mh
+except Exception as error_exception:
+    logger.info('Error importing maidenhead module, make sure it is installed.')
+# Module for sending email
+try:
+    import smtplib
+except Exception as error_exception:
+    logger.info('Error importing smtplib module, make sure it is installed.')
+
+#Modules for APRS settings
+import ast
+from pathlib import Path
+
+
+# Does anybody read this stuff? There's a PEP somewhere that says I should do this.
+__author__     = 'Cortney T. Buffington, N0MJS; Eric Craw, KF7EEL'
+__copyright__  = 'Copyright (c) 2020 Cortney T. Buffington'
+__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'
+__status__     = 'pre-alpha'
+
+# Known to work with: AT-D878
+
+# Must have the following at line 1054 in bridge.py to forward group vcsbk, also there is a typo there:
+# self.group_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data)
+
+##################################################################################################
+
+# Headers for GPS by model of radio:
+# AT-D878 - Compressed UDP
+# MD-380 - Unified Data Transport
+hdr_type = ''
+btf = -1
+ssid = ''
+
+# From dmr_utils3, modified to decode entire packet. Works for 1/2 rate coded data. 
+def decode_full(_data):
+    binlc = bitarray(endian='big')   
+    binlc.extend([_data[136],_data[121],_data[106],_data[91], _data[76], _data[61], _data[46], _data[31]])
+    binlc.extend([_data[152],_data[137],_data[122],_data[107],_data[92], _data[77], _data[62], _data[47], _data[32], _data[17], _data[2]  ])
+    binlc.extend([_data[123],_data[108],_data[93], _data[78], _data[63], _data[48], _data[33], _data[18], _data[3],  _data[184],_data[169]])
+    binlc.extend([_data[94], _data[79], _data[64], _data[49], _data[34], _data[19], _data[4],  _data[185],_data[170],_data[155],_data[140]])
+    binlc.extend([_data[65], _data[50], _data[35], _data[20], _data[5],  _data[186],_data[171],_data[156],_data[141],_data[126],_data[111]])
+    binlc.extend([_data[36], _data[21], _data[6],  _data[187],_data[172],_data[157],_data[142],_data[127],_data[112],_data[97], _data[82] ])
+    binlc.extend([_data[7],  _data[188],_data[173],_data[158],_data[143],_data[128],_data[113],_data[98], _data[83]])
+    #This is the rest of the Full LC data -- the RS1293 FEC that we don't need
+    # This is extremely important for SMS and GPS though.
+    binlc.extend([_data[68],_data[53],_data[174],_data[159],_data[144],_data[129],_data[114],_data[99],_data[84],_data[69],_data[54],_data[39]])
+    binlc.extend([_data[24],_data[145],_data[130],_data[115],_data[100],_data[85],_data[70],_data[55],_data[40],_data[25],_data[10],_data[191]])
+    return binlc
+   
+
+n_packet_assembly = 0
+
+packet_assembly = ''
+
+final_packet = ''
+
+#Convert DMR packet to binary from MMDVM packet and remove Slot Type and EMB Sync stuff to allow for BPTC 196,96 decoding
+def bptc_decode(_data):
+        binary_packet = bitarray(decode.to_bits(_data[20:]))
+        del binary_packet[98:166]
+        return decode_full(binary_packet)
+# Placeholder for future header id
+def header_ID(_data):
+    hex_hdr = str(ahex(bptc_decode(_data)))
+    return hex_hdr[2:6]
+    # Work in progress, used to determine data format
+##    pass
+
+def aprs_send(packet):
+    if aprs_callsign == 'N0CALL':
+        logger.info('APRS callsighn set to N0CALL, packet not sent.')
+        pass
+    else:
+        AIS = aprslib.IS(aprs_callsign, passwd=aprs_passcode,host=aprs_server, port=aprs_port)
+        AIS.connect()
+        AIS.sendall(packet)
+        AIS.close()
+        logger.info('Packet sent to APRS-IS.')
+# For future use
+##def position_timer(aprs_call):
+##    dash_entries = ast.literal_eval(os.popen('cat ' + loc_file).read())
+##    for i in dash_entries:
+##        if aprs_call == i['call']:
+##            if time.time()
+
+
+def dashboard_loc_write(call, lat, lon, time, comment):
+    dash_entries = ast.literal_eval(os.popen('cat /tmp/gps_data_user_loc.txt').read())
+    dash_entries.insert(0, {'call': call, 'lat': lat, 'lon': lon, 'time':time, 'comment':comment})
+# Clear old entries
+    list_index = 0
+    call_count = 0
+    new_dash_entries = []
+    for i in dash_entries:
+        if i['call'] == call:
+            if call_count >= 25:
+                pass
+            else:
+                new_dash_entries.append(i)
+            call_count = call_count + 1
+
+        if call != i['call']:
+            new_dash_entries.append(i)
+            pass
+        list_index = list_index + 1
+    with open(loc_file, 'w') as user_loc_file:
+            user_loc_file.write(str(new_dash_entries[:500]))
+            user_loc_file.close()
+    logger.info('User location saved for dashboard')
+    #logger.info(dash_entries)
+
+def dashboard_bb_write(call, dmr_id, time, bulletin):
+    #try:
+    dash_bb = ast.literal_eval(os.popen('cat ' + bb_file).read())
+   # except:
+    #    dash_entries = []
+    dash_bb.insert(0, {'call': call, 'dmr_id': dmr_id, 'time': time, 'bulletin':bulletin})
+    with open(bb_file, 'w') as user_bb_file:
+            user_bb_file.write(str(dash_bb[:20]))
+            user_bb_file.close()
+    logger.info('User bulletin entry saved.')
+    #logger.info(dash_bb)
+
+def mailbox_write(call, dmr_id, time, message, recipient):
+    #try:
+    mail_file = ast.literal_eval(os.popen('cat ' + the_mailbox_file).read())
+    mail_file.insert(0, {'call': call, 'dmr_id': dmr_id, 'time': time, 'message':message, 'recipient': recipient})
+    with open(the_mailbox_file, 'w') as mailbox_file:
+            mailbox_file.write(str(mail_file[:100]))
+            mailbox_file.close()
+    logger.info('User mail saved.')
+
+def mailbox_delete(dmr_id):
+    mail_file = ast.literal_eval(os.popen('cat ' + the_mailbox_file).read())
+    call = str(get_alias((dmr_id), subscriber_ids))
+    new_data = []
+    for message in mail_file:
+        if message['recipient'] != call:
+            new_data.append(message)
+    with open(the_mailbox_file, 'w') as mailbox_file:
+            mailbox_file.write(str(new_data[:100]))
+            mailbox_file.close()
+    logger.info('Mailbox updated. Delete occurred.')
+
+
+def sos_write(dmr_id, time, message):
+    user_settings = ast.literal_eval(os.popen('cat ' + user_settings_file).read())
+    try:
+        if user_settings[dmr_id][1]['ssid'] == '':
+            sos_call = user_settings[dmr_id][0]['call'] + '-' + user_ssid
+        else:
+            sos_call = user_settings[dmr_id][0]['call'] + '-' + user_settings[dmr_id][1]['ssid']
+    except:
+        sos_call = str(get_alias((dmr_id), subscriber_ids))
+    sos_info = {'call': sos_call, 'dmr_id': dmr_id, 'time': time, 'message':message}
+    with open(emergency_sos_file, 'w') as sos_file:
+            sos_file.write(str(sos_info))
+            sos_file.close()
+    logger.info('Saved SOS.')
+
+# Send email via SMTP function
+def send_email(to_email, email_subject, email_message):
+    global smtp_server
+    sender_address = email_sender
+    account_password = email_password
+    smtp_server = smtplib.SMTP_SSL(smtp_server, int(smtp_port))
+    smtp_server.login(sender_address, account_password)
+    message = "From: " + aprs_callsign + " D-APRS Gateway\nTo: " + to_email + "\nContent-type: text/html\nSubject: " + email_subject + "\n\n" + '<strong>' + email_subject + '</strong><p>&nbsp;</p><h3>' + email_message + '</h3><p>&nbsp;</p><p>This message was sent to you from a D-APRS gateway operated by <strong>' + aprs_callsign + '</strong>. Do not reply as this gateway is only one way at this time.</p>'
+    smtp_server.sendmail(sender_address, to_email, message)
+    smtp_server.close()
+
+# Thanks for this forum post for this - https://stackoverflow.com/questions/2579535/convert-dd-decimal-degrees-to-dms-degrees-minutes-seconds-in-python
+
+def decdeg2dms(dd):
+   is_positive = dd >= 0
+   dd = abs(dd)
+   minutes,seconds = divmod(dd*3600,60)
+   degrees,minutes = divmod(minutes,60)
+   degrees = degrees if is_positive else -degrees
+   return (degrees,minutes,seconds)
+
+def user_setting_write(dmr_id, setting, value):
+##    try:
+    # Open file and load as dict for modification
+        with open(user_settings_file, 'r') as f:
+##            if f.read() == '{}':
+##                user_dict = {}
+            user_dict = ast.literal_eval(f.read())
+            logger.info('Current settings: ' + str(user_dict))
+            if dmr_id not in user_dict:
+                user_dict[dmr_id] = [{'call': str(get_alias((dmr_id), subscriber_ids))}, {'ssid': ''}, {'icon': ''}, {'comment': ''}]
+            if setting.upper() == 'ICON':
+                user_dict[dmr_id][2]['icon'] = value
+            if setting.upper() == 'SSID':
+                user_dict[dmr_id][1]['ssid'] = value  
+            if setting.upper() == 'COM':
+                user_comment = user_dict[dmr_id][3]['comment'] = value[0:35]
+            if setting.upper() == 'APRS':
+                user_dict[dmr_id] = [{'call': str(get_alias((dmr_id), subscriber_ids))}, {'ssid': ''}, {'icon': ''}, {'comment': ''}]
+            if setting.upper() == 'PIN':
+                try:
+                    if user_dict[dmr_id]:
+                        user_dict[dmr_id][4]['pin'] = value
+                    if not user_dict[dmr_id]:
+                        user_dict[dmr_id] = [{'call': str(get_alias((dmr_id), subscriber_ids))}, {'ssid': ''}, {'icon': ''}, {'comment': ''}, {'pin': pin}]
+                except:
+                    user_dict[dmr_id].append({'pin': value})
+            f.close()
+            logger.info('Loaded user settings. Preparing to write...')
+    # Write modified dict to file
+        with open(user_settings_file, 'w') as user_dict_file:
+            user_dict_file.write(str(user_dict))
+            user_dict_file.close()
+            logger.info('User setting saved')
+            f.close()
+            packet_assembly = ''
+      
+# Process SMS, do something bases on message
+
+def process_sms(_rf_src, sms):
+    if sms == 'ID':
+        logger.info(str(get_alias(int_id(_rf_src), subscriber_ids)) + ' - ' + str(int_id(_rf_src)))
+    elif sms == 'TEST':
+        logger.info('It works!')
+    elif '@ICON' in sms:
+        user_setting_write(int_id(_rf_src), re.sub(' .*|@','',sms), re.sub('@ICON| ','',sms))
+    elif '@SSID' in sms:
+        user_setting_write(int_id(_rf_src), re.sub(' .*|@','',sms), re.sub('@SSID| ','',sms))
+    elif '@COM' in sms:
+        user_setting_write(int_id(_rf_src), re.sub(' .*|@','',sms), re.sub('@COM |@COM','',sms))
+    elif '@PIN' in sms:
+        user_setting_write(int_id(_rf_src), re.sub(' .*|@','',sms), int(re.sub('@PIN |@PIN','',sms)))
+    # Write blank entry to cause APRS receive to look for packets for this station.
+    elif '@APRS' in sms:
+        user_setting_write(int_id(_rf_src), 'APRS', '')
+    elif '@BB' in sms:
+        dashboard_bb_write(get_alias(int_id(_rf_src), subscriber_ids), int_id(_rf_src), time.time(), re.sub('@BB|@BB ','',sms))
+    elif '@' and ' E-' in sms:
+        email_message = str(re.sub('.*@|.* E-', '', sms))
+        to_email = str(re.sub(' E-.*', '', sms))
+        email_subject = 'New message from ' + str(get_alias(int_id(_rf_src), subscriber_ids))
+        logger.info('Email to: ' + to_email)
+        logger.info('Message: ' + email_message)
+        try:
+            send_email(to_email, email_subject, email_message)
+            logger.info('Email sent.')
+        except Exception as error_exception:
+            logger.info('Failed to send email.')
+            logger.info(error_exception)
+            logger.info(str(traceback.extract_tb(error_exception.__traceback__)))
+    elif '@SOS' in sms or '@NOTICE' in sms:
+        sos_write(int_id(_rf_src), time.time(), sms)
+    elif '@REM SOS' == sms:
+        os.remove(emergency_sos_file)
+        logger.info('Removing SOS or Notice')
+    elif '@' and 'M-' in sms:
+        message = re.sub('^@|.* M-|','',sms)
+        recipient = re.sub('@| M-.*','',sms)
+        mailbox_write(get_alias(int_id(_rf_src), subscriber_ids), int_id(_rf_src), time.time(), message, str(recipient).upper())
+    elif '@REM MAIL' == sms:
+        mailbox_delete(_rf_src)
+    elif '@MH' in sms:
+        grid_square = re.sub('@MH ', '', sms)
+        if len(grid_square) < 6:
+            pass
+        else:
+            lat = decdeg2dms(mh.to_location(grid_square)[0])
+            lon = decdeg2dms(mh.to_location(grid_square)[1])
+            
+            if lon[0] < 0:
+                lon_dir = 'W'
+            if lon[0] > 0:
+                lon_dir = 'E'
+            if lat[0] < 0:
+                lat_dir = 'S'
+            if lat[0] > 0:
+                lat_dir = 'N'
+            #logger.info(lat)
+            #logger.info(lat_dir)
+            aprs_lat = str(str(re.sub('\..*|-', '', str(lat[0]))) + str(re.sub('\..*', '', str(lat[1])) + '.')).zfill(5) + '  ' + lat_dir
+            aprs_lon = str(str(re.sub('\..*|-', '', str(lon[0]))) + str(re.sub('\..*', '', str(lon[1])) + '.')).zfill(6) + '  ' + lon_dir
+        logger.info('Latitude: ' + str(aprs_lat))
+        logger.info('Longitude: ' + str(aprs_lon))
+        # 14FRS2013 simplified and moved settings retrieval
+        user_settings = ast.literal_eval(os.popen('cat ' + user_settings_file).read())	
+        if int_id(_rf_src) not in user_settings:	
+            ssid = str(user_ssid)	
+            icon_table = '/'	
+            icon_icon = '['	
+            comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src)) 	
+        else:	
+            if user_settings[int_id(_rf_src)][1]['ssid'] == '':	
+                ssid = user_ssid	
+            if user_settings[int_id(_rf_src)][3]['comment'] == '':	
+                comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src))	
+            if user_settings[int_id(_rf_src)][2]['icon'] == '':	
+                icon_table = '/'	
+                icon_icon = '['	
+            if user_settings[int_id(_rf_src)][2]['icon'] != '':	
+                icon_table = user_settings[int_id(_rf_src)][2]['icon'][0]	
+                icon_icon = user_settings[int_id(_rf_src)][2]['icon'][1]	
+            if user_settings[int_id(_rf_src)][1]['ssid'] != '':	
+                ssid = user_settings[int_id(_rf_src)][1]['ssid']	
+            if user_settings[int_id(_rf_src)][3]['comment'] != '':	
+                comment = user_settings[int_id(_rf_src)][3]['comment']	
+        aprs_loc_packet = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid + '>APHBL3,TCPIP*:@' + str(datetime.datetime.utcnow().strftime("%H%M%Sh")) + str(aprs_lat) + icon_table + str(aprs_lon) + icon_icon + '/' + str(comment)
+        logger.info(aprs_loc_packet)
+        logger.info('User comment: ' + comment)
+        logger.info('User SSID: ' + ssid)
+        logger.info('User icon: ' + icon_table + icon_icon)
+        try:
+            aprslib.parse(aprs_loc_packet)
+            aprs_send(aprs_loc_packet)
+            dashboard_loc_write(str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid, aprs_lat, aprs_lon, time.time(), comment)
+            #logger.info('Sent manual position to APRS')
+        except Exception as error_exception:
+            logger.info('Exception. Not uploaded')
+            logger.info(error_exception)
+            logger.info(str(traceback.extract_tb(error_exception.__traceback__)))
+        packet_assembly = ''
+          
+            
+    elif 'A-' in sms and '@' in sms:
+        #Example SMS text: @ARMDS A-This is a test.
+        aprs_dest = re.sub('@| A-.*','',sms)
+        aprs_msg = re.sub('^@|.* A-|','',sms)
+        logger.info('APRS message to ' + aprs_dest.upper() + '. Message: ' + aprs_msg)
+        user_settings = ast.literal_eval(os.popen('cat ' + user_settings_file).read())
+        if int_id(_rf_src) in user_settings and user_settings[int_id(_rf_src)][1]['ssid'] != '':
+            ssid = user_settings[int_id(_rf_src)][1]['ssid']
+        else:
+            ssid = user_ssid
+        aprs_msg_pkt = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + str(ssid) + '>APHBL3,TCPIP*::' + str(aprs_dest).ljust(9).upper() + ':' + aprs_msg[0:73]
+        logger.info(aprs_msg_pkt)
+        try:
+            aprslib.parse(aprs_msg_pkt)
+            aprs_send(aprs_msg_pkt)
+            #logger.info('Packet sent.')
+        except Exception as error_exception:
+            logger.info('Error uploading MSG packet.')
+            logger.info(error_exception)
+            logger.info(str(traceback.extract_tb(error_exception.__traceback__)))
+    try:
+        if sms in cmd_list:
+            logger.info('Executing command/script.')
+            os.popen(cmd_list[sms]).read()
+            packet_assembly = ''
+    except Exception as error_exception:
+        logger.info('Exception. Command possibly not in list, or other error.')
+        packet_assembly = ''
+        logger.info(error_exception)
+        logger.info(str(traceback.extract_tb(error_exception.__traceback__)))
+    else:
+        pass
+
+###########
+
+    
+class DATA_SYSTEM(HBSYSTEM):
+##    global n_packet_assembly, packet_assembly
+
+    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):
+        # Capture data headers
+        global n_packet_assembly, hdr_type
+        #logger.info(_dtype_vseq)
+        logger.info(time.strftime('%H:%M:%S - %m/%d/%y'))
+        #logger.info('Special debug for developement:')
+        #logger.info(ahex(bptc_decode(_data)))
+        #logger.info(hdr_type)
+        #logger.info((ba2num(bptc_decode(_data)[8:12])))
+        if int_id(_dst_id) == data_id:
+            #logger.info(type(_seq))
+            if type(_seq) is bytes:
+                pckt_seq = int.from_bytes(_seq, 'big')
+            else:
+                pckt_seq = _seq
+            # Try to classify header
+            # UDT header has DPF of 0101, which is 5.
+            # If 5 is at position 3, then this should be a UDT header for MD-380 type radios.
+            # Coordinates are usually in the very next block after the header, we will discard the rest.
+            #logger.info(ahex(bptc_decode(_data)[0:10]))
+            if _call_type == call_type and header_ID(_data)[3] == '5' and ba2num(bptc_decode(_data)[69:72]) == 0 and ba2num(bptc_decode(_data)[8:12]) == 0 or (_call_type == 'vcsbk' and header_ID(_data)[3] == '5' and ba2num(bptc_decode(_data)[69:72]) == 0 and ba2num(bptc_decode(_data)[8:12]) == 0):
+                global udt_block
+                logger.info('MD-380 type UDT header detected. Very next packet should be location.')
+                hdr_type = '380'
+            if _dtype_vseq == 6 and hdr_type == '380' or _dtype_vseq == 'group' and hdr_type == '380':
+                udt_block = 1
+            if _dtype_vseq == 7 and hdr_type == '380':
+                udt_block = udt_block - 1
+                if udt_block == 0:
+                    logger.info('MD-380 type packet. This should contain the GPS location.')
+                    logger.info('Packet: ' + str(ahex(bptc_decode(_data))))
+                    if ba2num(bptc_decode(_data)[1:2]) == 1:
+                        lat_dir = 'N'
+                    if ba2num(bptc_decode(_data)[1:2]) == 0:
+                        lat_dir = 'S'
+                    if ba2num(bptc_decode(_data)[2:3]) == 1:
+                        lon_dir = 'E'
+                    if ba2num(bptc_decode(_data)[2:3]) == 0:
+                        lon_dir = 'W'
+                    lat_deg = ba2num(bptc_decode(_data)[11:18])
+                    lon_deg = ba2num(bptc_decode(_data)[38:46])
+                    lat_min = ba2num(bptc_decode(_data)[18:24])
+                    lon_min = ba2num(bptc_decode(_data)[46:52])
+                    lat_min_dec = str(ba2num(bptc_decode(_data)[24:38])).zfill(4)
+                    lon_min_dec = str(ba2num(bptc_decode(_data)[52:66])).zfill(4)
+                    # Old MD-380 coordinate format, keep here until new is confirmed working.
+                    #aprs_lat = str(str(lat_deg) + str(lat_min) + '.' + str(lat_min_dec)[0:2]).zfill(7) + lat_dir
+                    #aprs_lon = str(str(lon_deg) + str(lon_min) + '.' + str(lon_min_dec)[0:2]).zfill(8) + lon_dir
+                    # Fix for MD-380 by G7HIF
+                    aprs_lat = str(str(lat_deg) + str(lat_min).zfill(2) + '.' + str(lat_min_dec)[0:2]).zfill(7) + lat_dir
+                    aprs_lon = str(str(lon_deg) + str(lon_min).zfill(2) + '.' + str(lon_min_dec)[0:2]).zfill(8) + lon_dir
+
+                    # Form APRS packet
+                    #logger.info(aprs_loc_packet)
+                    logger.info('Lat: ' + str(aprs_lat) + ' Lon: ' + str(aprs_lon))
+                    # 14FRS2013 simplified and moved settings retrieval
+                    user_settings = ast.literal_eval(os.popen('cat ' + user_settings_file).read())
+                    if int_id(_rf_src) not in user_settings:	
+                        ssid = str(user_ssid)	
+                        icon_table = '/'	
+                        icon_icon = '['	
+                        comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src)) 	
+                    else:	
+                        if user_settings[int_id(_rf_src)][1]['ssid'] == '':	
+                            ssid = user_ssid	
+                        if user_settings[int_id(_rf_src)][3]['comment'] == '':	
+                            comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src))	
+                        if user_settings[int_id(_rf_src)][2]['icon'] == '':	
+                            icon_table = '/'	
+                            icon_icon = '['	
+                        if user_settings[int_id(_rf_src)][2]['icon'] != '':	
+                            icon_table = user_settings[int_id(_rf_src)][2]['icon'][0]	
+                            icon_icon = user_settings[int_id(_rf_src)][2]['icon'][1]	
+                        if user_settings[int_id(_rf_src)][1]['ssid'] != '':	
+                            ssid = user_settings[int_id(_rf_src)][1]['ssid']	
+                        if user_settings[int_id(_rf_src)][3]['comment'] != '':	
+                            comment = user_settings[int_id(_rf_src)][3]['comment']
+                    aprs_loc_packet = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid + '>APHBL3,TCPIP*:@' + str(datetime.datetime.utcnow().strftime("%H%M%Sh")) + str(aprs_lat) + icon_table + str(aprs_lon) + icon_icon + '/' + str(comment)
+                    logger.info(aprs_loc_packet)
+                    logger.info('User comment: ' + comment)
+                    logger.info('User SSID: ' + ssid)
+                    logger.info('User icon: ' + icon_table + icon_icon)
+                    # Attempt to prevent malformed packets from being uploaded.
+                    try:
+                        aprslib.parse(aprs_loc_packet)
+                        float(lat_deg) < 91
+                        float(lon_deg) < 121
+                        aprs_send(aprs_loc_packet)
+                        dashboard_loc_write(str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid, aprs_lat, aprs_lon, time.time(), comment)
+                        #logger.info('Sent APRS packet')
+                    except Exception as error_exception:
+                        logger.info('Error. Failed to send packet. Packet may be malformed.')
+                        logger.info(error_exception)
+                        logger.info(str(traceback.extract_tb(error_exception.__traceback__)))
+                    udt_block = 1
+                    hdr_type = ''
+                else:
+                      pass
+            #NMEA type packets for Anytone like radios.
+            #if _call_type == call_type or (_call_type == 'vcsbk' and pckt_seq > 3): #int.from_bytes(_seq, 'big') > 3 ):
+            # 14FRS2013 contributed improved header filtering, KF7EEL added conditions to allow both call types at the same time
+            if _call_type == call_type or (_call_type == 'vcsbk' and pckt_seq > 3 and call_type != 'unit') or (_call_type == 'group' and pckt_seq > 3 and call_type != 'unit') or (_call_type == 'group' and pckt_seq > 3 and call_type == 'both') or (_call_type == 'vcsbk' and pckt_seq > 3 and call_type == 'both') or (_call_type == 'unit' and pckt_seq > 3 and call_type == 'both'): #int.from_bytes(_seq, 'big') > 3 ):
+                global packet_assembly, btf
+                if _dtype_vseq == 6 or _dtype_vseq == 'group':
+                    global btf, hdr_start
+                    hdr_start = str(header_ID(_data))
+                    logger.info('Header from ' + str(get_alias(int_id(_rf_src), subscriber_ids)) + '. DMR ID: ' + str(int_id(_rf_src)))
+                    logger.info(ahex(bptc_decode(_data)))
+                    logger.info('Blocks to follow: ' + str(ba2num(bptc_decode(_data)[65:72])))
+                    btf = ba2num(bptc_decode(_data)[65:72])
+                    # Try resetting packet_assembly
+                    packet_assembly = ''
+                # Data blocks at 1/2 rate, see https://github.com/g4klx/MMDVM/blob/master/DMRDefines.h for data types. _dtype_seq defined here also
+                if _dtype_vseq == 7:
+                    btf = btf - 1
+                    logger.info('Block #: ' + str(btf))
+                    #logger.info(_seq)
+                    logger.info('Data block from ' + str(get_alias(int_id(_rf_src), subscriber_ids)) + '. DMR ID: ' + str(int_id(_rf_src)))
+                    logger.info(ahex(bptc_decode(_data)))
+                    if _seq == 0:
+                        n_packet_assembly = 0
+                        packet_assembly = ''
+                        
+                    #if btf < btf + 1:
+                    # 14FRS2013 removed condition, works great!
+                    n_packet_assembly = n_packet_assembly + 1
+                    packet_assembly = packet_assembly + str(bptc_decode(_data)) #str((decode_full_lc(b_packet)).strip('bitarray('))
+                    # Use block 0 as trigger. $GPRMC must also be in string to indicate NMEA.
+                    # This triggers the APRS upload
+                    if btf == 0:
+                        final_packet = str(bitarray(re.sub("\)|\(|bitarray|'", '', packet_assembly)).tobytes().decode('utf-8', 'ignore'))
+                        sms_hex = str(ba2hx(bitarray(re.sub("\)|\(|bitarray|'", '', packet_assembly))))
+                        sms_hex_string = re.sub("b'|'", '', str(sms_hex))
+                        #NMEA GPS sentence
+                        if '$GPRMC' in final_packet or '$GNRMC' in final_packet:
+                            logger.info(final_packet + '\n')
+                            # Eliminate excess bytes based on NMEA type
+                            # GPRMC
+                            if 'GPRMC' in final_packet:
+                                logger.info('GPRMC location')
+                                #nmea_parse = re.sub('A\*.*|.*\$', '', str(final_packet))
+                                nmea_parse = re.sub('A\*.*|.*\$|\n.*', '', str(final_packet))
+                            # GNRMC
+                            if 'GNRMC' in final_packet:
+                                logger.info('GNRMC location')
+                                nmea_parse = re.sub('.*\$|\n.*|V\*.*', '', final_packet)
+                            loc = pynmea2.parse(nmea_parse, check=False)
+                            logger.info('Latitude: ' + str(loc.lat) + str(loc.lat_dir) + ' Longitude: ' + str(loc.lon) + str(loc.lon_dir) + ' Direction: ' + str(loc.true_course) + ' Speed: ' + str(loc.spd_over_grnd) + '\n')
+                            try:
+                                # Begin APRS format and upload
+                                # Disable opening file for reading to reduce "collision" or reading and writing at same time.
+                                # 14FRS2013 simplified and moved settings retrieval
+                                user_settings = ast.literal_eval(os.popen('cat ' + user_settings_file).read())	
+                                if int_id(_rf_src) not in user_settings:	
+                                    ssid = str(user_ssid)	
+                                    icon_table = '/'	
+                                    icon_icon = '['	
+                                    comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src)) 	
+                                else:	
+                                    if user_settings[int_id(_rf_src)][1]['ssid'] == '':	
+                                        ssid = user_ssid	
+                                    if user_settings[int_id(_rf_src)][3]['comment'] == '':	
+                                        comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src))	
+                                    if user_settings[int_id(_rf_src)][2]['icon'] == '':	
+                                        icon_table = '/'	
+                                        icon_icon = '['	
+                                    if user_settings[int_id(_rf_src)][2]['icon'] != '':	
+                                        icon_table = user_settings[int_id(_rf_src)][2]['icon'][0]	
+                                        icon_icon = user_settings[int_id(_rf_src)][2]['icon'][1]	
+                                    if user_settings[int_id(_rf_src)][1]['ssid'] != '':	
+                                        ssid = user_settings[int_id(_rf_src)][1]['ssid']	
+                                    if user_settings[int_id(_rf_src)][3]['comment'] != '':	
+                                        comment = user_settings[int_id(_rf_src)][3]['comment']	
+                                aprs_loc_packet = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid + '>APHBL3,TCPIP*:@' + str(datetime.datetime.utcnow().strftime("%H%M%Sh")) + str(loc.lat[0:7]) + str(loc.lat_dir) + icon_table + str(loc.lon[0:8]) + str(loc.lon_dir) + icon_icon + str(round(loc.true_course)).zfill(3) + '/' + str(round(loc.spd_over_grnd)).zfill(3) + '/' + str(comment)
+                                logger.info(aprs_loc_packet)
+                                logger.info('User comment: ' + comment)
+                                logger.info('User SSID: ' + ssid)
+                                logger.info('User icon: ' + icon_table + icon_icon)
+                            except Exception as error_exception:
+                                logger.info('Error or user settings file not found, proceeding with default settings.')
+                                aprs_loc_packet = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + str(user_ssid) + '>APHBL3,TCPIP*:@' + str(datetime.datetime.utcnow().strftime("%H%M%Sh")) + str(loc.lat[0:7]) + str(loc.lat_dir) + '/' + str(loc.lon[0:8]) + str(loc.lon_dir) + '[' + str(round(loc.true_course)).zfill(3) + '/' + str(round(loc.spd_over_grnd)).zfill(3) + '/' + aprs_comment + ' DMR ID: ' + str(int_id(_rf_src))
+                                logger.info(error_exception)
+                                logger.info(str(traceback.extract_tb(error_exception.__traceback__)))
+                            try:
+                            # Try parse of APRS packet. If it fails, it will not upload to APRS-IS
+                                aprslib.parse(aprs_loc_packet)
+                            # Float values of lat and lon. Anything that is not a number will cause it to fail.
+                                float(loc.lat)
+                                float(loc.lon)
+                                aprs_send(aprs_loc_packet)
+                                dashboard_loc_write(str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid, str(loc.lat[0:7]) + str(loc.lat_dir), str(loc.lon[0:8]) + str(loc.lon_dir), time.time(), comment)
+                            except Exception as error_exception:
+                                logger.info('Failed to parse packet. Packet may be deformed. Not uploaded.')
+                                logger.info(error_exception)
+                                logger.info(str(traceback.extract_tb(error_exception.__traceback__)))
+                            #final_packet = ''
+                            # Get callsign based on DMR ID
+                            # End APRS-IS upload
+                        # Assume this is an SMS message
+                        elif '$GPRMC' not in final_packet or '$GNRMC' not in final_packet:
+                            
+####                            # Motorola type SMS header
+##                            if '824a' in hdr_start or '024a' in hdr_start:
+##                                logger.info('\nMotorola type SMS')
+##                                sms = codecs.decode(bytes.fromhex(''.join(sms_hex[74:-8].split('00'))), 'utf-8')
+##                                logger.info('\n\n' + 'Received SMS from ' + str(get_alias(int_id(_rf_src), subscriber_ids)) + ', DMR ID: ' + str(int_id(_rf_src)) + ': ' + str(sms) + '\n')
+##                                process_sms(_rf_src, sms)
+##                                packet_assembly = ''
+##                            # ETSI? type SMS header    
+##                            elif '0244' in hdr_start or '8244' in hdr_start:
+##                                logger.info('ETSI? type SMS')
+##                                sms = codecs.decode(bytes.fromhex(''.join(sms_hex[64:-8].split('00'))), 'utf-8')
+##                                logger.info('\n\n' + 'Received SMS from ' + str(get_alias(int_id(_rf_src), subscriber_ids)) + ', DMR ID: ' + str(int_id(_rf_src)) + ': ' + str(sms) + '\n')
+##                                #logger.info(final_packet)
+##                                #logger.info(sms_hex[64:-8])
+##                                process_sms(_rf_src, sms)
+##                                packet_assembly = ''
+####                                
+##                            else:
+                                logger.info('\nSMS detected. Attempting to parse.')
+                                #logger.info(final_packet)
+                                logger.info(sms_hex)
+##                                logger.info(type(sms_hex))
+                                logger.info('Attempting to find command...')
+##                                sms = codecs.decode(bytes.fromhex(''.join(sms_hex[:-8].split('00'))), 'utf-8', 'ignore')
+                                sms = codecs.decode(bytes.fromhex(''.join(sms_hex_string[:-8].split('00'))), 'utf-8', 'ignore')
+                                msg_found = re.sub('.*\n', '', sms)
+                                logger.info('\n\n' + 'Received SMS from ' + str(get_alias(int_id(_rf_src), subscriber_ids)) + ', DMR ID: ' + str(int_id(_rf_src)) + ': ' + str(msg_found) + '\n')
+                                process_sms(_rf_src, msg_found)
+                                #packet_assembly = ''
+                                pass
+                                #logger.info(bitarray(re.sub("\)|\(|bitarray|'", '', str(bptc_decode(_data)).tobytes().decode('utf-8', 'ignore'))))
+                            #logger.info('\n\n' + 'Received SMS from ' + str(get_alias(int_id(_rf_src), subscriber_ids)) + ', DMR ID: ' + str(int_id(_rf_src)) + ': ' + str(sms) + '\n')
+                        # Reset the packet assembly to prevent old data from returning.
+                        # 14FRS2013 moved variable reset
+                        hdr_start = ''
+                        n_packet_assembly = 0	
+                        packet_assembly = ''	
+                        btf = 0
+                    #logger.info(_seq)
+                    #packet_assembly = '' #logger.info(_dtype_vseq)
+                #logger.info(ahex(bptc_decode(_data)).decode('utf-8', 'ignore'))
+                #logger.info(bitarray(re.sub("\)|\(|bitarray|'", '', str(bptc_decode(_data)).tobytes().decode('utf-8', 'ignore'))))
+
+        else:
+            pass
+
+
+#************************************************
+#      MAIN PROGRAM LOOP STARTS HERE
+#************************************************
+
+if __name__ == '__main__':
+    #global aprs_callsign, aprs_passcode, aprs_server, aprs_port, user_ssid, aprs_comment, call_type, data_id
+    import argparse
+    import sys
+    import os
+    import signal
+    from dmr_utils3.utils import try_download, mk_id_dict
+
+    # 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 gps_data.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__))+'/gps_data.cfg'
+
+    # Call the external routine to build the configuration dictionary
+    CONFIG = config.build_config(cli_args.CONFIG_FILE)
+
+    data_id = int(CONFIG['GPS_DATA']['DATA_DMR_ID'])
+
+    # Group call or Unit (private) call
+    call_type = CONFIG['GPS_DATA']['CALL_TYPE']
+    # APRS-IS login information
+    aprs_callsign = CONFIG['GPS_DATA']['APRS_LOGIN_CALL']
+    aprs_passcode = int(CONFIG['GPS_DATA']['APRS_LOGIN_PASSCODE'])
+    aprs_server = CONFIG['GPS_DATA']['APRS_SERVER']
+    aprs_port = int(CONFIG['GPS_DATA']['APRS_PORT'])
+    user_ssid = CONFIG['GPS_DATA']['USER_APRS_SSID']
+    aprs_comment = CONFIG['GPS_DATA']['USER_APRS_COMMENT']
+    # EMAIL variables
+    email_sender = CONFIG['GPS_DATA']['EMAIL_SENDER']
+    email_password = CONFIG['GPS_DATA']['EMAIL_PASSWORD']
+    smtp_server = CONFIG['GPS_DATA']['SMTP_SERVER']
+    smtp_port = CONFIG['GPS_DATA']['SMTP_PORT']
+
+    # Dashboard files
+    bb_file = CONFIG['GPS_DATA']['BULLETIN_BOARD_FILE']
+    loc_file = CONFIG['GPS_DATA']['LOCATION_FILE']
+    the_mailbox_file = CONFIG['GPS_DATA']['MAILBOX_FILE']
+    emergency_sos_file = CONFIG['GPS_DATA']['EMERGENCY_SOS_FILE']
+
+    # User APRS settings
+    user_settings_file = CONFIG['GPS_DATA']['USER_SETTINGS_FILE']
+
+        # Check if user_settings (for APRS settings of users) exists. Creat it if not.
+    if Path(user_settings_file).is_file():
+        pass
+    else:
+        Path(user_settings_file).touch()
+        with open(user_settings_file, 'w') as user_dict_file:
+            user_dict_file.write("{1: [{'call': 'N0CALL'}, {'ssid': ''}, {'icon': ''}, {'comment': ''}]}")
+            user_dict_file.close()
+    # Check to see if dashboard files exist
+    if Path(loc_file).is_file():
+        pass
+    else:
+        Path(loc_file).touch()
+        with open(loc_file, 'w') as user_loc_file:
+            user_loc_file.write("[]")
+            user_loc_file.close()
+    if Path(bb_file).is_file():
+        pass
+    else:
+        Path(bb_file).touch()
+        with open(bb_file, 'w') as user_bb_file:
+            user_bb_file.write("[]")
+            user_bb_file.close()
+    if Path(the_mailbox_file).is_file():
+        pass
+    else:
+        Path(the_mailbox_file).touch()
+        with open(the_mailbox_file, 'w') as user_mail_file:
+            user_mail_file.write("[]")
+            user_mail_file.close()
+    
+    # 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, 2019\n\tThe Regents of the K0USY Group. All rights reserved.\n GPS and Data decoding by Eric, KF7EEL')
+    logger.debug('Logging system started, anything from here on gets logged')
+
+    # Set up the signal handler
+    def sig_handler(_signal, _frame):
+        logger.info('SHUTDOWN: >>>GPS and Data Decoder<<< IS TERMINATING WITH SIGNAL %s', str(_signal))
+        hblink_handler(_signal, _frame)
+        logger.info('SHUTDOWN: ALL SYSTEM HANDLERS EXECUTED - STOPPING REACTOR')
+        reactor.stop()
+
+    # Set signal handers so that we can gracefully exit if need be
+    for sig in [signal.SIGTERM, signal.SIGINT]:
+        signal.signal(sig, sig_handler)
+
+    # 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, reportFactory)
+    else:
+        report_server = None
+        logger.info('(REPORT) TCP Socket reporting not configured')
+
+    # HBlink instance creation
+    logger.info('HBlink \'gps_data.py\' -- SYSTEM STARTING...')
+    for system in CONFIG['SYSTEMS']:
+        if CONFIG['SYSTEMS'][system]['ENABLED']:
+            if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE':
+                systems[system] = OPENBRIDGE(system, CONFIG, report_server)
+            else:
+                systems[system] = DATA_SYSTEM(system, CONFIG, report_server)
+                
+            reactor.listenUDP(CONFIG['SYSTEMS'][system]['PORT'], systems[system], interface=CONFIG['SYSTEMS'][system]['IP'])
+            logger.debug('%s instance created: %s, %s', CONFIG['SYSTEMS'][system]['MODE'], system, systems[system])
+
+    reactor.run()
+
+    
+# John 3:16 - For God so loved the world, that he gave his only Son,
+# that whoever believes in him should not perish but have eternal life.
@@ -0,0 +1,11 @@
+# Various configurable options used in the GPS/Data application.
+
+# SMS message that triggers command
+
+
+cmd_list = {
+
+    'COMMAND' : 'echo "command to execute"',
+    'UPTIME' : 'uptime'
+
+    }
@@ -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
@@ -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
@@ -197,6 +167,22 @@ SUB_ACL: DENY:1
 TGID_TS1_ACL: PERMIT:ALL
 TGID_TS2_ACL: PERMIT:ALL

+[D-APRS]
+MODE: MASTER
+ENABLED: True
+REPEAT: True
+MAX_PEERS: 2
+EXPORT_AMBE: False
+IP:
+PORT: 54070
+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
@@ -241,6 +227,38 @@ SUB_ACL: DENY:1
 TGID_TS1_ACL: PERMIT:ALL
 TGID_TS2_ACL: PERMIT:ALL

+[ECHO]
+MODE: PEER
+ENABLED: True
+LOOSE: False
+EXPORT_AMBE: False
+IP: 
+PORT: 54073
+MASTER_IP: localhost
+MASTER_PORT: 54072
+passphrase: passw0rd
+CALLSIGN: ECHO
+RADIO_ID: 9999
+RX_FREQ: 000000000
+TX_FREQ: 000000000
+TX_POWER: 0
+COLORCODE: 1
+SLOTS: 1
+LATITUDE: 00.0000
+LONGITUDE: 000.0000
+HEIGHT: 0
+LOCATION: This Server
+DESCRIPTION: Echo Server
+URL: www.github.com/kf7eel/hblink3
+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
@@ -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()
@@ -66,30 +66,21 @@ class Proxy(DatagramProtocol):
        #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:
+            elif _command == MSTN:
                    _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()
@@ -159,7 +150,6 @@ class Proxy(DatagramProtocol):
                self.transport.write(data, (self.master,_dport))
                if self.debug:
                    print(data)
-
                return


@@ -0,0 +1,5 @@
+#! /bin/bash
+
+# Install the required support programs
+sudo apt-get install python3 python3-pip -y
+pip3 install -r requirements.txt
@@ -2,6 +2,7 @@
 #
 ###############################################################################
 #   Copyright (C) 2016-2019 Cortney T. Buffington, N0MJS <n0mjs@me.com>
+#   GPS/Data - Copyright (C) 2021 Eric Craw, 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
@@ -36,6 +37,8 @@ from dmr_utils3 import decode, bptc, const
 import config
 import log
 from const import *
+import re
+from pathlib import Path

 # Stuff for socket reporting
 import pickle
@@ -44,17 +47,144 @@ import pickle
 import logging
 logger = logging.getLogger(__name__)

+import ast, os, time
+

 # 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'
+__author__     = 'Eric Craw, KF7EEL'
+__copyright__  = 'Eric Craw, kf7eel@qsl.net'
 __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'
+__maintainer__ = 'Eric Craw, kf7eel@qsl.net'
+__email__      = 'kf7eel@qsl.net'
+
+def build_unit(CONFIG):
+    UNIT = []
+    for i in CONFIG['SYSTEMS'].items():
+        if i[1]['ENABLED'] == True and i[1]['MODE'] != 'XLXPEER': # and i[0] not in exclude:
+            UNIT.append(i[0])
+    return UNIT
+# Functions
+def data_que_check():
+    l=task.LoopingCall(data_que_send)
+    l.start(1)
+def data_que_send():
+    #logger.info('Check SMS que')
+    try:
+        #logger.info(UNIT_MAP)
+        for packet_file in os.listdir('/tmp/.hblink_data_que_ipsc/'):
+            logger.info('Sending SMS')
+            data_file = ast.literal_eval(os.popen('cat /tmp/.hblink_data_que_ipsc/' + str(packet_file)).read())
+
+            for i in data_file:
+                #print(bytes.fromhex(str(i)))
+                for d in UNIT:
+                    systems[d].send_system(bytes.fromhex(i))
+            os.system('rm /tmp/.hblink_data_que_ipsc/' + packet_file)
+
+            
+
+    except Exception as e:
+        logger.info(e)
+
+def mmdvm_encapsulate(dst_id, src_id, peer_id, _seq, _slot, _call_type, _dtype_vseq, _stream_id, _dmr_data):
+    signature = 'DMRD'
+    # needs to be in bytes
+    frame_type = 0x10 #bytes_2(int(10))
+    #print((frame_type))
+    dest_id = bytes_3(int(dst_id, 16))
+#    print((dest_id))
+
+    #print(ahex(dest_id))
+    source_id = bytes_3(int(src_id, 16))
+    via_id = bytes_4(int(peer_id, 16))
+   # print((source_id))
+    #print(ahex(via_id))
+    seq = int(_seq).to_bytes(1, 'big')
+    #print(ahex(seq))
+    # Binary, 0 for 1, 1 for 2
+    slot = bitarray(str(_slot))
+    #print(slot)
+    # binary, 0 for group, 1 for unit, bin(1)
+   # print(_call_type)
+    call_type = bitarray(str(_call_type))
+    #print(call_type)
+    #0x00 for voice, 0x01 for voice sync, 0x10 for data 
+    #frame_type = int(16).to_bytes(1, 'big')
+    frame_type = bitarray('10')
+    #print(frame_type)
+    # Observed to be always 7, int. Will be 6 for header
+    #dtype_vseq = hex(int(_dtype_vseq)).encode()
+    if _dtype_vseq == 6:
+        dtype_vseq = bitarray('0110')
+    if _dtype_vseq == 7:
+        dtype_vseq = bitarray('0111')
+    if _dtype_vseq == 3:
+        dtype_vseq = bitarray('0011')
+    # 9 digit integer in hex
+    stream_id = bytes_4(_stream_id)
+    #print(ahex(stream_id))
+
+    middle_guts = slot + call_type + frame_type + dtype_vseq
+    #print(middle_guts)
+    dmr_data = str(_dmr_data)[2:-1] #str(re.sub("b'|'", '', str(_dmr_data)))
+    complete_packet = signature.encode() + seq + dest_id + source_id + via_id + middle_guts.tobytes() + stream_id + bytes.fromhex((dmr_data)) + bitarray('0000000000101111').tobytes()#bytes.fromhex(dmr_data)
+
+    return complete_packet
+
+def dmr_encode(packet_list, _slot):
+    send_seq = []
+    for i in packet_list:
+        stitched_pkt = bptc.interleave_19696(bptc.encode_19696(i))
+        l_slot = bitarray('0111011100')
+        #MS
+        #sync_data = bitarray('110101011101011111110111011111111101011101010111')
+        if _slot == 0:
+            # TS1 - F7FDD5DDFD55
+            sync_data = bitarray('111101111111110111010101110111011111110101010101')
+        if _slot == 1:
+            #TS2 - D7557F5FF7F5
+            sync_data = bitarray('110101110101010101111111010111111111011111110101')
+        # TS1
+        #sync_data = bitarray('111101111111110111010101110111011111110101010101')
+        #TS2
+        #sync_data = bitarray('110101110101010101111111010111111111011111110101')
+        r_slot = bitarray('1101110001')
+        # Data sync? 110101011101011111110111011111111101011101010111 - D5D7F77FD757
+        new_pkt = ahex(stitched_pkt[:98] + l_slot + sync_data + r_slot + stitched_pkt[98:])
+        send_seq.append(new_pkt)
+    return send_seq

 # Module gobal varaibles

+def config_reports(_config, _factory):
+    if True: #_config['REPORTS']['REPORT']:
+        def reporting_loop(logger, _server):
+            logger.debug('(REPORT) Periodic reporting loop started')
+            _server.send_config()
+            _server.send_bridge()
+
+        logger.info('(REPORT) HBlink TCP reporting server configured')
+
+        report_server = _factory(_config)
+        report_server.clients = []
+        reactor.listenTCP(_config['REPORTS']['REPORT_PORT'], report_server)
+
+        reporting = task.LoopingCall(reporting_loop, logger, report_server)
+        reporting.start(_config['REPORTS']['REPORT_INTERVAL'])
+
+    return report_server
+
+class bridgeReportFactory(reportFactory):
+
+    def send_bridge(self):
+        serialized = pickle.dumps(BRIDGES, protocol=2) #.decode("utf-8", errors='ignore')
+        self.send_clients(REPORT_OPCODES['BRIDGE_SND']+serialized)
+
+    def send_bridgeEvent(self, _data):
+        if isinstance(_data, str):
+            _data = _data.decode('utf-8', error='ignore')
+        self.send_clients(REPORT_OPCODES['BRDG_EVENT']+_data)

 class OBP(OPENBRIDGE):

@@ -98,7 +228,7 @@ if __name__ == '__main__':

    # 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'
+        cli_args.CONFIG_FILE = os.path.dirname(os.path.abspath(__file__))+'/ipsc_to_mmdvm.cfg'

    # Call the external routine to build the configuration dictionary
    CONFIG = config.build_config(cli_args.CONFIG_FILE)
@@ -145,6 +275,9 @@ if __name__ == '__main__':
    def loopingErrHandle(failure):
        logger.error('(GLOBAL) STOPPING REACTOR TO AVOID MEMORY LEAK: Unhandled error in timed loop.\n %s', failure)
        reactor.stop()
+    Path('/tmp/.hblink_data_que_ipsc/').mkdir(parents=True, exist_ok=True)
+    UNIT = build_unit(CONFIG)
+    data_que_check()


    reactor.run()
@@ -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])
@@ -0,0 +1,209 @@
+# 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: 4322
+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/hb-playback.log
+LOG_HANDLERS: console
+LOG_LEVEL: DEBUG
+LOG_NAME: HBlink3 Playback
+
+# 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: False
+PATH: ./
+PEER_FILE: peer_ids.json
+SUBSCRIBER_FILE: subscriber_ids.json
+TGID_FILE: talkgroup_ids.json
+PEER_URL: https://www.radioid.net/static/rptrs.json
+SUBSCRIBER_URL: https://www.radioid.net/static/users.json
+STALE_DAYS: 7
+
+# 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.
+# OpenBridge passes all traffic on TS1, so there is only 1 TGID ACL.
+# Otherwise ACLs work as described in the global stanza
+#[OBP-1]
+#MODE: OPENBRIDGE
+#ENABLED: True
+#IP:
+#PORT: 62035
+#NETWORK_ID: 3129100
+#PASSPHRASE: password
+#TARGET_IP: 1.2.3.4
+#TARGET_PORT: 62035
+#USE_ACL: True
+#SUB_ACL: DENY:1
+#TGID_ACL: PERMIT:ALL
+
+# 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]
+MODE: MASTER
+ENABLED: True
+REPEAT: True
+MAX_PEERS: 1
+EXPORT_AMBE: False
+IP:
+PORT: 54072
+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: True
+#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
@@ -169,13 +169,13 @@ if __name__ == '__main__':

    # 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('-c', '--config', action='store', dest='CONFIG_FILE', help='/full/path/to/config.file (usually playback.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'
+        cli_args.CONFIG_FILE = os.path.dirname(os.path.abspath(__file__))+'/playback.cfg'

    # Call the external routine to build the configuration dictionary
    CONFIG = config.build_config(cli_args.CONFIG_FILE)
@@ -6,8 +6,8 @@ configparser>=3.0.0
 aprslib>=0.6.42
 pynmea2
 maidenhead
-requests
+flask
+folium
 libscrc
-resettabletimer
-cryptography
+requests

@@ -0,0 +1,85 @@
+###############################################################################
+#   GPS/Data - Copyright (C) 2020 Eric Craw, 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
+#   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
+###############################################################################
+
+import aprslib
+import ast, os
+import re
+from configparser import ConfigParser
+import time
+import argparse
+
+def mailbox_write(call, dmr_id, time, message, recipient):
+    global mailbox_file
+    mail_file = ast.literal_eval(os.popen('cat ' + parser.get('GPS_DATA', 'MAILBOX_FILE')).read())
+    mail_file.insert(0, {'call': call, 'dmr_id': dmr_id, 'time': time, 'message':message, 'recipient': recipient})
+    with open(parser.get('GPS_DATA', 'MAILBOX_FILE'), 'w') as mailbox_file:
+            mailbox_file.write(str(mail_file[:100]))
+            mailbox_file.close()
+    print('User mail saved.')
+
+def aprs_filter(packet):
+
+    user_settings = ast.literal_eval(os.popen('cat ' + user_settings_file).read())
+    if 'addresse' in aprslib.parse(packet):
+        #print(aprslib.parse(packet))
+        recipient = re.sub('-.*','', aprslib.parse(packet)['addresse'])
+        recipient_ssid = re.sub('.*-','', aprslib.parse(packet)['addresse'])
+        if recipient == '':
+            pass
+        else:
+            for i in user_settings.items():
+                ssid = i[1][1]['ssid']
+                if i[1][1]['ssid'] == '':
+                    ssid = user_aprs_ssid
+                if recipient in i[1][0]['call'] and recipient_ssid in ssid:
+                    mailbox_write(re.sub('-.*','', aprslib.parse(packet)['addresse']), aprslib.parse(packet)['from'], time.time(), aprslib.parse(packet)['message_text'], recipient)
+                    if 'msgNo' in aprslib.parse(packet):
+                        time.sleep(1)
+                        AIS.sendall(aprslib.parse(packet)['addresse'] + '>APHBL3,TCPIP*:' + ':' + aprslib.parse(packet)['from'].ljust(9) +':ack'+aprslib.parse(packet)['msgNo'])
+                        print('Send ACK')
+                        print(aprslib.parse(packet)['addresse'] + '>APHBL3,TCPIP*:' + ':' + aprslib.parse(packet)['from'].ljust(9) +':ack'+aprslib.parse(packet)['msgNo'])
+
+##    else:
+##        print(aprslib.parse(packet)['from'])
+
+if __name__ == '__main__':
+    arg_parser = argparse.ArgumentParser()
+    arg_parser.add_argument('-c', '--config', action='store', dest='CONFIG_FILE', help='/full/path/to/config.file (usually gps_data.cfg)')
+    cli_args = arg_parser.parse_args()
+    parser = ConfigParser()
+    if not cli_args.CONFIG_FILE:
+        print('\n\nMust specify a config file with -c argument.\n\n')
+    parser.read(cli_args.CONFIG_FILE)
+
+    aprs_server = parser.get('GPS_DATA', 'APRS_SERVER')
+    aprs_port = parser.get('GPS_DATA', 'APRS_PORT')
+    aprs_login = parser.get('GPS_DATA', 'APRS_RECEIVE_LOGIN_CALL')
+    aprs_passcode = parser.get('GPS_DATA', 'APRS_LOGIN_PASSCODE')
+    mailbox_file = parser.get('GPS_DATA', 'MAILBOX_FILE')
+    user_settings_file = parser.get('GPS_DATA', 'USER_SETTINGS_FILE')
+    user_aprs_ssid = parser.get('GPS_DATA', 'USER_APRS_SSID')
+
+    AIS = aprslib.IS(aprs_login, passwd=int(aprs_passcode), host=aprs_server, port=int(aprs_port))
+    user_settings = ast.literal_eval(os.popen('cat ' + user_settings_file).read())
+    print('APRS message receive script for GPS/Data Application.\nAuthor: Eric, KF7EEL - kf7eel@qsl.net')
+    AIS.set_filter(parser.get('GPS_DATA', 'APRS_FILTER'))
+    AIS.connect()
+    print('Connecting to APRS-IS')
+    AIS.consumer(aprs_filter, raw=True)
+
+
@@ -0,0 +1,398 @@
+# 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
+
+# APRS - BY IU7IGU
+# Enabling "APRS" will configure APRS-Beaconing of Master's connection
+# like repeater and hotspots.
+# REPORT_INTERVAL in Minute (ALLOW only > 3 Minutes)
+# CALLSIGN: Callsign that will pubblish data on aprs server
+# MESSAGE: This message will print on APRS description together RX and TX Frequency
+
+[APRS]
+ENABLED: False
+REPORT_INTERVAL: 15
+CALLSIGN:HB1LNK-11
+SERVER:euro.aprs2.net
+MESSAGE:Connesso ad HBLINK
+
+# 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: 4321
+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: 1
+
+# GPS/Data Application - by KF7EEL
+# Configure the settings for the DMR GPS to APRS position application here.
+#
+# DATA_DMR_ID - This is the DMR ID that users send DMR GPS data.
+# CALL_TYPE - group, unit, or both. Group if you want users to send data to a talkgroup,
+# unit if you want users to send data as a private call, or both if you want both options.
+# USER_APRS_SSID - Default APRS SSID assigned to user APRS positions.
+# USER_APRS_COMMENT - Default Comment attached to user APRS positions.
+# APRS_LOGIN_CALL, PASSCODE, SERVER, and PORT - Login settings for APRS-IS.
+[GPS_DATA]
+DATA_DMR_ID: 9099
+CALL_TYPE: both
+USER_APRS_SSID: 15
+USER_APRS_COMMENT: HBLink3 D-APRS -
+
+# Setting APRS_LOGIN_CALL to N0CALL will cause the gateway to not upload packets to APRS server.
+APRS_LOGIN_CALL: N0CALL
+APRS_LOGIN_PASSCODE: 12345
+APRS_SERVER: rotate.aprs2.net
+APRS_PORT: 14580
+
+# 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 = 0000.00N
+IGATE_LONGITUDE = 00000.00W
+
+# User settings file, MUST configure using absolute path.
+USER_SETTINGS_FILE: /path/to/user_settings.txt
+
+# The APRS filter below is used for the message received script. See http://www.aprs-is.net/javAPRSFilter.aspx for details
+# about APRS filters.
+APRS_RECEIVE_LOGIN_CALL: N0CALL-1
+APRS_FILTER: r/47/-120/500 t/m
+
+# The email gateway settingns below are OPTIONAL. They are NOT REQUIRED if you don't want
+# to enable the email gateway. Leave as is to disable.
+EMAIL_SENDER: 
+EMAIL_PASSWORD: 
+SMTP_SERVER: smtp.gmail.com
+SMTP_PORT: 465
+
+# 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
+
+# The following options are used for the dashboard. The dashboard is optional.
+# Title of the Dashboard
+DASHBOARD_TITLE: HBLink3 D-APRS Dashboard
+
+# 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
+
+# RSS feed link, shows in the link section of each RSS item.
+RSS_LINK: http://localhost:8092
+
+# 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: False
+IP:
+PORT: 62035
+NETWORK_ID: 3129100
+PASSPHRASE: password
+TARGET_IP: 1.2.3.4
+TARGET_PORT: 62035
+BOTH_SLOTS: True
+USE_ACL: True
+SUB_ACL: DENY:1
+TGID_ACL: PERMIT:ALL
+
+# 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
+# The APRS setting below has to do with the beaconing of PEER conections, and not GPS positions
+# from radios. This setting will not affect gps_data.py
+APRS: False
+REPEAT: True
+MAX_PEERS: 10
+EXPORT_AMBE: False
+IP:
+PORT: 54000
+PASSPHRASE: s3cr37w0rd
+GROUP_HANGTIME: 5
+USE_ACL: True
+REG_ACL: DENY:1
+SUB_ACL: DENY:1
+TGID_TS1_ACL: PERMIT:ALL
+TGID_TS2_ACL: PERMIT:ALL
+
+[D-APRS]
+MODE: MASTER
+ENABLED: True
+REPEAT: True
+MAX_PEERS: 2
+EXPORT_AMBE: False
+IP:
+PORT: 54070
+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
+
+[ECHO]
+MODE: PEER
+ENABLED: True
+LOOSE: False
+EXPORT_AMBE: False
+IP: 
+PORT: 54073
+MASTER_IP: localhost
+MASTER_PORT: 54072
+passphrase: passw0rd
+CALLSIGN: ECHO
+RADIO_ID: 9999
+RX_FREQ: 000000000
+TX_FREQ: 000000000
+TX_POWER: 0
+COLORCODE: 1
+SLOTS: 1
+LATITUDE: 00.0000
+LONGITUDE: 000.0000
+HEIGHT: 0
+LOCATION: This Server
+DESCRIPTION: Echo Server
+URL: www.github.com/kf7eel/hblink3
+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
@@ -63,7 +63,7 @@ TGID_TS2_ACL: PERMIT:ALL
 [REPORTS]
 REPORT: True
 REPORT_INTERVAL: 60
-REPORT_PORT: 4329
+REPORT_PORT: 4323
 REPORT_CLIENTS: 127.0.0.1


@@ -84,10 +84,10 @@ REPORT_CLIENTS: 127.0.0.1
 #   used.
 #
 [LOGGER]
-LOG_FILE: /tmp/hblink.log
+LOG_FILE: /tmp/gps_data.log
 LOG_HANDLERS: console-timed
 LOG_LEVEL: DEBUG
-LOG_NAME: HBlink
+LOG_NAME: HBlink3 GPS/Data

 # DOWNLOAD AND IMPORT SUBSCRIBER, PEER and TGID ALIASES
 # Ok, not the TGID, there's no master list I know of to download
@@ -103,41 +103,32 @@ 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
+STALE_DAYS: 1

-# 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]
+#####################################################################
+# GPS/Data Application - by KF7EEL
+# Configure the settings for the DMR GPS to APRS position application here.
+#
+# DATA_DMR_ID - This is the DMR ID that users send DMR GPS data.
+# CALL_TYPE - group, unit, or both. Group if you want users to send data to a talkgroup,
+# unit if you want users to send data as a private call, or both if you want both options.
+# USER_APRS_SSID - Default APRS SSID assigned to user APRS positions.
+# USER_APRS_COMMENT - Default Comment attached to user APRS positions.
+# APRS_LOGIN_CALL, PASSCODE, SERVER, and PORT - Login settings for APRS-IS.
+[GPS_DATA]
 DATA_DMR_ID: 9099
-CALL_TYPE: both
-UNIT_SMS_TS: 2
+CALL_TYPE: unit
+USER_APRS_SSID: 15
+USER_APRS_COMMENT: HBLink3 D-APRS -

-USER_APRS_SSID: 5
-USER_APRS_COMMENT: HBNet APRS Gateway
-APRS_SERVER: hbl.ink
-APRS_PORT: 14580
+# Setting APRS_LOGIN_CALL to N0CALL will cause the gateway to not upload packets to APRS server.
 APRS_LOGIN_CALL: N0CALL
 APRS_LOGIN_PASSCODE: 12345
+APRS_SERVER: rotate.aprs2.net
+APRS_PORT: 14580
+
+# The APRS filter below is used for the message received script. See http://www.aprs-is.net/javAPRSFilter.aspx for details
+# about APRS filters.
 APRS_FILTER: r/47/-120/500 t/m

 # The following settings are only applicable if you are using the gps_data_beacon_igate script.
@@ -146,15 +137,22 @@ APRS_FILTER: r/47/-120/500 t/m
 IGATE_BEACON_TIME = 45
 IGATE_BEACON_COMMENT = HBLink3 D-APRS Gateway
 IGATE_BEACON_ICON = /I
-IGATE_LATITUDE = 4730.  N
-IGATE_LONGITUDE = 11930.  W
+IGATE_LATITUDE = 0000.00N
+IGATE_LONGITUDE = 00000.00W

 # 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
+MESSAGE:Connected to HBLink
+
+# The email gateway settingns below are OPTIONAL. They are NOT REQUIRED if you don't want
+http://www.aprs-is.net/javAPRSFilter.aspx# to enable the email gateway. Leave as is to disable.
+EMAIL_SENDER: test@example.org
+EMAIL_PASSWORD: letmein
+SMTP_SERVER: smtp.gmail.com
+SMTP_PORT: 465

 # 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.
@@ -163,29 +161,13 @@ 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
+USER_SETTINGS_FILE: /path/to/user_settings.txt

 # 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
+DASHBOARD_TITLE: HBLink3 D-APRS Dashboard

 # Logo used on dashboard page
 LOGO: https://raw.githubusercontent.com/kf7eel/hblink3/gps/HBlink.png
@@ -217,7 +199,10 @@ ZOOM_LEVEL: 7
 # 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

+# RSS feed link, shows in the link section of each RSS item.
+RSS_LINK: http://localhost:8092

+#####################################################################
 # 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
@@ -237,21 +222,20 @@ MAP_THEME: Stamen Toner
 # 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
+PORT: 62035
+NETWORK_ID: 3129100
+PASSPHRASE: password
+TARGET_IP: 1.2.3.4
+TARGET_PORT: 62035
 BOTH_SLOTS: True
 USE_ACL: True
 SUB_ACL: DENY:1
 TGID_ACL: PERMIT:ALL
-USE_ENCRYPTION: False
-ENCRYPTION_KEY: 

 # MASTER INSTANCES - DUPLICATE SECTION FOR MULTIPLE MASTERS
 # HomeBrew Protocol Master instances go here.
@@ -268,17 +252,14 @@ ENCRYPTION_KEY:
 # 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
-
+ENABLED: False
+STATIC_APRS_POSITION_ENABLED: False
 REPEAT: True
-MAX_PEERS: 3
+MAX_PEERS: 10
 EXPORT_AMBE: False
 IP:
-PORT: 62033
-PASSPHRASE: passw0rd
+PORT: 54000
+PASSPHRASE: password
 GROUP_HANGTIME: 5
 USE_ACL: True
 REG_ACL: DENY:1
@@ -298,6 +279,7 @@ TGID_TS2_ACL: PERMIT:ALL
 #
 # ACLs:
 # See comments in the GLOBAL stanza
+
 [REPEATER-1]
 MODE: PEER
 ENABLED: False
@@ -330,6 +312,38 @@ SUB_ACL: DENY:1
 TGID_TS1_ACL: PERMIT:ALL
 TGID_TS2_ACL: PERMIT:ALL

+[ECHO]
+MODE: PEER
+ENABLED: True
+LOOSE: False
+EXPORT_AMBE: False
+IP: 
+PORT: 54073
+MASTER_IP: localhost
+MASTER_PORT: 54072
+passphrase: passw0rd
+CALLSIGN: ECHO
+RADIO_ID: 9999
+RX_FREQ: 000000000
+TX_FREQ: 000000000
+TX_POWER: 0
+COLORCODE: 1
+SLOTS: 1
+LATITUDE: 00.0000
+LONGITUDE: 000.0000
+HEIGHT: 0
+LOCATION: This Server
+DESCRIPTION: Echo Server
+URL: www.github.com/kf7eel/hblink3
+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
@@ -361,3 +375,4 @@ USE_ACL: True
 SUB_ACL: DENY:1
 TGID_TS1_ACL: PERMIT:ALL
 TGID_TS2_ACL: PERMIT:ALL
+
@@ -0,0 +1,820 @@
+#!/usr/bin/env python3
+#
+###############################################################################
+#   HBLink - Copyright (C) 2020 Cortney T. Buffington, N0MJS <n0mjs@me.com>
+#   GPS/Data - Copyright (C) 2020 Eric Craw, KF7EEL <kf7eel@qsl.net>
+#   Annotated modifications Copyright (C) 2021 Xavier FRS2013
+#
+#   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 is a GPS and Data application. It decodes and reassambles DMR GPS packets and
+uploads them th APRS-IS.
+'''
+
+# Python modules we need
+import sys
+from bitarray import bitarray
+from time import time
+from importlib import import_module
+from types import ModuleType
+
+# 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, config_reports, mk_aliases, acl_check
+from dmr_utils3.utils import bytes_3, int_id, get_alias
+from dmr_utils3 import decode, bptc, const
+import config
+import log
+import const
+
+# The module needs logging logging, but handlers, etc. are controlled by the parent
+import logging
+logger = logging.getLogger(__name__)
+import traceback
+
+# Other modules we need for data and GPS
+from bitarray import bitarray
+from binascii import b2a_hex as ahex
+import re
+##from binascii import a2b_hex as bhex
+import aprslib
+import datetime
+from bitarray.util import ba2int as ba2num
+from bitarray.util import ba2hex as ba2hx
+import codecs
+import time
+#Needed for working with NMEA
+import pynmea2
+
+# Modules for executing commands/scripts
+import os
+from gps_functions import cmd_list
+
+# Module for maidenhead grids
+try:
+    import maidenhead as mh
+except Exception as error_exception:
+    logger.info('Error importing maidenhead module, make sure it is installed.')
+# Module for sending email
+try:
+    import smtplib
+except Exception as error_exception:
+    logger.info('Error importing smtplib module, make sure it is installed.')
+
+#Modules for APRS settings
+import ast
+from pathlib import Path
+
+
+# Does anybody read this stuff? There's a PEP somewhere that says I should do this.
+__author__     = 'Cortney T. Buffington, N0MJS; Eric Craw, KF7EEL'
+__copyright__  = 'Copyright (c) 2020 Cortney T. Buffington'
+__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'
+__status__     = 'pre-alpha'
+
+# Known to work with: AT-D878
+
+# Must have the following at line 1054 in bridge.py to forward group vcsbk, also there is a typo there:
+# self.group_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data)
+
+##################################################################################################
+
+# Headers for GPS by model of radio:
+# AT-D878 - Compressed UDP
+# MD-380 - Unified Data Transport
+hdr_type = ''
+btf = -1
+ssid = ''
+
+# From dmr_utils3, modified to decode entire packet. Works for 1/2 rate coded data. 
+def decode_full(_data):
+    binlc = bitarray(endian='big')   
+    binlc.extend([_data[136],_data[121],_data[106],_data[91], _data[76], _data[61], _data[46], _data[31]])
+    binlc.extend([_data[152],_data[137],_data[122],_data[107],_data[92], _data[77], _data[62], _data[47], _data[32], _data[17], _data[2]  ])
+    binlc.extend([_data[123],_data[108],_data[93], _data[78], _data[63], _data[48], _data[33], _data[18], _data[3],  _data[184],_data[169]])
+    binlc.extend([_data[94], _data[79], _data[64], _data[49], _data[34], _data[19], _data[4],  _data[185],_data[170],_data[155],_data[140]])
+    binlc.extend([_data[65], _data[50], _data[35], _data[20], _data[5],  _data[186],_data[171],_data[156],_data[141],_data[126],_data[111]])
+    binlc.extend([_data[36], _data[21], _data[6],  _data[187],_data[172],_data[157],_data[142],_data[127],_data[112],_data[97], _data[82] ])
+    binlc.extend([_data[7],  _data[188],_data[173],_data[158],_data[143],_data[128],_data[113],_data[98], _data[83]])
+    #This is the rest of the Full LC data -- the RS1293 FEC that we don't need
+    # This is extremely important for SMS and GPS though.
+    binlc.extend([_data[68],_data[53],_data[174],_data[159],_data[144],_data[129],_data[114],_data[99],_data[84],_data[69],_data[54],_data[39]])
+    binlc.extend([_data[24],_data[145],_data[130],_data[115],_data[100],_data[85],_data[70],_data[55],_data[40],_data[25],_data[10],_data[191]])
+    return binlc
+   
+
+n_packet_assembly = 0
+
+packet_assembly = ''
+
+final_packet = ''
+
+#Convert DMR packet to binary from MMDVM packet and remove Slot Type and EMB Sync stuff to allow for BPTC 196,96 decoding
+def bptc_decode(_data):
+        binary_packet = bitarray(decode.to_bits(_data[20:]))
+        del binary_packet[98:166]
+        return decode_full(binary_packet)
+# Placeholder for future header id
+def header_ID(_data):
+    hex_hdr = str(ahex(bptc_decode(_data)))
+    return hex_hdr[2:6]
+    # Work in progress, used to determine data format
+##    pass
+
+def aprs_send(packet):
+    if aprs_callsign == 'N0CALL':
+        logger.info('APRS callsighn set to N0CALL, packet not sent.')
+        pass
+    else:
+        AIS = aprslib.IS(aprs_callsign, passwd=aprs_passcode,host=aprs_server, port=aprs_port)
+        AIS.connect()
+        AIS.sendall(packet)
+        AIS.close()
+        logger.info('Packet sent to APRS-IS.')
+# For future use
+##def position_timer(aprs_call):
+##    dash_entries = ast.literal_eval(os.popen('cat ' + loc_file).read())
+##    for i in dash_entries:
+##        if aprs_call == i['call']:
+##            if time.time()
+
+
+def dashboard_loc_write(call, lat, lon, time, comment):
+    dash_entries = ast.literal_eval(os.popen('cat /tmp/gps_data_user_loc.txt').read())
+    dash_entries.insert(0, {'call': call, 'lat': lat, 'lon': lon, 'time':time, 'comment':comment})
+# Clear old entries
+    list_index = 0
+    call_count = 0
+    new_dash_entries = []
+    for i in dash_entries:
+        if i['call'] == call:
+            if call_count >= 25:
+                pass
+            else:
+                new_dash_entries.append(i)
+            call_count = call_count + 1
+
+        if call != i['call']:
+            new_dash_entries.append(i)
+            pass
+        list_index = list_index + 1
+    with open(loc_file, 'w') as user_loc_file:
+            user_loc_file.write(str(new_dash_entries[:500]))
+            user_loc_file.close()
+    logger.info('User location saved for dashboard')
+    #logger.info(dash_entries)
+
+def dashboard_bb_write(call, dmr_id, time, bulletin):
+    #try:
+    dash_bb = ast.literal_eval(os.popen('cat ' + bb_file).read())
+   # except:
+    #    dash_entries = []
+    dash_bb.insert(0, {'call': call, 'dmr_id': dmr_id, 'time': time, 'bulletin':bulletin})
+    with open(bb_file, 'w') as user_bb_file:
+            user_bb_file.write(str(dash_bb[:20]))
+            user_bb_file.close()
+    logger.info('User bulletin entry saved.')
+    #logger.info(dash_bb)
+
+def mailbox_write(call, dmr_id, time, message, recipient):
+    #try:
+    mail_file = ast.literal_eval(os.popen('cat ' + the_mailbox_file).read())
+    mail_file.insert(0, {'call': call, 'dmr_id': dmr_id, 'time': time, 'message':message, 'recipient': recipient})
+    with open(the_mailbox_file, 'w') as mailbox_file:
+            mailbox_file.write(str(mail_file[:100]))
+            mailbox_file.close()
+    logger.info('User mail saved.')
+
+def mailbox_delete(dmr_id):
+    mail_file = ast.literal_eval(os.popen('cat ' + the_mailbox_file).read())
+    call = str(get_alias((dmr_id), subscriber_ids))
+    new_data = []
+    for message in mail_file:
+        if message['recipient'] != call:
+            new_data.append(message)
+    with open(the_mailbox_file, 'w') as mailbox_file:
+            mailbox_file.write(str(new_data[:100]))
+            mailbox_file.close()
+    logger.info('Mailbox updated. Delete occurred.')
+
+
+def sos_write(dmr_id, time, message):
+    user_settings = ast.literal_eval(os.popen('cat ' + user_settings_file).read())
+    try:
+        if user_settings[dmr_id][1]['ssid'] == '':
+            sos_call = user_settings[dmr_id][0]['call'] + '-' + user_ssid
+        else:
+            sos_call = user_settings[dmr_id][0]['call'] + '-' + user_settings[dmr_id][1]['ssid']
+    except:
+        sos_call = str(get_alias((dmr_id), subscriber_ids))
+    sos_info = {'call': sos_call, 'dmr_id': dmr_id, 'time': time, 'message':message}
+    with open(emergency_sos_file, 'w') as sos_file:
+            sos_file.write(str(sos_info))
+            sos_file.close()
+    logger.info('Saved SOS.')
+
+# Send email via SMTP function
+def send_email(to_email, email_subject, email_message):
+    global smtp_server
+    sender_address = email_sender
+    account_password = email_password
+    smtp_server = smtplib.SMTP_SSL(smtp_server, int(smtp_port))
+    smtp_server.login(sender_address, account_password)
+    message = "From: " + aprs_callsign + " D-APRS Gateway\nTo: " + to_email + "\nContent-type: text/html\nSubject: " + email_subject + "\n\n" + '<strong>' + email_subject + '</strong><p>&nbsp;</p><h3>' + email_message + '</h3><p>&nbsp;</p><p>This message was sent to you from a D-APRS gateway operated by <strong>' + aprs_callsign + '</strong>. Do not reply as this gateway is only one way at this time.</p>'
+    smtp_server.sendmail(sender_address, to_email, message)
+    smtp_server.close()
+
+# Thanks for this forum post for this - https://stackoverflow.com/questions/2579535/convert-dd-decimal-degrees-to-dms-degrees-minutes-seconds-in-python
+
+def decdeg2dms(dd):
+   is_positive = dd >= 0
+   dd = abs(dd)
+   minutes,seconds = divmod(dd*3600,60)
+   degrees,minutes = divmod(minutes,60)
+   degrees = degrees if is_positive else -degrees
+   return (degrees,minutes,seconds)
+
+def user_setting_write(dmr_id, setting, value):
+##    try:
+    # Open file and load as dict for modification
+        with open(user_settings_file, 'r') as f:
+##            if f.read() == '{}':
+##                user_dict = {}
+            user_dict = ast.literal_eval(f.read())
+            logger.info('Current settings: ' + str(user_dict))
+            if dmr_id not in user_dict:
+                user_dict[dmr_id] = [{'call': str(get_alias((dmr_id), subscriber_ids))}, {'ssid': ''}, {'icon': ''}, {'comment': ''}]
+            if setting.upper() == 'ICON':
+                user_dict[dmr_id][2]['icon'] = value
+            if setting.upper() == 'SSID':
+                user_dict[dmr_id][1]['ssid'] = value  
+            if setting.upper() == 'COM':
+                user_comment = user_dict[dmr_id][3]['comment'] = value[0:35]
+            if setting.upper() == 'APRS':
+                user_dict[dmr_id] = [{'call': str(get_alias((dmr_id), subscriber_ids))}, {'ssid': ''}, {'icon': ''}, {'comment': ''}]
+            if setting.upper() == 'PIN':
+                try:
+                    if user_dict[dmr_id]:
+                        user_dict[dmr_id][4]['pin'] = value
+                    if not user_dict[dmr_id]:
+                        user_dict[dmr_id] = [{'call': str(get_alias((dmr_id), subscriber_ids))}, {'ssid': ''}, {'icon': ''}, {'comment': ''}, {'pin': pin}]
+                except:
+                    user_dict[dmr_id].append({'pin': value})
+            f.close()
+            logger.info('Loaded user settings. Preparing to write...')
+    # Write modified dict to file
+        with open(user_settings_file, 'w') as user_dict_file:
+            user_dict_file.write(str(user_dict))
+            user_dict_file.close()
+            logger.info('User setting saved')
+            f.close()
+            packet_assembly = ''
+      
+# Process SMS, do something bases on message
+
+def process_sms(_rf_src, sms):
+    if sms == 'ID':
+        logger.info(str(get_alias(int_id(_rf_src), subscriber_ids)) + ' - ' + str(int_id(_rf_src)))
+    elif sms == 'TEST':
+        logger.info('It works!')
+    elif '@ICON' in sms:
+        user_setting_write(int_id(_rf_src), re.sub(' .*|@','',sms), re.sub('@ICON| ','',sms))
+    elif '@SSID' in sms:
+        user_setting_write(int_id(_rf_src), re.sub(' .*|@','',sms), re.sub('@SSID| ','',sms))
+    elif '@COM' in sms:
+        user_setting_write(int_id(_rf_src), re.sub(' .*|@','',sms), re.sub('@COM |@COM','',sms))
+    elif '@PIN' in sms:
+        user_setting_write(int_id(_rf_src), re.sub(' .*|@','',sms), int(re.sub('@PIN |@PIN','',sms)))
+    # Write blank entry to cause APRS receive to look for packets for this station.
+    elif '@APRS' in sms:
+        user_setting_write(int_id(_rf_src), 'APRS', '')
+    elif '@BB' in sms:
+        dashboard_bb_write(get_alias(int_id(_rf_src), subscriber_ids), int_id(_rf_src), time.time(), re.sub('@BB|@BB ','',sms))
+    elif '@' and ' E-' in sms:
+        email_message = str(re.sub('.*@|.* E-', '', sms))
+        to_email = str(re.sub(' E-.*', '', sms))
+        email_subject = 'New message from ' + str(get_alias(int_id(_rf_src), subscriber_ids))
+        logger.info('Email to: ' + to_email)
+        logger.info('Message: ' + email_message)
+        try:
+            send_email(to_email, email_subject, email_message)
+            logger.info('Email sent.')
+        except Exception as error_exception:
+            logger.info('Failed to send email.')
+            logger.info(error_exception)
+            logger.info(str(traceback.extract_tb(error_exception.__traceback__)))
+    elif '@SOS' in sms or '@NOTICE' in sms:
+        sos_write(int_id(_rf_src), time.time(), sms)
+    elif '@REM SOS' == sms:
+        os.remove(emergency_sos_file)
+        logger.info('Removing SOS or Notice')
+    elif '@' and 'M-' in sms:
+        message = re.sub('^@|.* M-|','',sms)
+        recipient = re.sub('@| M-.*','',sms)
+        mailbox_write(get_alias(int_id(_rf_src), subscriber_ids), int_id(_rf_src), time.time(), message, str(recipient).upper())
+    elif '@REM MAIL' == sms:
+        mailbox_delete(_rf_src)
+    elif '@MH' in sms:
+        grid_square = re.sub('@MH ', '', sms)
+        if len(grid_square) < 6:
+            pass
+        else:
+            lat = decdeg2dms(mh.to_location(grid_square)[0])
+            lon = decdeg2dms(mh.to_location(grid_square)[1])
+            
+            if lon[0] < 0:
+                lon_dir = 'W'
+            if lon[0] > 0:
+                lon_dir = 'E'
+            if lat[0] < 0:
+                lat_dir = 'S'
+            if lat[0] > 0:
+                lat_dir = 'N'
+            #logger.info(lat)
+            #logger.info(lat_dir)
+            aprs_lat = str(str(re.sub('\..*|-', '', str(lat[0]))) + str(re.sub('\..*', '', str(lat[1])) + '.')).zfill(5) + '  ' + lat_dir
+            aprs_lon = str(str(re.sub('\..*|-', '', str(lon[0]))) + str(re.sub('\..*', '', str(lon[1])) + '.')).zfill(6) + '  ' + lon_dir
+        logger.info('Latitude: ' + str(aprs_lat))
+        logger.info('Longitude: ' + str(aprs_lon))
+        # 14FRS2013 simplified and moved settings retrieval
+        user_settings = ast.literal_eval(os.popen('cat ' + user_settings_file).read())	
+        if int_id(_rf_src) not in user_settings:	
+            ssid = str(user_ssid)	
+            icon_table = '/'	
+            icon_icon = '['	
+            comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src)) 	
+        else:	
+            if user_settings[int_id(_rf_src)][1]['ssid'] == '':	
+                ssid = user_ssid	
+            if user_settings[int_id(_rf_src)][3]['comment'] == '':	
+                comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src))	
+            if user_settings[int_id(_rf_src)][2]['icon'] == '':	
+                icon_table = '/'	
+                icon_icon = '['	
+            if user_settings[int_id(_rf_src)][2]['icon'] != '':	
+                icon_table = user_settings[int_id(_rf_src)][2]['icon'][0]	
+                icon_icon = user_settings[int_id(_rf_src)][2]['icon'][1]	
+            if user_settings[int_id(_rf_src)][1]['ssid'] != '':	
+                ssid = user_settings[int_id(_rf_src)][1]['ssid']	
+            if user_settings[int_id(_rf_src)][3]['comment'] != '':	
+                comment = user_settings[int_id(_rf_src)][3]['comment']	
+        aprs_loc_packet = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid + '>APHBL3,TCPIP*:@' + str(datetime.datetime.utcnow().strftime("%H%M%Sh")) + str(aprs_lat) + icon_table + str(aprs_lon) + icon_icon + '/' + str(comment)
+        logger.info(aprs_loc_packet)
+        logger.info('User comment: ' + comment)
+        logger.info('User SSID: ' + ssid)
+        logger.info('User icon: ' + icon_table + icon_icon)
+        try:
+            aprslib.parse(aprs_loc_packet)
+            aprs_send(aprs_loc_packet)
+            dashboard_loc_write(str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid, aprs_lat, aprs_lon, time.time(), comment)
+            #logger.info('Sent manual position to APRS')
+        except Exception as error_exception:
+            logger.info('Exception. Not uploaded')
+            logger.info(error_exception)
+            logger.info(str(traceback.extract_tb(error_exception.__traceback__)))
+        packet_assembly = ''
+          
+            
+    elif 'A-' in sms and '@' in sms:
+        #Example SMS text: @ARMDS A-This is a test.
+        aprs_dest = re.sub('@| A-.*','',sms)
+        aprs_msg = re.sub('^@|.* A-|','',sms)
+        logger.info('APRS message to ' + aprs_dest.upper() + '. Message: ' + aprs_msg)
+        user_settings = ast.literal_eval(os.popen('cat ' + user_settings_file).read())
+        if int_id(_rf_src) in user_settings and user_settings[int_id(_rf_src)][1]['ssid'] != '':
+            ssid = user_settings[int_id(_rf_src)][1]['ssid']
+        else:
+            ssid = user_ssid
+        aprs_msg_pkt = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + str(ssid) + '>APHBL3,TCPIP*::' + str(aprs_dest).ljust(9).upper() + ':' + aprs_msg[0:73]
+        logger.info(aprs_msg_pkt)
+        try:
+            aprslib.parse(aprs_msg_pkt)
+            aprs_send(aprs_msg_pkt)
+            #logger.info('Packet sent.')
+        except Exception as error_exception:
+            logger.info('Error uploading MSG packet.')
+            logger.info(error_exception)
+            logger.info(str(traceback.extract_tb(error_exception.__traceback__)))
+    try:
+        if sms in cmd_list:
+            logger.info('Executing command/script.')
+            os.popen(cmd_list[sms]).read()
+            packet_assembly = ''
+    except Exception as error_exception:
+        logger.info('Exception. Command possibly not in list, or other error.')
+        packet_assembly = ''
+        logger.info(error_exception)
+        logger.info(str(traceback.extract_tb(error_exception.__traceback__)))
+    else:
+        pass
+
+###########
+
+    
+class DATA_SYSTEM(HBSYSTEM):
+##    global n_packet_assembly, packet_assembly
+
+    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):
+        # Capture data headers
+        global n_packet_assembly, hdr_type
+        #logger.info(_dtype_vseq)
+        logger.info(time.strftime('%H:%M:%S - %m/%d/%y'))
+        #logger.info('Special debug for developement:')
+        #logger.info(ahex(bptc_decode(_data)))
+        #logger.info(hdr_type)
+        #logger.info((ba2num(bptc_decode(_data)[8:12])))
+        if int_id(_dst_id) == data_id:
+            #logger.info(type(_seq))
+            if type(_seq) is bytes:
+                pckt_seq = int.from_bytes(_seq, 'big')
+            else:
+                pckt_seq = _seq
+            # Try to classify header
+            # UDT header has DPF of 0101, which is 5.
+            # If 5 is at position 3, then this should be a UDT header for MD-380 type radios.
+            # Coordinates are usually in the very next block after the header, we will discard the rest.
+            #logger.info(ahex(bptc_decode(_data)[0:10]))
+            if _call_type == call_type and header_ID(_data)[3] == '5' and ba2num(bptc_decode(_data)[69:72]) == 0 and ba2num(bptc_decode(_data)[8:12]) == 0 or (_call_type == 'vcsbk' and header_ID(_data)[3] == '5' and ba2num(bptc_decode(_data)[69:72]) == 0 and ba2num(bptc_decode(_data)[8:12]) == 0):
+                global udt_block
+                logger.info('MD-380 type UDT header detected. Very next packet should be location.')
+                hdr_type = '380'
+            if _dtype_vseq == 6 and hdr_type == '380' or _dtype_vseq == 'group' and hdr_type == '380':
+                udt_block = 1
+            if _dtype_vseq == 7 and hdr_type == '380':
+                udt_block = udt_block - 1
+                if udt_block == 0:
+                    logger.info('MD-380 type packet. This should contain the GPS location.')
+                    logger.info('Packet: ' + str(ahex(bptc_decode(_data))))
+                    if ba2num(bptc_decode(_data)[1:2]) == 1:
+                        lat_dir = 'N'
+                    if ba2num(bptc_decode(_data)[1:2]) == 0:
+                        lat_dir = 'S'
+                    if ba2num(bptc_decode(_data)[2:3]) == 1:
+                        lon_dir = 'E'
+                    if ba2num(bptc_decode(_data)[2:3]) == 0:
+                        lon_dir = 'W'
+                    lat_deg = ba2num(bptc_decode(_data)[11:18])
+                    lon_deg = ba2num(bptc_decode(_data)[38:46])
+                    lat_min = ba2num(bptc_decode(_data)[18:24])
+                    lon_min = ba2num(bptc_decode(_data)[46:52])
+                    lat_min_dec = str(ba2num(bptc_decode(_data)[24:38])).zfill(4)
+                    lon_min_dec = str(ba2num(bptc_decode(_data)[52:66])).zfill(4)
+                    # Old MD-380 coordinate format, keep here until new is confirmed working.
+                    #aprs_lat = str(str(lat_deg) + str(lat_min) + '.' + str(lat_min_dec)[0:2]).zfill(7) + lat_dir
+                    #aprs_lon = str(str(lon_deg) + str(lon_min) + '.' + str(lon_min_dec)[0:2]).zfill(8) + lon_dir
+                    # Fix for MD-380 by G7HIF
+                    aprs_lat = str(str(lat_deg) + str(lat_min).zfill(2) + '.' + str(lat_min_dec)[0:2]).zfill(7) + lat_dir
+                    aprs_lon = str(str(lon_deg) + str(lon_min).zfill(2) + '.' + str(lon_min_dec)[0:2]).zfill(8) + lon_dir
+
+                    # Form APRS packet
+                    #logger.info(aprs_loc_packet)
+                    logger.info('Lat: ' + str(aprs_lat) + ' Lon: ' + str(aprs_lon))
+                    # 14FRS2013 simplified and moved settings retrieval
+                    user_settings = ast.literal_eval(os.popen('cat ' + user_settings_file).read())
+                    if int_id(_rf_src) not in user_settings:	
+                        ssid = str(user_ssid)	
+                        icon_table = '/'	
+                        icon_icon = '['	
+                        comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src)) 	
+                    else:	
+                        if user_settings[int_id(_rf_src)][1]['ssid'] == '':	
+                            ssid = user_ssid	
+                        if user_settings[int_id(_rf_src)][3]['comment'] == '':	
+                            comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src))	
+                        if user_settings[int_id(_rf_src)][2]['icon'] == '':	
+                            icon_table = '/'	
+                            icon_icon = '['	
+                        if user_settings[int_id(_rf_src)][2]['icon'] != '':	
+                            icon_table = user_settings[int_id(_rf_src)][2]['icon'][0]	
+                            icon_icon = user_settings[int_id(_rf_src)][2]['icon'][1]	
+                        if user_settings[int_id(_rf_src)][1]['ssid'] != '':	
+                            ssid = user_settings[int_id(_rf_src)][1]['ssid']	
+                        if user_settings[int_id(_rf_src)][3]['comment'] != '':	
+                            comment = user_settings[int_id(_rf_src)][3]['comment']
+                    aprs_loc_packet = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid + '>APHBL3,TCPIP*:@' + str(datetime.datetime.utcnow().strftime("%H%M%Sh")) + str(aprs_lat) + icon_table + str(aprs_lon) + icon_icon + '/' + str(comment)
+                    logger.info(aprs_loc_packet)
+                    logger.info('User comment: ' + comment)
+                    logger.info('User SSID: ' + ssid)
+                    logger.info('User icon: ' + icon_table + icon_icon)
+                    # Attempt to prevent malformed packets from being uploaded.
+                    try:
+                        aprslib.parse(aprs_loc_packet)
+                        float(lat_deg) < 91
+                        float(lon_deg) < 121
+                        aprs_send(aprs_loc_packet)
+                        dashboard_loc_write(str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid, aprs_lat, aprs_lon, time.time(), comment)
+                        #logger.info('Sent APRS packet')
+                    except Exception as error_exception:
+                        logger.info('Error. Failed to send packet. Packet may be malformed.')
+                        logger.info(error_exception)
+                        logger.info(str(traceback.extract_tb(error_exception.__traceback__)))
+                    udt_block = 1
+                    hdr_type = ''
+                else:
+                      pass
+            #NMEA type packets for Anytone like radios.
+            #if _call_type == call_type or (_call_type == 'vcsbk' and pckt_seq > 3): #int.from_bytes(_seq, 'big') > 3 ):
+            # 14FRS2013 contributed improved header filtering, KF7EEL added conditions to allow both call types at the same time
+            if _call_type == call_type or (_call_type == 'vcsbk' and pckt_seq > 3 and call_type != 'unit') or (_call_type == 'group' and pckt_seq > 3 and call_type != 'unit') or (_call_type == 'group' and pckt_seq > 3 and call_type == 'both') or (_call_type == 'vcsbk' and pckt_seq > 3 and call_type == 'both') or (_call_type == 'unit' and pckt_seq > 3 and call_type == 'both'): #int.from_bytes(_seq, 'big') > 3 ):
+                global packet_assembly, btf
+                if _dtype_vseq == 6 or _dtype_vseq == 'group':
+                    global btf, hdr_start
+                    hdr_start = str(header_ID(_data))
+                    logger.info('Header from ' + str(get_alias(int_id(_rf_src), subscriber_ids)) + '. DMR ID: ' + str(int_id(_rf_src)))
+                    logger.info(ahex(bptc_decode(_data)))
+                    logger.info('Blocks to follow: ' + str(ba2num(bptc_decode(_data)[65:72])))
+                    btf = ba2num(bptc_decode(_data)[65:72])
+                    # Try resetting packet_assembly
+                    packet_assembly = ''
+                # Data blocks at 1/2 rate, see https://github.com/g4klx/MMDVM/blob/master/DMRDefines.h for data types. _dtype_seq defined here also
+                if _dtype_vseq == 7:
+                    btf = btf - 1
+                    logger.info('Block #: ' + str(btf))
+                    #logger.info(_seq)
+                    logger.info('Data block from ' + str(get_alias(int_id(_rf_src), subscriber_ids)) + '. DMR ID: ' + str(int_id(_rf_src)))
+                    logger.info(ahex(bptc_decode(_data)))
+                    if _seq == 0:
+                        n_packet_assembly = 0
+                        packet_assembly = ''
+                        
+                    #if btf < btf + 1:
+                    # 14FRS2013 removed condition, works great!
+                    n_packet_assembly = n_packet_assembly + 1
+                    packet_assembly = packet_assembly + str(bptc_decode(_data)) #str((decode_full_lc(b_packet)).strip('bitarray('))
+                    # Use block 0 as trigger. $GPRMC must also be in string to indicate NMEA.
+                    # This triggers the APRS upload
+                    if btf == 0:
+                        final_packet = str(bitarray(re.sub("\)|\(|bitarray|'", '', packet_assembly)).tobytes().decode('utf-8', 'ignore'))
+                        sms_hex = str(ba2hx(bitarray(re.sub("\)|\(|bitarray|'", '', packet_assembly))))
+                        sms_hex_string = re.sub("b'|'", '', str(sms_hex))
+                        #NMEA GPS sentence
+                        if '$GPRMC' in final_packet or '$GNRMC' in final_packet:
+                            logger.info(final_packet + '\n')
+                            # Eliminate excess bytes based on NMEA type
+                            # GPRMC
+                            if 'GPRMC' in final_packet:
+                                logger.info('GPRMC location')
+                                #nmea_parse = re.sub('A\*.*|.*\$', '', str(final_packet))
+                                nmea_parse = re.sub('A\*.*|.*\$|\n.*', '', str(final_packet))
+                            # GNRMC
+                            if 'GNRMC' in final_packet:
+                                logger.info('GNRMC location')
+                                nmea_parse = re.sub('.*\$|\n.*|V\*.*', '', final_packet)
+                            loc = pynmea2.parse(nmea_parse, check=False)
+                            logger.info('Latitude: ' + str(loc.lat) + str(loc.lat_dir) + ' Longitude: ' + str(loc.lon) + str(loc.lon_dir) + ' Direction: ' + str(loc.true_course) + ' Speed: ' + str(loc.spd_over_grnd) + '\n')
+                            try:
+                                # Begin APRS format and upload
+                                # Disable opening file for reading to reduce "collision" or reading and writing at same time.
+                                # 14FRS2013 simplified and moved settings retrieval
+                                user_settings = ast.literal_eval(os.popen('cat ' + user_settings_file).read())	
+                                if int_id(_rf_src) not in user_settings:	
+                                    ssid = str(user_ssid)	
+                                    icon_table = '/'	
+                                    icon_icon = '['	
+                                    comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src)) 	
+                                else:	
+                                    if user_settings[int_id(_rf_src)][1]['ssid'] == '':	
+                                        ssid = user_ssid	
+                                    if user_settings[int_id(_rf_src)][3]['comment'] == '':	
+                                        comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src))	
+                                    if user_settings[int_id(_rf_src)][2]['icon'] == '':	
+                                        icon_table = '/'	
+                                        icon_icon = '['	
+                                    if user_settings[int_id(_rf_src)][2]['icon'] != '':	
+                                        icon_table = user_settings[int_id(_rf_src)][2]['icon'][0]	
+                                        icon_icon = user_settings[int_id(_rf_src)][2]['icon'][1]	
+                                    if user_settings[int_id(_rf_src)][1]['ssid'] != '':	
+                                        ssid = user_settings[int_id(_rf_src)][1]['ssid']	
+                                    if user_settings[int_id(_rf_src)][3]['comment'] != '':	
+                                        comment = user_settings[int_id(_rf_src)][3]['comment']	
+                                aprs_loc_packet = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid + '>APHBL3,TCPIP*:@' + str(datetime.datetime.utcnow().strftime("%H%M%Sh")) + str(loc.lat[0:7]) + str(loc.lat_dir) + icon_table + str(loc.lon[0:8]) + str(loc.lon_dir) + icon_icon + str(round(loc.true_course)).zfill(3) + '/' + str(round(loc.spd_over_grnd)).zfill(3) + '/' + str(comment)
+                                logger.info(aprs_loc_packet)
+                                logger.info('User comment: ' + comment)
+                                logger.info('User SSID: ' + ssid)
+                                logger.info('User icon: ' + icon_table + icon_icon)
+                            except Exception as error_exception:
+                                logger.info('Error or user settings file not found, proceeding with default settings.')
+                                aprs_loc_packet = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + str(user_ssid) + '>APHBL3,TCPIP*:@' + str(datetime.datetime.utcnow().strftime("%H%M%Sh")) + str(loc.lat[0:7]) + str(loc.lat_dir) + '/' + str(loc.lon[0:8]) + str(loc.lon_dir) + '[' + str(round(loc.true_course)).zfill(3) + '/' + str(round(loc.spd_over_grnd)).zfill(3) + '/' + aprs_comment + ' DMR ID: ' + str(int_id(_rf_src))
+                                logger.info(error_exception)
+                                logger.info(str(traceback.extract_tb(error_exception.__traceback__)))
+                            try:
+                            # Try parse of APRS packet. If it fails, it will not upload to APRS-IS
+                                aprslib.parse(aprs_loc_packet)
+                            # Float values of lat and lon. Anything that is not a number will cause it to fail.
+                                float(loc.lat)
+                                float(loc.lon)
+                                aprs_send(aprs_loc_packet)
+                                dashboard_loc_write(str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid, str(loc.lat[0:7]) + str(loc.lat_dir), str(loc.lon[0:8]) + str(loc.lon_dir), time.time(), comment)
+                            except Exception as error_exception:
+                                logger.info('Failed to parse packet. Packet may be deformed. Not uploaded.')
+                                logger.info(error_exception)
+                                logger.info(str(traceback.extract_tb(error_exception.__traceback__)))
+                            #final_packet = ''
+                            # Get callsign based on DMR ID
+                            # End APRS-IS upload
+                        # Assume this is an SMS message
+                        elif '$GPRMC' not in final_packet or '$GNRMC' not in final_packet:
+                            
+####                            # Motorola type SMS header
+##                            if '824a' in hdr_start or '024a' in hdr_start:
+##                                logger.info('\nMotorola type SMS')
+##                                sms = codecs.decode(bytes.fromhex(''.join(sms_hex[74:-8].split('00'))), 'utf-8')
+##                                logger.info('\n\n' + 'Received SMS from ' + str(get_alias(int_id(_rf_src), subscriber_ids)) + ', DMR ID: ' + str(int_id(_rf_src)) + ': ' + str(sms) + '\n')
+##                                process_sms(_rf_src, sms)
+##                                packet_assembly = ''
+##                            # ETSI? type SMS header    
+##                            elif '0244' in hdr_start or '8244' in hdr_start:
+##                                logger.info('ETSI? type SMS')
+##                                sms = codecs.decode(bytes.fromhex(''.join(sms_hex[64:-8].split('00'))), 'utf-8')
+##                                logger.info('\n\n' + 'Received SMS from ' + str(get_alias(int_id(_rf_src), subscriber_ids)) + ', DMR ID: ' + str(int_id(_rf_src)) + ': ' + str(sms) + '\n')
+##                                #logger.info(final_packet)
+##                                #logger.info(sms_hex[64:-8])
+##                                process_sms(_rf_src, sms)
+##                                packet_assembly = ''
+####                                
+##                            else:
+                                logger.info('\nSMS detected. Attempting to parse.')
+                                #logger.info(final_packet)
+                                logger.info(sms_hex)
+##                                logger.info(type(sms_hex))
+                                logger.info('Attempting to find command...')
+##                                sms = codecs.decode(bytes.fromhex(''.join(sms_hex[:-8].split('00'))), 'utf-8', 'ignore')
+                                sms = codecs.decode(bytes.fromhex(''.join(sms_hex_string[:-8].split('00'))), 'utf-8', 'ignore')
+                                msg_found = re.sub('.*\n', '', sms)
+                                logger.info('\n\n' + 'Received SMS from ' + str(get_alias(int_id(_rf_src), subscriber_ids)) + ', DMR ID: ' + str(int_id(_rf_src)) + ': ' + str(msg_found) + '\n')
+                                process_sms(_rf_src, msg_found)
+                                #packet_assembly = ''
+                                pass
+                                #logger.info(bitarray(re.sub("\)|\(|bitarray|'", '', str(bptc_decode(_data)).tobytes().decode('utf-8', 'ignore'))))
+                            #logger.info('\n\n' + 'Received SMS from ' + str(get_alias(int_id(_rf_src), subscriber_ids)) + ', DMR ID: ' + str(int_id(_rf_src)) + ': ' + str(sms) + '\n')
+                        # Reset the packet assembly to prevent old data from returning.
+                        # 14FRS2013 moved variable reset
+                        hdr_start = ''
+                        n_packet_assembly = 0	
+                        packet_assembly = ''	
+                        btf = 0
+                    #logger.info(_seq)
+                    #packet_assembly = '' #logger.info(_dtype_vseq)
+                #logger.info(ahex(bptc_decode(_data)).decode('utf-8', 'ignore'))
+                #logger.info(bitarray(re.sub("\)|\(|bitarray|'", '', str(bptc_decode(_data)).tobytes().decode('utf-8', 'ignore'))))
+
+        else:
+            pass
+
+
+#************************************************
+#      MAIN PROGRAM LOOP STARTS HERE
+#************************************************
+
+if __name__ == '__main__':
+    #global aprs_callsign, aprs_passcode, aprs_server, aprs_port, user_ssid, aprs_comment, call_type, data_id
+    import argparse
+    import sys
+    import os
+    import signal
+    from dmr_utils3.utils import try_download, mk_id_dict
+
+    # 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 gps_data.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__))+'/gps_data.cfg'
+
+    # Call the external routine to build the configuration dictionary
+    CONFIG = config.build_config(cli_args.CONFIG_FILE)
+
+    data_id = int(CONFIG['GPS_DATA']['DATA_DMR_ID'])
+
+    # Group call or Unit (private) call
+    call_type = CONFIG['GPS_DATA']['CALL_TYPE']
+    # APRS-IS login information
+    aprs_callsign = CONFIG['GPS_DATA']['APRS_LOGIN_CALL']
+    aprs_passcode = int(CONFIG['GPS_DATA']['APRS_LOGIN_PASSCODE'])
+    aprs_server = CONFIG['GPS_DATA']['APRS_SERVER']
+    aprs_port = int(CONFIG['GPS_DATA']['APRS_PORT'])
+    user_ssid = CONFIG['GPS_DATA']['USER_APRS_SSID']
+    aprs_comment = CONFIG['GPS_DATA']['USER_APRS_COMMENT']
+    # EMAIL variables
+    email_sender = CONFIG['GPS_DATA']['EMAIL_SENDER']
+    email_password = CONFIG['GPS_DATA']['EMAIL_PASSWORD']
+    smtp_server = CONFIG['GPS_DATA']['SMTP_SERVER']
+    smtp_port = CONFIG['GPS_DATA']['SMTP_PORT']
+
+    # Dashboard files
+    bb_file = CONFIG['GPS_DATA']['BULLETIN_BOARD_FILE']
+    loc_file = CONFIG['GPS_DATA']['LOCATION_FILE']
+    the_mailbox_file = CONFIG['GPS_DATA']['MAILBOX_FILE']
+    emergency_sos_file = CONFIG['GPS_DATA']['EMERGENCY_SOS_FILE']
+
+    # User APRS settings
+    user_settings_file = CONFIG['GPS_DATA']['USER_SETTINGS_FILE']
+
+        # Check if user_settings (for APRS settings of users) exists. Creat it if not.
+    if Path(user_settings_file).is_file():
+        pass
+    else:
+        Path(user_settings_file).touch()
+        with open(user_settings_file, 'w') as user_dict_file:
+            user_dict_file.write("{1: [{'call': 'N0CALL'}, {'ssid': ''}, {'icon': ''}, {'comment': ''}]}")
+            user_dict_file.close()
+    # Check to see if dashboard files exist
+    if Path(loc_file).is_file():
+        pass
+    else:
+        Path(loc_file).touch()
+        with open(loc_file, 'w') as user_loc_file:
+            user_loc_file.write("[]")
+            user_loc_file.close()
+    if Path(bb_file).is_file():
+        pass
+    else:
+        Path(bb_file).touch()
+        with open(bb_file, 'w') as user_bb_file:
+            user_bb_file.write("[]")
+            user_bb_file.close()
+    if Path(the_mailbox_file).is_file():
+        pass
+    else:
+        Path(the_mailbox_file).touch()
+        with open(the_mailbox_file, 'w') as user_mail_file:
+            user_mail_file.write("[]")
+            user_mail_file.close()
+    
+    # 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, 2019\n\tThe Regents of the K0USY Group. All rights reserved.\n GPS and Data decoding by Eric, KF7EEL')
+    logger.debug('Logging system started, anything from here on gets logged')
+
+    # Set up the signal handler
+    def sig_handler(_signal, _frame):
+        logger.info('SHUTDOWN: >>>GPS and Data Decoder<<< IS TERMINATING WITH SIGNAL %s', str(_signal))
+        hblink_handler(_signal, _frame)
+        logger.info('SHUTDOWN: ALL SYSTEM HANDLERS EXECUTED - STOPPING REACTOR')
+        reactor.stop()
+
+    # Set signal handers so that we can gracefully exit if need be
+    for sig in [signal.SIGTERM, signal.SIGINT]:
+        signal.signal(sig, sig_handler)
+
+    # 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, reportFactory)
+    else:
+        report_server = None
+        logger.info('(REPORT) TCP Socket reporting not configured')
+
+    # HBlink instance creation
+    logger.info('HBlink \'gps_data.py\' -- SYSTEM STARTING...')
+    for system in CONFIG['SYSTEMS']:
+        if CONFIG['SYSTEMS'][system]['ENABLED']:
+            if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE':
+                systems[system] = OPENBRIDGE(system, CONFIG, report_server)
+            else:
+                systems[system] = DATA_SYSTEM(system, CONFIG, report_server)
+                
+            reactor.listenUDP(CONFIG['SYSTEMS'][system]['PORT'], systems[system], interface=CONFIG['SYSTEMS'][system]['IP'])
+            logger.debug('%s instance created: %s, %s', CONFIG['SYSTEMS'][system]['MODE'], system, systems[system])
+
+    reactor.run()
+
+    
+# John 3:16 - For God so loved the world, that he gave his only Son,
+# that whoever believes in him should not perish but have eternal life.
@@ -0,0 +1,60 @@
+#!/usr/bin/env python
+#
+###############################################################################
+#   HBLink - Copyright (C) 2020 Cortney T. Buffington, N0MJS <n0mjs@me.com>
+#   GPS/Data - Copyright (C) 2020 Eric Craw, 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
+#   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 script uploads a beacon to APRS-IS for the GPS/Data Application itself, cuasing it to appear as an igate
+an aprs.fi.
+'''
+
+import aprslib
+import argparse
+import os
+import config
+import time
+
+parser = argparse.ArgumentParser()
+parser.add_argument('-c', '--config', action='store', dest='CONFIG_FILE', help='/full/path/to/config.file (usually gps_data.cfg)')
+cli_args = parser.parse_args()
+
+if not cli_args.CONFIG_FILE:
+    cli_args.CONFIG_FILE = os.path.dirname(os.path.abspath(__file__))+'/gps_data.cfg'
+CONFIG = config.build_config(cli_args.CONFIG_FILE)
+
+print('''
+GPS/Data Application Beacon Script by Eric, KF7EEL. https://github.com/kf7eel/hblink3 \n
+This script will upload an APRS position for the GPS/Data Application. This usually causes most APRS-IS clients to see the GPS/Data Application
+as an i-gate. \n
+Using the following setting to upload beacon.\n
+Callsign: ''' + CONFIG['GPS_DATA']['APRS_LOGIN_CALL'] + ''' - Position comment: ''' + CONFIG['GPS_DATA']['IGATE_BEACON_COMMENT'] + '''
+Beacon time: ''' + CONFIG['GPS_DATA']['IGATE_BEACON_TIME'] + '''
+''')
+
+beacon_packet = CONFIG['GPS_DATA']['APRS_LOGIN_CALL'] + '>APHBL3,TCPIP*:!' + CONFIG['GPS_DATA']['IGATE_LATITUDE'] + str(CONFIG['GPS_DATA']['IGATE_BEACON_ICON'][0]) + CONFIG['GPS_DATA']['IGATE_LONGITUDE'] + str(CONFIG['GPS_DATA']['IGATE_BEACON_ICON'][1]) + '/' + CONFIG['GPS_DATA']['IGATE_BEACON_COMMENT']
+#print(beacon_packet)
+AIS = aprslib.IS(CONFIG['GPS_DATA']['APRS_LOGIN_CALL'], passwd=CONFIG['GPS_DATA']['APRS_LOGIN_PASSCODE'],host=CONFIG['GPS_DATA']['APRS_SERVER'], port=CONFIG['GPS_DATA']['APRS_PORT'])
+
+while int(CONFIG['GPS_DATA']['IGATE_BEACON_TIME']) > 15:
+    
+    AIS.connect()
+    AIS.sendall(beacon_packet)
+    print(beacon_packet)
+    AIS.close()
+    time.sleep(int(CONFIG['GPS_DATA']['IGATE_BEACON_TIME'])*60)
@@ -33,17 +33,17 @@ configuration file.
 '''

 BRIDGES = {
-    'WORLDWIDE': [
-            {'SYSTEM': 'MASTER-1',    'TS': 1, 'TGID': 1,    'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'ON',  'ON': [2,], 'OFF': [9,10], 'RESET': []},
-            {'SYSTEM': 'CLIENT-1',    'TS': 1, 'TGID': 3100, 'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'ON',  'ON': [2,], 'OFF': [9,10], 'RESET': []},
-        ],
-    'ENGLISH': [
-            {'SYSTEM': 'MASTER-1',    'TS': 1, 'TGID': 13,   'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'NONE', 'ON': [3,], 'OFF': [8,10], 'RESET': []},
-            {'SYSTEM': 'CLIENT-2',    'TS': 1, 'TGID': 13,   'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'NONE', 'ON': [3,], 'OFF': [8,10], 'RESET': []},
-        ],
-    'STATEWIDE': [
-            {'SYSTEM': 'MASTER-1',    'TS': 2, 'TGID': 3129, 'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'NONE', 'ON': [4,], 'OFF': [7,10], 'RESET': []},
-            {'SYSTEM': 'CLIENT-2',    'TS': 2, 'TGID': 3129, 'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'NONE', 'ON': [4,], 'OFF': [7,10], 'RESET': []},
+##    'ENGLISH': [
+##            {'SYSTEM': 'CHANGE_ME-1',    'TS': 1, 'TGID': 13,   'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'NONE', 'ON': [3,], 'OFF': [8,10], 'RESET': []},
+##            {'SYSTEM': 'CHANGE_ME-2',    'TS': 1, 'TGID': 13,   'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'NONE', 'ON': [3,], 'OFF': [8,10], 'RESET': []},
+##        ],
+##    'STATEWIDE': [
+##            {'SYSTEM': 'CHANGE_ME-1',    'TS': 2, 'TGID': 3129, 'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'NONE', 'ON': [4,], 'OFF': [7,10], 'RESET': []},
+##            {'SYSTEM': 'CHANGE_ME-2',    'TS': 2, 'TGID': 3129, 'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'NONE', 'ON': [4,], 'OFF': [7,10], 'RESET': []},
+##        ],
+    'ECHO': [
+            {'SYSTEM': 'MASTER-1',    'TS': 2, 'TGID': 9999,    'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'ON',  'ON': [9999,], 'OFF': [9,10], 'RESET': []},
+            {'SYSTEM': 'ECHO',    'TS': 2, 'TGID': 9999, 'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'ON',  'ON': [9999,], 'OFF': [9,10], 'RESET': []},
        ]
 }

@@ -51,7 +51,26 @@ BRIDGES = {
 list the names of each system that should bridge unit to unit (individual) calls.
 '''

-UNIT = ['ONE', 'TWO']
+UNIT = ['MASTER-1', 'PEER-1']
+
+'''
+Unit Call flood timeout:
+The amount of time to keep sending private calls to a single system before
+flooding all systems with the call. A higher value should be set for systems where subscribers
+are not moving between systems often. A lower value should be set for systems that have subscribers
+moving between systems often.
+
+Time is in minutes.
+'''
+UNIT_TIME = 1
+
+'''
+Input the DMR ID and SYSTEM of a subscriber that you would like to have always have private calls routed.
+This will not flood all systems.
+'''
+STATIC_UNIT = [
+     [ 9099, 'D-APRS']
+    ]

 '''
 This is for testing the syntax of the file. It won't eliminate all errors, but running this file
@@ -62,3 +81,4 @@ if __name__ == '__main__':
    from pprint import pprint
    pprint(BRIDGES)
    print(UNIT)
+    print(STATIC_UNIT)
@@ -0,0 +1,162 @@
+'''
+THIS EXAMPLE WILL NOT WORK AS IT IS - YOU MUST SPECIFY YOUR OWN VALUES!!!
+
+This file is organized around the "Conference Bridges" that you wish to use. If you're a c-Bridge
+person, think of these as "bridge groups". You might also liken them to a "reflector". If a particular
+system is "ACTIVE" on a particular conference bridge, any traffid from that system will be sent
+to any other system that is active on the bridge as well. This is not an "end to end" method, because
+each system must independently be activated on the bridge.
+
+The first level (e.g. "WORLDWIDE" or "STATEWIDE" in the examples) is the name of the conference
+bridge. This is any arbitrary ASCII text string you want to use. Under each conference bridge
+definition are the following items -- one line for each HBSystem as defined in the main HBlink
+configuration file.
+
+    * SYSTEM - The name of the sytem as listed in the main hblink configuration file (e.g. hblink.cfg)
+        This MUST be the exact same name as in the main config file!!!
+    * TS - Timeslot used for matching traffic to this confernce bridge
+        XLX connections should *ALWAYS* use TS 2 only.
+    * TGID - Talkgroup ID used for matching traffic to this conference bridge
+        XLX connections should *ALWAYS* use TG 9 only.
+    * ON and OFF are LISTS of Talkgroup IDs used to trigger this system off and on. Even if you
+        only want one (as shown in the ON example), it has to be in list format. None can be
+        handled with an empty list, such as " 'ON': [] ".
+    * TO_TYPE is timeout type. If you want to use timers, ON means when it's turned on, it will
+        turn off afer the timout period and OFF means it will turn back on after the timout
+        period. If you don't want to use timers, set it to anything else, but 'NONE' might be
+        a good value for documentation!
+    * TIMOUT is a value in minutes for the timout timer. No, I won't make it 'seconds', so don't
+        ask. Timers are performance "expense".
+    * RESET is a list of Talkgroup IDs that, in addition to the ON and OFF lists will cause a running
+        timer to be reset. This is useful   if you are using different TGIDs for voice traffic than
+        triggering. If you are not, there is NO NEED to use this feature.
+'''
+# REQUIRED! - Path to your full_bridge.cfg
+config_file = './full_bridge.cfg'
+
+BRIDGES_TEMPLATE = {
+    'STATEWIDE': [
+            {'SYSTEM': 'MASTER-1',    'TS': 2, 'TGID': 3129, 'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'NONE', 'ON': [4,], 'OFF': [7,10], 'RESET': []},
+            {'SYSTEM': 'PEER-2',    'TS': 2, 'TGID': 3129, 'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'NONE', 'ON': [4,], 'OFF': [7,10], 'RESET': []},
+        ],
+    'ECHO': [
+            {'SYSTEM': 'MASTER-1',    'TS': 2, 'TGID': 9999,    'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'ON',  'ON': [9999,], 'OFF': [9,10], 'RESET': []},
+            {'SYSTEM': 'PEER-1',    'TS': 2, 'TGID': 9999, 'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'ON',  'ON': [9999,], 'OFF': [9,10], 'RESET': []},
+            # For proxy MASTERs, just put in the name of the stanza, and rules will be generated automatically
+            {'SYSTEM': 'HOTSPOT',    'TS': 2, 'TGID': 9, 'ACTIVE': True, 'TIMEOUT': 2, 'TO_TYPE': 'NONE', 'ON': [4], 'OFF': [7,10], 'RESET': []},
+        ]
+}
+
+'''
+list the names of each system that should NOT be bridged unit to unit (individual) calls.
+'''
+
+EXCLUDE_FROM_UNIT = ['OBP-1', 'PEER-1']
+
+'''
+Unit Call flood timeout:
+The amount of time to keep sending private calls to a single system before
+flooding all systems with the call. A higher value should be set for systems where subscribers
+are not moving between systems often. A lower value should be set for systems that have subscribers
+moving between systems often.
+
+Time is in minutes.
+'''
+UNIT_TIME = 1
+
+'''
+Input the DMR ID and SYSTEM of a subscriber that you would like to have always have private calls routed.
+This will not flood all systems. The last item in the entry is the timeslot. It has no effect on STATIC_UNIT. It
+is only there to prevent an error in another function.
+'''
+STATIC_UNIT = [
+#     [ 9099, 'MASTER-1', 2]
+              ]
+
+'''
+Manually specify other networks/servers that are authorized to send SMS to your server
+'''
+
+authorized_users = {
+##    'ABC':{
+##        'mode':'msg_xfer',
+##        'user':'test_name',
+##        'password':'passw0rd'
+##        },
+##    'XYZ':{
+##        'mode':'msg_xfer',
+##        'user':'test_name',
+##        'password':'passw0rd'
+##        }
+}
+
+'''
+List of external servers/networks or external applications that your users can access. The list below can be used in conjunction
+with or instead of the public list.
+'''
+
+local_systems = {
+# Shortcut used in SMS message
+##    'XYZ':{
+        # Mode of transfer, this case, message transfer
+##        'mode':'msg_xfer',
+        # Public or Private auth
+##        'auth_type':'public',
+        # Name of the server/network
+##        'network_name':'My HBlink Server',
+        # URL to the dashboard of the server/network
+##        'url':'http://example.net/',
+        # Username and password given to you by network operator
+##        'user':'test_name',
+##        'password':'passw0rd'
+##        },
+    # Shortcut used in SMS message
+##    'BBD':{
+        # Mode for application, operates differently than msg_xfer
+##        'mode':'app',
+        # Name of external application
+##        'app_name':'Multi Network Bulletin Board',
+        # Endpoint URL of API
+##        'url':'http://hbl.ink/bb/post',
+        # Website for users to get info
+##        'website':'http://hbl.ink',
+##        },
+}
+
+
+
+
+#################### Function used to build bridges for PROXY stanzas, leave alone ####################
+def build_bridges():
+    import sms_aprs_config, random
+    CONFIG = sms_aprs_config.build_config(config_file)
+    built_bridge = BRIDGES_TEMPLATE.copy()
+    proxy_list = []
+    unique = str('_' + str(random.randint(100, 999)))
+    for i in CONFIG['SYSTEMS']:
+        print(CONFIG['SYSTEMS'][i])
+        if CONFIG['SYSTEMS'][i]['ENABLED'] == True:
+            if CONFIG['SYSTEMS'][i]['MODE'] == 'PROXY':
+                proxy_list.append(i + unique)
+    for p in  proxy_list:
+        for b in BRIDGES_TEMPLATE:
+                for s in BRIDGES_TEMPLATE[b]:
+                    if s['SYSTEM'] + unique in proxy_list:
+                        n_systems = CONFIG['SYSTEMS'][p[:-4]]]['INTERNAL_PORT_STOP'] - CONFIG['SYSTEMS'][p[:-4]]]['INTERNAL_PORT_START']
+                        n_count = 0
+                        while n_count < n_systems:
+                           built_bridge[b].append({'SYSTEM': s['SYSTEM'] + '-' + str(n_count), 'TS': s['TS'], 'TGID': s['TGID'], 'ACTIVE': s['ACTIVE'], 'TIMEOUT': s['TIMEOUT'], 'TO_TYPE': s['TO_TYPE'], 'ON': s['ON'], 'OFF': s['OFF'], 'RESET': s['RESET']})
+                           n_count = n_count + 1
+                        built_bridge[b].remove(s)
+    return built_bridge
+############################################################################################################33
+
+'''
+This is for testing the syntax of the file. It won't eliminate all errors, but running this file
+like it were a Python program itself will tell you if the syntax is correct!
+'''
+
+if __name__ == '__main__':
+    from pprint import pprint
+    pprint(BRIDGES)
+    pprint(EXCLUDE_FROM_UNIT)
@@ -0,0 +1,63 @@
+###############################################################################
+#   HBLink - Copyright (C) 2020 Cortney T. Buffington, N0MJS <n0mjs@me.com>
+#   GPS/Data - Copyright (C) 2020 Eric Craw, 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
+#   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
+###############################################################################
+
+'''
+Settings for web dashboard.
+'''
+
+# Title of the Dashboard
+dashboard_title = 'HBLink3 D-APRS Dashboard'
+# 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_title + '''.
+'''
+# The following will generate a help page for your users.
+
+# Data call type
+data_call_type = 'Private Call'
+# DMR ID of GPS/Data application
+data_call_id = '9099'
+# Default APRS ssid
+aprs_ssid = '15'
+
+# 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 = (47.00, -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'
+
+# RSS feed link, shows in the link section of each RSS item.
+rss_link = 'http://localhost:8092'
+
@@ -0,0 +1,299 @@
+# Functions to encode DMR and MMDVM
+from dmr_utils3 import bptc, decode
+from bitarray import bitarray
+from binascii import b2a_hex as ahex
+from bitarray.util import hex2ba as hex2bits
+import random
+from dmr_utils3.utils import bytes_3, int_id, get_alias, bytes_2, bytes_4
+import re
+import libscrc
+from pathlib import Path
+
+def create_crc16(fragment_input):
+    crc16 = libscrc.gsm16(bytearray.fromhex(fragment_input))
+    return fragment_input + re.sub('x', '0', str(hex(crc16 ^ 0xcccc))[-4:])
+
+def create_crc32(fragment_input):
+    # Create and append CRC32 to data 
+    # Create list of hex
+    word_list = []
+    count_index = 0
+    while count_index < len(fragment_input):
+        word_list.append((fragment_input[count_index:count_index + 2]))
+        count_index = count_index + 2
+    # Create string of rearranged word_list to match ETSI 102 361-1 pg 141
+    lst_index = 0
+    crc_string = ''
+    for i in (word_list):
+        #print(lst_index)
+        if lst_index % 2 == 0:
+            crc_string =  crc_string + word_list[lst_index + 1]
+            #print(crc_string)
+        if lst_index % 2 == 1:
+            crc_string = crc_string + word_list[lst_index - 1]
+            #print(crc_string)
+        lst_index = lst_index + 1
+    # Create bytearray of word_list_string
+   # print(crc_string)
+    word_array = libscrc.posix(bytearray.fromhex(crc_string))
+    # XOR to get almost final CRC
+    pre_crc = str(hex(word_array ^ 0xffffffff))[2:]
+    # Rearrange pre_crc for transmission
+    crc = ''
+    c = 8
+    while c > 0:
+        crc = crc + pre_crc[c-2:c]
+        c = c - 2
+    crc = crc.ljust(8, '0')
+    print(crc)
+    # Return original data and append CRC32
+    print('Output: ' + fragment_input + crc)
+    #print(len(crc.zfill(9)))
+    return fragment_input + crc
+def create_crc16_csbk(fragment_input):
+    crc16_csbk = libscrc.gsm16(bytearray.fromhex(fragment_input))
+    return fragment_input + re.sub('x', '0', str(hex(crc16_csbk ^ 0xa5a5))[-4:])
+def csbk_gen(to_id, from_id):
+    csbk_lst = ['BD00801a', 'BD008019', 'BD008018', 'BD008017', 'BD008016']
+
+    send_seq_list = ''
+    for block in csbk_lst:
+        block = block + to_id + from_id
+        block  = create_crc16_csbk(block)
+        print(block)
+        send_seq_list = send_seq_list + block
+        print(send_seq_list)
+    return send_seq_list
+def mmdvm_encapsulate(dst_id, src_id, peer_id, _seq, _slot, _call_type, _dtype_vseq, _stream_id, _dmr_data):
+    signature = 'DMRD'
+    # needs to be in bytes
+    frame_type = 0x10 #bytes_2(int(10))
+    #print((frame_type))
+    dest_id = bytes_3(int(dst_id, 16))
+#    print((dest_id))
+
+    #print(ahex(dest_id))
+    source_id = bytes_3(int(src_id, 16))
+    via_id = bytes_4(int(peer_id, 16))
+   # print((source_id))
+    #print(ahex(via_id))
+    seq = int(_seq).to_bytes(1, 'big')
+    #print(ahex(seq))
+    # Binary, 0 for 1, 1 for 2
+    slot = bitarray(str(_slot))
+    #print(slot)
+    # binary, 0 for group, 1 for unit, bin(1)
+   # print(_call_type)
+    call_type = bitarray(str(_call_type))
+    #print(call_type)
+    #0x00 for voice, 0x01 for voice sync, 0x10 for data 
+    #frame_type = int(16).to_bytes(1, 'big')
+    frame_type = bitarray('10')
+    #print(frame_type)
+    # Observed to be always 7, int. Will be 6 for header
+    #dtype_vseq = hex(int(_dtype_vseq)).encode()
+    if _dtype_vseq == 6:
+        dtype_vseq = bitarray('0110')
+    if _dtype_vseq == 7:
+        dtype_vseq = bitarray('0111')
+    if _dtype_vseq == 3:
+        dtype_vseq = bitarray('0011')
+    # 9 digit integer in hex
+    stream_id = bytes_4(_stream_id)
+    #print(ahex(stream_id))
+
+    middle_guts = slot + call_type + frame_type + dtype_vseq
+    #print(middle_guts)
+    dmr_data = str(_dmr_data)[2:-1] #str(re.sub("b'|'", '', str(_dmr_data)))
+    complete_packet = signature.encode() + seq + dest_id + source_id + via_id + middle_guts.tobytes() + stream_id + bytes.fromhex((dmr_data)) + bitarray('0000000000101111').tobytes()#bytes.fromhex(dmr_data)
+    #print('Complete: ' + type(ahex(complete_packet)))
+##    #print(hex2bits(ahex(complete_packet))[119:120])
+    #print(bitarray.frombytes(ahex(complete_packet)))
+    return complete_packet
+
+
+### Sequence MMDVM packets from encoded DMR
+##def seq_mmdvm(dmr_list):
+##    cap_in = 0
+##    mmdvm_send_seq = []
+##    for i in dmr_list:
+##        if cap_in < 8:
+##            
+##        if cap_in == 8:
+##            #print('header')
+##            the_mmdvm_pkt = mmdvm_encapsulate(3153597, 3153591, 9099, cap_in, 1, 1, 6, rand_seq, i) #(bytes.fromhex(re.sub("b'|'", '', str(orig_cap[cap_in][20:-4])))))
+##        else:
+##            #print('block')
+##            the_mmdvm_pkt = mmdvm_encapsulate(3153597, 3153591, 9099, cap_in, 1, 1, 7, rand_seq, i)#(bytes.fromhex(re.sub("b'|'", '', str(orig_cap[cap_in][20:-4])))))
+##        new_send_seq.append(ahex(the_mmdvm_pkt))
+##        cap_in = cap_in + 1
+
+# Break long string into block sequence
+def block_sequence(input_string):
+    seq_blocks = len(input_string)/24
+    n = 0
+    block_seq = []
+    while n < seq_blocks:
+        if n == 0:
+            block_seq.append(bytes.fromhex(input_string[:24].ljust(24,'0')))
+            n = n + 1
+        else:
+            block_seq.append(bytes.fromhex(input_string[n*24:n*24+24].ljust(24,'0')))
+            n = n + 1
+    return block_seq
+
+# Takes list of DMR packets, 12 bytes, then encodes them
+def dmr_encode(packet_list, _slot):
+    send_seq = []
+    for i in packet_list:
+        stitched_pkt = bptc.interleave_19696(bptc.encode_19696(i))
+        l_slot = bitarray('0111011100')
+        #MS
+        #sync_data = bitarray('110101011101011111110111011111111101011101010111')
+        if _slot == 0:
+            # TS1 - F7FDD5DDFD55
+            sync_data = bitarray('111101111111110111010101110111011111110101010101')
+        if _slot == 1:
+            #TS2 - D7557F5FF7F5
+            sync_data = bitarray('110101110101010101111111010111111111011111110101')
+        # TS1
+        #sync_data = bitarray('111101111111110111010101110111011111110101010101')
+        #TS2
+        #sync_data = bitarray('110101110101010101111111010111111111011111110101')
+        r_slot = bitarray('1101110001')
+        # Data sync? 110101011101011111110111011111111101011101010111 - D5D7F77FD757
+        new_pkt = ahex(stitched_pkt[:98] + l_slot + sync_data + r_slot + stitched_pkt[98:])
+        send_seq.append(new_pkt)
+    return send_seq
+
+
+def create_sms_seq(dst_id, src_id, peer_id, _slot, _call_type, dmr_string, que_dir):
+    rand_seq = random.randint(1, 999999)
+    block_seq = block_sequence(dmr_string)
+    dmr_list = dmr_encode(block_seq, _slot)
+    cap_in = 0
+    mmdvm_send_seq = []
+    for i in dmr_list:
+        #print(i)
+        if use_csbk == True:
+            if cap_in < 5:
+                the_mmdvm_pkt = mmdvm_encapsulate(dst_id, src_id, peer_id, cap_in, _slot, _call_type, 3, rand_seq, i)
+                #print(block_seq[cap_in])
+                #print(3)
+            if cap_in == 5:
+                #print(block_seq[cap_in])
+                #print(6)
+                the_mmdvm_pkt = mmdvm_encapsulate(dst_id, src_id, peer_id, cap_in, _slot, _call_type, 6, rand_seq, i) #(bytes.fromhex(re.sub("b'|'", '', str(orig_cap[cap_in][20:-4])))))
+            if cap_in > 5:
+                #print(block_seq[cap_in])
+                #print(7)
+                the_mmdvm_pkt = mmdvm_encapsulate(dst_id, src_id, peer_id, cap_in, _slot, _call_type, 7, rand_seq, i)#(bytes.fromhex(re.sub("b'|'", '', str(orig_cap[cap_in][20:-4])))))
+            mmdvm_send_seq.append(ahex(the_mmdvm_pkt))
+            cap_in = cap_in + 1
+        if use_csbk == False:
+            if cap_in == 0:
+                the_mmdvm_pkt = mmdvm_encapsulate(dst_id, src_id, peer_id, cap_in, _slot, _call_type, 6, rand_seq, i) #(bytes.fromhex(re.sub("b'|'", '', str(orig_cap[cap_in][20:-4])))))
+            else:
+                the_mmdvm_pkt = mmdvm_encapsulate(dst_id, src_id, peer_id, cap_in, _slot, _call_type, 7, rand_seq, i)#(bytes.fromhex(re.sub("b'|'", '', str(orig_cap[cap_in][20:-4])))))
+            mmdvm_send_seq.append(ahex(the_mmdvm_pkt))
+            cap_in = cap_in + 1
+    with open(que_dir + str(random.randint(1000, 9999)) + '.mmdvm_seq', "w") as packet_write_file:
+                packet_write_file.write(str(mmdvm_send_seq))
+
+    return mmdvm_send_seq
+try:
+    Path(que_dir).mkdir(parents=True, exist_ok=True)
+except:
+    pass
+
+# Built for max length msg
+def sms_headers(to_id, from_id):
+##    #ETSI 102 361-2 uncompressed ipv4
+##    # UDP header, src and dest ports are 4007, 0fa7
+##    udp_ports = '0fa70fa7'
+##    # Length, of what?
+##    udp_length = '00da'
+##    # Checksum
+##    udp_checksum = '4b37'
+##
+##    # IPV4
+##    #IPV4 version and header length, always 45
+##    ipv4_v_l = '45'
+##    #Type of service, always 00
+##    ipv4_svc = '00'
+##    #length, always 00ee
+##    ipv4_len = '00ee'
+##    #ID always 000d
+##    ipv4_id = '000d'
+##    #Flags and offset always0
+##    ipv4_flag_off = '0000'
+##    #TTL and Protocol always 4011, no matter what
+##    ipv4_ttl_proto = '4011'
+    #ipv4 = '450000ee000d0000401100000c' + from_id + '0c' + to_id
+    #ipv4 = '450000ee00000000401100000c' + from_id + '0c' + to_id
+    ipv4 = '450000ee00000000401100000c' + from_id + '0c' + to_id
+    print(from_id)
+    print(to_id)
+    count_index = 0
+    hdr_lst = []
+    while count_index < len(ipv4):
+        hdr_lst.append((ipv4[count_index:count_index + 4]))
+        count_index = count_index + 4
+    sum = 0
+    for i in hdr_lst:
+        sum = sum + int(i, 16)
+    flipped = ''
+    for i in str(bin(sum))[2:]:
+        if i == '1':
+            flipped = flipped + '0'
+        if i == '0':
+            flipped = flipped + '1'
+    ipv4_chk_sum = str(hex(int(flipped, 2)))[2:]
+    print(ipv4_chk_sum)
+    header = ipv4[:20] + ipv4_chk_sum + ipv4[24:] +  '0fa70fa700da583100d0a00081040d000a'
+    return header
+
+def format_sms(msg, to_id, from_id):
+    msg_bytes = str.encode(msg)
+    encoded = "".join([str('00' + x) for x in re.findall('..',bytes.hex(msg_bytes))] )
+    final = encoded
+    while len(final) < 400:
+        final = final + '002e'
+    final = final + '0000000000000000000000'
+    headers = sms_headers(to_id, from_id)
+    return headers + final
+
+def gen_header(to_id, from_id, call_type):
+    #print(call_type)
+    if call_type == 1:
+        seq_header = '024A' + to_id + from_id + '9550'
+    if call_type == 0:
+        seq_header = '824A' + to_id + from_id + '9550'
+    return seq_header
+
+def send_sms(csbk, to_id, from_id, peer_id, call_type, slot, msg, que_dir):
+    global use_csbk
+    #to_id = str(hex(to_id))[2:].zfill(6)
+    #from_id = str(hex(from_id))[2:].zfill(6)
+    to_id = str(hex(to_id))[2:].zfill(6)
+    from_id = str(hex(from_id))[2:].zfill(6)
+    peer_id = str(hex(peer_id))[2:].zfill(8)
+    # Weird fix for redio not decoding, will fix later
+    if len(str(int(from_id, 16))) >= 4 and len(str(int(from_id, 16))) <= 6:
+        from_id = str('000000')
+    if call_type == 'unit':
+        new_call_type = 1
+    if call_type == 'group':
+        new_call_type = 0
+    if csbk == 'yes':
+        use_csbk = True
+        create_sms_seq(to_id, from_id, peer_id, int(slot), new_call_type, csbk_gen(to_id, from_id) + create_crc16(gen_header(to_id, from_id, new_call_type)) + create_crc32(format_sms(msg, to_id, from_id)), que_dir)
+    else:
+        use_csbk = False
+        create_sms_seq(to_id, from_id, peer_id, int(slot), new_call_type, create_crc16(gen_header(to_id, from_id, new_call_type)) + create_crc32(format_sms(msg, to_id, from_id)), que_dir)
+    print('Call type: ' + call_type)
+    print('Destination: ' + str(to_id))
+    print('Source: ' + str(from_id))
+    print('Message: ' + msg)
+    print('Use CSBK: ' + str(use_csbk))
+    print('Slot: ' + str(int(slot)))
@@ -0,0 +1,28 @@
+{% include 'page.html' %}
+{% include 'header.html' %}
+{{description}}
+<p>&nbsp;</p>
+<p>Contact information for this gateway.</p>
+<table style="margin-left: auto; margin-right: auto;" border="black">
+<tbody>
+<tr>
+<td><strong>Name</strong></td>
+<td>&nbsp;{{contact_name}} </td>
+</tr>
+<tr>
+<td><strong>Callsign</strong></td>
+<td>&nbsp;{{contact_call}}</td>
+</tr>
+<tr>
+<td><strong>E-Mail</strong></td>
+<td>&nbsp;{{contact_email}}</td>
+</tr>
+<tr>
+<td><strong>Website</strong></td>
+<td>&nbsp;{{contact_website}}</td>
+</tr>
+</tbody>
+</table>
+<p>&nbsp;</p>
+{% include 'footer.html' %}
+
@@ -0,0 +1,5 @@
+<div>
+<hr />
+<div style="text-align: center;">Dashboard created by KF7EEL - <a href="https://kf7eel.github.io/hblink3/">https://github.com/kf7eel/hblink3</a><br />HBLink created by N0MJS.<br /><a href="https://github.com/HBLink-org">HBLink GitHub page</a><br />This is branch: <strong>sms_dev</strong></div>
+<div style="text-align: center;"><strong>$Id$</strong></div></body>
+ </html>
@@ -0,0 +1,5 @@
+{% include 'page.html' %}
+{% include 'header.html' %}
+{{content}}
+{% include 'footer.html' %}
+
@@ -0,0 +1,21 @@
+<p><img style="display: block; margin-left: auto; margin-right: auto;" src="{{logo}}" alt="Logo" width="300" height="144" /></p>
+<h1 style="text-align: center;">{{title}}</h1>
+<hr />
+<table style="width: 500px; margin-left: auto; margin-right: auto;" border="black" cellspacing="3" cellpadding="3">
+<tbody>
+<tr>
+<td style="text-align: center;"><button onclick="window.location.href='{{dashboard_url}}/';"> Dashboard Home </button></td>
+<td style="text-align: center;"><button onclick="window.location.href='{{dashboard_url}}/map';"> Station Map </button></td>
+<td style="text-align: center;"><button onclick="window.location.href='{{dashboard_url}}/mailbox';"> The Mailbox </button></td>
+<td style="text-align: center;"><button onclick="window.location.href='{{dashboard_url}}/sms';"> SMS Capture </button></td>
+<td style="text-align: center;"><button onclick="window.location.href='{{dashboard_url}}/user';"> User Settings </button></td>
+{% if api %}
+<td style="text-align: center;"><button onclick="window.location.href='{{dashboard_url}}/external_apps';"> External Applications </button></td>
+{% endif %}
+<td style="text-align: center;"><button onclick="window.location.href='{{dashboard_url}}/help';"> Dashboard Help </button></td>
+<td style="text-align: center;"><button onclick="window.location.href='{{dashboard_url}}/about';"> Gateway Contact </button></td>
+</tr>
+</tbody>
+</table>
+<hr />
+
@@ -0,0 +1,117 @@
+{% include 'page.html' %}
+{% include 'header.html' %}
+<h2 style="text-align: center;">Attention:</h2>
+<p><span style="color: #ff0000;"><strong>Please be aware that many (if not all) DMR radios DO NOT transmit your callsign when sending a GPS position. It is your responsibility to identify your station per the regulations of your country.</strong></span></p>
+<p>&nbsp;</p>
+<p>{{description}}</p>
+<p>Configure your radio to send GPS positions with the following settings:</p>
+<table style="margin-left: auto; margin-right: auto;" border="black">
+<tbody>
+<tr>
+<td style="text-align: center;"><strong>Data Call Type</strong></td>
+<td style="text-align: center;"><strong>DMR ID</strong></td>
+</tr>
+<tr>
+<td style="text-align: center;">&nbsp;{{data_call_type}}</td>
+<td style="text-align: center;">&nbsp;{{data_call_id}}</td>
+</tr>
+</tbody>
+</table>
+<p>&nbsp;</p>
+<p>When a position is received by this gateway, it will extract the coordinates and create an APRS position packet. This gateway will find your callsign based your radio's DMR ID. It is essential to have your information up to date with <a href="https://radioid.net/">RadioID.net</a>. A predefined APRS SSID of <strong>{{aprs_ssid}}</strong> is appended your callsign. The APRS location packet is then uploaded to APRS-IS. No setup or account creation is required beforehand. This is pretty much "plug and play."</p>
+<p>For example, N0CALL has a DMR ID of 1234567. N0CALL's radio sends a position to this gateway with the call type settings above. This gateway will query the <a href="https://radioid.net/">RadioID.net</a> database for DMR ID 1234567. The result will be an APRS location packet with APRS SSID&nbsp;{{aprs_ssid}}. </p>
+<p>You can change the default APRS settings for your radio via SMS.</p>
+<h2 style="text-align: center;">Commands</h2>
+<table style="margin-left: auto; margin-right: auto;" border="black">
+<tbody>
+<tr>
+<td style="text-align: center;">
+<h4><strong>Command</strong></h4>
+</td>
+<td style="text-align: center;">
+<h4><strong>Description</strong></h4>
+</td>
+<td style="text-align: center;">
+<h4><strong>Example</strong></h4>
+</td>
+</tr>
+<tr>
+<td><strong>@COM</strong></td>
+<td>Change the comment of the APRS.</td>
+<td><em><code>@COM This is a test comment.</code></em></td>
+</tr>
+<tr>
+<td><strong>@ICON</strong></td>
+<td>Change the icon of the APRS position. *See <a href="http://aprs.net/vm/DOS/SYMBOLS.HTM" rel="nofollow">http://aprs.net/vm/DOS/SYMBOLS.HTM</a> for icon list.</td>
+<td><em><code>@ICON /p</code></em></td>
+</tr>
+<tr>
+<td><strong>@SSID</strong></td>
+<td>Change SSID of your callsign.</td>
+<td><em><code>@SSID 7</code></em></td>
+</tr>
+<tr>
+<td><strong>@PIN</strong></td>
+<td>Set a PIN. This is used for changing your APRS settings ia the dashboard. You must set this for each DMR ID you wish to change via the dashboard.</td>
+<td><em><code>@PIN 1234</code></em></td>
+</tr>
+<tr>
+<td><strong>@MH</strong></td>
+<td>Set you location by maidenhead grid square. Designed for radios with no GPS or that are not compatable yet.</td>
+<td><em><code>@MH DN97uk</code></em></td>
+</tr>
+<tr>
+<td><strong>@BB</strong></td>
+<td>Post a bulliten to the web dashboard.</td>
+<td><em><code>@BB This is a test bulletin.</code></em></td>
+</tr>
+<tr>
+<td><strong>@[CALLSIGN W/ SSID] [MESSAGE]</strong></td>
+<td>Send a message to another station via APRS.</td>
+<td><em><code>@N0CALL-15 This is a test.</code></em></td>
+</tr>
+<tr>
+<td><strong>[EMAIL ADDRESS] [MESSAGE]</strong></td>
+<td>Send an email to an email address.</td>
+<td><em><code>test@example.org This is a test.</code></em></td>
+</tr>
+<tr>
+<td><strong>@[RECIPIENT CALLSIGN] M-[MESSAGE]</strong></td>
+<td>Post a message to the Mailbox.</td>
+<td><em><code>@N0CALL M-This is a test.</code></em></td>
+</tr>
+<tr>
+<td><strong>@REM MAIL</strong></td>
+<td>Remove all mail addressed to you.</td>
+<td><em><code>@REM MAIL</code></em></td>
+</tr>
+<tr>
+<td><strong>@SOS</strong></td>
+<td>EMERGENCY activation displays a banner on the main dashboard page.</td>
+<td><em><code>THIS IS AN EMERGENCY. @SOS</code></em></td>
+</tr>
+<tr>
+<td><strong>@NOTICE</strong></td>
+<td>Used to prominantly display a notice, similar to EMERGENCY activation.</td>
+<td><em><code>@NOTICE Server going down at 1800</code></em></td>
+</tr>
+<tr>
+<td><strong>@REM SOS</strong></td>
+<td>Removes an EMERGENCY or notice.</td>
+<td><em><code>@REM SOS</code></em></td>
+</tr>
+</tbody>
+</table>
+<p>&nbsp;</p>
+<p><strong>Commands should be in upper case.</strong> Send an SMS to <strong>{{data_call_id}}</strong> as a <strong>{{data_call_type}}</strong> with the desired command followed by the value. For example, to change your icon to a dog, the command would be <code>@ICON /p</code> (see the icon table for values). Changing your SSID is as simple as <code>@SSID 7</code>, and <code>@COM Testing 123</code> will change the comment.</p>
+<p>Sending <code>@BB Test</code> will result in a post to the bulletin board with the messaage of "Test".</p>
+<p><strong>To remove any of the stored values, just send the appropriate command without any input.</strong> <code>@COM</code> will remove the stored comment, <code>@ICON</code> will remove the stored icon, and <code>@ICON</code> will remove the strored icon. Any position reports sent will have the default settings.</p>
+
+<h3 style="text-align: center;">EMERGENCY Activation</h3>
+<p>The EMERGENCY Activation function will display a prominant banner accross the main dashboard page. The banner contains a message, time, callsign of station, and a link to the last known location of the station. This feature is intended to be used in situations where a user is in distress. To trigger an EMERGENCY activation, simply send an SMS to <strong>{{data_call_id}}</strong> with <strong>@SOS</strong> in the message. The <strong>@SOS</strong> command can be anywhere in the message. A less intimidating banner can be displayed for testing, or other purposes, by using <strong>@NOTICE</strong>. To remove the EMERGENCY activation, simply send the <strong>@REM SOS</strong> command.</p>
+<h3 style="text-align: center;">The Map</h3>
+<p>This dashboard now has a built in map. The map will display the last know location of stations and some previous plots from them. You can track a station by clicking on the red pin, and selecting the <strong>Track Station</strong> link. When tracking a station, you have a few options for a refresh rate, located in a drop down menu.</p>
+<h3 style="text-align: center;">The Mailbox</h3>
+<p>The Mailbox is a place where users can leave messages via DMR SMS. A user can leave a message for someone else by sending a formatted SMS to <strong>{{data_call_id}}</strong>. See the table above for a syntax example of posting a message to the Mailbox. The message recipient can then use the mailbox to check for messages. Message recipients can delete all of their messages by sending the command <strong>@REM MAIL</strong>. There is no way to remove a single message, it's all or none.</p>
+
+{% include 'footer.html' %}
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="refresh" content="120" > 
+    <title>{{title}}</title>
+    <style>
+body {background-color: D3D3D3;}
+h1   {color: green;}
+p {
+  padding: 10px;
+  margin: 20px;
+
+}
+.content {
+  max-width: 1200px;
+  min-width: 1200px;
+  margin: auto;
+}
+ .emergency_button {
+  display: block;
+  width: 100%;
+  border: none;
+  background-color: ##ff0000;
+  padding: 14px 28px;
+  font-size: 16px;
+  cursor: pointer;
+  text-align: center;
+}
+</style>
+</head>
+<div class="content">
+<body>
+{% include 'header.html' %}
+{{emergency}}
+<p style="text-align: center;"><em>Page automatically reloads every 2 minutes.</em></p>
+<h4 style="text-align: center;"><a href="bulletin_rss.xml"><em>Bulletin Board 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=" /></h4>
+<table>
+<tbody>
+<tr>
+<td><div><p align="center"><iframe style="border: none;" title="Bulletin Board" src="bulletin_board" width="480" height="950"></iframe></p></div></td>
+<td><div>
+<p align="center"><iframe style="border: none;" title="Positions Received" src="positions" width="620" height="950"></iframe></p>
+</div></td>
+</tr>
+</tbody>
+</table>
+ {% include 'footer.html' %}
+
@@ -0,0 +1,8 @@
+{% include 'page.html' %}
+{% include 'header.html' %}
+<p style="text-align: center;"><span style="color: #ff0000;"><strong>Red</strong></span>: Last location received. <span style="color: #0000ff;"><strong>Blue</strong></span>: Location history.</p>
+<p style="text-align: center;">&nbsp;</p>
+<div><p align="center"><iframe style="border: none;" title="Map" src="{{dashboard_url}}/view_map?track=" width="1100" height="700"></iframe></p></div>
+<p>&nbsp;</p>
+{% include 'footer.html' %}
+
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>{{title}}</title>
+    <style>
+body {background-color: D3D3D3;}
+h1   {color: green;}
+p {
+  padding: 10px;
+  margin: 20px;
+
+}
+.content {
+  max-width: 1200px;
+  min-width: 1200px;
+  margin: auto;
+}
+</style>
+</head>
+<div class="content">
+<body>
@@ -53,7 +53,7 @@ def process_acls(_config):
    # System level ACLs
    for system in _config['SYSTEMS']:
        # Registration ACLs (which make no sense for peer systems)
-        if _config['SYSTEMS'][system]['MODE'] == 'MASTER':
+        if _config['SYSTEMS'][system]['MODE'] == 'MASTER' or _config['SYSTEMS'][system]['MODE'] == 'PROXY':
            _config['SYSTEMS'][system]['REG_ACL'] = acl_build(_config['SYSTEMS'][system]['REG_ACL'], const.PEER_MAX)

        # Subscriber and TGID ACLs (valid for all system types)
@@ -64,12 +64,11 @@ def process_acls(_config):
 # ORIGINAL:  'DENY:1-5,3120101,3120124'
 # PROCESSED: (False, set([(1, 5), (3120124, 3120124), (3120101, 3120101)]))
 def acl_build(_acl, _max):
+    #print(_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':
@@ -108,9 +107,8 @@ def build_config(_config_file):
    CONFIG['GLOBAL'] = {}
    CONFIG['REPORTS'] = {}
    CONFIG['LOGGER'] = {}
+    CONFIG['GPS_DATA'] = {}
    CONFIG['ALIASES'] = {}
-    CONFIG['WEB_SERVICE'] = {}
-    CONFIG['DATA_CONFIG'] = {}
    CONFIG['SYSTEMS'] = {}

    try:
@@ -145,32 +143,12 @@ def build_config(_config_file):
                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({
+            elif section == 'GPS_DATA':
+                CONFIG['GPS_DATA'].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'),
+                    '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'),
@@ -184,28 +162,41 @@ def build_config(_config_file):
                    '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'),
+                    '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'),
+                    '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'),


                })
+                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 config.getboolean(section, 'ENABLED'):
                if config.get(section, 'MODE') == 'PEER':
@@ -236,12 +227,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=HBlink;', bytes(config.get(section, 'OPTIONS'), 'utf-8')]),
+                        'OPTIONS': 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 
@@ -287,8 +277,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 
@@ -305,7 +294,7 @@ 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'),
+                        'STATIC_APRS_POSITION_ENABLED': config.getboolean(section, 'STATIC_APRS_POSITION_ENABLED'),
                        'REPEAT': config.getboolean(section, 'REPEAT'),
                        'MAX_PEERS': config.getint(section, 'MAX_PEERS'),
                        'IP': gethostbyname(config.get(section, 'IP')),
@@ -316,8 +305,27 @@ 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': {}})
+                    
+                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')
                    }})
                    CONFIG['SYSTEMS'][section].update({'PEERS': {}})
                    
@@ -336,31 +344,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'),
-                        '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))
@@ -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'
-
@@ -1,5 +0,0 @@
-def gen_script(dmr_id, passphrase):
-    script = '''
-DMR ID: ''' + str(dmr_id) + ''' \n Passphrase: ''' + str(passphrase) + '''
-'''
-    return script
@@ -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
-
@@ -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
@@ -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 %}
@@ -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 %}
@@ -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 %}
@@ -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 %}
@@ -1,8 +0,0 @@
-<p>Dear {{ user.email }} - {{ user.username }},</p>
-
-{% block message %}
-{% endblock %}
-
-<p>Sincerely,<br/>
-{{ app_name }}
-</p>
@@ -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 %}
@@ -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 %}
@@ -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>
@@ -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 %}
@@ -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 %}
@@ -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 %}
@@ -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 %}
@@ -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 %}
@@ -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 %}
@@ -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 %}
@@ -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 %}
@@ -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 %}
@@ -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 %}
@@ -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 %}
@@ -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 %}
@@ -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 %}
@@ -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 %}
@@ -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 %}
@@ -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
@@ -1,11 +0,0 @@
-from app import hbnet_web_service
-
-app = hbnet_web_service()
-
-
-if __name__ == "__main__":
-#    app = create_app()
-
-    app.run()
-
-
Author	SHA1	Message	Date
KF7EEL	9048b156e5	fix bug in rules-SAMPLE.py	2021-06-06 11:45:12 -07:00
KF7EEL	3229360f70	fix bugs	2021-06-05 16:46:20 -07:00
KF7EEL	ff25a032c6	rewrite PROXY master instance	2021-06-05 16:25:08 -07:00
KF7EEL	60c790f5cb	first possible working built in PROXY	2021-06-04 21:23:49 -07:00
KF7EEL	13d86a5b88	save progress	2021-06-04 20:06:52 -07:00
KF7EEL	949f9b4404	add ability for 3 different proxies	2021-05-30 19:36:23 -07:00
KF7EEL	dd45e351c3	update hotspot proxy	2021-05-30 17:49:04 -07:00
KF7EEL	4343677843	continue work on hotspot proxy	2021-05-30 12:21:32 -07:00
KF7EEL	0698417682	work on MASTER generation	2021-05-28 12:29:55 -07:00
KF7EEL	20444b7de0	add hotspot proxy from FreeDMR	2021-05-28 11:10:24 -07:00
KF7EEL	979fedb218	add SMS capture	2021-05-02 09:09:20 -07:00
KF7EEL	11a296252d	fix IPSC to MMDVM	2021-05-01 17:45:13 -07:00
KF7EEL	e756efcaa1	Merge branch 'sms_dev' of https://github.com/kf7eel/hblink3 into sms_dev	2021-05-01 15:59:34 -07:00
KF7EEL	570efa04ce	initial commit of IPSC bridge	2021-05-01 15:59:15 -07:00
KF7EEL	582fe1e0ac	Update README.md	2021-04-30 09:55:26 -07:00
KF7EEL	458f115de3	update footer	2021-04-29 12:09:14 -07:00
KF7EEL	71f5bd7a04	Merge branch 'sms_dev' of https://github.com/kf7eel/hblink3 into sms_dev	2021-04-29 12:06:03 -07:00
KF7EEL	de5192ab6b	add commit id to footer.html	2021-04-29 12:05:47 -07:00
KF7EEL	890e52bfd2	Update README.md	2021-04-29 11:52:25 -07:00
KF7EEL	867a50a4f1	Update README.md	2021-04-29 11:10:27 -07:00
KF7EEL	75d2b9ccc2	add TG reply	2021-04-28 16:07:55 -07:00
KF7EEL	7f4844299d	change UNIT to EXCLUDE_FROM_UNIT	2021-04-28 15:07:26 -07:00
KF7EEL	dd2879a1a9	Update README.md	2021-04-27 13:11:08 -07:00
KF7EEL	425d77c83c	add function to rule.py	2021-04-26 19:57:48 -07:00
KF7EEL	f937581e49	prepare for OPENBRIDGE support	2021-04-26 15:54:36 -07:00
KF7EEL	285eec5267	update README and install.sh	2021-04-26 13:28:55 -07:00
KF7EEL	0664c4124a	fix blank STATIC_UNIT from config, update documentation to config, remove from requirements.txt	2021-04-26 12:25:05 -07:00
KF7EEL	6875d95475	fix incorrect line of code	2021-04-25 14:17:59 -07:00
KF7EEL	ca0e8927c1	remove position count	2021-04-25 13:55:26 -07:00
KF7EEL	e3b74c6cbb	disable position count	2021-04-25 13:48:51 -07:00
KF7EEL	b4de3650fc	fix dashboard bug	2021-04-25 13:47:26 -07:00
KF7EEL	09c2ee5b4c	add position count to beacon comment	2021-04-25 13:37:05 -07:00
KF7EEL	4e335e2831	re-enable APRS beacon	2021-04-25 13:20:50 -07:00
KF7EEL	7263c41ac6	restore bridge.py to original state	2021-04-25 10:39:04 -07:00
KF7EEL	a0176551b8	fix API toggle	2021-04-25 10:25:32 -07:00
KF7EEL	906ada085a	fix excessive generation in send que, zero source ID	2021-04-25 10:20:18 -07:00
KF7EEL	12169a1065	add description to external apps	2021-04-25 09:38:17 -07:00
KF7EEL	dd4c7d91a1	change sending que path, generate dictionaries, moved locap_apps and authorized_users to rules.py	2021-04-25 09:35:58 -07:00
KF7EEL	aa3ae3d3a1	genetate app list, use sms_aprs_config.py	2021-04-25 08:55:26 -07:00
KF7EEL	03552877ef	start public app dictionary	2021-04-24 19:59:07 -07:00
KF7EEL	7002c79c8b	fix typo	2021-04-24 11:23:29 -07:00
KF7EEL	5aa8a14269	add option to disable beacon	2021-04-24 11:22:04 -07:00
KF7EEL	4ef4e78599	fix typo	2021-04-24 07:46:53 -07:00
KF7EEL	3cc71a4040	add dashboard url to code	2021-04-24 07:39:48 -07:00
KF7EEL	a1fa625df5	improve APRS thread kill	2021-04-24 06:58:18 -07:00
KF7EEL	c5ea8f625b	update requirements	2021-04-23 12:34:54 -07:00
KF7EEL	6d7cc08559	add external apps page, add som comments	2021-04-22 19:18:32 -07:00
KF7EEL	4881380132	add external applications page to dashboard	2021-04-22 18:54:08 -07:00
KF7EEL	3b945ab886	update dashboard	2021-04-22 16:14:54 -07:00
KF7EEL	9946b7ee53	Update README, change API fields	2021-04-22 15:21:42 -07:00
KF7EEL	830799db2c	change API field	2021-04-22 15:21:13 -07:00
KF7EEL	5031d7d4aa	Update README.md	2021-04-22 15:03:26 -07:00
KF7EEL	7b2b33b2d9	tested and working API to external app	2021-04-22 14:47:22 -07:00
KF7EEL	e15169b09c	add app and msg_xfer send to process_sms	2021-04-22 12:26:29 -07:00
KF7EEL	eb06c9c268	change SMS command syntax	2021-04-22 10:55:17 -07:00
KF7EEL	1540b3e806	add app mode to API	2021-04-22 10:03:48 -07:00
KF7EEL	e3817980ec	add JSON template examples	2021-04-21 19:16:03 -07:00
KF7EEL	1ce6c26d84	improvements	2021-04-21 16:10:52 -07:00
KF7EEL	0719db4e77	add TS to msg_xfer	2021-04-21 14:37:52 -07:00
KF7EEL	5632ad507b	basic system auth	2021-04-21 14:17:42 -07:00
KF7EEL	c8c8ccc4d0	update README	2021-04-21 11:01:43 -07:00
Eric	5815e1993c	initial commit of SMS dev	2021-04-21 10:46:52 -07:00
KF7EEL	e97e5cff32	fix dashboard logging bug	2021-03-11 17:54:38 -08:00
KF7EEL	7f46a19749	improve PIN write to user_settings	2021-03-11 08:40:55 -08:00
KF7EEL	e6ace9e72d	fix missing code from bridge_gps_data.py	2021-03-11 08:02:24 -08:00
KF7EEL	1fb22d01c6	Merge branch 'gps' of https://github.com/kf7eel/hblink3 into gps	2021-03-11 07:52:43 -08:00
KF7EEL	4e0c87dac9	fix config.py, add editing of user settings to dashboard, limit number of stored locations per user	2021-03-11 07:52:06 -08:00
KF7EEL	ef850596d1	cap positions on map at 15 for station view	2021-03-05 08:15:42 -08:00
KF7EEL	247168d567	fix typo	2021-03-05 07:27:25 -08:00
KF7EEL	6a6fdf367a	correct condition	2021-03-05 07:20:07 -08:00
KF7EEL	b860dc75ba	pass on blank addrersse messages	2021-03-05 07:15:58 -08:00
KF7EEL	6cc6f7fc81	fix exception	2021-03-04 17:15:37 -08:00
KF7EEL	873bbb6ce7	fix bug again	2021-03-04 16:55:17 -08:00
KF7EEL	2e5dec5cac	fix bugs	2021-03-04 16:31:54 -08:00
KF7EEL	239c0730c0	fix incorrect config	2021-03-04 15:17:51 -08:00
KF7EEL	fcff610fd3	fix bugs, add user settings to config	2021-03-04 15:16:03 -08:00
KF7EEL	6a1476af51	Update gps_data-SAMPLE.cfg	2021-03-04 13:57:10 -08:00
KF7EEL	295dfbda1f	rewrite dahboard config, update APRS receive	2021-03-04 12:36:45 -08:00
KF7EEL	e61f90fcfd	initial untested receive script	2021-03-03 16:42:01 -08:00
KF7EEL	599f549ab9	add dashboard APRS message hook	2021-03-03 16:36:25 -08:00
KF7EEL	65ab256b7f	fix dashboard SOS bug	2021-03-02 14:04:42 -08:00
KF7EEL	104cab1c29	fix typo	2021-03-02 13:46:12 -08:00
KF7EEL	eded346f91	fix typo	2021-03-02 13:41:40 -08:00
KF7EEL	a91eb65273	make mailbox file persistent	2021-03-02 13:40:03 -08:00
KF7EEL	5b1e250d57	fix exception in map view	2021-03-02 12:56:24 -08:00
KF7EEL	d332604f26	add comment to map plots	2021-03-02 12:41:03 -08:00
KF7EEL	888d8c19b7	fix typos	2021-03-01 20:24:37 -08:00
KF7EEL	cb47556205	switch to UNIX time	2021-03-01 20:11:32 -08:00
KF7EEL	f8cdf8fead	minor improvement, remove user_settings.html	2021-03-01 18:16:49 -08:00
KF7EEL	d0e90531c6	fix mailbox parsing	2021-03-01 16:50:55 -08:00
KF7EEL	dccf561e3d	add generic template	2021-03-01 16:41:36 -08:00
KF7EEL	751af20357	update help	2021-03-01 16:39:48 -08:00
KF7EEL	12dc612c2e	add mailbox feature	2021-03-01 15:58:09 -08:00
KF7EEL	dfedf9eade	add generic template to dashboard	2021-03-01 14:18:51 -08:00
KF7EEL	ee7c7eccf1	add user setting query, improve dashboard	2021-03-01 13:52:22 -08:00
KF7EEL	f4010939dc	increase number of BB entries in RSS	2021-02-28 20:01:29 -08:00
KF7EEL	9b19a09eac	limit map size on track screen	2021-02-28 19:48:42 -08:00
KF7EEL	89176e922c	add option for map theme	2021-02-28 17:27:08 -08:00
KF7EEL	7febe66a76	add notice function as an alternative to emergency	2021-02-28 17:01:32 -08:00
KF7EEL	ce36850621	use internal map rather than aprs.fi	2021-02-28 16:17:58 -08:00
KF7EEL	3368683a1f	update emergency function	2021-02-28 14:37:23 -08:00
KF7EEL	d84e937c1f	add emergency feature	2021-02-28 13:47:02 -08:00
KF7EEL	ec82ce8b24	add bulletin board rss, correct spelling of bulletin	2021-02-28 12:25:19 -08:00
KF7EEL	40a3030694	update map look and feel	2021-02-28 10:51:39 -08:00
KF7EEL	f68c5d0691	improve map	2021-02-27 15:44:14 -08:00
KF7EEL	bf9b45d44f	fix map template	2021-02-27 15:11:09 -08:00
KF7EEL	fb9226e04f	add tracking to map	2021-02-27 14:57:48 -08:00
KF7EEL	b00ba9ea62	improve map plotting	2021-02-27 06:55:48 -08:00
KF7EEL	9b14982abe	improve map and dashboard	2021-02-26 23:30:49 -08:00
KF7EEL	61fd13514b	increase positions logged	2021-02-26 21:51:42 -08:00
KF7EEL	77309d5ca6	Merge branch 'gps' of https://github.com/kf7eel/hblink3 into gps	2021-02-26 21:17:33 -08:00
KF7EEL	db77a165b4	add map to dashboard	2021-02-26 21:17:06 -08:00
KF7EEL	83274856a3	Update README.md	2021-02-26 18:50:02 -08:00
KF7EEL	72ed9f2d2b	remove aprs_upload calls Accidentally added aprs calls from aprs_features branch	2021-02-26 13:45:06 -08:00
KF7EEL	1b904e9af7	improve regexp for APRS messages	2021-02-26 13:40:44 -08:00
KF7EEL	db068d859e	add exception logging	2021-02-26 10:49:54 -08:00
KF7EEL	74ca23af73	add example config for combined application	2021-02-08 12:38:45 -08:00
KF7EEL	76cadf01a4	fix typo	2021-02-07 15:02:52 -08:00
KF7EEL	ccd197a8c1	add combined bridge/D-APRS	2021-02-07 13:52:03 -08:00
KF7EEL	1a96434c78	fix typo	2021-02-04 12:58:16 -08:00
KF7EEL	3047b55bcc	add 14FRS2013 contributions, add both option for call type	2021-02-04 12:45:14 -08:00
KF7EEL	21a0c95ad3	add option to disable APRS upload	2021-02-04 10:06:09 -08:00
Roby	08f53ee1a4	Update help.html (#22 ) Add new commands	2021-02-03 13:37:54 -08:00
KF7EEL	82ce4995ae	Merge branch 'gps' of https://github.com/kf7eel/hblink3 into gps	2021-02-02 12:04:19 -08:00
KF7EEL	dc5dbc0f7f	fix typo for GNRMC	2021-02-02 12:04:03 -08:00
KF7EEL	85d085d563	Update README.md	2021-02-02 11:57:24 -08:00
KF7EEL	5e349a9705	Merge branch 'gps' of https://github.com/kf7eel/hblink3 into gps	2021-02-02 11:36:17 -08:00
KF7EEL	664cc46b63	potential fix for RT73	2021-02-02 11:35:56 -08:00
KF7EEL	45dca64490	Update README.md	2021-02-01 17:31:19 -08:00
KF7EEL	bc8bb8b298	Update README.md	2021-02-01 17:29:35 -08:00
KF7EEL	40fa5372ce	change email syntax, bug fix	2021-02-01 17:28:11 -08:00
KF7EEL	586533ac4c	Update README.md	2021-02-01 07:32:55 -08:00
KF7EEL	f99451b0a4	Update gps_data-SAMPLE.cfg	2021-01-31 12:56:48 -08:00
KF7EEL	afb249c418	fix bugs	2021-01-31 12:45:43 -08:00
KF7EEL	a750dedab0	Merge branch 'gps' of https://github.com/kf7eel/hblink3 into gps	2021-01-31 12:36:35 -08:00
KF7EEL	84f7baf9b4	Update requirements.txt	2021-01-31 12:35:22 -08:00
KF7EEL	fccbdc908c	Update README.md	2021-01-31 12:34:58 -08:00
KF7EEL	2affa319d4	Update README.md	2021-01-31 12:33:57 -08:00
KF7EEL	54f4ad799e	imrove email template	2021-01-31 11:55:09 -08:00
KF7EEL	372bb845b2	add email sending	2021-01-31 11:42:15 -08:00
KF7EEL	fcb0f1bd05	fix manual positions	2021-01-31 09:17:45 -08:00
KF7EEL	14f4eafa6e	Update footer.html	2021-01-30 11:22:53 -08:00
KF7EEL	bebf487936	Update help.html	2021-01-30 11:18:28 -08:00
KF7EEL	9def4fbfec	Update help.html	2021-01-30 09:58:10 -08:00
KF7EEL	33f499a32a	Update gps_data.py	2021-01-30 09:15:18 -08:00
KF7EEL	2d94dbe045	fix MD-380 and SMS positions	2021-01-26 08:54:48 -08:00
KF7EEL	0b5ecaa04f	Update README.md	2021-01-21 15:50:47 -08:00
KF7EEL	becbffed8e	Update README.md	2021-01-12 14:23:54 -08:00
KF7EEL	24e5329ac7	add sending messages to APRS	2021-01-12 13:54:53 -08:00
KF7EEL	e7b76acaff	fix typo	2021-01-12 10:00:38 -08:00
KF7EEL	c9b9c307d6	add GNRMC to filter to allow RT73 compatability	2021-01-12 09:56:17 -08:00
M0GLJ	22d371a8f6	Update README.md (#19 ) Model Correction	2021-01-10 10:01:49 -08:00
KF7EEL	f81e5dae78	Update README.md	2021-01-08 10:19:28 -08:00
KF7EEL	bd4bb0b611	Change example to allow D-APRS out of the box	2021-01-07 15:10:34 -08:00
KF7EEL	d76a808e4a	Update gps_data.py	2021-01-06 11:31:22 -08:00
KF7EEL	e6e9600e73	fix grammar	2021-01-02 18:13:35 -08:00
KF7EEL	22e04f6ff3	fix dash width	2021-01-02 18:02:55 -08:00
KF7EEL	a943748c94	fix missing templates	2021-01-02 16:17:34 -08:00
KF7EEL	674f9102d1	improve dash	2021-01-02 15:58:45 -08:00
KF7EEL	3dde015e5d	Merge branch 'gps' of https://github.com/kf7eel/hblink3 into gps	2021-01-02 14:58:58 -08:00
KF7EEL	3b36b44c5d	add page, split header and footer	2021-01-02 14:58:38 -08:00
KF7EEL	e4ef4383fe	Update gps_data-SAMPLE.cfg	2021-01-02 08:46:56 -08:00
KF7EEL	f2675d885c	clean up pages	2021-01-01 15:10:12 -08:00
KF7EEL	105f4bdc7a	fix html	2021-01-01 14:46:05 -08:00
KF7EEL	1df3026a59	update dashboard theme	2021-01-01 14:44:08 -08:00
KF7EEL	79fe60fc3f	add about page	2021-01-01 14:35:15 -08:00
KF7EEL	3a3f4719a0	fix description yet again	2021-01-01 14:16:57 -08:00
KF7EEL	dcc1b4ff40	fix description again	2021-01-01 14:15:43 -08:00
KF7EEL	e753f4f56b	fix description location	2021-01-01 14:12:38 -08:00
KF7EEL	215af2ea6c	add description to dashboard	2021-01-01 14:09:14 -08:00
KF7EEL	944e3bf1af	Update requirements.txt	2021-01-01 13:51:45 -08:00
M0GLJ	ecba8f75bd	Added install.sh and appended requirements.txt (#16 ) * Create install.sh * Update requirements.txt Add additional for gps operation	2021-01-01 13:51:20 -08:00
M0GLJ	1af61d184a	Update README.md (#17 )	2021-01-01 13:50:21 -08:00
KF7EEL	f411531bd0	Merge branch 'gps' of https://github.com/kf7eel/hblink3 into gps	2021-01-01 09:58:33 -08:00
KF7EEL	15111563ed	fix bug, improve index template	2021-01-01 09:58:13 -08:00
KF7EEL	b6adc461c6	Update README.md	2021-01-01 09:43:19 -08:00
KF7EEL	6fc4dcfe27	Update README.md	2021-01-01 09:37:22 -08:00
KF7EEL	8cb40cbe2c	add host to dashboard	2020-12-30 16:41:51 -08:00
KF7EEL	7cd73740b4	add port settings	2020-12-30 09:35:25 -08:00
KF7EEL	6da1c4de0d	update web dashboard, add template	2020-12-30 09:10:23 -08:00
KF7EEL	e4b55b05fe	basic functioning web dashboard	2020-12-29 20:36:07 -08:00
KF7EEL	54bdbd72e8	Merge branch 'gps' of https://github.com/kf7eel/hblink3 into gps add backend code for upcoming web dashboard	2020-12-27 20:39:42 -08:00
KF7EEL	3a8e111443	add backend code for upcoming web dashboard	2020-12-27 20:39:17 -08:00
KF7EEL	a04f8e8cc3	Update README.md	2020-12-27 08:33:02 -08:00
KF7EEL	350b366ffd	Update README.md	2020-12-26 15:30:58 -08:00
KF7EEL	636246c664	Update README.md	2020-12-26 14:47:52 -08:00
KF7EEL	2a752487d0	add UDT SAP requirement to reduce fake packets	2020-12-26 14:31:11 -08:00
KF7EEL	c6ebf86b0f	add UDT UAB criteria to reduce inaccurate packets	2020-12-26 13:43:19 -08:00
KF7EEL	4900f859f8	fix parse bug, md-380 working again	2020-12-26 12:53:50 -08:00
KF7EEL	17999eb3f4	fix typo	2020-12-26 10:38:03 -08:00
KF7EEL	c09d2ea734	fix hdr_type error for non MD-380 radios	2020-12-26 09:59:08 -08:00
KF7EEL	84eaaf70f7	remove code from accidental commit	2020-12-24 13:53:44 -08:00
KF7EEL	a0d49b5175	Update README.md	2020-12-23 22:59:52 -08:00
KF7EEL	423d269e78	Update README.md	2020-12-23 22:53:23 -08:00
KF7EEL	9c73c70d71	fix typo in gps_data.py	2020-12-23 16:09:45 -08:00
KF7EEL	11e5aba3fc	fix typo	2020-12-23 15:27:59 -08:00
KF7EEL	f6a501a42e	initial commit for MD-380 type radios	2020-12-23 15:19:10 -08:00
KF7EEL	6902b3bd4c	fix beacon time to minutes	2020-12-11 13:05:59 -08:00
KF7EEL	fe1daeb406	add APRS beacon script for gps_data	2020-12-11 12:49:34 -08:00
KF7EEL	76ad6adea4	add APRS beacon script for gps_data	2020-12-11 12:47:43 -08:00
KF7EEL	542e7496ca	fix import time	2020-12-06 16:39:05 -08:00
KF7EEL	05a90944e2	add official tocall, add timestamp, and hook for MD-380 GPS	2020-12-06 12:30:20 -08:00
KF7EEL	804cb1c025	Update README.md	2020-12-01 13:35:32 -08:00
KF7EEL	b2fda94746	Update README.md	2020-12-01 13:34:39 -08:00
KF7EEL	6d934096aa	Update README.md	2020-12-01 13:21:26 -08:00
KF7EEL	a583ff92d2	parse all SMS for command string instead of header	2020-12-01 12:15:17 -08:00
KF7EEL	43e6e6d6b1	change handling of unknown SMS	2020-12-01 09:15:57 -08:00
KF7EEL	579ba3d282	add ETSI like SMS	2020-11-30 17:25:33 -08:00
KF7EEL	5c8be7c177	add debug statements	2020-11-30 14:08:33 -08:00
KF7EEL	28a2e7ba70	APRS position via SMS for grid square	2020-11-30 12:38:50 -08:00
KF7EEL	b47d70142d	Update README.md	2020-11-30 10:03:59 -08:00
KF7EEL	896ba4fbae	change file read, move global declaration	2020-11-30 09:59:15 -08:00
KF7EEL	d202f4d0ce	fix group SMS for Motorola, fix typo	2020-11-29 15:36:44 -08:00
KF7EEL	4beaf3000d	added blank variables to attempt to fix bug	2020-11-29 15:08:53 -08:00
KF7EEL	7e19e705ef	Update README.md	2020-11-28 23:53:53 -08:00
KF7EEL	821c57b381	Update README.md	2020-11-28 19:57:37 -08:00
KF7EEL	ffdfe55cb8	Merge branch 'gps' of https://github.com/kf7eel/hblink3 into gps	2020-11-28 09:15:26 -08:00
KF7EEL	9e40195161	attempt to fix bug with assembled packets	2020-11-28 09:14:26 -08:00
KF7EEL	7fd8500105	Update README.md	2020-11-27 23:53:22 -08:00
KF7EEL	d9e5085765	Update README.md	2020-11-27 09:39:18 -08:00
KF7EEL	d7afa94a5a	added user settings, added speed and course	2020-11-27 09:31:38 -08:00
KF7EEL	00e3ea840c	update readme, sample, and functions	2020-11-26 19:40:43 -08:00
KF7EEL	9dc7ce12e1	fix another bug	2020-11-26 17:44:19 -08:00
KF7EEL	a21393313f	revert change, remove UNIT_MAP changes	2020-11-26 15:23:33 -08:00
KF7EEL	e736893543	time for static unit now generated at start	2020-11-26 11:50:28 -08:00
KF7EEL	e88d545955	add hooks in code for shell commands	2020-11-25 15:53:42 -08:00
KF7EEL	eca8619153	Merge branch 'gps' of https://github.com/kf7eel/hblink3 into gps	2020-11-25 14:52:41 -08:00
KF7EEL	8e8836057b	fix typo for unit calls	2020-11-25 14:50:49 -08:00
KF7EEL	471feee9c3	implement static routes for unit calls	2020-11-25 14:39:28 -08:00
KF7EEL	d4e1ebd4ec	Update README.md	2020-11-25 12:35:06 -08:00
KF7EEL	ee40ad1e34	Update README.md	2020-11-25 12:17:51 -08:00
KF7EEL	37521fc7f1	implement custom UNIT time	2020-11-25 12:02:58 -08:00
KF7EEL	64ee23788a	Update README.md	2020-11-24 11:56:40 -08:00
KF7EEL	c07edcdc91	ensure lat and lon are float	2020-11-23 13:43:54 -08:00
KF7EEL	29fb602fcb	Update README.md	2020-11-23 13:19:04 -08:00
KF7EEL	6b9ae44256	add info to README	2020-11-23 13:15:22 -08:00
KF7EEL	72a9bd015b	fix typo again	2020-11-23 12:54:44 -08:00
KF7EEL	0ffd119994	implement basic SMS processing	2020-11-23 12:52:40 -08:00
KF7EEL	0056e1e09e	moved config to file	2020-11-23 10:08:31 -08:00
KF7EEL	84dee59b37	fix typo	2020-11-22 22:03:02 -08:00
KF7EEL	696e0bc128	fix typo	2020-11-22 21:58:45 -08:00
KF7EEL	f233e50516	fix old data bug	2020-11-22 20:39:45 -08:00
KF7EEL	6293497b61	decode motorola type sms	2020-11-22 18:51:46 -08:00
KF7EEL	6c3cab0827	added debug stuff	2020-11-22 13:55:06 -08:00
KF7EEL	0c6912c55f	fix typo	2020-11-22 12:44:52 -08:00
KF7EEL	e838fc3423	now using NMEA parser	2020-11-22 12:43:38 -08:00
KF7EEL	6224c84772	initial commit of GPS/Data application	2020-11-21 22:54:01 -08:00