Skip to content

Fix #172, Move DS_TableFindMsgID lookups out of DS_AddMidCmd conditions #173

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

Open
chillfig wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix #172, Move DS_TableFindMsgID lookups out of DS_AddMidCmd conditions #173

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
28 changes: 18 additions & 10 deletions fsw/src/ds_cmds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1245,14 +1245,22 @@ CFE_Status_t DS_GetFileInfoCmd(const DS_GetFileInfoCmd_t *BufPtr)
CFE_Status_t DS_AddMidCmd(const DS_AddMidCmd_t *BufPtr)
{
const DS_AddRemoveMid_Payload_t *PayloadPtr;
DS_PacketEntry_t *pPacketEntry = NULL;
DS_FilterParms_t *pFilterParms = NULL;
int32 FilterTableIndex = 0;
int32 HashTableIndex = 0;
int32 i = 0;
DS_PacketEntry_t *pPacketEntry = NULL;
DS_FilterParms_t *pFilterParms = NULL;
int32 ExistingIndex = DS_INDEX_NONE;
int32 UnusedIndex = DS_INDEX_NONE;
int32 HashTableIndex = 0;
int32 i = 0;

PayloadPtr = DS_GET_CMD_PAYLOAD(BufPtr, DS_AddMidCmd_t);

/* Ensure filter table is loaded since DS_TableFindMsgID dereferences it */
if (DS_AppData.FilterTblPtr != (DS_FilterTable_t *)NULL)
{
ExistingIndex = DS_TableFindMsgID(PayloadPtr->MessageID);
UnusedIndex = DS_TableFindMsgID(CFE_SB_INVALID_MSG_ID);
}

if (!CFE_SB_IsValidMsgId(PayloadPtr->MessageID))
{
/*
Expand All @@ -1276,7 +1284,7 @@ CFE_Status_t DS_AddMidCmd(const DS_AddMidCmd_t *BufPtr)
CFE_EVS_EventType_ERROR,
"Invalid ADD MID command: filter table is not loaded");
}
else if ((FilterTableIndex = DS_TableFindMsgID(PayloadPtr->MessageID)) != DS_INDEX_NONE)
else if (ExistingIndex != DS_INDEX_NONE)
{
/*
** New message ID is already in packet filter table...
Expand All @@ -1287,9 +1295,9 @@ CFE_Status_t DS_AddMidCmd(const DS_AddMidCmd_t *BufPtr)
CFE_EVS_EventType_ERROR,
"Invalid ADD MID command: MID = 0x%08lX is already in filter table at index = %d",
(unsigned long)CFE_SB_MsgIdToValue(PayloadPtr->MessageID),
(int)FilterTableIndex);
(int)ExistingIndex);
}
else if ((FilterTableIndex = DS_TableFindMsgID(CFE_SB_INVALID_MSG_ID)) == DS_INDEX_NONE)
else if (UnusedIndex == DS_INDEX_NONE)
{
/*
** Packet filter table has no unused entries...
Expand All @@ -1305,7 +1313,7 @@ CFE_Status_t DS_AddMidCmd(const DS_AddMidCmd_t *BufPtr)
/*
** Initialize unused packet filter entry for new message ID...
*/
pPacketEntry = &DS_AppData.FilterTblPtr->Packet[FilterTableIndex];
pPacketEntry = &DS_AppData.FilterTblPtr->Packet[UnusedIndex];

pPacketEntry->MessageID = PayloadPtr->MessageID;

Expand Down Expand Up @@ -1337,7 +1345,7 @@ CFE_Status_t DS_AddMidCmd(const DS_AddMidCmd_t *BufPtr)
CFE_EVS_EventType_INFORMATION,
"ADD MID command: MID = 0x%08lX, filter index = %d, hash index = %d",
(unsigned long)CFE_SB_MsgIdToValue(PayloadPtr->MessageID),
(int)FilterTableIndex,
(int)UnusedIndex,
(int)HashTableIndex);
}

Expand Down
Loading