Skip to content
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

Fix #923, Perform appid lookup early #925

Merged
merged 2 commits into from
Oct 1, 2020
Merged

Fix #923, Perform appid lookup early #925

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a7dc8f
Merge pull request #916 from nasa/integration-candidate
yammajamma Sep 29, 2020
a4ffe5b
Fix #923, Perform appid lookup early
jphickey Sep 30, 2020
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
16 changes: 7 additions & 9 deletions fsw/cfe-core/src/sb/cfe_sb_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1197,6 +1197,7 @@ int32 CFE_SB_SendMsgFull(CFE_SB_Msg_t *MsgPtr,
CFE_SB_BufferD_t *BufDscPtr;
uint16 TotalMsgSize;
CFE_SB_MsgRouteIdx_t RtgTblIdx;
CFE_ES_ResourceID_t AppId;
CFE_ES_ResourceID_t TskId;
uint32 i;
char FullName[(OS_MAX_API_NAME * 2)];
Expand All @@ -1205,6 +1206,9 @@ int32 CFE_SB_SendMsgFull(CFE_SB_Msg_t *MsgPtr,

SBSndErr.EvtsToSnd = 0;

/* get app id for loopback testing */
CFE_ES_GetAppID(&AppId);

/* get task id for events and Sender Info*/
CFE_ES_GetTaskID(&TskId);

Expand Down Expand Up @@ -1356,16 +1360,10 @@ int32 CFE_SB_SendMsgFull(CFE_SB_Msg_t *MsgPtr,

PipeDscPtr = &CFE_SB.PipeTbl[DestPtr->PipeId];

if(PipeDscPtr->Opts & CFE_SB_PIPEOPTS_IGNOREMINE)
if((PipeDscPtr->Opts & CFE_SB_PIPEOPTS_IGNOREMINE) != 0 &&
CFE_ES_ResourceID_Equal(PipeDscPtr->AppId, AppId))
{
CFE_ES_ResourceID_t AppId;

CFE_ES_GetAppID(&AppId);

if( CFE_ES_ResourceID_Equal(PipeDscPtr->AppId, AppId) )
{
continue;
}
continue;
}/* end if */

/* if Msg limit exceeded, log event, increment counter */
Expand Down