Update README.md

disable dashboard stuff
add example config for combined application
2021-02-08 14:55:08 -08:00 · 2021-02-08 14:46:11 -08:00 · 2021-02-08 12:38:45 -08:00 · 2021-02-07 15:02:52 -08:00 · 2021-02-07 13:52:03 -08:00 · 2021-02-04 12:58:16 -08:00
33 changed files with 5483 additions and 622 deletions
@@ -1,32 +0,0 @@
-FROM python:3.7-slim-stretch
-
-RUN apt update && \
-    apt install -y git && \
-    cd /usr/src/ && \
-    git clone https://github.com/n0mjs710/dmr_utils3 && \
-    cd /usr/src/dmr_utils3 && \
-    ./install.sh && \
-    rm -rf /var/lib/apt/lists/* && \
-    cd /opt && \
-    rm -rf /usr/src/dmr_utils3 && \
-    git clone https://github.com/n0mjs710/hblink3
-
-RUN cd /opt/hblink3/ && \
-    sed -i s/.*python.*//g  requirements.txt && \
-    pip install --no-cache-dir -r requirements.txt
-
-
-ADD entrypoint /entrypoint
-
-RUN adduser -u 54000 radio && \
-    adduser radio radio && \
-    chmod 755 /entrypoint && \
-    chown radio:radio /entrypoint && \
-    chown radio /opt/hblink3
-
-RUN chmod 755 /entrypoint
-
-USER radio 
-EXPOSE 54000
-
-ENTRYPOINT [ "/entrypoint" ]
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0beta1 (d565813, 2019-09-28)"
+   sodipodi:docname="HBlink.svg"
+   id="svg877"
+   height="411.17413"
+   width="1042.9242"
+   viewBox="49.656 217.125 1042.9242 411.17414"
+   version="1.1">
+  <sodipodi:namedview
+     inkscape:current-layer="svg877"
+     inkscape:window-maximized="0"
+     inkscape:window-y="23"
+     inkscape:window-x="583"
+     inkscape:cy="48.366866"
+     inkscape:cx="574.39926"
+     inkscape:zoom="1"
+     fit-margin-left="5"
+     fit-margin-bottom="5"
+     fit-margin-right="5"
+     fit-margin-top="5"
+     units="px"
+     inkscape:pagecheckerboard="true"
+     showgrid="false"
+     id="namedview879"
+     inkscape:window-height="1348"
+     inkscape:window-width="1943"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     inkscape:document-rotation="0"
+     bordercolor="#666666"
+     pagecolor="#ffffff" />
+  <defs
+     id="defs837">
+    <font-face
+       overline-thickness="0"
+       overline-position="0"
+       strikethrough-thickness="0"
+       strikethrough-position="0"
+       v-hanging="0"
+       v-mathematical="0"
+       v-alphabetic="0"
+       v-ideographic="0"
+       hanging="0"
+       mathematical="0"
+       alphabetic="0"
+       ideographic="0"
+       accent-height="0"
+       stemh="0"
+       stemv="0"
+       id="font-face833"
+       font-weight="400"
+       descent="-255.00488"
+       ascent="945.0073"
+       cap-height="669"
+       x-height="669"
+       slope="0"
+       underline-thickness="20"
+       underline-position="-133"
+       units-per-em="1000"
+       panose-1="2 0 6 0 0 0 0 0 0 0"
+       font-size="96"
+       font-family="Ethnocentric">
+      <font-face-src>
+        <font-face-name
+           name="EthnocentricRg-Regular" />
+      </font-face-src>
+    </font-face>
+    <font-face
+       overline-thickness="0"
+       overline-position="0"
+       strikethrough-thickness="0"
+       strikethrough-position="0"
+       v-hanging="0"
+       v-mathematical="0"
+       v-alphabetic="0"
+       v-ideographic="0"
+       hanging="0"
+       mathematical="0"
+       alphabetic="0"
+       ideographic="0"
+       accent-height="0"
+       stemh="0"
+       stemv="0"
+       id="font-face835"
+       font-weight="400"
+       descent="-255.00488"
+       ascent="945.0073"
+       cap-height="669"
+       x-height="669"
+       slope="0"
+       underline-thickness="20"
+       underline-position="-133"
+       units-per-em="1000"
+       panose-1="2 0 6 0 0 0 0 0 0 0"
+       font-size="48"
+       font-family="Ethnocentric">
+      <font-face-src>
+        <font-face-name
+           name="EthnocentricRg-Regular" />
+      </font-face-src>
+    </font-face>
+  </defs>
+  <metadata
+     id="metadata839"> Produced by OmniGraffle 7.12.1 
+    <dc:date>2018-03-14 13:37:44 +0000</dc:date>
+<rdf:RDF>
+  <cc:Work
+     rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type
+       rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+    <dc:title></dc:title>
+  </cc:Work>
+</rdf:RDF>
+</metadata>
+  <g
+     transform="matrix(3.5262508,0,0,3.5262508,-159.40153,-655.56235)"
+     stroke-opacity="1"
+     stroke="none"
+     stroke-dasharray="none"
+     fill-opacity="1"
+     fill="none"
+     id="Canvas_2">
+    <title
+       id="title841">Canvas 2</title>
+    <g
+       id="Canvas_2: Layer 1">
+      <title
+         id="title843">Layer 1</title>
+      <g
+         id="Group_40">
+        <g
+           id="Graphic_39">
+          <title
+             id="title845">path6007</title>
+          <path
+             inkscape:connector-curvature="0"
+             id="path847"
+             stroke-width="3"
+             stroke-linejoin="round"
+             stroke-linecap="round"
+             stroke="#009051"
+             d="m 72.52062,328.5 h 225.5218 c 6.17355,0 11.1782,5.00465 11.1782,11.1782 v 0 c 0,6.17355 -5.00465,11.1782 -11.1782,11.1782 H 72.52062 c -6.17355,0 -11.1782,-5.00465 -11.1782,-11.1782 v 0 c 0,-6.17355 5.00465,-11.1782 11.1782,-11.1782 z" />
+        </g>
+        <g
+           id="Graphic_38">
+          <g
+             style="fill:#009051"
+             id="text852"
+             transform="translate(54.656,222.125)"
+             aria-label="HB">
+            <path
+               inkscape:connector-curvature="0"
+               id="path881"
+               style="font-weight:400;font-size:96px;font-family:Ethnocentric;fill:#009051"
+               d="M 84,91 H 64.224 V 66.232 H 26.016 V 91 H 6.048 V 26.776 H 26.016 V 49.528 H 64.224 V 26.776 H 84 Z" />
+            <path
+               inkscape:connector-curvature="0"
+               id="path883"
+               style="font-weight:400;font-size:96px;font-family:Ethnocentric;fill:#009051"
+               d="m 168.7155,57.976 q 4.224,1.248 7.104,4.896 2.976,3.648 2.976,9.408 0,4.032 -1.248,7.488 -1.248,3.36 -4.224,5.856 -2.976,2.496 -8.064,3.936 -4.992,1.44 -12.576,1.44 H 96.2355 V 51.928 h 56.832 q 2.208,0 3.84,-0.864 1.728,-0.96 1.728,-3.456 0,-2.4 -1.728,-3.264 -1.728,-0.864 -3.84,-0.864 h -56.832 l 13.44,-16.704 h 42.528 q 5.76,0 10.368,1.152 4.704,1.056 7.968,3.36 3.36,2.208 5.088,5.568 1.824,3.264 1.824,7.68 0,2.88 -0.768,5.088 -0.768,2.208 -2.016,3.936 -1.152,1.632 -2.784,2.784 -1.536,1.056 -3.168,1.632 z m -52.512,7.68 v 8.832 h 36.576 q 3.264,0 4.704,-1.152 1.44,-1.152 1.44,-3.36 0,-2.112 -1.44,-3.168 -1.44,-1.152 -4.704,-1.152 z" />
+          </g>
+        </g>
+        <g
+           id="Graphic_37">
+          <g
+             style="fill:#ff9300"
+             id="text857"
+             transform="translate(209.109,275)"
+             aria-label="link">
+            <path
+               inkscape:connector-curvature="0"
+               id="path886"
+               style="font-weight:400;font-size:48px;font-family:Ethnocentric;fill:#ff9300"
+               d="M 3.024,45 Z M 37.824,36.744 31.392,45 H 3.024 V 12.888 h 9.936 v 23.856 z" />
+            <path
+               inkscape:connector-curvature="0"
+               id="path888"
+               style="font-weight:400;font-size:48px;font-family:Ethnocentric;fill:#ff9300"
+               d="m 41.32425,45 z m 9.936,0 h -9.936 V 12.888 h 9.936 z" />
+            <path
+               inkscape:connector-curvature="0"
+               id="path890"
+               style="font-weight:400;font-size:48px;font-family:Ethnocentric;fill:#ff9300"
+               d="m 57.34875,45 z m 32.688,0.528 q -0.96,0 -1.92,-0.336 -0.912,-0.288 -2.064,-1.392 l -19.68,-17.664 V 45 h -9.024 V 18.36 q 0,-1.584 0.432,-2.736 0.48,-1.152 1.2,-1.872 0.768,-0.72 1.728,-1.056 1.008,-0.336 2.064,-0.336 0.912,0 1.824,0.336 0.96,0.288 2.16,1.392 l 19.68,17.664 V 12.888 h 9.072 V 39.48 q 0,1.584 -0.48,2.736 -0.432,1.152 -1.2,1.92 -0.72,0.72 -1.728,1.056 -1.008,0.336 -2.064,0.336 z" />
+            <path
+               inkscape:connector-curvature="0"
+               id="path892"
+               style="font-weight:400;font-size:48px;font-family:Ethnocentric;fill:#ff9300"
+               d="m 101.36775,45 z m 40.512,0 h -15.024 l -9.696,-8.448 q -2.496,-2.16 -3.84,-3.36 -1.296,-1.2 -2.112,-2.016 0.048,1.104 0.096,2.304 0.048,1.152 0.048,2.304 V 45 h -9.984 V 12.888 h 9.984 v 7.44 q 0,1.488 -0.048,2.928 -0.048,1.44 -0.144,2.688 0.96,-0.864 2.304,-2.112 1.392,-1.296 3.6,-3.12 l 9.264,-7.824 h 14.4 l -12.288,9.216 q -1.584,1.2 -2.832,2.112 -1.2,0.912 -2.16,1.584 -0.96,0.672 -1.776,1.2 -0.768,0.528 -1.536,1.008 1.392,0.96 3.36,2.4 1.968,1.44 5.088,3.984 z" />
+          </g>
+        </g>
+        <g
+           id="Graphic_36">
+          <path
+             inkscape:connector-curvature="0"
+             d="m 302.0625,336.9375 h 14.5771 v 6.1875 h -14.5771 z"
+             style="fill:#ffffff"
+             id="rect860" />
+        </g>
+        <g
+           id="Graphic_35">
+          <title
+             id="title863">path6381</title>
+          <path
+             inkscape:connector-curvature="0"
+             id="path865"
+             stroke-width="3"
+             stroke-linejoin="round"
+             stroke-linecap="round"
+             stroke="#ff9300"
+             d="M 116.9282,340.3125 H 342.45 c 6.17355,0 11.1782,5.00465 11.1782,11.1782 v 0 c 0,6.17355 -5.00465,11.1782 -11.1782,11.1782 H 116.9282 c -6.17355,0 -11.1782,-5.00465 -11.1782,-11.1782 v 0 c 0,-6.17355 5.00465,-11.1782 11.1782,-11.1782 z" />
+        </g>
+        <g
+           id="Graphic_34">
+          <path
+             inkscape:connector-curvature="0"
+             d="m 99,347.625 h 14.5771 v 6.1875 H 99 Z"
+             style="fill:#ffffff"
+             id="rect868" />
+        </g>
+        <g
+           id="Line_33">
+          <path
+             inkscape:connector-curvature="0"
+             d="M 93.9375,350.85641 H 120.375"
+             style="stroke:#009051;stroke-width:3;stroke-linecap:round;stroke-linejoin:round"
+             id="line871" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
@@ -1,3 +1,7 @@
+## See the main README (under branch: gps) for more on the operation of the application.
+
+This branch is really no different than the other branches. It just has the dashboard disabled, and the example configs modified to make it easier to run on an Android device.
+
 ---
 ### FOR SUPPORT, DISCUSSION, GETTING INVOLVED ###

