Merge branch 'dev'

Author: janiversen

CHANGELOG.rst

@@ -11,6 +11,7 @@ Version 3.11.0
 --------------
  * Correct bit handling (each byte is LSB->MSB). (#2707)
  * read_input_registers docstring change count to regs (#2704)
+ * Add dev_id/tid check in clients (#2711)
 
 Version 3.10.0
 --------------

pymodbus/transaction/transaction.py

@@ -130,6 +130,14 @@ def sync_execute(self, no_response_expected: bool, request: ModbusPDU) -> Modbus
                     return ExceptionResponse(0xff)
                 try:
                     response = self.sync_get_response(request.dev_id, request.transaction_id)
+                    if response.dev_id != request.dev_id:
+                        raise ModbusIOException(
+                            f"ERROR: request uses device id={request.dev_id} but received {response.dev_id}."
+                        )
+                    if response.transaction_id != request.transaction_id:
+                        raise ModbusIOException(
+                            f"ERROR: request uses transaction id={request.transaction_id} but received {response.transaction_id}."
+                       )
                     response.retries = count_retries
                     return response
                 except asyncio.exceptions.TimeoutError:
@@ -170,8 +178,12 @@ async def execute(self, no_response_expected: bool, request: ModbusPDU) -> Modbu
                     self.count_until_disconnect= self.max_until_disconnect
                     if response.dev_id != request.dev_id:
                         raise ModbusIOException(
-                            f"ERROR: request ask for id={request.dev_id} but got id={response.dev_id}, CLOSING CONNECTION."
+                            f"ERROR: request uses device id={request.dev_id} but received {response.dev_id}."
                         )
+                    if response.transaction_id != request.transaction_id:
+                        raise ModbusIOException(
+                            f"ERROR: request uses transaction id={request.transaction_id} but received {response.transaction_id}."
+                       )
                     response.retries = count_retries
                     return response
                 except asyncio.exceptions.TimeoutError: