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

cmd_send: allow multiple things in a single message

Browse Source
This commit is contained in:
Brian Warner 2016-05-24 19:30:55 -07:00
parent 8e7c6f16cb
commit afdbbe84c3
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wormhole/cli/cmd_send.py
View File

@ -132,16 +132,19 @@ class Sender:
# TODO: get() fired, so now it's safe to use w.derive_key() # TODO: get() fired, so now it's safe to use w.derive_key()
them_d = json.loads(them_d_bytes.decode("utf-8")) them_d = json.loads(them_d_bytes.decode("utf-8"))
#print("GOT", them_d) #print("GOT", them_d)
recognized = False
if u"transit" in them_d: if u"transit" in them_d:
recognized = True
yield self._handle_transit(them_d[u"transit"]) yield self._handle_transit(them_d[u"transit"])
continue
if u"answer" in them_d: if u"answer" in them_d:
recognized = True
if not want_answer: if not want_answer:
raise TransferError("duplicate answer") raise TransferError("duplicate answer")
yield self._handle_answer(them_d[u"answer"]) yield self._handle_answer(them_d[u"answer"])
done = True done = True
returnValue(None) returnValue(None)
log.msg("unrecognized message %r" % (them_d,)) if not recognized:
log.msg("unrecognized message %r" % (them_d,))
def _handle_transit(self, receiver_hints): def _handle_transit(self, receiver_hints):
ts = self._transit_sender ts = self._transit_sender