diff --git a/bin/bombshell-client b/bin/bombshell-client index 77db1c3..28a8392 100755 --- a/bin/bombshell-client +++ b/bin/bombshell-client @@ -193,6 +193,8 @@ def write(dst, buffer, l): while len(mv): dst.write(mv) writtenthisloop = len(mv) + #logging.debug("write: Sent %s bytes to sink %s", writtenthisloop, dst) + #logging.debug("write: %s", mv[:writtenthisloop].tobytes()) if writtenthisloop is None or writtenthisloop < 1: raise Exception("copy: Failed to write any bytes") mv = mv[writtenthisloop:] @@ -238,6 +240,8 @@ class DataMultiplexer(MyThread): self.sink.write(header) continue l = readthisloop + #logging.debug("mux: Received %s bytes from source %s", l, n) + #logging.debug("mux: %s", buffer[:l]) header = struct.pack(PACKFORMAT, n, True, l) self.sink.write(header) write(self.sink, buffer, l) diff --git a/connection_plugins/qubes.py b/connection_plugins/qubes.py index 9593c8b..7df4fd9 100644 --- a/connection_plugins/qubes.py +++ b/connection_plugins/qubes.py @@ -264,7 +264,6 @@ class Connection(ConnectionBase): self.transport_cmd = kwargs['transport_cmd'] return self.transport_cmd = distutils.spawn.find_executable('qrun') - self.transport_cmd = None if not self.transport_cmd: self.transport_cmd = os.path.join( os.path.dirname(__file__),