From 1da27dd5585af378856327b08f022a127c7573d6 Mon Sep 17 00:00:00 2001 From: Jan Pochyla Date: Thu, 9 Jun 2016 16:10:40 +0200 Subject: [PATCH] fix write of empty messages, add loging to wire --- src/trezor/wire.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/trezor/wire.py b/src/trezor/wire.py index 78b3c61f9..db1df5bf0 100644 --- a/src/trezor/wire.py +++ b/src/trezor/wire.py @@ -1,6 +1,7 @@ import ustruct from . import msg from . import loop +from . import log IFACE = const(0) @@ -58,7 +59,7 @@ def write_wire_msg(mtype, mbuf): mbuf = memoryview(mbuf) data = rep[9:] - while mbuf: + while True: n = min(len(data), len(mbuf)) data[:n] = mbuf[:n] i = n @@ -67,10 +68,14 @@ def write_wire_msg(mtype, mbuf): i += 1 yield from write_report(rep) mbuf = mbuf[n:] + if not mbuf: + break data = rep[1:] def read(*types): + if __debug__: + log.debug(__name__, 'Reading one of %s', types) mtype, mbuf = yield from read_wire_msg() for t in types: if t.wire_type == mtype: @@ -80,6 +85,8 @@ def read(*types): def write(m): + if __debug__: + log.debug(__name__, 'Writing %s', m) mbuf = m.dumps() mtype = m.message_type.wire_type yield from write_wire_msg(mtype, mbuf)