From 34bf67648aa121d960940644df84f1b04ffac984 Mon Sep 17 00:00:00 2001 From: michaelalink Date: Sat, 24 Apr 2021 13:50:19 -0500 Subject: [PATCH 1/4] Allow bridging between time slots on same systme Allow rules to bridge between different timeslots on the same system --- bridge.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridge.py b/bridge.py index d166a6e..706a842 100755 --- a/bridge.py +++ b/bridge.py @@ -687,7 +687,7 @@ class routerHBP(HBSYSTEM): if (_system['SYSTEM'] == self._system and _system['TGID'] == _dst_id and _system['TS'] == _slot and _system['ACTIVE'] == True): for _target in BRIDGES[_bridge]: - if _target['SYSTEM'] != self._system: + if _target['SYSTEM'] != self._system or (_target['SYSTEM'] == self._system and _target['TS'] != _slot): if _target['ACTIVE']: _target_status = systems[_target['SYSTEM']].STATUS _target_system = self._CONFIG['SYSTEMS'][_target['SYSTEM']] From c430f78b4cbbe02edfd727b2651e969dd5350286 Mon Sep 17 00:00:00 2001 From: brianjester Date: Tue, 6 Jul 2021 07:37:42 -0700 Subject: [PATCH 2/4] Update README.md fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1735783..536cc86 100755 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ A voluntary registrty for HBlink systems with public access has been created at --- -## PROJECT: Open Source HomeBrew Repeater Proctol Client/Master. ## +## PROJECT: Open Source HomeBrew Repeater Protocol Client/Master. ## **UPDATES:** From 0c12df00a753773f6f79047a3f752b351eccdf3e Mon Sep 17 00:00:00 2001 From: Michael Eckhoff Date: Wed, 4 Aug 2021 23:08:52 -0500 Subject: [PATCH 3/4] Add log entry for RPTSBKN Site Beacon. --- const.py | 2 ++ hblink.py | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/const.py b/const.py index f873a94..926c4b7 100755 --- a/const.py +++ b/const.py @@ -68,6 +68,8 @@ RPTC = b'RPTC' RPTP = b'RPTP' RPTA = b'RPTA' RPTO = b'RPTO' +RPTS = b'RPTS' +RPTSBKN = b'RPTSBKN' # Higheset peer ID permitted by HBP diff --git a/hblink.py b/hblink.py index 7896396..2236335 100755 --- a/hblink.py +++ b/hblink.py @@ -695,6 +695,10 @@ class HBSYSTEM(DatagramProtocol): self._stats['CONNECTION'] = 'NO' logger.info('(%s) MSTCL Recieved', self._system) + elif _command == RPTS: + if _data[:7] == RPTSBKN: + logger.info('(%s) Recieved Site Beacon with Repeater ID: \'%s\'', self._system, int_id(_data[7:])) + else: logger.error('(%s) Received an invalid command in packet: %s', self._system, ahex(_data)) From 8d763c279ce7290979f45af007838ecbde0fac23 Mon Sep 17 00:00:00 2001 From: K5MRE Date: Wed, 4 Aug 2021 23:28:38 -0500 Subject: [PATCH 4/4] Update hblink.py Fix spelling error on previous commit. --- hblink.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hblink.py b/hblink.py index 2236335..f586ef3 100755 --- a/hblink.py +++ b/hblink.py @@ -697,7 +697,7 @@ class HBSYSTEM(DatagramProtocol): elif _command == RPTS: if _data[:7] == RPTSBKN: - logger.info('(%s) Recieved Site Beacon with Repeater ID: \'%s\'', self._system, int_id(_data[7:])) + logger.info('(%s) Received Site Beacon with Repeater ID: %s', self._system, int_id(_data[7:])) else: logger.error('(%s) Received an invalid command in packet: %s', self._system, ahex(_data))