-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #152 from jphickey:fix-149-decode
Fix #149, add decode hooks
- Loading branch information
Showing
5 changed files
with
182 additions
and
30 deletions.
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| /************************************************************************ | ||
| * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” | ||
| * | ||
| * Copyright (c) 2020 United States Government as represented by the | ||
| * Administrator of the National Aeronautics and Space Administration. | ||
| * All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. You may obtain | ||
| * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| ************************************************************************/ | ||
|
|
||
| /** | ||
| * @file | ||
| * This is the dispatch hdr file for the Command Ingest lab application. | ||
| */ | ||
| #ifndef CI_LAB_DECODE_H | ||
| #define CI_LAB_DECODE_H | ||
|
|
||
| /* | ||
| ** Required header files... | ||
| */ | ||
| #include "common_types.h" | ||
| #include "cfe_sb_api_typedefs.h" | ||
|
|
||
| CFE_Status_t CI_LAB_GetInputBuffer(void **BufferOut, size_t *SizeOut); | ||
| CFE_Status_t CI_LAB_DecodeInputMessage(void *SourceBuffer, size_t SourceSize, CFE_SB_Buffer_t **DestBufferOut); | ||
|
|
||
| #endif |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| /************************************************************************ | ||
| * NASA Docket No. GSC-18,719-1, and identified as “core Flight System: Bootes” | ||
| * | ||
| * Copyright (c) 2020 United States Government as represented by the | ||
| * Administrator of the National Aeronautics and Space Administration. | ||
| * All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. You may obtain | ||
| * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| ************************************************************************/ | ||
|
|
||
| /** | ||
| * \file | ||
| * This file contains the source code for the Command Ingest task. | ||
| */ | ||
|
|
||
| /* | ||
| ** Include Files: | ||
| */ | ||
| #include "cfe.h" | ||
|
|
||
| #include "ci_lab_app.h" | ||
| #include "ci_lab_perfids.h" | ||
| #include "ci_lab_msgids.h" | ||
| #include "ci_lab_decode.h" | ||
|
|
||
| /* | ||
| * --------------------------------------- | ||
| * In a "passthrough" configuration - the data from the network | ||
| * is expected to be a direct instance of the CFE_MSG_Message_t base, | ||
| * and thus something can be sent directly to SB. | ||
| * | ||
| * Instead of using an intermediate buffer, just get a buffer from | ||
| * SB and put it directly in there. This reduces copying. | ||
| * --------------------------------------- | ||
| */ | ||
| CFE_Status_t CI_LAB_GetInputBuffer(void **BufferOut, size_t *SizeOut) | ||
| { | ||
| CFE_SB_Buffer_t *IngestBuffer; | ||
| const size_t IngestSize = CI_LAB_MAX_INGEST; | ||
|
|
||
| IngestBuffer = CFE_SB_AllocateMessageBuffer(IngestSize); | ||
| if (IngestBuffer == NULL) | ||
| { | ||
| *BufferOut = NULL; | ||
| *SizeOut = 0; | ||
|
|
||
| CFE_EVS_SendEvent(CI_LAB_INGEST_ALLOC_ERR_EID, CFE_EVS_EventType_ERROR, "CI_LAB: buffer allocation failed\n"); | ||
|
|
||
| return CFE_SB_BUF_ALOC_ERR; | ||
| } | ||
|
|
||
| *BufferOut = IngestBuffer; | ||
| *SizeOut = IngestSize; | ||
|
|
||
| return CFE_SUCCESS; | ||
| } | ||
|
|
||
| /* | ||
| * --------------------------------------- | ||
| * In a "passthrough" configuration - the data from the network | ||
| * is expected to be a direct instance of the CFE_MSG_Message_t base, | ||
| * and thus something can be sent directly to SB. | ||
| * | ||
| * This just does a simple sanity check on the message size. But | ||
| * otherwise, the source buffer is used directly as the output buffer. | ||
| * --------------------------------------- | ||
| */ | ||
| CFE_Status_t CI_LAB_DecodeInputMessage(void *SourceBuffer, size_t SourceSize, CFE_SB_Buffer_t **DestBufferOut) | ||
| { | ||
| CFE_SB_Buffer_t *MsgBufPtr; | ||
| CFE_MSG_Size_t MsgSize; | ||
| CFE_Status_t Status; | ||
|
|
||
| if (SourceSize < sizeof(CFE_MSG_CommandHeader_t)) | ||
| { | ||
| MsgBufPtr = NULL; | ||
| Status = CFE_STATUS_WRONG_MSG_LENGTH; | ||
|
|
||
| CFE_EVS_SendEvent(CI_LAB_INGEST_LEN_ERR_EID, CFE_EVS_EventType_ERROR, | ||
| "CI: cmd dropped, bad packet length=%lu\n", (unsigned long)SourceSize); | ||
| } | ||
| else | ||
| { | ||
| MsgBufPtr = SourceBuffer; | ||
|
|
||
| /* Check the size from within the header itself, compare against network buffer size */ | ||
| CFE_MSG_GetSize(&MsgBufPtr->Msg, &MsgSize); | ||
|
|
||
| if (MsgSize > SourceSize) | ||
| { | ||
| Status = CFE_STATUS_WRONG_MSG_LENGTH; | ||
|
|
||
| CFE_EVS_SendEvent(CI_LAB_INGEST_LEN_ERR_EID, CFE_EVS_EventType_ERROR, | ||
| "CI: cmd dropped - length mismatch, %lu (hdr) / %lu (packet)\n", (unsigned long)MsgSize, | ||
| (unsigned long)SourceSize); | ||
| } | ||
| else | ||
| { | ||
| Status = CFE_SUCCESS; | ||
| } | ||
| } | ||
|
|
||
| *DestBufferOut = MsgBufPtr; | ||
|
|
||
| return Status; | ||
| } |