diff --git a/LXMF/LXMPeer.py b/LXMF/LXMPeer.py index 37515e6..be24650 100644 --- a/LXMF/LXMPeer.py +++ b/LXMF/LXMPeer.py @@ -328,7 +328,7 @@ class LXMPeer: self.alive = True self.last_heard = time.time() self.sync_backoff = 0 - min_accepted_cost = min(0, self.propagation_stamp_cost-self.propagation_stamp_cost_flexibility) + min_accepted_cost = max(0, self.propagation_stamp_cost-self.propagation_stamp_cost_flexibility) RNS.log("Synchronisation link to peer "+RNS.prettyhexrep(self.destination_hash)+" established, preparing sync offer...", RNS.LOG_DEBUG) unhandled_entries = [] diff --git a/LXMF/LXMRouter.py b/LXMF/LXMRouter.py index 36675d6..83e741d 100644 --- a/LXMF/LXMRouter.py +++ b/LXMF/LXMRouter.py @@ -1994,19 +1994,15 @@ class LXMRouter: # Don't consider for unpeering until at # least one message has been offered pass - else: - waiting_peers.append(peer) - else: - unresponsive_peers.append(peer) + else: waiting_peers.append(peer) + else: unresponsive_peers.append(peer) drop_pool = [] if len(unresponsive_peers) > 0: drop_pool.extend(unresponsive_peers) if not self.prioritise_rotating_unreachable_peers: drop_pool.extend(waiting_peers) - - else: - drop_pool.extend(waiting_peers) + else: drop_pool.extend(waiting_peers) if len(drop_pool) > 0: drop_count = min(required_drops, len(drop_pool))