From c9cb71accd851882e53bcef9e66f09c86d304b8a Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 4 Aug 2022 00:47:10 +0100 Subject: [PATCH] hoppy --- bridge_master.py | 1 - hblink.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bridge_master.py b/bridge_master.py index 674befb..e703bd7 100644 --- a/bridge_master.py +++ b/bridge_master.py @@ -563,7 +563,6 @@ def topoTrimmer(): _toprem.append(_src) for _remove in _toprem: TOPO.pop(_remove) - print(TOPO) topoWrite() diff --git a/hblink.py b/hblink.py index 18c10ea..315dc56 100755 --- a/hblink.py +++ b/hblink.py @@ -758,11 +758,11 @@ class OPENBRIDGE(DatagramProtocol): _ver = _packet[12:13] _hops = _packet[13:14] if _hash == _hash2: - logger.trace('(%s) *ProtoControl* BCTO received: %s connected to %s with proto ver. %s',self._system, int_id(_src), int_id(_dst), int.from_bytes(_ver,'big')) + logger.trace('(%s) *ProtoControl* BCTO received: %s connected to %s with proto ver. %s. HOPS: ',self._system, int_id(_src), int_id(_dst), int.from_bytes(_ver,'big'), int.from_bytes(_hops,'big') if (int.from_bytes(_hops,'big') < 10 and _src != self._CONFIG['GLOBAL']['SERVER_ID']): self.retransmit_bcto(_packet[4:13],int.from_bytes(_hops,'big')) else: - logger.trace('(%s) *BridgeControl* not retransmitting BCTO - hop count exceeded',self._system) + logger.trace('(%s) *BridgeControl* not retransmitting BCTO - hop count exceeded or my packet',self._system) self.process_bcto(_src,_dst,_ver) else: h,p = _sockaddr