From 8d80600f43b1ec6e18ea4462901627961629dab5 Mon Sep 17 00:00:00 2001 From: KF7EEL Date: Tue, 24 Nov 2020 13:40:14 -0800 Subject: [PATCH] add adjustable UNIT time --- bridge.py | 9 +++++---- rules_SAMPLE.py | 5 +++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/bridge.py b/bridge.py index 0047820..21c68f4 100644 --- a/bridge.py +++ b/bridge.py @@ -56,6 +56,9 @@ import pickle import logging logger = logging.getLogger(__name__) +# Import UNIT time from rules.py +from rules import UNIT_TIME + # Does anybody read this stuff? There's a PEP somewhere that says I should do this. __author__ = 'Cortney T. Buffington, N0MJS' @@ -152,7 +155,7 @@ def rule_timer_loop(): else: logger.debug('(ROUTER) Conference Bridge NO ACTION: System: %s, Bridge: %s, TS: %s, TGID: %s', _system['SYSTEM'], _bridge, _system['TS'], int_id(_system['TGID'])) - _then = _now - 60 + _then = _now - 60 * UNIT_TIME remove_list = [] for unit in UNIT_MAP: if UNIT_MAP[unit][1] < (_then): @@ -1051,9 +1054,7 @@ class routerHBP(HBSYSTEM): else: self.unit_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data) elif _call_type == 'vcsbk': - # Route CSBK packets to destination TG. Necessary for group data to work with GPS/Data decoder. - self.group_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data) - logger.debug('CSBK recieved, but HBlink does not process them currently. Packets routed to talkgroup.') + logger.debug('CSBK recieved, but HBlink does not process them currently') else: logger.error('Unknown call type recieved -- not processed') diff --git a/rules_SAMPLE.py b/rules_SAMPLE.py index b46a46a..4a283b8 100755 --- a/rules_SAMPLE.py +++ b/rules_SAMPLE.py @@ -53,6 +53,11 @@ list the names of each system that should bridge unit to unit (individual) calls UNIT = ['ONE', 'TWO'] +''' +The amount of time to keep sending private calls to a system before flooding again +''' +UNIT_TIME = 15 + ''' 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!