Factor out processResponse() method.

christoph2 · Mar 29, 2018 · 8d89ddf · 8d89ddf
1 parent 617430c
commit 8d89ddf
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/pyxcp/transport/base.py b/pyxcp/transport/base.py
@@ -110,3 +110,13 @@ def closeConnection(self):
     def listen(self):
         pass
 
+    def processResponse(self, response):
+        if len(response) < self.HEADER_SIZE:
+            raise types.FrameSizeError("Frame too short.")
+        self.logger.debug("<- {}\n".format(hexDump(response)))
+        packetLen, self.counterReceived = struct.unpack(self.HEADER, response[ : 4])
+        xcpPDU = response[4 : ]
+        if len(xcpPDU) != packetLen:
+            raise types.FrameSizeError("Size mismatch.")
+        self.resQueue.put(xcpPDU)
+
diff --git a/pyxcp/transport/eth.py b/pyxcp/transport/eth.py
@@ -75,14 +75,7 @@ def listen(self):
                         except Exception as e:
                             self.logger.error(str(e))
                             continue
-                    if len(response) < self.HEADER_SIZE:
-                        raise types.FrameSizeError("Frame too short.")
-                    self.logger.debug("<- {}\n".format(hexDump(response)))
-                    packetLen, self.counterReceived = struct.unpack(Eth.HEADER, response[ : 4])
-                    xcpPDU = response[4 : ]
-                    if len(xcpPDU) != packetLen:
-                        raise types.FrameSizeError("Size mismatch.")
-                    self.resQueue.put(xcpPDU)
+                    self.processResponse(response)
 
     def send(self, frame):
         self.sock.send(frame)

diff --git a/pyxcp/transport/sxi.py b/pyxcp/transport/sxi.py
@@ -89,14 +89,8 @@ def listen(self):
             self.timing.stop()
             response = rawLength + response
 
-            if len(response) < self.HEADER_SIZE:
-                raise types.FrameSizeError("Frame too short.")
-            self.logger.debug("<- {}\n".format(hexDump(response)))
-            packetLen, self.counterReceived = struct.unpack(SxI.HEADER, response[ : 4])
-            xcpPDU = response[4 : ]
-            if len(xcpPDU) != packetLen:
-                raise types.FrameSizeError("Size mismatch.")
-            self.resQueue.put(xcpPDU)
+            self.processResponse(response)
+
 
     def send(self, frame):
         self.port.write(frame)