Merge branch 'HBLink-org:master' into master

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:**
 

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']]

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

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) 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))