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

start on transit relay client

Browse Source
This commit is contained in:
Brian Warner 2015-02-20 01:40:09 -08:00
parent 3cc4461049
commit cd54eff994
1 changed files with 31 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

@ -57,13 +57,17 @@ TIMEOUT=15
class BadHandshake(Exception): class BadHandshake(Exception):
pass pass
def force_ascii(s):
if isinstance(s, type(u"")):
return s.encode("ascii")
return s
def connector(owner, hint, send_handshake, expected_handshake): def connector(owner, hint, send_handshake, expected_handshake):
if isinstance(hint, type(u"")):
hint = hint.encode("ascii")
addr,port = hint.split(",") addr,port = hint.split(",")
skt = None skt = None
try: try:
skt = socket.create_connection((addr,port)) # timeout here skt = socket.create_connection((addr,port),
TIMEOUT) # timeout or ECONNREFUSED
skt.settimeout(TIMEOUT) skt.settimeout(TIMEOUT)
#print("socket(%s) connected" % (hint,)) #print("socket(%s) connected" % (hint,))
skt.send(send_handshake) skt.send(send_handshake)
@ -85,7 +89,7 @@ def connector(owner, hint, send_handshake, expected_handshake):
# ignore socket errors, warn about coding errors # ignore socket errors, warn about coding errors
if not isinstance(e, (socket.error, socket.timeout, BadHandshake)): if not isinstance(e, (socket.error, socket.timeout, BadHandshake)):
raise raise
return owner._connector_failed(hint)
# owner is now responsible for the socket # owner is now responsible for the socket
owner._negotiation_finished(skt) # note thread owner._negotiation_finished(skt) # note thread
@ -169,9 +173,9 @@ class Common:
return [] return []
def add_their_direct_hints(self, hints): def add_their_direct_hints(self, hints):
self._their_direct_hints = hints self._their_direct_hints = [force_ascii(h) for h in hints]
def add_their_relay_hints(self, hints): def add_their_relay_hints(self, hints):
self._their_relay_hints = hints # ignored self._their_relay_hints = [force_ascii(h) for h in hints]
def _send_this(self): def _send_this(self):
if self.is_sender: if self.is_sender:
@ -198,8 +202,13 @@ class Common:
self._have_transit_key.release() self._have_transit_key.release()
def _start_outbound(self): def _start_outbound(self):
self.connectors = [] self._active_connectors = set(self._their_direct_hints)
for hint in self._their_direct_hints: 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):
t = threading.Thread(target=connector, t = threading.Thread(target=connector,
args=(self, hint, args=(self, hint,
self._send_this(), self._send_this(),
@ -207,6 +216,10 @@ class Common:
t.daemon = True t.daemon = True
t.start() t.start()
def _start_relay_connectors(self):
for hint in self._their_relay_hints:
self._start_connector(hint)
def establish_connection(self): def establish_connection(self):
self.winning_skt = None self.winning_skt = None
self._start_outbound() self._start_outbound()
@ -223,6 +236,11 @@ class Common:
return self.winning_skt return self.winning_skt
raise TransitError raise TransitError
def _connector_failed(self, hint):
self._active_connectors.remove(hint)
if not self._active_connectors:
self._start_relay_connectors()
def _negotiation_finished(self, skt): def _negotiation_finished(self, skt):
# inbound/outbound sockets call this when they finish negotiation. # inbound/outbound sockets call this when they finish negotiation.
# The first one wins and gets a "go". Any subsequent ones lose and # The first one wins and gets a "go". Any subsequent ones lose and