Merge pull request nasa#898 from jphickey/fix-897-evs-unreg-appid

Fix nasa#897, EVS unregistered AppID
jphickey · Oct 1, 2020 · 5a64dd7 · 5a64dd7
2 parents 8a7dc8f + 02b3a54
commit 5a64dd7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/fsw/cfe-core/src/evs/cfe_evs_task.h b/fsw/cfe-core/src/evs/cfe_evs_task.h
@@ -89,6 +89,8 @@ typedef struct
 typedef struct
 {
     CFE_ES_ResourceID_t AppID;
+    CFE_ES_ResourceID_t UnregAppID;
+
     EVS_BinFilter_t    BinFilters[CFE_PLATFORM_EVS_MAX_EVENT_FILTERS];  /* Array of binary filters */
 
     uint8              ActiveFlag;             /* Application event service active flag */

diff --git a/fsw/cfe-core/src/evs/cfe_evs_utils.c b/fsw/cfe-core/src/evs/cfe_evs_utils.c
@@ -185,13 +185,13 @@ int32 EVS_NotRegistered (EVS_AppData_t *AppDataPtr, CFE_ES_ResourceID_t CallerID
    char AppName[OS_MAX_API_NAME];
 
    /* Send only one "not registered" event per application */
-   if (AppDataPtr->EventCount == 0) 
+   if ( !CFE_ES_ResourceID_Equal(AppDataPtr->UnregAppID, CallerID) )
    { 
       /* Increment count of "not registered" applications */
       CFE_EVS_GlobalData.EVS_TlmPkt.Payload.UnregisteredAppCounter++;
 
       /* Indicate that "not registered" event has been sent for this app */
-      AppDataPtr->EventCount++;
+      AppDataPtr->UnregAppID = CallerID;
 
       /* Get the name of the "not registered" app */
       CFE_ES_GetAppName(AppName, CallerID, OS_MAX_API_NAME);