aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2017-04-11 08:50:14 -0400
committerRob Austein <sra@hactrn.net>2017-04-11 08:50:14 -0400
commit038287d5d5f97316c898c140a5c6be688df2a18c (patch)
tree63e48c37a2fe62f307ddf5fae34b9a5103ad1a17
parentfa06f54b63a4b38dc59b529362a48d1c8075bae7 (diff)
parent5291c46a6d43813af6a1a59dcecda03229869004 (diff)
Merge branch 'pymux' into pkcs8
-rwxr-xr-xcryptech_muxd3
1 files changed, 3 insertions, 0 deletions
diff --git a/cryptech_muxd b/cryptech_muxd
index dacf889..dc20b62 100755
--- a/cryptech_muxd
+++ b/cryptech_muxd
@@ -164,10 +164,13 @@ class RPCIOStream(SerialIOStream):
q.put_nowait(None)
return
logger.debug("RPC recv: %s", ":".join("{:02x}".format(ord(c)) for c in reply))
+ if reply == SLIP_END:
+ continue
try:
handle = client_handle_get(slip_decode(reply))
queue = self.queues[handle]
except:
+ logger.debug("RPC skipping bad packet")
continue
logger.debug("RPC queue put: handle 0x%x, qsize %s, maxsize %s",
handle, queue.qsize(), queue.maxsize)