2 files changed, 16 insertions, 4 deletions
diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_jsonrpc_client.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_jsonrpc_client.py
index 93a930e4..ce430e2b 100644
--- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_jsonrpc_client.py
+++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_jsonrpc_client.py
@@ -130,13 +130,13 @@ class JsonRpcClient(object):
 
         if self.zipper.check_threshold(buffer):
             response = self.send_raw_msg(self.zipper.compress(buffer))
-            if response:
-                response = self.zipper.decompress(response)
         else:
             response = self.send_raw_msg(buffer)
 
         if not response:
             return response
+        elif self.zipper.is_compressed(response):
+            response = self.zipper.decompress(response)
 
         # return to string
         response = response.decode()
diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/zipmsg.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/zipmsg.py
index 397ada16..a2a47927 100644
--- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/zipmsg.py
+++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/zipmsg.py
@@ -6,7 +6,7 @@ class ZippedMsg:
     MSG_COMPRESS_THRESHOLD    = 256
     MSG_COMPRESS_HEADER_MAGIC = 0xABE85CEA
 
-    def check_threshold (self, msg):
+    def check_threshold(self, msg):
         return len(msg) >= self.MSG_COMPRESS_THRESHOLD
 
     def compress (self, msg):
@@ -16,7 +16,7 @@ class ZippedMsg:
         return new_msg
 
 
-    def decompress (self, msg):
+    def decompress(self, msg):
         if len(msg) < 8:
             return None
 
@@ -30,3 +30,15 @@ class ZippedMsg:
 
         return x
 
+
+    def is_compressed(self, msg):
+        if len(msg) < 8:
+            return False
+
+        t = struct.unpack(">II", msg[:8])
+        if (t[0] != self.MSG_COMPRESS_HEADER_MAGIC):
+            return False
+
+        return True
+
+