clean ProcessIncommingPacket. (#1491)

Author: janiversen

pymodbus/framer/ascii_framer.py

@@ -166,20 +166,20 @@ def processIncomingPacket(self, data, callback, slave, **kwargs):
         single = kwargs.get("single", False)
         self.addToFrame(data)
         while self.isFrameReady():
-            if self.checkFrame():
-                if self._validate_slave_id(slave, single):
-                    frame = self.getFrame()
-                    if (result := self.decoder.decode(frame)) is None:
-                        raise ModbusIOException("Unable to decode response")
-                    self.populateResult(result)
-                    self.advanceFrame()
-                    callback(result)  # defer this
-                else:
-                    header_txt = self._header["uid"]
-                    Log.error("Not a valid slave id - {}, ignoring!!", header_txt)
-                    self.resetFrame()
-            else:
+            if not self.checkFrame():
                 break
+            if not self._validate_slave_id(slave, single):
+                header_txt = self._header["uid"]
+                Log.error("Not a valid slave id - {}, ignoring!!", header_txt)
+                self.resetFrame()
+                continue
+
+            frame = self.getFrame()
+            if (result := self.decoder.decode(frame)) is None:
+                raise ModbusIOException("Unable to decode response")
+            self.populateResult(result)
+            self.advanceFrame()
+            callback(result)  # defer this
 
     def buildPacket(self, message):
         """Create a ready to send modbus packet.

pymodbus/framer/binary_framer.py

@@ -163,23 +163,20 @@ def processIncomingPacket(self, data, callback, slave, **kwargs):
             slave = [slave]
         single = kwargs.get("single", False)
         while self.isFrameReady():
-            if self.checkFrame():
-                if self._validate_slave_id(slave, single):
-                    if (result := self.decoder.decode(self.getFrame())) is None:
-                        raise ModbusIOException("Unable to decode response")
-                    self.populateResult(result)
-                    self.advanceFrame()
-                    callback(result)  # defer or push to a thread?
-                else:
-                    header_txt = self._header["uid"]
-                    Log.debug("Not a valid slave id - {}, ignoring!!", header_txt)
-                    self.resetFrame()
-                    break
-
-            else:
+            if not self.checkFrame():
                 Log.debug("Frame check failed, ignoring!!")
                 self.resetFrame()
                 break
+            if not self._validate_slave_id(slave, single):
+                header_txt = self._header["uid"]
+                Log.debug("Not a valid slave id - {}, ignoring!!", header_txt)
+                self.resetFrame()
+                break
+            if (result := self.decoder.decode(self.getFrame())) is None:
+                raise ModbusIOException("Unable to decode response")
+            self.populateResult(result)
+            self.advanceFrame()
+            callback(result)  # defer or push to a thread?
 
     def buildPacket(self, message):
         """Create a ready to send modbus packet.

pymodbus/framer/socket_framer.py

@@ -161,23 +161,22 @@ def processIncomingPacket(self, data, callback, slave, **kwargs):
         Log.debug("Processing: {}", data, ":hex")
         self.addToFrame(data)
         while True:
-            if self.isFrameReady():
-                if self.checkFrame():
-                    if self._validate_slave_id(slave, single):
-                        self._process(callback)
-                    else:
-                        header_txt = self._header["uid"]
-                        Log.debug("Not a valid slave id - {}, ignoring!!", header_txt)
-                        self.resetFrame()
-                else:
-                    Log.debug("Frame check failed, ignoring!!")
-                    self.resetFrame()
-            else:
+            if not self.isFrameReady():
                 if len(self._buffer):
                     # Possible error ???
                     if self._header["len"] < 2:
                         self._process(callback, error=True)
                 break
+            if not self.checkFrame():
+                Log.debug("Frame check failed, ignoring!!")
+                self.resetFrame()
+                continue
+            if not self._validate_slave_id(slave, single):
+                header_txt = self._header["uid"]
+                Log.debug("Not a valid slave id - {}, ignoring!!", header_txt)
+                self.resetFrame()
+                continue
+            self._process(callback)
 
     def _process(self, callback, error=False):
         """Process incoming packets irrespective error condition."""

pymodbus/framer/tls_framer.py

@@ -126,16 +126,16 @@ def processIncomingPacket(self, data, callback, slave, **kwargs):
         Log.debug("Processing: {}", data, ":hex")
         self.addToFrame(data)
 
-        if self.isFrameReady():
-            if self.checkFrame():
-                if self._validate_slave_id(slave, single):
-                    self._process(callback)
-                else:
-                    Log.debug("Not in valid slave id - {}, ignoring!!", slave)
-                    self.resetFrame()
-            else:
-                Log.debug("Frame check failed, ignoring!!")
-                self.resetFrame()
+        if not self.isFrameReady():
+            return
+        if not self.checkFrame():
+            Log.debug("Frame check failed, ignoring!!")
+            self.resetFrame()
+            return
+        if not self._validate_slave_id(slave, single):
+            Log.debug("Not in valid slave id - {}, ignoring!!", slave)
+            self.resetFrame()
+        self._process(callback)
 
     def _process(self, callback, error=False):
         """Process incoming packets irrespective error condition."""