linux/ipcore/PapbVcInterface.cpp

@@ -30,6 +30,7 @@ ReturnValue_t PapbVcInterface::initialize() {
 ReturnValue_t PapbVcInterface::write(const uint8_t* data, size_t size, size_t& writtenSize) {
   // There are no packets smaller than 4, this is considered a configuration error.
   if (size < 4) {
+    sif::warning << "PapbVcInterface::write: Passed packet smaller than 4 bytes" << std::endl;
     return returnvalue::FAILED;
   }
   // The user must call advance until completion before starting a new packet transfer.

mission/com/LiveTmTask.cpp

@@ -54,8 +54,13 @@ ReturnValue_t LiveTmTask::performOperation(uint8_t opCode) {
           }
         }
       } else if (result != MessageQueueIF::EMPTY) {
-        sif::warning << "LiveTmTask: TM queue failure, returncode 0x" << std::hex << std::setw(4)
-                     << result << std::dec << std::endl;
+        const char* contextStr = "Regular TM queue";
+        if (isCfdp) {
+          contextStr = "CFDP TM queue";
+        }
+        sif::warning << "LiveTmTask: " << contextStr << " handling failure, returncode 0x"
+                     << std::setfill('0') << std::hex << std::setw(4) << result << std::dec
+                     << std::endl;
       }
     }