[nasa/nos3#176] Unit Tests

fsw/inc/ds_extern_typedefs.h

@@ -84,9 +84,7 @@ typedef struct
  */
 typedef struct
 {
-#if (DS_MOVE_FILES == true)
     char Movename[DS_PATHNAME_BUFSIZE]; /**< \brief Move files to this dir after close */
-#endif
     char Pathname[DS_PATHNAME_BUFSIZE];   /**< \brief Path portion of filename */
     char Basename[DS_BASENAME_BUFSIZE];   /**< \brief Base portion of filename */
     char Extension[DS_EXTENSION_BUFSIZE]; /**< \brief Extension portion of filename */

fsw/inc/ds_msg.h

@@ -407,8 +407,6 @@ typedef struct
  */
 typedef struct
 {
-    CFE_MSG_CommandHeader_t CommandHeader; /**< \brief cFE Software Bus command message header */
-
     CFE_SB_MsgId_t MessageID; /**< \brief Message ID to add to Packet Filter Table */
 } DS_AddRemoveMid_Payload_t;
 

fsw/src/ds_app.c

@@ -184,6 +184,7 @@ CFE_Status_t DS_AppInitialize(void)
     memset(&DS_AppData, 0, sizeof(DS_AppData));
 
     DS_AppData.AppEnableState = DS_DEF_ENABLE_STATE;
+    DS_AppData.EnableMoveFiles = DS_MOVE_FILES;
 
     /*
     ** Mark files as closed
@@ -357,15 +358,15 @@ void DS_AppSendHkCmd(void)
         Status = CFE_TBL_GetInfo(&FilterTblInfo, FilterTblName);
         if (Status == CFE_SUCCESS)
         {
-            strncpy(PayloadPtr->FilterTblFilename, FilterTblInfo.LastFileLoaded, OS_MAX_PATH_LEN - 1);
-            PayloadPtr->FilterTblFilename[OS_MAX_PATH_LEN - 1] = '\0';
+            snprintf(PayloadPtr->FilterTblFilename, OS_MAX_PATH_LEN, "%s", FilterTblInfo.LastFileLoaded);
         }
         else
         {
             /* If the filter table name is invalid, send an event and erase any
              * stale/misleading filename from the HK packet */
             CFE_EVS_SendEvent(DS_APPHK_FILTER_TBL_ERR_EID, CFE_EVS_EventType_ERROR,
-                              "Invalid filter tbl name in DS_AppSendHkCmd. Name=%s, Err=0x%08X", FilterTblName, Status);
+                              "Invalid filter tbl name in DS_AppSendHkCmd. Name=%s, Err=0x%08X", FilterTblName,
+                              (unsigned int)Status);
 
             memset(PayloadPtr->FilterTblFilename, 0, sizeof(PayloadPtr->FilterTblFilename));
         }

fsw/src/ds_app.h

@@ -104,6 +104,8 @@ typedef struct
 
     DS_HashLink_t  HashLinks[DS_PACKETS_IN_FILTER_TABLE]; /**< \brief Hash table linked list elements */
     DS_HashLink_t *HashTable[DS_HASH_TABLE_ENTRIES];      /**< \brief Each hash table entry is a linked list */
+
+    uint8 EnableMoveFiles; /**< \brief Whether to move files to downlink directory after close */
 } DS_AppData_t;
 
 /** \brief DS global data structure reference */

fsw/src/ds_appdefs.h

@@ -43,7 +43,7 @@
 
 #define DS_PATH_SEPARATOR '/' /**< \brief File system path separator */
 
-#define DS_TABLE_VERIFY_ERR 0xFFFFFFFF /**< \brief Table verification error return value */
+#define DS_TABLE_VERIFY_ERR -1 /**< \brief Table verification error return value */
 
 #define DS_FILE_HEADER_NONE 0 /**< \brief File header type is NONE */
 #define DS_FILE_HEADER_CFE  1 /**< \brief File header type is CFE */

fsw/src/ds_cmds.c

