From 21f9c680beace0f07d864f909b37326b92878c5a Mon Sep 17 00:00:00 2001
From: Cort Buffington <n0mjs@me.com>
Date: Mon, 17 Feb 2020 19:20:10 -0600
Subject: [PATCH] update sample config

---
 bridge.py       | 14 ++++++++++----
 rules_SAMPLE.py | 13 +++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/bridge.py b/bridge.py
index 2dacd6e..ee6e1a1 100755
--- a/bridge.py
+++ b/bridge.py
@@ -892,23 +892,27 @@ class routerHBP(HBSYSTEM):
             if _dst_id in UNIT_MAP:
                 if UNIT_MAP[_dst_id][0] != self._system:
                     self._targets = [UNIT_MAP[_dst_id][0]]
-                    _target_route = UNIT_MAP[_dst_id][0]
+                    #_target_route = UNIT_MAP[_dst_id][0]
                 else:
                     self._targets = []
                     logger.debug('UNIT call to a subscriber on the same system, send nothing')
             else:
                 self._targets = list(systems)
                 self._targets.remove(self._system)
-                _target_route = 'FLOOD'
+                #_target_route = 'FLOOD'
             
             # This is a new call stream, so log & report
             self.STATUS[_slot]['RX_START'] = pkt_time
             logger.info('(%s) *UNIT CALL START* STREAM ID: %s SUB: %s (%s) PEER: %s (%s) UNIT: %s (%s), TS: %s, FORWARD: %s', \
-                    self._system, int_id(_stream_id), get_alias(_rf_src, subscriber_ids), int_id(_rf_src), get_alias(_peer_id, peer_ids), int_id(_peer_id), get_alias(_dst_id, talkgroup_ids), int_id(_dst_id), _slot, _target_route)
+                    self._system, int_id(_stream_id), get_alias(_rf_src, subscriber_ids), int_id(_rf_src), get_alias(_peer_id, peer_ids), int_id(_peer_id), get_alias(_dst_id, talkgroup_ids), int_id(_dst_id), _slot, self._targets)
             if CONFIG['REPORTS']['REPORT']:
                 self._report.send_bridgeEvent('UNIT VOICE,START,RX,{},{},{},{},{},{},{}'.format(self._system, int_id(_stream_id), int_id(_peer_id), int_id(_rf_src), _slot, int_id(_dst_id), _target_route).encode(encoding='utf-8', errors='ignore'))
 
         for _target in self._targets:
+            if _target not in UNIT:
+                logger.debug('(%s) *UNIT CALL NOT FORWARDED* UNIT calling is disabled for this system (EGRESS)', self._system)
+                continue
+                
             _target_status = systems[_target].STATUS
             _target_system = self._CONFIG['SYSTEMS'][_target]
             
@@ -1007,7 +1011,9 @@ class routerHBP(HBSYSTEM):
         if _call_type == 'group':
             self.group_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data)
         elif _call_type == 'unit':
-            if UNIT:
+            if self._system not in UNIT:
+                logger.debug('(%s) *UNIT CALL NOT FORWARDED* UNIT calling is disabled for this system (INGRESS)', self._system)
+            else:
                 self.unit_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data)
         elif _call_type == 'vscsbk':
             logger.debug('CSBK recieved, but HBlink does not process them currently')
diff --git a/rules_SAMPLE.py b/rules_SAMPLE.py
index a3c3701..a86d02d 100755
--- a/rules_SAMPLE.py
+++ b/rules_SAMPLE.py
@@ -47,6 +47,19 @@ BRIDGES = {
         ]
 }
 
+'''
+list the names of each system that should process unit to unit (individual) calls. Processing
+is both ingress and egress.
+'''
+
+UNIT = ['ONE', 'TWO']
+
+'''
+This is for testing the syntax of the file. It won't eliminate all errors, but running this file
+like it were a Python program itself will tell you if the syntax is correct!
+'''
+
 if __name__ == '__main__':
     from pprint import pprint
     pprint(BRIDGES)
+    print(UNIT)