commit a5ed6585c102e0cb502080f4265ace9ad1bbbdcf
author Tom Joseph <rushtotom@gmail.com> Thu Jun 17 22:08:47 2021 -0700
committer Tom Joseph <rushtotom@gmail.com> Tue Jun 22 01:58:19 2021 +0000
tree aa0653d046c503c6788a066b37b82202c07da015
parent ea72f240bbb734b0faa8f9b29056eca5a163c1de

requester: Enhance the PLDM requester code

- Free the instance id on error paths
- Make the conditional checks consistent
- Make the unit tests robust

Signed-off-by: Tom Joseph <rushtotom@gmail.com>
Change-Id: Ieb70da2820ab818c36f5bf874a602fb090659836

requester/handler.hpp

diff --git a/requester/handler.hpp b/requester/handler.hpp
index 2082f69..319cb8e 100644
--- a/requester/handler.hpp
+++ b/requester/handler.hpp
@@ -171,8 +171,9 @@
             event.get(), instanceIdExpiryCallBack);
 
         auto rc = request->start();
-        if (rc != PLDM_SUCCESS)
+        if (rc)
         {
+            requester.markFree(eid, instanceId);
             std::cerr << "Failure to send the PLDM request message"
                       << "\n";
             return rc;
@@ -184,6 +185,7 @@
         }
         catch (const std::runtime_error& e)
         {
+            requester.markFree(eid, instanceId);
             std::cerr << "Failed to start the instance ID expiry timer. RC = "
                       << e.what() << "\n";
             return PLDM_ERROR;