@@ -962,11 +962,11 @@ void DS_SetDestCountCmd(const CFE_SB_Buffer_t *BufPtr)
 
 void DS_CloseFileCmd(const CFE_SB_Buffer_t *BufPtr)
 {
-    const DS_CloseFile_Payload_t *DS_CloseFileCmd;
+    const DS_CloseFile_Payload_t *PayloadPtr;
 
-    DS_CloseFileCmd = DS_GET_CMD_PAYLOAD(BufPtr, DS_CloseFileCmd_t);
+    PayloadPtr = DS_GET_CMD_PAYLOAD(BufPtr, DS_CloseFileCmd_t);
 
-    if (DS_TableVerifyFileIndex(DS_CloseFileCmd->FileTableIndex) == false)
+    if (DS_TableVerifyFileIndex(PayloadPtr->FileTableIndex) == false)
     {
         /*
         ** Invalid destination file table index...
@@ -975,23 +975,23 @@ void DS_CloseFileCmd(const CFE_SB_Buffer_t *BufPtr)
 
         CFE_EVS_SendEvent(DS_CLOSE_CMD_ERR_EID, CFE_EVS_EventType_ERROR,
                           "Invalid DEST CLOSE command arg: file table index = %d",
-                          (int)DS_CloseFileCmd->FileTableIndex);
+                          (int)PayloadPtr->FileTableIndex);
     }
     else
     {
         /*
         ** Close destination file (if the file was open)...
         */
-        if (OS_ObjectIdDefined(DS_AppData.FileStatus[DS_CloseFileCmd->FileTableIndex].FileHandle))
+        if (OS_ObjectIdDefined(DS_AppData.FileStatus[PayloadPtr->FileTableIndex].FileHandle))
         {
-            DS_FileUpdateHeader(DS_CloseFileCmd->FileTableIndex);
-            DS_FileCloseDest(DS_CloseFileCmd->FileTableIndex);
+            DS_FileUpdateHeader(PayloadPtr->FileTableIndex);
+            DS_FileCloseDest(PayloadPtr->FileTableIndex);
         }
 
         DS_AppData.CmdAcceptedCounter++;
 
         CFE_EVS_SendEvent(DS_CLOSE_CMD_EID, CFE_EVS_EventType_INFORMATION, "DEST CLOSE command: file table index = %d",
-                          (int)DS_CloseFileCmd->FileTableIndex);
+                          (int)PayloadPtr->FileTableIndex);
     }
 }
 
@@ -1096,7 +1096,7 @@ void DS_GetFileInfoCmd(const CFE_SB_Buffer_t *BufPtr)
             /*
             ** Set current open filename...
             */
-            strncpy(FileInfoPtr->FileName, DS_AppData.FileStatus[i].FileName, sizeof(FileInfoPtr->FileName));
+            snprintf(FileInfoPtr->FileName, sizeof(FileInfoPtr->FileName), "%s", DS_AppData.FileStatus[i].FileName);
         }
     }
 