@@ -5,6 +9,8 @@ Please join the DVSwitch group at groups.io for online forum support, discussion

 DVSwitch@groups.io 

+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.
+
 ---

 ## PROJECT: Open Source HomeBrew Repeater Proctol Client/Master. ##
@@ -13,7 +19,7 @@ DVSwitch@groups.io

 **PURPOSE:** Thanks to the work of Jonathan Naylor, G4KLX; Hans Barthen, DL5DI; Torsten Shultze, DG1HT we have an open protocol for internetworking DMR repeaters. Unfortunately, there's no generic client and/or master stacks. This project is to build an open-source, python-based implementation. You are free to use this software however you want, however we ask that you provide attribution in some public venue (such as project, club, organization web site). This helps us see where the software is in use and track how it is used.

-For those who will ask: This is a piece of software that implements an open-source, amateur radio networking protocol. It is not a network. It is not indended to be a network. It is not intended to replace or circumvent a network. People do those things, code doesn't.
+For those who will ask: This is a piece of software that implements an open-source, amateur radio networking protocol. It is not a network. It is not intended to be a network. It is not intended to replace or circumvent a network. People do those things, code doesn't.
  
 **PROPERTY:**  
 This work represents the author's interpretation of the HomeBrew Repeater Protocol, based on the 2015-07-26 documents from DMRplus, "IPSC Protocol Specs for homebrew DMR repeater" as written by Jonathan Naylor, G4KLX; Hans Barthen, DL5DI; Torsten Shultze, DG1HT, also licenced under Creative Commons BY-NC-SA license.
@@ -54,7 +60,7 @@ chown 65000  /var/log/hblink.log

 ***0x49 DE N0MJS***

-Copyright (C) 2016-2019 Cortney T. Buffington, N0MJS n0mjs@me.com
+Copyright (C) 2016-2020 Cortney T. Buffington, N0MJS n0mjs@me.com

 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.

@@ -1,150 +0,0 @@
-#!/usr/bin/env python
-#
-###############################################################################
-#   Copyright (C) 2016-2019 Cortney T. Buffington, N0MJS <n0mjs@me.com>
-#
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 3 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software Foundation,
-#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
-###############################################################################
-
-# Python modules we need
-import sys
-from bitarray import bitarray
-from time import time
-from importlib import import_module
-
-# Twisted is pretty important, so I keep it separate
-from twisted.internet.protocol import Factory, Protocol
-from twisted.protocols.basic import NetstringReceiver
-from twisted.internet import reactor, task
-
-# Things we import from the main hblink module
-from hblink import HBSYSTEM, OPENBRIDGE, systems, hblink_handler, reportFactory, REPORT_OPCODES, mk_aliases
-from dmr_utils3.utils import bytes_3, int_id, get_alias
-from dmr_utils3 import decode, bptc, const
-import config
-import log
-from const import *
-
-# Stuff for socket reporting
-import pickle
-# REMOVE LATER from datetime import datetime
-# The module needs logging, but handlers, etc. are controlled by the parent
-import logging
-logger = logging.getLogger(__name__)
-
-
-# Does anybody read this stuff? There's a PEP somewhere that says I should do this.
-__author__     = 'Cortney T. Buffington, N0MJS'
-__copyright__  = 'Copyright (c) 2016-2018 Cortney T. Buffington, N0MJS and the K0USY Group'
-__credits__    = 'Colin Durbridge, G4EML, Steve Zingman, N4IRS; Mike Zingman, N4IRR; Jonathan Naylor, G4KLX; Hans Barthen, DL5DI; Torsten Shultze, DG1HT'
-__license__    = 'GNU GPLv3'
-__maintainer__ = 'Cort Buffington, N0MJS'
-__email__      = 'n0mjs@me.com'
-
-# Module gobal varaibles
-
-
-class OBP(OPENBRIDGE):
-
-    def __init__(self, _name, _config, _report):
-        OPENBRIDGE.__init__(self, _name, _config, _report)
-
-
-    def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data):
-        pass
-
-
-class HBP(HBSYSTEM):
-
-    def __init__(self, _name, _config, _report):
-        HBSYSTEM.__init__(self, _name, _config, _report)
-
-    def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data):
-        pass
-
-
-
-#************************************************
-#      MAIN PROGRAM LOOP STARTS HERE
-#************************************************
-
-if __name__ == '__main__':
-
-    import argparse
-    import sys
-    import os
-    import signal
-
-    # Change the current directory to the location of the application
-    os.chdir(os.path.dirname(os.path.realpath(sys.argv[0])))
-
-    # CLI argument parser - handles picking up the config file from the command line, and sending a "help" message
-    parser = argparse.ArgumentParser()
-    parser.add_argument('-c', '--config', action='store', dest='CONFIG_FILE', help='/full/path/to/config.file (usually hblink.cfg)')
-    parser.add_argument('-l', '--logging', action='store', dest='LOG_LEVEL', help='Override config file logging level.')
-    cli_args = parser.parse_args()
-
-    # Ensure we have a path for the config file, if one wasn't specified, then use the default (top of file)
-    if not cli_args.CONFIG_FILE:
-        cli_args.CONFIG_FILE = os.path.dirname(os.path.abspath(__file__))+'/hblink.cfg'
-
-    # Call the external routine to build the configuration dictionary
-    CONFIG = config.build_config(cli_args.CONFIG_FILE)
-
-    # Start the system logger
-    if cli_args.LOG_LEVEL:
-        CONFIG['LOGGER']['LOG_LEVEL'] = cli_args.LOG_LEVEL
-    logger = log.config_logging(CONFIG['LOGGER'])
-    logger.info('\n\nCopyright (c) 2013, 2014, 2015, 2016, 2018\n\tThe Regents of the K0USY Group. All rights reserved.\n')
-    logger.debug('(GLOBAL) Logging system started, anything from here on gets logged')
-
-    # Set up the signal handler
-    def sig_handler(_signal, _frame):
-        logger.info('(GLOBAL) SHUTDOWN: CONFBRIDGE IS TERMINATING WITH SIGNAL %s', str(_signal))
-        hblink_handler(_signal, _frame)
-        logger.info('(GLOBAL) SHUTDOWN: ALL SYSTEM HANDLERS EXECUTED - STOPPING REACTOR')
-        reactor.stop()
-
-    # Set signal handers so that we can gracefully exit if need be
-    for sig in [signal.SIGINT, signal.SIGTERM]:
-        signal.signal(sig, sig_handler)
-
-    # Create the name-number mapping dictionaries
-    peer_ids, subscriber_ids, talkgroup_ids = mk_aliases(CONFIG)
-
-    # INITIALIZE THE REPORTING LOOP
-    if CONFIG['REPORTS']['REPORT']:
-        report_server = config_reports(CONFIG, bridgeReportFactory)
-    else:
-        report_server = None
-        logger.info('(REPORT) TCP Socket reporting not configured')
-
-    # HBlink instance creation
-    logger.info('(GLOBAL) HBlink \'bridge.py\' -- SYSTEM STARTING...')
-    for system in CONFIG['SYSTEMS']:
-        if CONFIG['SYSTEMS'][system]['ENABLED']:
-            if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE':
-                systems[system] = OBP(system, CONFIG, report_server)
-            else:
-                systems[system] = HBP(system, CONFIG, report_server)
-            reactor.listenUDP(CONFIG['SYSTEMS'][system]['PORT'], systems[system], interface=CONFIG['SYSTEMS'][system]['IP'])
-            logger.debug('(GLOBAL) %s instance created: %s, %s', CONFIG['SYSTEMS'][system]['MODE'], system, systems[system])
-
-    def loopingErrHandle(failure):
-        logger.error('(GLOBAL) STOPPING REACTOR TO AVOID MEMORY LEAK: Unhandled error in timed loop.\n %s', failure)
-        reactor.stop()
-
-
-    reactor.run()
@@ -0,0 +1,295 @@
+#!/usr/bin/env python
+#
+###############################################################################
+#   Copyright (C) 2016-2019 Cortney T. Buffington, N0MJS <n0mjs@me.com>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software Foundation,
+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+###############################################################################
+
+'''
+This is a very simple call/packet router for Homebrew Repeater Protocol. It
+will forward traffic from any system to all other systems configured in the
+hblink.py configuration file. It does not check for call contentions or
+filter TS/TGID combinations. It should really only be used as a proxy to
+hide multiple Homebrew repater protocol systems behind what appears as a single
+repeater, hotspot, etc.
+
+As is, this program only works with group voice packets. It could work for all
+of them by removing a few things.
+
+IT ONLY WORKS FOR HBP SYSTEMS!!! Using it with OpenBridge or XLX wouldn't make
+a lot of sense, and has the potential to do bad things.
+'''
+
+# 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__)
+
+
+# Does anybody read this stuff? There's a PEP somewhere that says I should do this.
+__author__     = 'Cortney T. Buffington, N0MJS'
+__copyright__  = 'Copyright (c) 2016-2018 Cortney T. Buffington, N0MJS and the K0USY Group'
+__credits__    = 'Colin Durbridge, G4EML, Steve Zingman, N4IRS; Mike Zingman, N4IRR; Jonathan Naylor, G4KLX; Hans Barthen, DL5DI; Torsten Shultze, DG1HT'
+__license__    = 'GNU GPLv3'
+__maintainer__ = 'Cort Buffington, N0MJS'
+__email__      = 'n0mjs@me.com'
+__status__     = 'pre-alpha'
+
+# Module gobal varaibles
+
+
+class bridgeallSYSTEM(HBSYSTEM):
+
+    def __init__(self, _name, _config, _report):
+        HBSYSTEM.__init__(self, _name, _config, _report)
+        self._laststrid = ''
+
+        # Status information for the system, TS1 & TS2
+        # 1 & 2 are "timeslot"
+        self.STATUS = {
+            1: {
+                'RX_START':     time(),
+                'RX_LOSS':      0,
+                'RX_SEQ':       0,
+                'RX_RFS':       b'\x00',
+                'TX_RFS':       b'\x00',
+                'RX_STREAM_ID': b'\x00',
+                'TX_STREAM_ID': b'\x00',
+                'RX_TGID':      b'\x00\x00\x00',
+                'TX_TGID':      b'\x00\x00\x00',
+                'RX_TIME':      time(),
+                'TX_TIME':      time(),
+                'RX_TYPE':      const.HBPF_SLT_VTERM,
+                },
+            2: {
+                'RX_START':     time(),
+                'RX:LOSS':      0,
+                'RX_SEQ':       0,
+                'RX_RFS':       b'\x00',
+                'TX_RFS':       b'\x00',
+                'RX_STREAM_ID': b'\x00',
+                'TX_STREAM_ID': b'\x00',
+                'RX_TGID':      b'\x00\x00\x00',
+                'TX_TGID':      b'\x00\x00\x00',
+                'RX_TIME':      time(),
+                'TX_TIME':      time(),
+                'RX_TYPE':      const.HBPF_SLT_VTERM,
+                }
+            }
+
+    def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data):
+        pkt_time = time()
+        dmrpkt = _data[20:53]
+        _bits = _data[15]
+
+        if _call_type == 'group':
+
+            # Is this is a new call stream?
+            new_stream = (_stream_id != self.STATUS[_slot]['RX_STREAM_ID'])
+
+            if new_stream:
+                self.STATUS[_slot]['RX_START'] = pkt_time
+                self.STATUS[_slot]['RX_LOSS'] = 0
+                self.STATUS[_slot]['RX_SEQ'] = _seq
+                logger.info('(%s) *CALL START* STREAM ID: %s SUB: %s (%s) PEER: %s (%s) TGID %s (%s), TS %s', \
+                        self._system, int_id(_stream_id), get_alias(_rf_src, subscriber_ids), int_id(_rf_src), get_alias(_peer_id, peer_ids), int_id(_peer_id), get_alias(_dst_id, talkgroup_ids), int_id(_dst_id), _slot)
+            else:
+                # This could be much better, it will have errors during roll-over
+                if _seq > (self.STATUS[_slot]['RX_SEQ'] + 1):
+                    #print(_seq, self.STATUS[_slot]['RX_SEQ'])
+                    self.STATUS[_slot]['RX_LOSS'] += _seq - (self.STATUS[_slot]['RX_SEQ'] + 1)
+
+            # Final actions - Is this a voice terminator?
+            if (_frame_type == const.HBPF_DATA_SYNC) and (_dtype_vseq == const.HBPF_SLT_VTERM) and (self.STATUS[_slot]['RX_TYPE'] != const.HBPF_SLT_VTERM):
+                call_duration = pkt_time - self.STATUS[_slot]['RX_START']
+                logger.info('(%s) *CALL END*   STREAM ID: %s SUB: %s (%s) PEER: %s (%s) TGID %s (%s), TS %s, Loss: %s, Duration: %s', \
+                        self._system, int_id(_stream_id), get_alias(_rf_src, subscriber_ids), int_id(_rf_src), get_alias(_peer_id, peer_ids), int_id(_peer_id), get_alias(_dst_id, talkgroup_ids), int_id(_dst_id), _slot, self.STATUS[_slot]['RX_LOSS'], call_duration)
+
+
+            for _target in self._CONFIG['SYSTEMS']: 
+                if _target != self._system:
+
+                    _target_status = systems[_target].STATUS
+                    _target_system = self._CONFIG['SYSTEMS'][_target]
+
+                    # BEGIN STANDARD CONTENTION HANDLING
+                    #
+                    # The rules for each of the 4 "ifs" below are listed here for readability. The Frame To Send is:
+                    #   From a different group than last RX from this HBSystem, but it has been less than Group Hangtime
+                    #   From a different group than last TX to this HBSystem, but it has been less than Group Hangtime
+                    #   From the same group as the last RX from this HBSystem, but from a different subscriber, and it has been less than stream timeout
+                    #   From the same group as the last TX to this HBSystem, but from a different subscriber, and it has been less than stream timeout
+                    # The "continue" at the end of each means the next iteration of the for loop that tests for matching rules
+                    #
+                    if ((_dst_id != _target_status[_slot]['RX_TGID']) and ((pkt_time - _target_status[_slot]['RX_TIME']) < _target_system['GROUP_HANGTIME'])):
+                        if _frame_type == const.HBPF_DATA_SYNC and _dtype_vseq == const.HBPF_SLT_VHEAD and self.STATUS[_slot]['RX_STREAM_ID'] != _stream_id:
+                            logger.info('(%s) Call not routed to TGID %s, target active or in group hangtime: HBSystem: %s, TS: %s, TGID: %s', self._system, int_id(_dst_id), _target, _slot, int_id(_target_status[_slot]['RX_TGID']))
+                        continue
+                    if ((_dst_id != _target_status[_slot]['TX_TGID']) and ((pkt_time - _target_status[_slot]['TX_TIME']) < _target_system['GROUP_HANGTIME'])):
+                        if _frame_type == const.HBPF_DATA_SYNC and _dtype_vseq == const.HBPF_SLT_VHEAD and self.STATUS[_slot]['RX_STREAM_ID'] != _stream_id:
+                            logger.info('(%s) Call not routed to TGID%s, target in group hangtime: HBSystem: %s, TS: %s, TGID: %s', self._system, int_id(_dst_id), _target, _slot, int_id(_target_status[_slot]['TX_TGID']))
+                        continue
+                    if (_dst_id == _target_status[_slot]['RX_TGID']) and ((pkt_time - _target_status[_slot]['RX_TIME']) < const.STREAM_TO):
+                        if _frame_type == const.HBPF_DATA_SYNC and _dtype_vseq == const.HBPF_SLT_VHEAD and self.STATUS[_slot]['RX_STREAM_ID'] != _stream_id:
+                            logger.info('(%s) Call not routed to TGID%s, matching call already active on target: HBSystem: %s, TS: %s, TGID: %s', self._system, int_id(_dst_id), _target, _slot, int_id(_target_status[_slot]['RX_TGID']))
+                        continue
+                    if (_dst_id == _target_status[_slot]['TX_TGID']) and (_rf_src != _target_status[_slot]['TX_RFS']) and ((pkt_time - _target_status[_slot]['TX_TIME']) < const.STREAM_TO):
+                        if _frame_type == const.HBPF_DATA_SYNC and _dtype_vseq == const.HBPF_SLT_VHEAD and self.STATUS[_slot]['RX_STREAM_ID'] != _stream_id:
+                            logger.info('(%s) Call not routed for subscriber %s, call route in progress on target: HBSystem: %s, TS: %s, TGID: %s, SUB: %s', self._system, int_id(_rf_src), _target, _slot, int_id(_target_status[_slot]['TX_TGID']), int_id(_target_status[_slot]['TX_RFS']))
+                        continue
+
+
+                    # ACL Processing
+                    if self._CONFIG['GLOBAL']['USE_ACL']:
+                        if not acl_check(_rf_src, self._CONFIG['GLOBAL']['SUB_ACL']):
+                            if _stream_id != _target_status[_slot]['TX_STREAM_ID']:
+                                logger.info('(%s) CALL DROPPED ON EGRESS WITH STREAM ID %s FROM SUBSCRIBER %s BY GLOBAL ACL', _target, int_id(_stream_id), int_id(_rf_src))
+                                _target_status[_slot]['TX_STREAM_ID'] = _stream_id
+                            continue
+                        if _slot == 1 and not acl_check(_dst_id, self._CONFIG['GLOBAL']['TG1_ACL']):
+                            if _stream_id != _target_status[_slot]['TX_STREAM_ID']:
+                                logger.info('(%s) CALL DROPPED ON EGRESS WITH STREAM ID %s ON TGID %s BY GLOBAL TS1 ACL', _target, int_id(_stream_id), int_id(_dst_id))
+                                _target_status[_slot]['TX_STREAM_ID'] = _stream_id
+                            continue
+                        if _slot == 2 and not acl_check(_dst_id, self._CONFIG['GLOBAL']['TG2_ACL']):
+                            if _stream_id != _target_status[_slot]['TX_STREAM_ID']:
+                                logger.info('(%s) CALL DROPPED ON EGRESS WITH STREAM ID %s ON TGID %s BY GLOBAL TS2 ACL', _target, int_id(_stream_id), int_id(_dst_id))
+                                _target_status[_slot]['TX_STREAM_ID'] = _stream_id
+                            continue
+                    if _target_system['USE_ACL']:
+                        if not acl_check(_rf_src, _target_system['SUB_ACL']):
+                            if _stream_id != _target_status[_slot]['TX_STREAM_ID']:
+                                logger.info('(%s) CALL DROPPED ON EGRESS WITH STREAM ID %s FROM SUBSCRIBER %s BY SYSTEM ACL', _target, int_id(_stream_id), int_id(_rf_src))
+                                _target_status[_slot]['TX_STREAM_ID'] = _stream_id
+                            continue
+                        if _slot == 1 and not acl_check(_dst_id, _target_system['TG1_ACL']):
+                            if _stream_id != _target_status[_slot]['TX_STREAM_ID']:
+                                logger.info('(%s) CALL DROPPED ON EGRESS WITH STREAM ID %s ON TGID %s BY SYSTEM TS1 ACL', _target, int_id(_stream_id), int_id(_dst_id))
+                                _target_status[_slot]['TX_STREAM_ID'] = _stream_id
+                            continue
+                        if _slot == 2 and not acl_check(_dst_id, _target_system['TG2_ACL']):
+                            if _stream_id != _target_status[_slot]['TX_STREAM_ID']:
+                                logger.info('(%s) CALL DROPPED ON EGRESS WITH STREAM ID %s ON TGID %s BY SYSTEM TS2 ACL', _target, int_id(_stream_id), int_id(_dst_id))
+                                _target_status[_slot]['TX_STREAM_ID'] = _stream_id
+                            continue
+
+                    # Record this stuff for later
+                    # Is this a new call stream?
+                    if new_stream:
+                         # Record the DST TGID and Stream ID
+                         _target_status[_slot]['TX_START'] = pkt_time
+                         _target_status[_slot]['TX_TGID'] = _dst_id
+                         _target_status[_slot]['TX_RFS'] = _rf_src
+                         _target_status[_slot]['TX_PEER'] = _peer_id
+                         _target_status[_slot]['TX_STREAM_ID'] = _stream_id
+
+                    _target_status[_slot]['TX_TIME'] = pkt_time
+
+                    systems[_target].send_system(_data)
+                    #logger.debug('(%s) Packet routed to system: %s', self._system, _target)
+
+            # Mark status variables for use later
+            self.STATUS[_slot]['RX_RFS']       = _rf_src
+            self.STATUS[_slot]['RX_SEQ']       = _seq
+            self.STATUS[_slot]['RX_TYPE']      = _dtype_vseq
+            self.STATUS[_slot]['RX_TGID']      = _dst_id
+            self.STATUS[_slot]['RX_TIME']      = pkt_time
+            self.STATUS[_slot]['RX_STREAM_ID'] = _stream_id
+
+
+#************************************************
+#      MAIN PROGRAM LOOP STARTS HERE
+#************************************************
+
+if __name__ == '__main__':
+    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 hblink.cfg)')
+    parser.add_argument('-l', '--logging', action='store', dest='LOG_LEVEL', help='Override config file logging level.')
+    cli_args = parser.parse_args()
+
+    # Ensure we have a path for the config file, if one wasn't specified, then use the default (top of file)
+    if not cli_args.CONFIG_FILE:
+        cli_args.CONFIG_FILE = os.path.dirname(os.path.abspath(__file__))+'/hblink.cfg'
+
+    # Call the external routine to build the configuration dictionary
+    CONFIG = config.build_config(cli_args.CONFIG_FILE)
+
+    # Start the system logger
+    if cli_args.LOG_LEVEL:
+        CONFIG['LOGGER']['LOG_LEVEL'] = cli_args.LOG_LEVEL
+    logger = log.config_logging(CONFIG['LOGGER'])
+    logger.info('\n\nCopyright (c) 2013, 2014, 2015, 2016, 2018, 2019\n\tThe Regents of the K0USY Group. All rights reserved.\n')
+    logger.debug('Logging system started, anything from here on gets logged')
+
+    # Set up the signal handler
+    def sig_handler(_signal, _frame):
+        logger.info('SHUTDOWN: BRIDGE_ALL 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
+    report_server = config_reports(CONFIG, reportFactory)
+
+    # HBlink instance creation
+    logger.info('HBlink \'bridge_all.py\' -- SYSTEM STARTING...')
+    for system in CONFIG['SYSTEMS']:
+        if CONFIG['SYSTEMS'][system]['ENABLED']:
+            if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE':
+                logger.critical('%s FATAL: Instance is mode \'OPENBRIDGE\', \n\t\t...Which would be tragic for Bridge All, since it carries multiple call\n\t\tstreams simultaneously. bridge_all.py onlyl works with MMDVM-based systems', system)
+                sys.exit('bridge_all.py cannot function with systems that are not MMDVM devices. System {} is configured as an OPENBRIDGE'.format(system))
+            else:
+                systems[system] = bridgeallSYSTEM(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()
@@ -0,0 +1,329 @@
+# 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: ./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
+
+# 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
+
+# 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
+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
@@ -86,7 +86,7 @@ def acl_build(_acl, _max):
            if (const.ID_MIN <= start <= _max) or (const.ID_MIN <= end <= _max):
                acl.append((start, end))
            else:
-                sys.exit('ACL CREATION ERROR, VALUE OUT OF RANGE (} - {})IN RANGE-BASED ENTRY: {}'.format(const.ID_MIN, _max, entry))
+                sys.exit('ACL CREATION ERROR, VALUE OUT OF RANGE ({} - {})IN RANGE-BASED ENTRY: {}'.format(const.ID_MIN, _max, entry))
        else:
            id = int(entry)
            if (const.ID_MIN <= id <= _max):
@@ -106,6 +106,7 @@ def build_config(_config_file):
    CONFIG['GLOBAL'] = {}
    CONFIG['REPORTS'] = {}
    CONFIG['LOGGER'] = {}
+    CONFIG['GPS_DATA'] = {}
    CONFIG['ALIASES'] = {}
    CONFIG['SYSTEMS'] = {}

@@ -141,6 +142,30 @@ def build_config(_config_file):
                if not CONFIG['LOGGER']['LOG_FILE']:
                    CONFIG['LOGGER']['LOG_FILE'] = '/dev/null'

+            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'),
+                    'USER_APRS_COMMENT': config.get(section, 'USER_APRS_COMMENT'),
+                    'APRS_LOGIN_CALL': config.get(section, 'APRS_LOGIN_CALL'),
+                    'APRS_LOGIN_PASSCODE': config.get(section, 'APRS_LOGIN_PASSCODE'),
+                    'APRS_SERVER': config.get(section, 'APRS_SERVER'),
+                    'APRS_PORT': config.get(section, 'APRS_PORT'),
+                    'IGATE_BEACON_TIME': config.get(section, 'IGATE_BEACON_TIME'),
+                    'IGATE_BEACON_ICON': config.get(section, 'IGATE_BEACON_ICON'),
+                    'IGATE_BEACON_COMMENT': config.get(section, 'IGATE_BEACON_COMMENT'),
+                    'IGATE_LATITUDE': config.get(section, 'IGATE_LATITUDE'),
+                    'IGATE_LONGITUDE': config.get(section, 'IGATE_LONGITUDE'),
+                    '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'),
+
+                })
+                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'),
@@ -274,6 +299,7 @@ def build_config(_config_file):
                        'TARGET_SOCK': (gethostbyname(config.get(section, 'TARGET_IP')), config.getint(section, 'TARGET_PORT')),
                        'TARGET_IP': gethostbyname(config.get(section, 'TARGET_IP')),
                        'TARGET_PORT': config.getint(section, 'TARGET_PORT'),
