From 5bddaab1ca206e9eb8f0973ccb8562568db6b923 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Fri, 6 Mar 2015 14:15:17 +0100 Subject: [PATCH] fix execute command test utility for configd --- src/opnsense/service/configd_ctl.py | 1 + src/opnsense/service/execute_command.py | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/opnsense/service/configd_ctl.py b/src/opnsense/service/configd_ctl.py index a37cd043e..a6f1683a4 100755 --- a/src/opnsense/service/configd_ctl.py +++ b/src/opnsense/service/configd_ctl.py @@ -59,6 +59,7 @@ else: if line: data = data + line + # end of stream marker found, exit if data.find("%c%c%c"%(chr(0),chr(0),chr(0))) > -1: break diff --git a/src/opnsense/service/execute_command.py b/src/opnsense/service/execute_command.py index 49459d79a..848c25b73 100755 --- a/src/opnsense/service/execute_command.py +++ b/src/opnsense/service/execute_command.py @@ -63,13 +63,19 @@ except socket.error, msg: try: print ('send:%s '%exec_command) sock.send(exec_command) - data = [] + data = "" while True: line = sock.recv(4096) if line: - data.append(line) - else: + data = data + line + + # end of stream marker found, exit + if data.find("%c%c%c"%(chr(0),chr(0),chr(0))) > -1: break - print ('response:%s'% ''.join(data) ) + + print ('response:%s'% data[:-3] ) finally: sock.close() + + +