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

blocking transit: tolerate inbound connections before connect() starts

Browse Source
This commit is contained in:
Brian Warner 2016-02-17 18:56:09 -08:00
parent 369854b4cc
commit dba42aff01
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,14 +129,15 @@ class MyTCPServer(socketserver.TCPServer):
def process_request(self, request, client_address): def process_request(self, request, client_address):
description = "<-tcp:%s:%d" % (client_address[0], client_address[1]) description = "<-tcp:%s:%d" % (client_address[0], client_address[1])
kc = self.owner._have_transit_key ready_lock = self.owner._ready_for_connections_lock
kc.acquire() ready_lock.acquire()
while not self.owner._transit_key: while not (self.owner._ready_for_connections
kc.wait() and self.owner._transit_key):
ready_lock.wait()
# owner._transit_key is either None or set to a value. We don't # owner._transit_key is either None or set to a value. We don't
# modify it from here, so we can release the condition lock before # modify it from here, so we can release the condition lock before
# grabbing the key. # grabbing the key.
kc.release() ready_lock.release()
# Once it is set, we can get handler_(send|receive)_handshake, which # Once it is set, we can get handler_(send|receive)_handshake, which
# is what we actually care about. # is what we actually care about.
@ -210,7 +211,8 @@ class Common:
self._transit_relays = [] self._transit_relays = []
self.winning = threading.Event() self.winning = threading.Event()
self._negotiation_check_lock = threading.Lock() self._negotiation_check_lock = threading.Lock()
self._have_transit_key = threading.Condition() self._ready_for_connections_lock = threading.Condition()
self._ready_for_connections = False
self._transit_key = None self._transit_key = None
self._start_server() self._start_server()
@ -272,16 +274,16 @@ class Common:
CTXinfo=b"transit_record_sender_key") CTXinfo=b"transit_record_sender_key")
def set_transit_key(self, key): def set_transit_key(self, key):
# This _have_transit_key condition/lock protects us against the race # This _ready_for_connections condition/lock protects us against the
# where the sender knows the hints and the key, and connects to the # race where the sender knows the hints and the key, and connects to
# receiver's transit socket before the receiver gets relay message # the receiver's transit socket before the receiver gets relay
# (and thus the key). # message (and thus the key).
self._have_transit_key.acquire() self._ready_for_connections_lock.acquire()
self._transit_key = key self._transit_key = key
self.handler_send_handshake = self._send_this() # no "go" self.handler_send_handshake = self._send_this() # no "go"
self.handler_expected_handshake = self._expect_this() self.handler_expected_handshake = self._expect_this()
self._have_transit_key.notify_all() self._ready_for_connections_lock.notify_all()
self._have_transit_key.release() self._ready_for_connections_lock.release()
def _start_outbound(self): def _start_outbound(self):
self._active_connectors = set(self._their_direct_hints) self._active_connectors = set(self._their_direct_hints)
@ -317,6 +319,10 @@ class Common:
start = time.time() start = time.time()
self.winning_skt = None self.winning_skt = None
self.winning_skt_description = None self.winning_skt_description = None
self._ready_for_connections_lock.acquire()
self._ready_for_connections = True
self._ready_for_connections_lock.notify_all()
self._ready_for_connections_lock.release()
self._start_outbound() self._start_outbound()
# we sit here until one of our inbound or outbound sockets succeeds # we sit here until one of our inbound or outbound sockets succeeds