Fix routing of unsupported MEI types - #2975
Merged
janiversen merged 2 commits intoJul 23, 2026
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Prevent unsupported Encapsulated Interface Transport (FC 0x2B) MEI types from being routed to the Read Device Identification implementation.
Problem
Function code
0x2Buses theMEI Typefield to dispatch requests to different encapsulated interfaces. Read Device Identification is specifically assigned MEI type0x0E, while0x0Drepresents the separately defined CANopen General Reference interface and other ranges are reserved.Previously,
ReadDeviceInformationRequestwas registered as both the base handler for function0x2Band the handler for MEI type0x0E. When the decoder received another MEI type and could not find a matching subtype, it retained the baseReadDeviceInformationRequestobject. The server could consequently process an unsupported or reserved MEI request as Read Device Identification and return a normal0x0Eresponse with semantics unrelated to the original request.Changes
This change introduces a generic Encapsulated Interface Transport dispatch PDU as the base handler for function
0x2B. MEI type0x0Econtinues to route toReadDeviceInformationRequest, while unsupported and reserved MEI types remain on the generic handler and returnILLEGAL_FUNCTION (0x01)instead of entering the device-identification logic.Tests verify that
0x0Estill routes correctly and that MEI types0x00,0x0D,0x0F, and0xFFare not interpreted as Read Device Identification requests and return the expected exception.