added the new key waiter to be cleaned up on error in wormhole

Also, set new print statment to print to args.stdout
This commit is contained in:
laharah 2016-06-05 02:55:31 -07:00 committed by Brian Warner
parent f786031f40
commit a2ab1863cf
2 changed files with 6 additions and 2 deletions

View File

@ -86,7 +86,8 @@ class Sender:
print(u"", file=args.stdout)
key_established = yield w.establish_key()
print(u"Key established, waiting for confirmation...")
print(u"Key established, waiting for confirmation...",
file=args.stdout)
# TODO: don't stall on w.verify() unless they want it
verifier_bytes = yield w.verify() # this may raise WrongPasswordError

View File

@ -289,7 +289,7 @@ class _Wormhole:
returns a Deferred that fires when we've established the shared key.
When successful, the Deferred fires with a simple `True`, otherwise
it fails.
"""
return self._API_establish_key()
@ -852,6 +852,9 @@ class _Wormhole:
if self._verifier_waiter and not self._verifier_waiter.called:
if self.DEBUG: print("EB VW")
self._verifier_waiter.errback(error)
if self._key_waiter and not self._key_waiter.called:
if self.DEBUG: print("EB KW")
self._key_waiter.errback(error)
for d in self._receive_waiters.values():
if self.DEBUG: print("EB RW")
d.errback(error)