Fix #82, use separate dispatcher for messages #88
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
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| /* Process a command pipe message */ | ||
| /* */ | ||
| /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ | ||
| int32 LC_AppPipe(const CFE_SB_Buffer_t *BufPtr) |
Check notice
Code scanning / CodeQL
Function too long
| } | ||
|
|
||
| /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ | ||
| /* */ | ||
| /* Housekeeping request */ | ||
| /* */ | ||
| /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ | ||
| int32 LC_HousekeepingReq(const CFE_MSG_CommandHeader_t *MsgPtr) | ||
| int32 LC_SendHkCmd(const CFE_MSG_CommandHeader_t *MsgPtr) |
Check notice
Code scanning / CodeQL
Long function without assertion
| /* Process a command pipe message */ | ||
| /* */ | ||
| /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ | ||
| int32 LC_AppPipe(const CFE_SB_Buffer_t *BufPtr) |
Check notice
Code scanning / CodeQL
Long function without assertion
| /* Verify message packet length */ | ||
| /* */ | ||
| /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ | ||
| bool LC_VerifyMsgLength(const CFE_MSG_Message_t *MsgPtr, size_t ExpectedLength) |
Check notice
Code scanning / CodeQL
Long function without assertion
| } | ||
|
|
||
| /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ | ||
| /* */ | ||
| /* Housekeeping request */ | ||
| /* */ | ||
| /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ | ||
| int32 LC_HousekeepingReq(const CFE_MSG_CommandHeader_t *MsgPtr) | ||
| int32 LC_SendHkCmd(const CFE_MSG_CommandHeader_t *MsgPtr) |
Check notice
Code scanning / CodeQL
Function too long
Comment on lines
+252
to
+324
| switch (CFE_SB_MsgIdToValue(MessageID)) | ||
| { | ||
| /* | ||
| ** Sample actionpoints request | ||
| */ | ||
| case LC_SAMPLE_AP_MID: | ||
| LC_SampleAPVerifyDispatch(BufPtr); | ||
| break; | ||
|
|
||
| /* | ||
| ** Housekeeping telemetry request | ||
| ** (only routine that can return a critical error indicator) | ||
| */ | ||
| case LC_SEND_HK_MID: | ||
| LC_SendHkVerifyDispatch(BufPtr); | ||
| break; | ||
|
|
||
| /* | ||
| ** LC application commands... | ||
| */ | ||
| case LC_CMD_MID: | ||
|
|
||
| CFE_MSG_GetFcnCode(&BufPtr->Msg, &CommandCode); | ||
| switch (CommandCode) | ||
| { | ||
| case LC_NOOP_CC: | ||
| LC_NoopVerifyDispatch(BufPtr); | ||
| break; | ||
|
|
||
| case LC_RESET_CC: | ||
| LC_ResetCountersVerifyDispatch(BufPtr); | ||
| break; | ||
|
|
||
| case LC_SET_LC_STATE_CC: | ||
| LC_SetLCStateVerifyDispatch(BufPtr); | ||
| break; | ||
|
|
||
| case LC_SET_AP_STATE_CC: | ||
| LC_SetAPStateVerifyDispatch(BufPtr); | ||
| break; | ||
|
|
||
| case LC_SET_AP_PERM_OFF_CC: | ||
| LC_SetAPPermOffVerifyDispatch(BufPtr); | ||
| break; | ||
|
|
||
| case LC_RESET_AP_STATS_CC: | ||
| LC_ResetAPStatsVerifyDispatch(BufPtr); | ||
| break; | ||
|
|
||
| case LC_RESET_WP_STATS_CC: | ||
| LC_ResetWPStatsVerifyDispatch(BufPtr); | ||
| break; | ||
|
|
||
| default: | ||
| CFE_EVS_SendEvent(LC_CC_ERR_EID, CFE_EVS_EventType_ERROR, | ||
| "Invalid command code: ID = 0x%08lX, CC = %d", | ||
| (unsigned long)CFE_SB_MsgIdToValue(MessageID), CommandCode); | ||
|
|
||
| LC_AppData.CmdErrCount++; | ||
| break; | ||
|
|
||
| } /* end CommandCode switch */ | ||
| break; | ||
|
|
||
| /* | ||
| ** All other message ID's should be monitor | ||
| ** packets | ||
| */ | ||
| default: | ||
| LC_CheckMsgForWPs(MessageID, BufPtr); | ||
| break; | ||
|
|
||
| } /* end MessageID switch */ |
Check notice
Code scanning / CodeQL
Long switch case
jphickey
force-pushed
the
fix-82-dispatch
branch
from
16d72e3
to
171ff1c
Compare
jphickey
force-pushed
the
fix-82-dispatch
branch
from
171ff1c
to
b7dcff4
Compare
Isolate the message verification and dispatch from the general message processing. Functions in the "cmds" file now strictly handle the command content, and do not get involved in general validation.
jphickey
force-pushed
the
fix-82-dispatch
branch
from
b7dcff4
to
8aa3742
Compare
|
Format checks fixed, all passing now. |
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.
Checklist (Please check before submitting)
Describe the contribution
Isolate the message verification and dispatch from the general message processing. Functions in the "cmds" file now strictly handle the command content, and do not get involved in general validation.
Fixes #82
Testing performed
Build and run CFE with LC, sanity check operation
Expected behavior changes
No impact, just improves source unit organization
System(s) tested on
Debian
Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.