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

require caller to provide transit relay too

Browse Source
This commit is contained in:
Brian Warner 2015-03-25 13:07:17 -07:00
parent fae14ebe6a
commit 106991fe0d
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,6 @@ from __future__ import print_function
import re, time, threading, socket, SocketServer import re, time, threading, socket, SocketServer
from binascii import hexlify, unhexlify from binascii import hexlify, unhexlify
from nacl.secret import SecretBox from nacl.secret import SecretBox
from .. import const
from ..util import ipaddrs from ..util import ipaddrs
from ..util.hkdf import HKDF from ..util.hkdf import HKDF
@ -270,8 +269,8 @@ class RecordPipe:
self.skt.close() self.skt.close()
class Common: class Common:
def __init__(self, transit_relay=None): def __init__(self, transit_relay):
self._transit_relay = transit_relay or const.TRANSIT_RELAY self._transit_relay = transit_relay
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._have_transit_key = threading.Condition()

2
src/wormhole/scripts/cmd_receive_file.py
View File

@ -8,7 +8,7 @@ APPID = "lothar.com/wormhole/file-xfer"
def receive_file(args): def receive_file(args):
# we're receiving # we're receiving
transit_receiver = TransitReceiver(transit_relay=args.transit_helper) transit_receiver = TransitReceiver(args.transit_helper)
r = Receiver(APPID, args.relay_url) r = Receiver(APPID, args.relay_url)
code = args.code code = args.code

2
src/wormhole/scripts/cmd_send_file.py
View File

@ -10,7 +10,7 @@ def send_file(args):
# we're sending # we're sending
filename = args.filename filename = args.filename
assert os.path.isfile(filename) assert os.path.isfile(filename)
transit_sender = TransitSender(transit_relay=args.transit_helper) transit_sender = TransitSender(args.transit_helper)
i = Initiator(APPID, args.relay_url) i = Initiator(APPID, args.relay_url)
code = i.get_code(args.code_length) code = i.get_code(args.code_length)