[diag] Handle errors of TransmitPacket()

`TransmitPacket()` should return an error from platform Radio implementation, as for example Radio can be in incorrect state. If error occurs, output it onto console. Signed-off-by: Maciej Baczmanski <[email protected]>
maciejbaczmanski · Dec 20, 2024 · 2910524 · 2910524
1 parent 143ebbf
commit 2910524
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/src/core/diags/factory_diags.cpp b/src/core/diags/factory_diags.cpp
@@ -457,9 +457,9 @@ Error Diags::ProcessSend(uint8_t aArgsLength, char *aArgs[])
     VerifyOrExit(txLength >= OT_RADIO_FRAME_MIN_SIZE, error = kErrorInvalidArgs);
     mTxLen = txLength;
 
-    Output("sending %#x packet(s), length %#x\r\n", static_cast<int>(mTxPackets), static_cast<int>(mTxLen));
-    TransmitPacket();
+    SuccessOrExit(error = TransmitPacket());
 
+    Output("sending %#x packet(s), length %#x\r\n", static_cast<int>(mTxPackets), static_cast<int>(mTxLen));
 exit:
     return error;
 }
@@ -537,7 +537,7 @@ Error Diags::ProcessStop(uint8_t aArgsLength, char *aArgs[])
     return kErrorNone;
 }
 
-void Diags::TransmitPacket(void)
+Error Diags::TransmitPacket(void)
 {
     mTxPacket->mChannel = mChannel;
 
@@ -559,7 +559,7 @@ void Diags::TransmitPacket(void)
     }
 
     mDiagSendOn = true;
-    IgnoreError(Get<Radio>().Transmit(*static_cast<Mac::TxFrame *>(mTxPacket)));
+    return Get<Radio>().Transmit(*static_cast<Mac::TxFrame *>(mTxPacket));
 }
 
 Error Diags::ParseReceiveConfigFormat(const char *aFormat, ReceiveConfig &aConfig)
@@ -758,7 +758,11 @@ void Diags::AlarmFired(void)
     {
         uint32_t now = otPlatAlarmMilliGetNow();
 
-        TransmitPacket();
+        Error error = TransmitPacket();
+        if (error != kErrorNone)
+        {
+            Output("Packet transmission failed\r\ntatus %#x\r\n", error);
+        }
         otPlatAlarmMilliStartAt(&GetInstance(), now, mTxPeriod);
     }
     else
@@ -841,6 +845,8 @@ void Diags::ReceiveDone(otRadioFrame *aFrame, Error aError)
 
 void Diags::TransmitDone(Error aError)
 {
+    Error error;
+
     VerifyOrExit(mDiagSendOn);
     mDiagSendOn = false;
 
@@ -859,7 +865,11 @@ void Diags::TransmitDone(Error aError)
     }
 
     VerifyOrExit(!mRepeatActive);
-    TransmitPacket();
+    error = TransmitPacket();
+    if (error != kErrorNone)
+    {
+        Output("Packet transmission failed\r\ntatus %#x\r\n", error);
+    }
 
 exit:
     return;

diff --git a/src/core/diags/factory_diags.hpp b/src/core/diags/factory_diags.hpp
@@ -231,7 +231,7 @@ class Diags : public InstanceLocator, private NonCopyable
     void  OutputReceivedFrame(const otRadioFrame *aFrame);
     bool  ShouldHandleReceivedFrame(const otRadioFrame &aFrame) const;
 
-    void TransmitPacket(void);
+    Error TransmitPacket(void);
     void Output(const char *aFormat, ...);
     void AppendErrorResult(Error aError);
     void ResetTxPacket(void);