Skip to content

Partial solve ext. cancel sideeffects. #3072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
janiversen merged 1 commit into from
Oct 29, 2026
Merged

Partial solve ext. cancel sideeffects. #3072

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions pymodbus/transaction/transaction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,11 @@ async def execute(
self.response_future, timeout=self.comm_params.timeout_connect
)
self.count_until_disconnect = self.max_until_disconnect
if request.dev_id and response.dev_id != request.dev_id:
if (request.dev_id and response.dev_id != request.dev_id) or (
response.function_code & 0x7F
) != request.function_code:
raise self._io_exception_from_request(
f"ERROR: request uses device id={request.dev_id} but received {response.dev_id}.",
"ERROR: Unsolicited response received.",
request,
)
if (
Expand Down Expand Up @@ -273,7 +275,11 @@ def callback_data(self, data: bytes, addr: tuple | None = None) -> int:
self.last_pdu = self.trace_pdu(False, pdu)
self.last_addr = addr
if not self.is_server:
if self.response_future.done():
if (
not self.response_future
or self.response_future.done()
or self.response_future.cancelled()
):
Log.warning(
"ERROR: received pdu without a corresponding request, IGNORING"
)
Expand Down
Loading