From 539d4b852a030001b504a086c86850bb74016cc7 Mon Sep 17 00:00:00 2001
From: Cort Buffington <n0mjs@me.com>
Date: Thu, 25 Aug 2016 21:27:10 -0500
Subject: [PATCH] Now it works

---
 hb_router.py | 10 +++++-----
 hblink.py    |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/hb_router.py b/hb_router.py
index 7a3e149..f84458e 100755
--- a/hb_router.py
+++ b/hb_router.py
@@ -72,7 +72,7 @@ class routerMASTER(HBMASTER):
                 _target = rule['DST_NET']
                 if _target in RULES:
                     systems[_target].send_system(_data)
-                    logger.debug('(%s) Packet routed %s to system: %s', self._master, CONFIG[_target]['MODE'], _target)
+                    logger.debug('(%s) Packet routed %s to system: %s', self._master, CONFIG['SYSTEMS'][_target]['MODE'], _target)
                     
                 else:
                     logger.debug('(%s) Packet router found no target for packet. Destination was: %s on target network %s', self._master, _dst_id, _target)
@@ -85,8 +85,8 @@ class routerCLIENT(HBCLIENT):
             for rule in RULES[self._client]['GROUP_VOICE']:
                 _target = rule['DST_NET']
                 if _target in RULES:
-                    system[_target].send_system(_data)
-                    logger.debug('(%s) Packet routed to %s system: %s', self._client, CONFIG[_target]['MODE'], _target)
+                    systems[_target].send_system(_data)
+                    logger.debug('(%s) Packet routed to %s system: %s', self._client, CONFIG['SYSTEMS'][_target]['MODE'], _target)
                     
                 else:
                     logger.debug('(%s) Packet router found no target for packet. Destination was: %s on target network %s', self._client, _dst_id, _target)
@@ -103,9 +103,9 @@ if __name__ == '__main__':
     for system in CONFIG['SYSTEMS']:
         if CONFIG['SYSTEMS'][system]['ENABLED']:
             if CONFIG['SYSTEMS'][system]['MODE'] == 'MASTER':
-                systems[system] = HBMASTER(system)
+                systems[system] = routerMASTER(system)
             elif CONFIG['SYSTEMS'][system]['MODE'] == 'CLIENT':
-                systems[system] = HBCLIENT(system)     
+                systems[system] = routerCLIENT(system)     
             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])
 
diff --git a/hblink.py b/hblink.py
index 0d1f359..1003187 100755
--- a/hblink.py
+++ b/hblink.py
@@ -235,7 +235,6 @@ class HBMASTER(DatagramProtocol):
                 else:
                     _frame_type = 'none'
                 _stream_id = _data[16:20]
-                
                 #logger.debug('(%s) DMRD - Seqence: %s, RF Source: %s, Destination ID: %s', self._master, int_id(_seq), int_id(_rf_src), int_id(_dst_id))
     
                 # If AMBE audio exporting is configured...