+                        'BOTH_SLOTS': config.getboolean(section, 'BOTH_SLOTS'),
                        'USE_ACL': config.getboolean(section, 'USE_ACL'),
                        'SUB_ACL': config.get(section, 'SUB_ACL'),
                        'TG1_ACL': config.get(section, 'TGID_ACL'),
@@ -50,6 +50,7 @@ HBPF_SLT_VHEAD  = 0x1
 HBPF_SLT_VTERM  = 0x2

 # HomeBrew Protocol Commands
+DMRA    = b'DMRA'
 DMRD    = b'DMRD'
 MSTCL   = b'MSTCL'
 MSTNAK  = b'MSTNAK'
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-mkdir -p /var/tmp/config 
-cd /var/tmp/config
-git clone https://${GIT_USER}:${GIT_PASSWORD}@${GIT_REPO}
-
-DIR=$(echo ${GIT_REPO}| sed s/.git$//g | sed s#^.*/##g)
-
-cp -a /var/tmp/config/${DIR}/*cfg /opt/hblink3/
-python /opt/hblink3/hblink.py
@@ -0,0 +1,252 @@
+# 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: ./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 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
+
+# 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: test@example.org
+EMAIL_PASSWORD: letmein
+SMTP_SERVER: smtp.gmail.com
+SMTP_PORT: 465
+
+# 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,705 @@
+#!/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__)
+
+# 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:
+    logger.info('Error importing maidenhead module, make sure it is installed.')
+# Module for sending email
+try:
+    import smtplib
+except:
+    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'
+
+# 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 = ''
+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.')
+
+def dashboard_loc_write(call, lat, lon, time):
+    pass
+##    #try:
+##    dash_entries = ast.literal_eval(os.popen('cat /tmp/gps_data_user_loc.txt').read())
+##   # except:
+##    #    dash_entries = []
+##    dash_entries.insert(0, {'call': call, 'lat': lat, 'lon': lon, 'time':time})
+##    with open("/tmp/gps_data_user_loc.txt", 'w') as user_loc_file:
+##            user_loc_file.write(str(dash_entries[:15]))
+##            user_loc_file.close()
+##    logger.info('User location saved for dashboard')
+##    #logger.info(dash_entries)
+
+def dashboard_bb_write(call, dmr_id, time, bulletin):
+    pass
+##    #try:
+##    dash_bb = ast.literal_eval(os.popen('cat /tmp/gps_data_user_bb.txt').read())
+##   # except:
+##    #    dash_entries = []
+##    dash_bb.insert(0, {'call': call, 'dmr_id': dmr_id, 'time': time, 'bulliten':bulletin})
+##    with open("/tmp/gps_data_user_bb.txt", 'w') as user_bb_file:
+##            user_bb_file.write(str(dash_bb[:10]))
+##            user_bb_file.close()
+##    logger.info('User bulletin entry saved.')
+##    #logger.info(dash_bb)
+
+# 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.txt", '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]
+            f.close()
+            logger.info('Loaded user settings. Preparing to write...')
+    # Write modified dict to file
+        with open("./user_settings.txt", '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 = ''
+##    except:
+##        logger.info('No data file found, creating one.')
+##        #Path('./user_settings.txt').mkdir(parents=True, exist_ok=True)
+##        Path('./user_settings.txt').touch()
+        
+# Process SMS, do something bases on message
+
+def process_sms(_rf_src, sms):
+    if sms == 'ID':
+        logger.info(str(get_alias(int_id(from_id), subscriber_ids)) + ' - ' + str(int_id(from_id)))
+    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 '@BB' in sms:
+        dashboard_bb_write(get_alias(int_id(_rf_src), subscriber_ids), int_id(_rf_src), time.strftime('%H:%M:%S - %m/%d/%y'), re.sub('@BB|@BB ','',sms))
+    elif '@' and ' E-' in sms:
+        email_message = re.sub('.*@|.* E-', '', sms)
+        to_email = 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:
+            logger.info('Failed to send email.')
+    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.txt').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.strftime('%H:%M:%S - %m/%d/%y'))
+            #logger.info('Sent manual position to APRS')
+        except:
+            logger.info('Exception. Not uploaded')
+        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.txt').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:
+            logger.info('Error uploading MSG packet.')
+    try:
+        if sms in cmd_list:
+            logger.info('Executing command/script.')
+            os.popen(cmd_list[sms]).read()
+            packet_assembly = ''
+    except:
+        logger.info('Exception. Command possibly not in list, or other error.')
+        packet_assembly = ''
+    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)
+                    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
+                    # 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.txt').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.strftime('%H:%M:%S - %m/%d/%y'))
+                        #logger.info('Sent APRS packet')
+                    except:
+                        logger.info('Error. Failed to send packet. Packet may be malformed.')
+                    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)) + '. Destination: ' + str(int_id(_dst_id)))
+                    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.txt').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:
+                                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))
+                            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.strftime('%H:%M:%S - %m/%d/%y'))
+                            except:
+                                logger.info('Failed to parse packet. Packet may be deformed. Not uploaded.')
+                            #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])))
+
+    # Check if user_settings (for APRS settings of users) exists. Creat it if not.
+    if Path('./user_settings.txt').is_file():
+        pass
+    else:
+        Path('./user_settings.txt').touch()
+        with open("./user_settings.txt", '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('/tmp/gps_data_user_loc.txt').is_file():
+##        pass
+##    else:
+##        Path('/tmp/gps_data_user_loc.txt').touch()
+##        with open("/tmp/gps_data_user_loc.txt", 'w') as user_loc_file:
+##            user_loc_file.write("[]")
+##            user_loc_file.close()
+##    if Path('/tmp/gps_data_user_bb.txt').is_file():
+##        pass
+##    else:
+##        Path('/tmp/gps_data_user_bb.txt').touch()
+##        with open("/tmp/gps_data_user_bb.txt", 'w') as user_bb_file:
+##            user_bb_file.write("[]")
+##            user_bb_file.close()
+    # 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']
+    
+    # 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)
@@ -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'
+
+    }
@@ -84,7 +84,7 @@ REPORT_CLIENTS: 127.0.0.1
 #   used.
 #
 [LOGGER]
-LOG_FILE: /tmp/hblink.log
+LOG_FILE: ./hblink.log
 LOG_HANDLERS: console-timed
 LOG_LEVEL: DEBUG
 LOG_NAME: HBlink
@@ -120,17 +120,20 @@ STALE_DAYS: 7
 #
 # ACLs:
 # OpenBridge does not 'register', so registration ACL is meaningless.
-# OpenBridge passes all traffic on TS1, so there is only 1 TGID ACL.
+# Proper OpenBridge passes all traffic on TS1.
+# HBlink can extend OPB to use both slots for unit calls only.
+# Setting "BOTH_SLOTS" True ONLY affects unit traffic!
 # Otherwise ACLs work as described in the global stanza
 [OBP-1]
 MODE: OPENBRIDGE
-ENABLED: True
+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
@@ -164,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
@@ -178,7 +197,7 @@ TGID_TS2_ACL: PERMIT:ALL
 # See comments in the GLOBAL stanza
 [REPEATER-1]
 MODE: PEER
-ENABLED: True
+ENABLED: False
 LOOSE: False
 EXPORT_AMBE: False
 IP: 
@@ -208,9 +227,41 @@ 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: True
+ENABLED: False
 LOOSE: True
 EXPORT_AMBE: False
 IP: 
@@ -160,8 +160,8 @@ class OPENBRIDGE(DatagramProtocol):
                _stream_id = _data[16:20]
                #logger.debug('(%s) DMRD - Seqence: %s, RF Source: %s, Destination ID: %s', self._system, int_id(_seq), int_id(_rf_src), int_id(_dst_id))

-                # Sanity check for OpenBridge -- all calls must be on Slot 1
-                if _slot != 1:
+                # Sanity check for OpenBridge -- all calls must be on Slot 1 for Brandmeister or DMR+. Other HBlinks can process timeslot on OPB if the flag is set
+                if _slot != 1 and not self._config['BOTH_SLOTS'] and not _call_type == 'unit':
                    logger.error('(%s) OpenBridge packet discarded because it was not received on slot 1. SID: %s, TGID %s', self._system, int_id(_rf_src), int_id(_dst_id))
                    return

@@ -206,8 +206,7 @@ class HBSYSTEM(DatagramProtocol):
        self._system = _name
        self._report = _report
        self._config = self._CONFIG['SYSTEMS'][self._system]
-        self._laststrid1 = ''
-        self._laststrid2 = ''
+        self._laststrid = {1: b'', 2: b''}

        # Define shortcuts and generic function names based on the type of system we are
        if self._config['MODE'] == 'MASTER':
@@ -353,45 +352,39 @@ class HBSYSTEM(DatagramProtocol):
                _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))
+                #logger.debug('(%s) DMRD - Seqence: %s, RF Source: %s, Destination ID: %s', self._system, _seq, 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 self._laststrid != _stream_id:
+                        if self._laststrid[_slot] != _stream_id:
                            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))
-                            if _slot == 1:
-                                self._laststrid1 = _stream_id
-                            else:
-                                self._laststrid2 = _stream_id
+                            self._laststrid[_slot] = _stream_id
                        return
                    if _slot == 1 and not acl_check(_dst_id, self._CONFIG['GLOBAL']['TG1_ACL']):
-                        if self._laststrid1 != _stream_id:
+                        if self._laststrid[_slot] != _stream_id:
                            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._laststrid1 = _stream_id
+                            self._laststrid[_slot] = _stream_id
                        return
                    if _slot == 2 and not acl_check(_dst_id, self._CONFIG['GLOBAL']['TG2_ACL']):
-                        if self._laststrid2 != _stream_id:
+                        if self._laststrid[_slot] != _stream_id:
                            logger.info('(%s) CALL DROPPED WITH STREAM ID %s ON TGID %s BY GLOBAL TS2 ACL', self._system, int_id(_stream_id), int_id(_dst_id))
-                            self._laststrid2 = _stream_id
+                            self._laststrid[_slot] = _stream_id
                        return
                if self._config['USE_ACL']:
                    if not acl_check(_rf_src, self._config['SUB_ACL']):
-                        if self._laststrid != _stream_id:
+                        if self._laststrid[_slot] != _stream_id:
                            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))
-                            if _slot == 1:
-                                self._laststrid1 = _stream_id
-                            else:
-                                self._laststrid2 = _stream_id
+                            self._laststrid[_slot] = _stream_id
                        return
                    if _slot == 1 and not acl_check(_dst_id, self._config['TG1_ACL']):
-                        if self._laststrid1 != _stream_id:
+                        if self._laststrid[_slot] != _stream_id:
                            logger.info('(%s) CALL DROPPED WITH STREAM ID %s ON TGID %s BY SYSTEM TS1 ACL', self._system, int_id(_stream_id), int_id(_dst_id))
-                            self._laststrid1 = _stream_id
+                            self._laststrid[_slot] = _stream_id
                        return
                    if _slot == 2 and not acl_check(_dst_id, self._config['TG2_ACL']):
-                        if self._laststrid2 != _stream_id:
+                        if self._laststrid[_slot]!= _stream_id:
                            logger.info('(%s) CALL DROPPED WITH STREAM ID %s ON TGID %s BY SYSTEM TS2 ACL', self._system, int_id(_stream_id), int_id(_dst_id))
-                            self._laststrid2 = _stream_id
+                            self._laststrid[_slot] = _stream_id
                        return

                # The basic purpose of a master is to repeat to the peers
@@ -446,7 +439,7 @@ class HBSYSTEM(DatagramProtocol):
                    logger.info('(%s) Sent Challenge Response to %s for login: %s', self._system, int_id(_peer_id), self._peers[_peer_id]['SALT'])
                else:
                    self.transport.write(b''.join([MSTNAK, _peer_id]), _sockaddr)
-                    logger.warning('(%s) Invalid Login from Radio ID: %s Denied by Registation ACL', self._system, int_id(_peer_id))
+                    logger.warning('(%s) Invalid Login from %s Radio ID: %s Denied by Registation ACL', self._system, _sockaddr[0], int_id(_peer_id))
            else:
                self.transport.write(b''.join([MSTNAK, _peer_id]), _sockaddr)
                logger.warning('(%s) Registration denied from Radio ID: %s Maximum number of peers exceeded', self._system, int_id(_peer_id))
@@ -526,6 +519,18 @@ class HBSYSTEM(DatagramProtocol):
                    self.transport.write(b''.join([MSTNAK, _peer_id]), _sockaddr)
                    logger.warning('(%s) Ping from Radio ID that is not logged in: %s', self._system, int_id(_peer_id))

+        elif _command == RPTO:
+            _peer_id = _data[4:8]
+            if _peer_id in self._peers \
+                        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:])
+                self.transport.write(b''.join([RPTACK, _peer_id]), _sockaddr)
+
+        elif _command == DMRA:
+            _peer_id = _data[4:8]
+            logger.info('(%s) Recieved DMR Talker Alias from peer %s, subscriber %s', self._system, self._peers[_peer_id]['CALLSIGN'], int_id(_rf_src))
+
        else:
            logger.error('(%s) Unrecognized command. Raw HBP PDU: %s', self._system, ahex(_data))

@@ -562,41 +567,35 @@ class HBSYSTEM(DatagramProtocol):
                    # ACL Processing
                    if self._CONFIG['GLOBAL']['USE_ACL']:
                        if not acl_check(_rf_src, self._CONFIG['GLOBAL']['SUB_ACL']):
-                            if self._laststrid != _stream_id:
-                                logger.debug('(%s) CALL DROPPED WITH STREAM ID %s FROM SUBSCRIBER %s BY GLOBAL ACL', self._system, int_id(_stream_id), int_id(_rf_src))
-                                if _slot == 1:
-                                    self._laststrid1 = _stream_id
-                                else:
-                                    self._laststrid2 = _stream_id
+                            if self._laststrid[_slot] != _stream_id:
+                                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[_slot] = _stream_id
                            return
                        if _slot == 1 and not acl_check(_dst_id, self._CONFIG['GLOBAL']['TG1_ACL']):
-                            if self._laststrid1 != _stream_id:
-                                logger.debug('(%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._laststrid1 = _stream_id
+                            if self._laststrid[_slot] != _stream_id:
+                                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[_slot] = _stream_id
                            return
                        if _slot == 2 and not acl_check(_dst_id, self._CONFIG['GLOBAL']['TG2_ACL']):
-                            if self._laststrid2 != _stream_id:
-                                logger.debug('(%s) CALL DROPPED WITH STREAM ID %s ON TGID %s BY GLOBAL TS2 ACL', self._system, int_id(_stream_id), int_id(_dst_id))
-                                self._laststrid2 = _stream_id
+                            if self._laststrid[_slot] != _stream_id:
+                                logger.info('(%s) CALL DROPPED WITH STREAM ID %s ON TGID %s BY GLOBAL TS2 ACL', self._system, int_id(_stream_id), int_id(_dst_id))
+                                self._laststrid[_slot] = _stream_id
                            return
                    if self._config['USE_ACL']:
                        if not acl_check(_rf_src, self._config['SUB_ACL']):
-                            if self._laststrid != _stream_id:
-                                logger.debug('(%s) CALL DROPPED WITH STREAM ID %s FROM SUBSCRIBER %s BY SYSTEM ACL', self._system, int_id(_stream_id), int_id(_rf_src))
-                                if _slot == 1:
-                                    self._laststrid1 = _stream_id
-                                else:
-                                    self._laststrid2 = _stream_id
+                            if self._laststrid[_slot] != _stream_id:
+                                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[_slot] = _stream_id
                            return
                        if _slot == 1 and not acl_check(_dst_id, self._config['TG1_ACL']):
-                            if self._laststrid1 != _stream_id:
-                                logger.debug('(%s) CALL DROPPED WITH STREAM ID %s ON TGID %s BY SYSTEM TS1 ACL', self._system, int_id(_stream_id), int_id(_dst_id))
-                                self._laststrid1 = _stream_id
+                            if self._laststrid[_slot] != _stream_id:
+                                logger.info('(%s) CALL DROPPED WITH STREAM ID %s ON TGID %s BY SYSTEM TS1 ACL', self._system, int_id(_stream_id), int_id(_dst_id))
+                                self._laststrid[_slot] = _stream_id
                            return
                        if _slot == 2 and not acl_check(_dst_id, self._config['TG2_ACL']):
-                            if self._laststrid2 != _stream_id:
-                                logger.debug('(%s) CALL DROPPED WITH STREAM ID %s ON TGID %s BY SYSTEM TS2 ACL', self._system, int_id(_stream_id), int_id(_dst_id))
-                                self._laststrid2 = _stream_id
+                            if self._laststrid[_slot] != _stream_id:
+                                logger.info('(%s) CALL DROPPED WITH STREAM ID %s ON TGID %s BY SYSTEM TS2 ACL', self._system, int_id(_stream_id), int_id(_dst_id))
+                                self._laststrid[_slot] = _stream_id
                            return


@@ -661,6 +660,7 @@ class HBSYSTEM(DatagramProtocol):
                            self._stats['CONNECTION'] = 'YES'
                            self._stats['CONNECTED'] = time()
                            logger.info('(%s) Connection to Master Completed', self._system)
+
                            # If we are an XLX, send the XLX module request here.
                            if self._config['MODE'] == 'XLXPEER':
                                self.send_xlxmaster(self._config['RADIO_ID'], int(4000), self._config['MASTER_SOCKADDR'])
@@ -802,7 +802,7 @@ if __name__ == '__main__':
    if cli_args.LOG_LEVEL:
        CONFIG['LOGGER']['LOG_LEVEL'] = cli_args.LOG_LEVEL
    logger = log.config_logging(CONFIG['LOGGER'])
-    logger.info('\n\nCopyright (c) 2013, 2014, 2015, 2016, 2018, 2019\n\tThe Regents of the K0USY Group. All rights reserved.\n')
+    logger.info('\n\nCopyright (c) 2013, 2014, 2015, 2016, 2018, 2019, 2020\n\tThe Regents of the K0USY Group. All rights reserved.\n')
    logger.debug('(GLOBAL) Logging system started, anything from here on gets logged')

    # Set up the signal handler
@@ -3,4 +3,3 @@
 # Install the required support programs
 apt-get install python3 python3-pip -y
 pip3 install -r requirements.txt
-
@@ -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
@@ -0,0 +1,229 @@
+#!/usr/bin/env python
+#
+###############################################################################
+#   Copyright (C) 2016-2019  Cortney T. Buffington, N0MJS <n0mjs@me.com> (and Mike Zingman N4IRR)
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software Foundation,
+#   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+###############################################################################
+
+
+# Python modules we need
+import sys
+from bitarray import bitarray
+from time import time, sleep
+from importlib import import_module
+
+# Twisted is pretty important, so I keep it separate
+from twisted.internet.protocol import Factory, Protocol
+from twisted.protocols.basic import NetstringReceiver
+from twisted.internet import reactor, task
+
+# Things we import from the main hblink module
+from hblink import HBSYSTEM, systems, hblink_handler, reportFactory, REPORT_OPCODES, config_reports, mk_aliases
+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__)
+
+
+# Does anybody read this stuff? There's a PEP somewhere that says I should do this.
+__author__     = 'Cortney T. Buffington, N0MJS and Mike Zingman, N4IRR'
+__copyright__  = 'Copyright (c) 2016-2019 Cortney T. Buffington, N0MJS and the K0USY Group'
+__license__    = 'GNU GPLv3'
+__maintainer__ = 'Cort Buffington, N0MJS'
+__email__      = 'n0mjs@me.com'
+__status__     = 'pre-alpha'
+
+# Module gobal varaibles
+
+class playback(HBSYSTEM):
+
+    def __init__(self, _name, _config, _report):
+        HBSYSTEM.__init__(self, _name, _config, _report)
+
+        # Status information for the system, TS1 & TS2
+        # 1 & 2 are "timeslot"
+        # In TX_EMB_LC, 2-5 are burst B-E
+        self.STATUS = {
+            1: {
+                'RX_START':     time(),
+                'RX_SEQ':       '\x00',
+                'RX_RFS':       '\x00',
+                'TX_RFS':       '\x00',
+                'RX_STREAM_ID': '\x00',
+                'TX_STREAM_ID': '\x00',
+                'RX_TGID':      '\x00\x00\x00',
+                'TX_TGID':      '\x00\x00\x00',
+                'RX_TIME':      time(),
+                'TX_TIME':      time(),
+                'RX_TYPE':      const.HBPF_SLT_VTERM,
+                'RX_LC':        '\x00',
+                'TX_H_LC':      '\x00',
+                'TX_T_LC':      '\x00',
+                'TX_EMB_LC': {
+                    1: '\x00',
+                    2: '\x00',
+                    3: '\x00',
+                    4: '\x00',
+                }
+                },
+            2: {
+                'RX_START':     time(),
+                'RX_SEQ':       '\x00',
+                'RX_RFS':       '\x00',
+                'TX_RFS':       '\x00',
+                'RX_STREAM_ID': '\x00',
+                'TX_STREAM_ID': '\x00',
+                'RX_TGID':      '\x00\x00\x00',
+                'TX_TGID':      '\x00\x00\x00',
+                'RX_TIME':      time(),
+                'TX_TIME':      time(),
+                'RX_TYPE':      const.HBPF_SLT_VTERM,
+                'RX_LC':        '\x00',
+                'TX_H_LC':      '\x00',
+                'TX_T_LC':      '\x00',
+                'TX_EMB_LC': {
+                    1: '\x00',
+                    2: '\x00',
+                    3: '\x00',
+                    4: '\x00',
+                }
+            }
+        }
+        self.CALL_DATA = []
+
+    def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data):
+        pkt_time = time()
+        dmrpkt = _data[20:53]
+        _bits = _data[15]
+        if _call_type == 'group':
+            
+            # Is this is a new call stream?
+            if (_stream_id != self.STATUS[_slot]['RX_STREAM_ID']):
+                self.STATUS['RX_START'] = pkt_time
+                logger.info('(%s) *START RECORDING* STREAM ID: %s SUB: %s (%s) REPEATER: %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)
+                self.CALL_DATA.append(_data)
+                self.STATUS[_slot]['RX_STREAM_ID'] = _stream_id
+                return
+
+            # Final actions - Is this a voice terminator?
+            if (_frame_type == const.HBPF_DATA_SYNC) and (_dtype_vseq == const.HBPF_SLT_VTERM) and (self.STATUS[_slot]['RX_TYPE'] != const.HBPF_SLT_VTERM) and (self.CALL_DATA):
+                call_duration = pkt_time - self.STATUS['RX_START']
+                self.CALL_DATA.append(_data)
+                logger.info('(%s) *END   RECORDING* STREAM ID: %s', self._system, int_id(_stream_id))
+                sleep(2)
+                logger.info('(%s) *START  PLAYBACK* STREAM ID: %s SUB: %s (%s) REPEATER: %s (%s) TGID %s (%s), TS %s, Duration: %s', \
+                                  self._system, int_id(_stream_id), get_alias(_rf_src, subscriber_ids), int_id(_rf_src), get_alias(_peer_id, peer_ids), int_id(_peer_id), get_alias(_dst_id, talkgroup_ids), int_id(_dst_id), _slot, call_duration)
+                for i in self.CALL_DATA:
+                    self.send_system(i)
+                    #print(i)
+                    sleep(0.06)
+                self.CALL_DATA = []
+                logger.info('(%s) *END    PLAYBACK* STREAM ID: %s', self._system, int_id(_stream_id))
+
+            else:
+                if self.CALL_DATA:
+                    self.CALL_DATA.append(_data)
+
+
+            # Mark status variables for use later
+            self.STATUS[_slot]['RX_RFS']       = _rf_src
+            self.STATUS[_slot]['RX_TYPE']      = _dtype_vseq
+            self.STATUS[_slot]['RX_TGID']      = _dst_id
+            self.STATUS[_slot]['RX_TIME']      = pkt_time
+            self.STATUS[_slot]['RX_STREAM_ID'] = _stream_id
+
+
+#************************************************
+#      MAIN PROGRAM LOOP STARTS HERE
+#************************************************
+
+if __name__ == '__main__':
+    
+    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 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__))+'/playback.cfg'
+
+    # Call the external routine to build the configuration dictionary
+    CONFIG = config.build_config(cli_args.CONFIG_FILE)
+    
+    # Start the system logger
+    if cli_args.LOG_LEVEL:
+        CONFIG['LOGGER']['LOG_LEVEL'] = cli_args.LOG_LEVEL
+    logger = log.config_logging(CONFIG['LOGGER'])
+    logger.info('\n\nCopyright (c) 2013, 2014, 2015, 2016, 2018, 2019\n\tThe Founding Members of the K0USY Group. All rights reserved.\n')
+    logger.debug('Logging system started, anything from here on gets logged')
+    
+    # Set up the signal handler
+    def sig_handler(_signal, _frame):
+        logger.info('SHUTDOWN: HBROUTER IS TERMINATING WITH SIGNAL %s', str(_signal))
+        hblink_handler(_signal, _frame)
+        logger.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)
+    
+    # ID ALIAS CREATION
+    # Download
+    if CONFIG['ALIASES']['TRY_DOWNLOAD'] == True:
+        # Try updating peer aliases file
+        result = try_download(CONFIG['ALIASES']['PATH'], CONFIG['ALIASES']['PEER_FILE'], CONFIG['ALIASES']['PEER_URL'], CONFIG['ALIASES']['STALE_TIME'])
+        logger.info(result)
+        # Try updating subscriber aliases file
+        result = try_download(CONFIG['ALIASES']['PATH'], CONFIG['ALIASES']['SUBSCRIBER_FILE'], CONFIG['ALIASES']['SUBSCRIBER_URL'], CONFIG['ALIASES']['STALE_TIME'])
+        logger.info(result)
+        
+    # Create the name-number mapping dictionaries
+    peer_ids, subscriber_ids, talkgroup_ids = mk_aliases(CONFIG)
+        
+    # INITIALIZE THE REPORTING LOOP
+    report_server = config_reports(CONFIG, reportFactory)    
+    
+    # HBlink instance creation
+    logger.info('HBlink \'playback.py\' (c) 2017-2019 Cort Buffington, N0MJS & Mike Zingman, N4IRR -- SYSTEM STARTING...')
+    for system in CONFIG['SYSTEMS']:
+        if CONFIG['SYSTEMS'][system]['ENABLED']:
+            if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE':
+                logger.critical('%s FATAL: Instance is mode \'OPENBRIDGE\', \n\t\t...Which would be tragic for playback, since it carries multiple call\n\t\tstreams simultaneously. playback.py onlyl works with MMDVM-based systems', system)
+                sys.exit('playback.py cannot function with systems that are not MMDVM devices. System {} is configured as an OPENBRIDGE'.format(system))
+            else:
+                systems[system] = playback(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()
@@ -3,3 +3,8 @@ bitarray>=0.8.1
 Twisted>=16.3.0
 dmr_utils3>=0.1.19
 configparser>=3.0.0
+aprslib
+pynmea2
+maidenhead
+flask
+smtplib
@@ -33,20 +33,55 @@ 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': []},
        ]
 }

+'''
+list the names of each system that should bridge unit to unit (individual) calls.
+'''
+
+UNIT = ['MASTER-1', 'CHANGE_ME']
+
+'''
+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 = [
+#    [ 456, 'CLIENT-1'],
+#    [ 123, 'MASTER-1'],
+     [ 9099, 'D-APRS']
+    ]
+
+
+'''
+This is for testing the syntax of the file. It won't eliminate all errors, but running this file
+like it were a Python program itself will tell you if the syntax is correct!
+'''
+
 if __name__ == '__main__':
    from pprint import pprint
    pprint(BRIDGES)
+    print(UNIT)
+    print(STATIC_UNIT)
@@ -0,0 +1,130 @@
+###############################################################################
+#   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 is a web dashboard for the GPS/Data application.
+'''
+
+from flask import Flask, render_template
+import ast, os
+from dashboard_settings import *
+
+app = Flask(__name__)
+
+
+tbl_hdr = '''
+<table style="border-color: black; margin-left: auto; margin-right: auto;" border="2" cellspacing="6" cellpadding="2"><tbody>
+'''
+tbl_ftr = '''
+</tbody>
+</table>
+'''
+
+def get_loc_data():
+    try:
+        dash_loc = ast.literal_eval(os.popen('cat /tmp/gps_data_user_loc.txt').read())
+        tmp_loc = ''
+        loc_hdr = '''
+    <tr>
+    <td style="text-align: center;">
+    <h2><strong>&nbsp;Callsign&nbsp;</strong></h2>
+    </td>
+    <td style="text-align: center;">
+    <h2>&nbsp;<strong>Latitude</strong>&nbsp; </h2>
+    </td>
+    <td style="text-align: center;">
+    <h2>&nbsp;<strong>Longitude</strong>&nbsp;</h2>
+    </td>
+    <td style="text-align: center;">
+    <h2>&nbsp;<strong>Local Time</strong>&nbsp;</h2>
+    </td>
+    </tr>
+    '''
+        for e in dash_loc:
+            tmp_loc = tmp_loc + '''<tr>
+    <td style="text-align: center;"><a href="https://aprs.fi/''' + e['call'] + '''"><strong>''' + e['call'] + '''</strong></a></td>
+    <td style="text-align: center;"><strong>&nbsp;''' + str(e['lat']) + '''&nbsp;</strong></td>
+    <td style="text-align: center;"><strong>&nbsp;''' + str(e['lon']) + '''&nbsp;</strong></td>
+    <td style="text-align: center;">&nbsp;''' + e['time'] + '''&nbsp;</td>
+    </tr>'''
+        return str(str('<h1 style="text-align: center;">Positions Received</h1>') + tbl_hdr + loc_hdr + tmp_loc + tbl_ftr)
+    except:
+        return str('<h1 style="text-align: center;">No data</h1>')
+
+
+def get_bb_data():
+    try:
+        dash_bb = ast.literal_eval(os.popen('cat /tmp/gps_data_user_bb.txt').read())
+        tmp_bb = ''
+        
+        bb_hdr = '''
+    <tr>
+    <td style="text-align: center;">
+    <h2><strong>&nbsp;Callsign&nbsp;</strong></h2>
+    </td>
+    <td style="text-align: center;">
+    <h2>&nbsp;<strong>DMR ID</strong>&nbsp; </h2>
+    </td>
+    <td style="text-align: center;">
+    <h2>&nbsp;<strong>Bulletin</strong>&nbsp;</h2>
+    </td>
+    <td style="text-align: center;">
+    <h2>&nbsp;<strong>Local Time</strong>&nbsp;</h2>
+    </td>
+    </tr>
+    '''
+        
+        for e in dash_bb:
+            tmp_bb = tmp_bb + '''<tr>
+    <td style="text-align: center;"><strong>&nbsp;''' + e['call'] + '''&nbsp;</strong></td>
+    <td style="text-align: center;">''' + str(e['dmr_id']) + '''</td>
+    <td style="text-align: center;"><strong>&nbsp;''' + e['bulliten'] + '''&nbsp;</strong></td>
+    <td style="text-align: center;">&nbsp;''' + e['time'] + '''&nbsp;</td>
+    </tr>'''
+
+        return str('<h1 style="text-align: center;">Bulletin Board</h1>' + tbl_hdr + bb_hdr + tmp_bb + tbl_ftr)
+    except:
+        return str('<h1 style="text-align: center;">No data</h1>')
+
+@app.route('/')
+def index():
+    #return get_data()
+    return render_template('index.html', title = dashboard_title, logo = logo)
+@app.route('/bulletin_board')
+def dash_bb():
+    return get_bb_data()
+    #return render_template('index.html', data = str(get_data()))
+@app.route('/positions')
+def dash_loc():
+    return get_loc_data()
+    #return render_template('index.html', data = str(get_data()))
+##@app.route('/<string:page_name>/')
+##def render_static(page_name):
+##    return render_template('%s.html' % page_name, title = dashboard_title, logo = logo, description = description)
+@app.route('/help/')
+def help():
+    #return get_data()
+    return render_template('help.html', title = dashboard_title, logo = logo, description = description, data_call_type = data_call_type, data_call_id = data_call_id, aprs_ssid = aprs_ssid)
+@app.route('/about/')
+def about():
+    #return get_data()
+    return render_template('about.html', title = dashboard_title, logo = logo, contact_name = contact_name, contact_call = contact_call, contact_email = contact_email, contact_website = contact_website)
+
+if __name__ == '__main__':
+    app.run(debug = True, port=dash_port, host=dash_host)
@@ -0,0 +1,49 @@
+###############################################################################
+#   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'
@@ -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>{{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://github.com/kf7eel/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>gps<strong></div>
+</body>
+ </html>
@@ -0,0 +1,13 @@
+<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='/';"> D-APRS Dashboard </button></td>
+<td style="text-align: center;"><button onclick="window.location.href='/help';"> D-APRS Help </button></td>
+<td style="text-align: center;"><button onclick="window.location.href='/about';"> Gateway Contact </button></td>
+</tr>
+</tbody>
+</table>
+<hr />
@@ -0,0 +1,79 @@
+{% 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>@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] A-[MESSAGE]</strong></td>
+<td>Send a message to another station via APRS.</td>
+<td><em><code>@N0CALL-15 A-This is a test.</code></em></td>
+</tr>
+<tr>
+<td><strong>[EMAIL ADDRESS] E-[MESSAGE]</strong></td>
+<td>Send an email to an email address.</td>
+<td><em><code>test@example.org E-This is a test.</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>
+{% include 'footer.html' %}
@@ -0,0 +1,37 @@
+<!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;
+}
+</style>
+</head>
+<div class="content">
+<body>
+{% include 'header.html' %}
+<p style="text-align: center;"><em>Page automatically reloads every 2 minutes.</em></p>
+<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,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>