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

send_data(): add wait=True

Browse Source 
This doesn't do anything yet (the HTTP-based Channel always waits), but
will matter in an upcoming implementation change.
This commit is contained in:
Brian Warner 2016-04-20 12:10:35 -07:00
parent 8068aeeca4
commit 9c1af2667e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/txwormhole/transcribe.py
View File

@ -448,7 +448,7 @@ class Wormhole:
@close_on_error @close_on_error
@inlineCallbacks @inlineCallbacks
def send_data(self, outbound_data, phase=u"data"): def send_data(self, outbound_data, phase=u"data", wait=False):
if not isinstance(outbound_data, type(b"")): if not isinstance(outbound_data, type(b"")):
raise TypeError(type(outbound_data)) raise TypeError(type(outbound_data))
if not isinstance(phase, type(u"")): raise TypeError(type(phase)) if not isinstance(phase, type(u"")): raise TypeError(type(phase))
@ -467,6 +467,8 @@ class Wormhole:
data_key = self.derive_key(u"wormhole:phase:%s" % phase) data_key = self.derive_key(u"wormhole:phase:%s" % phase)
outbound_encrypted = self._encrypt_data(data_key, outbound_data) outbound_encrypted = self._encrypt_data(data_key, outbound_data)
yield self._channel.send(phase, outbound_encrypted) yield self._channel.send(phase, outbound_encrypted)
# Since that always waits for the server to ack the POST, we always
# behave as if wait=True.
self._timing.finish_event(_sent) self._timing.finish_event(_sent)
@close_on_error @close_on_error