Fix #229, Check return values for CFE_SB_Subscribe for TO_LAB_CMD_MID and TO_LAB_SEND_HK_MID in TO_LAB_init() in fsw/src/to_lab_app.c

Author: myc-yang

fsw/src/to_lab_app.c

@@ -38,6 +38,11 @@
 */
 TO_LAB_GlobalData_t TO_LAB_Global;
 
+/*
+** TO Local Function Prototypes
+*/
+CFE_Status_t TO_LAB_CmdSubscribe(CFE_SB_MsgId_Atom_t MsgIdValue);
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /*                                                                   */
 /* TO_LAB_AppMain() -- Application entry point and main process loop */
@@ -111,6 +116,8 @@ void TO_LAB_delete_callback(void)
 CFE_Status_t TO_LAB_init(void)
 {
     CFE_Status_t status;
+    CFE_Status_t status_cmd_subscribe;
+    CFE_Status_t status_send_hk_subscribe;
     char         PipeName[16];
     uint16       PipeDepth;
     char         ToTlmPipeName[16];
@@ -208,18 +215,25 @@ CFE_Status_t TO_LAB_init(void)
 
     if (status == CFE_SUCCESS)
     {
-        CFE_SB_Subscribe(CFE_SB_ValueToMsgId(TO_LAB_CMD_MID), TO_LAB_Global.Cmd_pipe);
-        CFE_SB_Subscribe(CFE_SB_ValueToMsgId(TO_LAB_SEND_HK_MID), TO_LAB_Global.Cmd_pipe);
+        status_cmd_subscribe     = TO_LAB_CmdSubscribe(TO_LAB_CMD_MID);
+        status_send_hk_subscribe = TO_LAB_CmdSubscribe(TO_LAB_SEND_HK_MID);
 
-        /* Create TO TLM pipe */
-        status = CFE_SB_CreatePipe(&TO_LAB_Global.Tlm_pipe, ToTlmPipeDepth, ToTlmPipeName);
-        if (status != CFE_SUCCESS)
+        if (status_cmd_subscribe >= CFE_SUCCESS && status_send_hk_subscribe >= CFE_SUCCESS)
         {
-            CFE_EVS_SendEvent(TO_LAB_TLMPIPE_ERR_EID,
-                              CFE_EVS_EventType_ERROR,
-                              "L%d TO Can't create Tlm pipe status %i",
-                              __LINE__,
-                              (int)status);
+            /* Create TO TLM pipe */
+            status = CFE_SB_CreatePipe(&TO_LAB_Global.Tlm_pipe, ToTlmPipeDepth, ToTlmPipeName);
+            if (status != CFE_SUCCESS)
+            {
+                CFE_EVS_SendEvent(TO_LAB_TLMPIPE_ERR_EID,
+                                  CFE_EVS_EventType_ERROR,
+                                  "L%d TO Can't create Tlm pipe status %i",
+                                  __LINE__,
+                                  (int)status);
+            }
+        }
+        else
+        {
+            status = (CFE_SUCCESS - 1);
         }
     }
 
@@ -246,6 +260,30 @@ CFE_Status_t TO_LAB_init(void)
     return status;
 }
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/*                                                                 */
+/* TO_LAB_CmdSubscribe() -- Subscribes to command message          */
+/*                                                                 */
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+CFE_Status_t TO_LAB_CmdSubscribe(CFE_SB_MsgId_Atom_t MsgIdValue)
+{
+    CFE_Status_t status;
+    status = CFE_SB_Subscribe(CFE_SB_ValueToMsgId(MsgIdValue), TO_LAB_Global.Cmd_pipe);
+
+    if (status != CFE_SUCCESS)
+    {
+        (void)CFE_EVS_SendEvent(TO_LAB_SUBSCRIBE_ERR_EID,
+                                CFE_EVS_EventType_ERROR,
+                                "L%d TO Can't subscribe to stream 0x%x status %i",
+                                __LINE__,
+                                (unsigned int)MsgIdValue,
+                                (int)status);
+    }
+
+    return status;
+}
+
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /*                                                                 */
 /* TO_LAB_process_commands() -- Process command pipe message       */