Update CRC

Author: Brian-Campuzano

Svc/Ccsds/CfdpManager/cf_cfdp.cpp

@@ -449,7 +449,7 @@ CFE_Status_t CF_CFDP_SendEof(CF_Transaction_t *txn)
         eof = &ph->int_header.eof;
 
         eof->cc   = CF_TxnStatus_To_ConditionCode(txn->history->txn_stat);
-        eof->crc  = txn->crc.result;
+        eof->crc  = txn->crc.getValue();
         eof->size = txn->fsize;
 
         if (eof->cc != CF_CFDP_ConditionCode_NO_ERROR)
@@ -1894,7 +1894,7 @@ void CF_CFDP_SendEotPkt(CF_Transaction_t *txn)
         EotPktPtr->Payload.peer_eid   = txn->history->peer_eid;
         EotPktPtr->Payload.seq_num    = txn->history->seq_num;
         EotPktPtr->Payload.fsize      = txn->fsize;
-        EotPktPtr->Payload.crc_result = txn->crc.result;
+        EotPktPtr->Payload.crc_result = txn->crc.getValue();
 
         /*
         ** Timestamp and send eod of transaction telemetry

Svc/Ccsds/CfdpManager/cf_cfdp_r.cpp

@@ -87,13 +87,20 @@ void CF_CFDP_R2_Reset(CF_Transaction_t *txn)
 CFE_Status_t CF_CFDP_R_CheckCrc(CF_Transaction_t *txn, U32 expected_crc)
 {
     CFE_Status_t ret = CFE_SUCCESS;
-    CF_CRC_Finalize(&txn->crc);
-    if (txn->crc.result != expected_crc)
+    U32 crc_result;
+
+    // The F' version does not have an equivelent finalize call as it
+    // - Never stores a partial word internally
+    // - Never needs to "flush" anything
+    // - Always accounts for padding at update time
+    // CF_CRC_Finalize(&txn->crc);
+    crc_result = txn->crc.getValue();
+    if (crc_result != expected_crc)
     {
         CFE_EVS_SendEvent(CF_CFDP_R_CRC_ERR_EID, CFE_EVS_EventType_ERROR,
                           "CF R%d(%lu:%lu): CRC mismatch for R trans. got 0x%08lx expected 0x%08lx",
                           (txn->state == CF_TxnState_R2), (unsigned long)txn->history->src_eid,
-                          (unsigned long)txn->history->seq_num, (unsigned long)txn->crc.result,
+                          (unsigned long)txn->history->seq_num, (unsigned long)crc_result,
                           (unsigned long)expected_crc);
         ++CF_AppData.hk.Payload.channel_hk[txn->chan_num].counters.fault.crc_mismatch;
         ret = CF_ERROR;
@@ -386,7 +393,7 @@ void CF_CFDP_R1_SubstateRecvFileData(CF_Transaction_t *txn, CF_Logical_PduBuffer
     if (ret == CFE_SUCCESS)
     {
         /* class 1 digests CRC */
-        CF_CRC_Digest(&txn->crc, ph->int_header.fd.data_ptr, ph->int_header.fd.data_len);
+        txn->crc.update(ph->int_header.fd.data_ptr, ph->int_header.fd.offset, ph->int_header.fd.data_len);
     }
     else
     {
@@ -631,7 +638,7 @@ CFE_Status_t CF_CFDP_R2_CalcCrcChunk(CF_Transaction_t *txn)
 
     if (txn->state_data.receive.r2.rx_crc_calc_bytes == 0)
     {
-        CF_CRC_Start(&txn->crc);
+        txn->crc = CFDP::Checksum(0);
     }
 
     while ((count_bytes < CF_AppData.config_table->rx_crc_calc_bytes_per_wakeup) &&
@@ -677,7 +684,7 @@ CFE_Status_t CF_CFDP_R2_CalcCrcChunk(CF_Transaction_t *txn)
             break;
         }
 
-        CF_CRC_Digest(&txn->crc, buf, read_size);
+        txn->crc.update(buf, txn->state_data.receive.r2.rx_crc_calc_bytes, read_size);
         txn->state_data.receive.r2.rx_crc_calc_bytes += read_size;
         txn->state_data.receive.cached_pos = txn->state_data.receive.r2.rx_crc_calc_bytes;
         count_bytes += read_size;

Svc/Ccsds/CfdpManager/cf_cfdp_s.cpp

@@ -46,7 +46,11 @@ CFE_Status_t CF_CFDP_S_SendEof(CF_Transaction_t *txn)
     /* this is OK as we still need to put some value into the EOF */
     if (!txn->flags.com.crc_calc)
     {
-        CF_CRC_Finalize(&txn->crc);
+        // The F' version does not have an equivelent finalize call as it
+        // - Never stores a partial word internally
+        // - Never needs to "flush" anything
+        // - Always accounts for padding at update time
+        // CF_CRC_Finalize(&txn->crc);
         txn->flags.com.crc_calc = true;
     }
     return CF_CFDP_SendEof(txn);
@@ -189,7 +193,7 @@ CFE_Status_t CF_CFDP_S_SendFileData(CF_Transaction_t *txn, U32 foffs, U32 bytes_
             FW_ASSERT((foffs + actual_bytes) <= txn->fsize, foffs, actual_bytes, txn->fsize); /* sanity check */
             if (calc_crc)
             {
-                CF_CRC_Digest(&txn->crc, fd->data_ptr, fd->data_len);
+                txn->crc.update(fd->data_ptr, fd->offset, fd->data_len);
             }
 
             ret = actual_bytes;
@@ -409,8 +413,7 @@ void CF_CFDP_S_SubstateSendMetadata(CF_Transaction_t *txn)
         CF_CFDP_FinishTransaction(txn, true);
     }
 
-    /* don't need CF_CRC_Start() since taken care of by reset_cfdp() */
-    /*CF_CRC_Start(&txn->crc);*/
+    /* don't need to reset the CRC since its taken care of by reset_cfdp() */
 }
 
 /*----------------------------------------------------------------

Svc/Ccsds/CfdpManager/cf_cfdp_types.hpp

@@ -37,6 +37,8 @@
 #include "cf_codec.hpp"
 #include "CfdpTimer.hpp"
 
+#include <CFDP/Checksum/Checksum.hpp>
+#include <Os/File.hpp>
 #include <Os/Directory.hpp>
 
 namespace Svc {
@@ -352,7 +354,7 @@ typedef struct CF_Transaction
     U32    foffs; /**< \brief offset into file for next read */
     Os::FileHandle fd;
 
-    CF_Crc_t crc;
+    CFDP::Checksum crc;
 
     U8 keep;
     U8 chan_num; /**< \brief if ever more than one engine, this may need to change to pointer */