fix

arrase · Apr 11, 2017 · fa49d48 · fa49d48
1 parent 4fd3514
commit fa49d48
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/ducky/RaspiDucky/RFCommClient.py b/ducky/RaspiDucky/RFCommClient.py
@@ -32,7 +32,10 @@ def run(self, payload, address=None):
 
         with open(payload) as f:
             for line in f:
-                sock.send(struct.pack('!I', len(line)))
-                sock.send(line)
+                data = line.replace('\n', '').replace('\r', '')
+                data_size = len(data)
+                if data_size > 0:
+                    sock.send(struct.pack('!I', data_size))
+                    sock.send(data)
 
         sock.close()
diff --git a/ducky/RaspiDucky/RFCommServer.py b/ducky/RaspiDucky/RFCommServer.py
@@ -31,8 +31,7 @@ def run(self):
                 lengthbuf = self._client_sock.recv(4)
                 length, = struct.unpack('!I', lengthbuf)
                 data = self._client_sock.recv(length)
-                if len(data) == 0: break
-                self._ducky.run(data.replace('\n', '').replace('\r', '').split(' ', 1))
+                self._ducky.run(data.split(' ', 1))
         except IOError:
             pass