ShaYmez
/
HBLink3
mirror of https://github.com/ShaYmez/hblink3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

1st Working Version 

May still have issues, definitley needs improvement.
This commit is contained in:
n0mjs710 2019-09-06 09:06:37 -05:00
parent aefedca6ee
commit 64a685cd80
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bridge_all.py
View File

@ -28,6 +28,9 @@ repeater, hotspot, etc.
As is, this program only works with group voice packets. It could work for all As is, this program only works with group voice packets. It could work for all
of them by removing a few things. 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 # Python modules we need
@ -71,6 +74,7 @@ class bridgeallSYSTEM(HBSYSTEM):
def __init__(self, _name, _config, _report): def __init__(self, _name, _config, _report):
HBSYSTEM.__init__(self, _name, _config, _report) HBSYSTEM.__init__(self, _name, _config, _report)
self._laststrid = ''
# Status information for the system, TS1 & TS2 # Status information for the system, TS1 & TS2
# 1 & 2 are "timeslot" # 1 & 2 are "timeslot"
@ -160,33 +164,33 @@ class bridgeallSYSTEM(HBSYSTEM):
if self._CONFIG['GLOBAL']['USE_ACL']: if self._CONFIG['GLOBAL']['USE_ACL']:
if not acl_check(_rf_src, self._CONFIG['GLOBAL']['SUB_ACL']): if not acl_check(_rf_src, self._CONFIG['GLOBAL']['SUB_ACL']):
if self._laststrid != _stream_id: if self._laststrid != _stream_id:
logger.info('(%s) CALL DROPPED ON EGRESS WITH STREAM ID %s FROM SUBSCRIBER %s BY GLOBAL ACL', _target_system, int_id(_stream_id), int_id(_rf_src)) 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))
self._laststrid = _stream_id self._laststrid = _stream_id
return return
if _slot == 1 and not acl_check(_dst_id, self._CONFIG['GLOBAL']['TG1_ACL']): if _slot == 1 and not acl_check(_dst_id, self._CONFIG['GLOBAL']['TG1_ACL']):
if self._laststrid != _stream_id: if self._laststrid != _stream_id:
logger.info('(%s) CALL DROPPED ON EGRESS WITH STREAM ID %s ON TGID %s BY GLOBAL TS1 ACL', _target_system, int_id(_stream_id), int_id(_dst_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))
self._laststrid = _stream_id self._laststrid = _stream_id
return return
if _slot == 2 and not acl_check(_dst_id, self._CONFIG['GLOBAL']['TG2_ACL']): if _slot == 2 and not acl_check(_dst_id, self._CONFIG['GLOBAL']['TG2_ACL']):
if self._laststrid != _stream_id: if self._laststrid != _stream_id:
logger.info('(%s) CALL DROPPED ON EGRESS WITH STREAM ID %s ON TGID %s BY GLOBAL TS2 ACL', _target_system, int_id(_stream_id), int_id(_dst_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))
self._laststrid = _stream_id self._laststrid = _stream_id
return return
if _target_system['USE_ACL']: if _target_system['USE_ACL']:
if not acl_check(_rf_src, _target_system['SUB_ACL']): if not acl_check(_rf_src, _target_system['SUB_ACL']):
if self._laststrid != _stream_id: if self._laststrid != _stream_id:
logger.info('(%s) CALL DROPPED ON EGRESS WITH STREAM ID %s FROM SUBSCRIBER %s BY SYSTEM ACL', _target_system, int_id(_stream_id), int_id(_rf_src)) 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))
self._laststrid = _stream_id self._laststrid = _stream_id
return return
if _slot == 1 and not acl_check(_dst_id, _target_system['TG1_ACL']): if _slot == 1 and not acl_check(_dst_id, _target_system['TG1_ACL']):
if self._laststrid != _stream_id: if self._laststrid != _stream_id:
logger.info('(%s) CALL DROPPED ON EGRESS WITH STREAM ID %s ON TGID %s BY SYSTEM TS1 ACL', _target_system, int_id(_stream_id), int_id(_dst_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))
self._laststrid = _stream_id self._laststrid = _stream_id
return return
if _slot == 2 and not acl_check(_dst_id, _target_system['TG2_ACL']): if _slot == 2 and not acl_check(_dst_id, _target_system['TG2_ACL']):
if self._laststrid != _stream_id: if self._laststrid != _stream_id:
logger.info('(%s) CALL DROPPED ON EGRESS WITH STREAM ID %s ON TGID %s BY SYSTEM TS2 ACL', _target_system, int_id(_stream_id), int_id(_dst_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))
self._laststrid = _stream_id self._laststrid = _stream_id
return return
self._laststrid = _stream_id self._laststrid = _stream_id