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

Transit: properly virtualize reactor in _build_listener

Browse Source
This commit is contained in:
Brian Warner 2020-02-06 22:49:12 -08:00
parent 0c43499850
commit aead249576
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wormhole/transit.py
View File

@ -10,7 +10,6 @@ from collections import deque
import six
from nacl.secret import SecretBox
import twisted.internet
from twisted.internet import (address, defer, endpoints, error, interfaces,
protocol, task)
from twisted.internet.defer import inlineCallbacks, returnValue
@ -581,7 +580,7 @@ class Common:
self._listener = None
self._winner = None
if reactor is None:
reactor = twisted.internet.reactor
from twisted.internet import reactor
self._reactor = reactor
self._timing = timing or DebugTiming()
self._timing.add("transit")
@ -599,7 +598,7 @@ class Common:
direct_hints = [
DirectTCPV1Hint(six.u(addr), portnum, 0.0) for addr in addresses
]
ep = endpoints.serverFromString(twisted.internet.reactor, "tcp:%d" % portnum)
ep = endpoints.serverFromString(self._reactor, "tcp:%d" % portnum)
return direct_hints, ep
def get_connection_abilities(self):