commit c6162fb649a850e129d760f59369c8adf46d070f
author Tom Joseph <tomjoseph@in.ibm.com> Thu Jan 25 01:55:20 2018 +0530
committer Tom Joseph <tomjoseph@in.ibm.com> Wed Jan 31 09:44:39 2018 +0000
tree 20cdc293461f87a449f0f8ed6f53dba4a75e4a63
parent e29be41f1d014a55e93abd3e55ac23f158f5fa16

sensor: Modify the Get sensor reading command

a) Scanning is enabled for all sensors, otherwise ipmitool would
   report the sensors as disabled.
b) Correct the error handling scenario which will occur when the
   D-Bus object is not present or error occurs when reading the D-Bus
   property.

Change-Id: I49535663a242305ab02a67f8f5998647cfee7eee
Signed-off-by: Tom Joseph <tomjoseph@in.ibm.com>

sensorhandler.cpp

diff --git a/sensorhandler.cpp b/sensorhandler.cpp
index 8877bb3..e6320be 100644
--- a/sensorhandler.cpp
+++ b/sensorhandler.cpp
@@ -489,6 +489,8 @@
     sd_bus_message *reply = NULL;
     int reading = 0;
     char* assertion = NULL;
+    ipmi::sensor::GetSensorResponse getResponse {};
+    static constexpr auto scanningEnabledBit = 6;
 
     printf("IPMI GET_SENSOR_READING [0x%02x]\n",reqptr->sennum);
 
@@ -622,7 +624,7 @@
 
             resp->value = static_cast<uint8_t>(
                     (raw_value - sensor.scaledOffset) / sensor.coefficientM);
-            resp->operation = 1<<6; // scanning enabled
+            resp->operation = 1 << scanningEnabledBit; // scanning enabled
             resp->indication[0] = 0; // not a threshold sensor. ignore
             resp->indication[1] = 0;
             rc = IPMI_CC_OK;
@@ -638,22 +640,23 @@
 
             try
             {
-                auto getResponse =  iter->second.getFunc(iter->second);
+                getResponse =  iter->second.getFunc(iter->second);
                 *data_len = getResponse.size();
                 memcpy(resp, getResponse.data(), *data_len);
+                resp->operation = 1 << scanningEnabledBit;
                 return IPMI_CC_OK;
             }
             catch (InternalFailure& e)
             {
-                 log<level::ERR>("Get sensor failed",
-                                 entry("SENSOR_NUM=%d", reqptr->sennum));
-                 commit<InternalFailure>();
-                 return IPMI_CC_SENSOR_INVALID;
+                *data_len = getResponse.size();
+                memcpy(resp, getResponse.data(), *data_len);
+                return IPMI_CC_OK;
             }
             catch (const std::runtime_error& e)
             {
-                log<level::ERR>(e.what());
-                return IPMI_CC_SENSOR_INVALID;
+                *data_len = getResponse.size();
+                memcpy(resp, getResponse.data(), *data_len);
+                return IPMI_CC_OK;
             }
         }
     }