commit b69209b498bf9b1c009c528e40280d13e68f8dbd
author William A. Kennington III <wak@google.com> Tue Jul 13 13:22:24 2021 -0700
committer William A. Kennington III <wak@google.com> Mon Jul 26 13:56:39 2021 -0700
tree 46b2d6488050a03048675b1d9c1535215586c674
parent 8d3d46a2746c03657a6406ec2a2dcd576e40626f

eth: Support looking up alternate interace channels

This makes it possible to use the GetEthDevice command to look up
interfaces other than the default NCSI interface.

Change-Id: I3a5563743a28b39adc753d8957f68f0bc330cf3a
Signed-off-by: William A. Kennington III <wak@google.com>

eth.cpp

diff --git a/eth.cpp b/eth.cpp
index 127309a..0c85d28 100644
--- a/eth.cpp
+++ b/eth.cpp
@@ -40,8 +40,8 @@
 #define MAX_IPMI_BUFFER 64
 #endif
 
-ipmi_ret_t getEthDevice(const uint8_t*, uint8_t* replyBuf, size_t* dataLen,
-                        const HandlerInterface* handler)
+ipmi_ret_t getEthDevice(const uint8_t* reqBuf, uint8_t* replyBuf,
+                        size_t* dataLen, const HandlerInterface* handler)
 {
     if ((*dataLen) < sizeof(struct EthDeviceRequest))
     {
@@ -49,8 +49,11 @@
                      static_cast<uint32_t>(*dataLen));
         return IPMI_CC_REQ_DATA_LEN_INVALID;
     }
+    reqBuf += sizeof(struct EthDeviceRequest);
+    *dataLen -= sizeof(struct EthDeviceRequest);
 
-    std::tuple<std::uint8_t, std::string> details = handler->getEthDetails();
+    std::tuple<std::uint8_t, std::string> details = handler->getEthDetails(
+        std::string(reinterpret_cast<const char*>(reqBuf), *dataLen));
 
     std::string device = std::get<1>(details);
     if (device.length() == 0)