@@ -1115,16 +1115,16 @@ void DS_GetFileInfoCmd(const CFE_SB_Buffer_t *BufPtr)
 
 void DS_AddMIDCmd(const CFE_SB_Buffer_t *BufPtr)
 {
-    const DS_AddRemoveMid_Payload_t *DS_AddMidCmd;
+    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_AddMidCmd = DS_GET_CMD_PAYLOAD(BufPtr, DS_AddMidCmd_t);
+    PayloadPtr = DS_GET_CMD_PAYLOAD(BufPtr, DS_AddMidCmd_t);
 
-    if (!CFE_SB_IsValidMsgId(DS_AddMidCmd->MessageID))
+    if (!CFE_SB_IsValidMsgId(PayloadPtr->MessageID))
     {
         /*
         ** Invalid packet message ID - can be anything but unused...
@@ -1133,7 +1133,7 @@ void DS_AddMIDCmd(const CFE_SB_Buffer_t *BufPtr)
 
         CFE_EVS_SendEvent(DS_ADD_MID_CMD_ERR_EID, CFE_EVS_EventType_ERROR,
                           "Invalid ADD MID command arg: invalid MID = 0x%08lX",
-                          (unsigned long)CFE_SB_MsgIdToValue(DS_AddMidCmd->MessageID));
+                          (unsigned long)CFE_SB_MsgIdToValue(PayloadPtr->MessageID));
     }
     else if (DS_AppData.FilterTblPtr == (DS_FilterTable_t *)NULL)
     {
@@ -1145,7 +1145,7 @@ void DS_AddMIDCmd(const CFE_SB_Buffer_t *BufPtr)
         CFE_EVS_SendEvent(DS_ADD_MID_CMD_ERR_EID, CFE_EVS_EventType_ERROR,
                           "Invalid ADD MID command: filter table is not loaded");
     }
-    else if ((FilterTableIndex = DS_TableFindMsgID(DS_AddMidCmd->MessageID)) != DS_INDEX_NONE)
+    else if ((FilterTableIndex = DS_TableFindMsgID(PayloadPtr->MessageID)) != DS_INDEX_NONE)
     {
         /*
         ** New message ID is already in packet filter table...
@@ -1154,7 +1154,7 @@ void DS_AddMIDCmd(const CFE_SB_Buffer_t *BufPtr)
 
         CFE_EVS_SendEvent(DS_ADD_MID_CMD_ERR_EID, CFE_EVS_EventType_ERROR,
                           "Invalid ADD MID command: MID = 0x%08lX is already in filter table at index = %d",
-                          (unsigned long)CFE_SB_MsgIdToValue(DS_AddMidCmd->MessageID), (int)FilterTableIndex);
+                          (unsigned long)CFE_SB_MsgIdToValue(PayloadPtr->MessageID), (int)FilterTableIndex);
     }
     else if ((FilterTableIndex = DS_TableFindMsgID(CFE_SB_INVALID_MSG_ID)) == DS_INDEX_NONE)
     {
@@ -1173,10 +1173,10 @@ void DS_AddMIDCmd(const CFE_SB_Buffer_t *BufPtr)
         */
         pPacketEntry = &DS_AppData.FilterTblPtr->Packet[FilterTableIndex];
 
-        pPacketEntry->MessageID = DS_AddMidCmd->MessageID;
+        pPacketEntry->MessageID = PayloadPtr->MessageID;
 
         /* Add the message ID to the hash table as well */
-        HashTableIndex = DS_TableAddMsgID(DS_AddMidCmd->MessageID, FilterTableIndex);
+        HashTableIndex = DS_TableAddMsgID(PayloadPtr->MessageID, FilterTableIndex);
 
         for (i = 0; i < DS_FILTERS_PER_PACKET; i++)
         {
@@ -1190,7 +1190,7 @@ void DS_AddMIDCmd(const CFE_SB_Buffer_t *BufPtr)
             pFilterParms->Algorithm_O = 0;
         }
 
-        CFE_SB_SubscribeEx(DS_AddMidCmd->MessageID, DS_AppData.CmdPipe, CFE_SB_DEFAULT_QOS, DS_PER_PACKET_PIPE_LIMIT);
+        CFE_SB_SubscribeEx(PayloadPtr->MessageID, DS_AppData.CmdPipe, CFE_SB_DEFAULT_QOS, DS_PER_PACKET_PIPE_LIMIT);
         /*
         ** Notify cFE that we have modified the table data...
         */
@@ -1200,7 +1200,7 @@ void DS_AddMIDCmd(const CFE_SB_Buffer_t *BufPtr)
 
         CFE_EVS_SendEvent(DS_ADD_MID_CMD_EID, CFE_EVS_EventType_INFORMATION,
                           "ADD MID command: MID = 0x%08lX, filter index = %d, hash index = %d",
-                          (unsigned long)CFE_SB_MsgIdToValue(DS_AddMidCmd->MessageID), (int)FilterTableIndex,
+                          (unsigned long)CFE_SB_MsgIdToValue(PayloadPtr->MessageID), (int)FilterTableIndex,
                           (int)HashTableIndex);
     }
 }
