commit 9915d02238290f8d27dc70552880946636074633
author George Liu <liuxiwei@inspur.com> Tue Dec 21 14:04:31 2021 +0800
committer George Liu <liuxiwei@inspur.com> Tue Jan 18 06:14:21 2022 +0000
tree 4c2091361cf347396f1ebe89b974aa05d1fe5868
parent 2b7c1bfd342a388f67951632b5be00d99f33bfc2

softoff: Check the return value of the HOST

When BMC sends `set_state_effecter_states` command, only when HOST
responds successfully(PLDM_SUCCESS), it will continue to wait for the
HOST to do the preparatory work before shutdown, otherwise it will
directly exit the softoff daemon.

Signed-off-by: George Liu <liuxiwei@inspur.com>
Change-Id: Idfd5e50cf3372c89fbc48d8f1ad67a2c3b800352

softoff/softoff.cpp

diff --git a/softoff/softoff.cpp b/softoff/softoff.cpp
index ffc81c8..8ef0729 100644
--- a/softoff/softoff.cpp
+++ b/softoff/softoff.cpp
@@ -55,8 +55,7 @@
     rc = getSensorInfo();
     if (rc != PLDM_SUCCESS)
     {
-        std::cerr << "Message get Sensor PDRs error. PLDM "
-                     "error code = "
+        std::cerr << "Message get Sensor PDRs error. PLDM error code = "
                   << std::hex << std::showbase << rc << "\n";
         hasError = true;
         return;
@@ -351,9 +350,9 @@
                                    Timer::TimePoint /*time*/) {
         if (!responseReceived)
         {
-            std::cerr << "PLDM soft off: ERROR! Can't get the response for the "
-                         "PLDM request msg. Time out!\n"
-                      << "Exit the pldm-softpoweroff\n";
+            std::cerr
+                << "PLDM soft off: ERROR! Can't get the response for the PLDM request msg. Time out!\n"
+                << "Exit the pldm-softpoweroff\n";
             exit(-1);
         }
         return;
@@ -375,6 +374,8 @@
                             &responseMsgSize);
         if (rc)
         {
+            std::cerr << "Soft off: failed to recv pldm data. PLDM RC = " << rc
+                      << "\n";
             return;
         }
 
@@ -385,9 +386,12 @@
         // sent out
         io.set_enabled(Enabled::Off);
         auto response = reinterpret_cast<pldm_msg*>(responseMsgPtr.get());
-        std::cerr << "Getting the response. PLDM RC = " << std::hex
-                  << std::showbase
-                  << static_cast<uint16_t>(response->payload[0]) << "\n";
+        if (response->payload[0] != PLDM_SUCCESS)
+        {
+            std::cerr << "Getting the wrong response. PLDM RC = "
+                      << (unsigned)response->payload[0] << "\n";
+            exit(-1);
+        }
 
         responseReceived = true;
 
@@ -405,9 +409,9 @@
         }
         else
         {
-            std::cerr << "Timer started waiting for host soft off, "
-                         "TIMEOUT_IN_SEC = "
-                      << SOFTOFF_TIMEOUT_SECONDS << "\n";
+            std::cerr
+                << "Timer started waiting for host soft off, TIMEOUT_IN_SEC = "
+                << SOFTOFF_TIMEOUT_SECONDS << "\n";
         }
         return;
     };