diff --git a/bridge.py b/bridge.py index 21c68f4..ae302d1 100644 --- a/bridge.py +++ b/bridge.py @@ -158,8 +158,8 @@ def rule_timer_loop(): _then = _now - 60 * UNIT_TIME remove_list = [] for unit in UNIT_MAP: - if UNIT_MAP[unit][1] < (_then): - remove_list.append(unit) + if UNIT_MAP[unit][1] < (_then): + remove_list.append(unit) for unit in remove_list: del UNIT_MAP[unit] @@ -578,8 +578,12 @@ class routerOBP(OPENBRIDGE): self.group_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data) elif _call_type == 'unit': self.unit_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data) - elif _call_type == 'vscsbk': + elif _call_type == 'vcsbk': + # Route CSBK packets to destination TG. Necessary for group data to work with GPS/Data decoder. logger.debug('CSBK recieved, but HBlink does not process them currently') + 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.') + else: logger.error('Unknown call type recieved -- not processed') @@ -1054,7 +1058,10 @@ 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. logger.debug('CSBK recieved, but HBlink does not process them currently') + 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.') else: logger.error('Unknown call type recieved -- not processed') diff --git a/rules_SAMPLE.py b/rules_SAMPLE.py index 4a283b8..6f234c0 100755 --- a/rules_SAMPLE.py +++ b/rules_SAMPLE.py @@ -58,6 +58,9 @@ The amount of time to keep sending private calls to a system before flooding aga ''' UNIT_TIME = 15 +''' +''' +#UNIT_STATIC = {b'0\x1e\xb7': ('HOTSPOT', 1924991999)} ''' 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!