@@ -1213,18 +1213,18 @@ void DS_AddMIDCmd(const CFE_SB_Buffer_t *BufPtr)
 
 void DS_RemoveMIDCmd(const CFE_SB_Buffer_t *BufPtr)
 {
-    const DS_AddRemoveMid_Payload_t *DS_RemoveMidCmd;
+    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_RemoveMidCmd  = DS_GET_CMD_PAYLOAD(BufPtr, DS_RemoveMidCmd_t);
-    FilterTableIndex = DS_TableFindMsgID(DS_RemoveMidCmd->MessageID);
+    PayloadPtr  = DS_GET_CMD_PAYLOAD(BufPtr, DS_RemoveMidCmd_t);
+    FilterTableIndex = DS_TableFindMsgID(PayloadPtr->MessageID);
 
-    if (!CFE_SB_IsValidMsgId(DS_RemoveMidCmd->MessageID))
+    if (!CFE_SB_IsValidMsgId(PayloadPtr->MessageID))
     {
         /*
         ** Invalid packet message ID - can be anything but unused...
@@ -1233,7 +1233,7 @@ void DS_RemoveMIDCmd(const CFE_SB_Buffer_t *BufPtr)
 
         CFE_EVS_SendEvent(DS_REMOVE_MID_CMD_ERR_EID, CFE_EVS_EventType_ERROR,
                           "Invalid REMOVE MID command arg: invalid MID = 0x%08lX",
-                          (unsigned long)CFE_SB_MsgIdToValue(DS_RemoveMidCmd->MessageID));
+                          (unsigned long)CFE_SB_MsgIdToValue(PayloadPtr->MessageID));
     }
     else if (DS_AppData.FilterTblPtr == (DS_FilterTable_t *)NULL)
     {
@@ -1254,12 +1254,12 @@ void DS_RemoveMIDCmd(const CFE_SB_Buffer_t *BufPtr)
 
         CFE_EVS_SendEvent(DS_REMOVE_MID_CMD_ERR_EID, CFE_EVS_EventType_ERROR,
                           "Invalid REMOVE MID command: MID = 0x%08lX is not in filter table",
-                          (unsigned long)CFE_SB_MsgIdToValue(DS_RemoveMidCmd->MessageID));
+                          (unsigned long)CFE_SB_MsgIdToValue(PayloadPtr->MessageID));
     }
     else
     {
         /* Convert MID into hash table index */
-        HashTableIndex = DS_TableHashFunction(DS_RemoveMidCmd->MessageID);
+        HashTableIndex = DS_TableHashFunction(PayloadPtr->MessageID);
 
         /*
         ** Reset used packet filter entry for used message ID...
@@ -1283,7 +1283,7 @@ void DS_RemoveMIDCmd(const CFE_SB_Buffer_t *BufPtr)
             pFilterParms->Algorithm_O = 0;
         }
 
-        CFE_SB_Unsubscribe(DS_RemoveMidCmd->MessageID, DS_AppData.CmdPipe);
+        CFE_SB_Unsubscribe(PayloadPtr->MessageID, DS_AppData.CmdPipe);
 
         /*
         ** Notify cFE that we have modified the table data...
@@ -1294,7 +1294,7 @@ void DS_RemoveMIDCmd(const CFE_SB_Buffer_t *BufPtr)
 
         CFE_EVS_SendEvent(DS_REMOVE_MID_CMD_EID, CFE_EVS_EventType_INFORMATION,
                           "REMOVE MID command: MID = 0x%08lX, filter index = %d, hash index = %d",
-                          (unsigned long)CFE_SB_MsgIdToValue(DS_RemoveMidCmd->MessageID), (int)FilterTableIndex,
+                          (unsigned long)CFE_SB_MsgIdToValue(PayloadPtr->MessageID), (int)FilterTableIndex,
                           (int)HashTableIndex);
     }
 }