open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

transit: avoid near-infinite loop upon connector error

Browse Source 
Now we will never try any hint more than once. Previously we'd hit the
relay hint over and over until the timeout fired.
This commit is contained in:
Brian Warner 2015-12-03 16:22:03 -06:00
parent 11f806a316
commit 95d0e68cf2
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wormhole/blocking/transit.py
View File

@ -348,12 +348,18 @@ class Common:
def _start_outbound(self):
self._active_connectors = set(self._their_direct_hints)
self._attempted_connectors = set()
for hint in self._their_direct_hints:
self._start_connector(hint)
if not self._their_direct_hints:
self._start_relay_connectors()
def _start_connector(self, hint, is_relay=False):
# Don't try any hint more than once. If all hints fail, we'll
# eventually timeout. We make no attempt to fail any faster.
if hint in self._attempted_connectors:
return
self._attempted_connectors.add(hint)
description = "->%s" % (hint,)
if is_relay:
description = "->relay:%s" % (hint,)