fix(isotp_sock.c): add CAN_ISOTP_WAIT_TX_DONE flag to ISOTP sockets #30
Conversation
This file contains 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
driftregion
requested changes
May 19, 2024
There was a problem hiding this comment.
Thank you @muehlke . Please address the feedback and consider adding yourself to AUTHORS.txt
test/test_tp_compliance.c
Outdated
Comment on lines
103
to
105
| // setup | ||
| client = ENV_TpNew("client"); | ||
| TPMockLogToStdout(); |
There was a problem hiding this comment.
Please remove these lines. They are not necessary and make the test fail on tp_c
Suggested change
| // setup | |
| client = ENV_TpNew("client"); | |
| TPMockLogToStdout(); |
test/test_tp_compliance.c
Outdated
Comment on lines
112
to
114
| // teardown | ||
| ENV_TpFree(client); | ||
|
|
There was a problem hiding this comment.
Same as above, please remove these lines.
Suggested change
| // teardown | |
| ENV_TpFree(client); |
test/test_tp_compliance.c
Outdated
| int main() { | ||
| const struct CMUnitTest tests[] = { | ||
| // cmocka_unit_test_setup_teardown(TestSendRecv, setup, teardown), | ||
| cmocka_unit_test_setup_teardown(TestSendRecvFunctional, setup, teardown), | ||
| cmocka_unit_test_setup_teardown(TestISOTPSendLargestSingleFrame, setup, teardown), | ||
| cmocka_unit_test_setup_teardown(TestISOTPSendLargerThanSingleFrameFails, setup, teardown), | ||
| cmocka_unit_test_setup_teardown(TestISOTPSendRecvMaxLen, setup, teardown), | ||
| cmocka_unit_test_setup_teardown(TestISOTPFlowControlFrameTimeout, NULL, NULL), |
There was a problem hiding this comment.
Please use the default setup and teardown
Suggested change
| cmocka_unit_test_setup_teardown(TestISOTPFlowControlFrameTimeout, NULL, NULL), | |
| cmocka_unit_test_setup_teardown(TestISOTPFlowControlFrameTimeout, setup, teardown), |
test/test_tp_compliance.c
Outdated
| // teardown | ||
| ENV_TpFree(client); | ||
|
|
||
| // -1 is expected as the elapsed 1s timeout raises an error on the ISOTP socket |
There was a problem hiding this comment.
make the comment match the assertion
Suggested change
| // -1 is expected as the elapsed 1s timeout raises an error on the ISOTP socket | |
| // failure is expected as the elapsed 1s timeout raises an error on the ISOTP socket |
As of now, an UDS client run on the Linux ISOTP kernel module was not able to recognize a timeout error of a Flow Control frame not arriving in time after a multi-frame request. To fix this, the flag CAN_ISOTP_WAIT_TX_DONE is set on the socket. Otherwise writing the bytes of the SEND buffer to the ISOTP socket would incorrectly return the expected SEND buffer size, creating further problems like e.g. a timeout waiting on the response of the "sent" request, since it was not really sent so the UDS server is not sending a response.
…n a client ISOTP socket with no responding server With this test it can be assured that by having set the CAN_ISOTP_WAIT_TX_DONE flag on an ISOTP socket a communication error will be raised after trying to send a multi-frame request to an UDS server that will not send a FC frame within 1s.
|
Hi @driftregion, could you please delete this pull request from the repo. I've made a new one #32. By mistake I committed with the wrong git username and email. I've pushed everything as you mentioned but with the right git username and email. |
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.
As of now, an UDS client run on the Linux ISOTP kernel module was not able to recognize a timeout error of a Flow Control frame not arriving in time after a multi-frame request. To fix this, the flag CAN_ISOTP_WAIT_TX_DONE is set on the socket. Otherwise writing the bytes of the SEND buffer to the ISOTP socket would incorrectly return the expected SEND buffer size, creating further problems like e.g. a timeout waiting on the response of the "sent" request, since it was not really sent so the UDS server is not sending a response.