commit 39f94ef8f2a49709b2743a444acd36ea2d871fe3
author William A. Kennington III <wak@google.com> Mon Nov 19 22:36:16 2018 -0800
committer Vernon Mauery <vernon.mauery@linux.intel.com> Mon Nov 26 16:45:01 2018 +0000
tree 2b6700f486c1d9cc2e06642d4ed59dd3a67a1106
parent 7a3479eefe373b5d122876173bbaf6aad7424a52

transporthandler: Use switch when applicable

Tested:
    Build and run through unit tests.

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

transporthandler.cpp

diff --git a/transporthandler.cpp b/transporthandler.cpp
index 39b1c9f..c6a4031 100644
--- a/transporthandler.cpp
+++ b/transporthandler.cpp
@@ -585,98 +585,111 @@
     }
     auto channelConf = getChannelConfig(channel);
 
-    if (reqptr->parameter == LAN_PARM_INPROGRESS)
+    switch (reqptr->parameter)
     {
-        uint8_t buf[] = {current_revision, channelConf->lan_set_in_progress};
-        *data_len = sizeof(buf);
-        std::memcpy(response, &buf, *data_len);
-    }
-    else if (reqptr->parameter == LAN_PARM_AUTHSUPPORT)
-    {
-        uint8_t buf[] = {current_revision, 0x04};
-        *data_len = sizeof(buf);
-        std::memcpy(response, &buf, *data_len);
-    }
-    else if (reqptr->parameter == LAN_PARM_AUTHENABLES)
-    {
-        uint8_t buf[] = {current_revision, 0x04, 0x04, 0x04, 0x04, 0x04};
-        *data_len = sizeof(buf);
-        std::memcpy(response, &buf, *data_len);
-    }
-    else if ((reqptr->parameter == LAN_PARM_IP) ||
-             (reqptr->parameter == LAN_PARM_SUBNET) ||
-             (reqptr->parameter == LAN_PARM_GATEWAY) ||
-             (reqptr->parameter == LAN_PARM_MAC))
-    {
-        uint8_t buf[ipmi::network::MAC_ADDRESS_SIZE_BYTE + 1] = {};
-
-        *data_len = sizeof(current_revision);
-        std::memcpy(buf, &current_revision, *data_len);
-
-        if (getNetworkData(reqptr->parameter, &buf[1], channel) == IPMI_CC_OK)
+        case LAN_PARM_INPROGRESS:
         {
-            if (reqptr->parameter == LAN_PARM_MAC)
+            uint8_t buf[] = {current_revision,
+                             channelConf->lan_set_in_progress};
+            *data_len = sizeof(buf);
+            std::memcpy(response, &buf, *data_len);
+            break;
+        }
+        case LAN_PARM_AUTHSUPPORT:
+        {
+            uint8_t buf[] = {current_revision, 0x04};
+            *data_len = sizeof(buf);
+            std::memcpy(response, &buf, *data_len);
+            break;
+        }
+        case LAN_PARM_AUTHENABLES:
+        {
+            uint8_t buf[] = {current_revision, 0x04, 0x04, 0x04, 0x04, 0x04};
+            *data_len = sizeof(buf);
+            std::memcpy(response, &buf, *data_len);
+            break;
+        }
+        case LAN_PARM_IP:
+        case LAN_PARM_SUBNET:
+        case LAN_PARM_GATEWAY:
+        case LAN_PARM_MAC:
+        {
+            uint8_t buf[ipmi::network::MAC_ADDRESS_SIZE_BYTE + 1] = {};
+
+            *data_len = sizeof(current_revision);
+            std::memcpy(buf, &current_revision, *data_len);
+
+            if (getNetworkData(reqptr->parameter, &buf[1], channel) ==
+                IPMI_CC_OK)
             {
-                *data_len = sizeof(buf);
+                if (reqptr->parameter == LAN_PARM_MAC)
+                {
+                    *data_len = sizeof(buf);
+                }
+                else
+                {
+                    *data_len = ipmi::network::IPV4_ADDRESS_SIZE_BYTE + 1;
+                }
+                std::memcpy(response, &buf, *data_len);
             }
             else
             {
-                *data_len = ipmi::network::IPV4_ADDRESS_SIZE_BYTE + 1;
+                rc = IPMI_CC_UNSPECIFIED_ERROR;
             }
-            std::memcpy(response, &buf, *data_len);
+            break;
         }
-        else
+        case LAN_PARM_VLAN:
         {
-            rc = IPMI_CC_UNSPECIFIED_ERROR;
-        }
-    }
-    else if (reqptr->parameter == LAN_PARM_VLAN)
-    {
-        uint8_t buf[ipmi::network::VLAN_SIZE_BYTE + 1] = {};
+            uint8_t buf[ipmi::network::VLAN_SIZE_BYTE + 1] = {};
 
-        *data_len = sizeof(current_revision);
-        std::memcpy(buf, &current_revision, *data_len);
-        if (getNetworkData(reqptr->parameter, &buf[1], channel) == IPMI_CC_OK)
-        {
-            *data_len = sizeof(buf);
-            std::memcpy(response, &buf, *data_len);
+            *data_len = sizeof(current_revision);
+            std::memcpy(buf, &current_revision, *data_len);
+            if (getNetworkData(reqptr->parameter, &buf[1], channel) ==
+                IPMI_CC_OK)
+            {
+                *data_len = sizeof(buf);
+                std::memcpy(response, &buf, *data_len);
+            }
+            break;
         }
-    }
-    else if (reqptr->parameter == LAN_PARM_IPSRC)
-    {
-        uint8_t buff[ipmi::network::IPSRC_SIZE_BYTE + 1] = {};
-        *data_len = sizeof(current_revision);
-        std::memcpy(buff, &current_revision, *data_len);
-        if (getNetworkData(reqptr->parameter, &buff[1], channel) == IPMI_CC_OK)
+        case LAN_PARM_IPSRC:
         {
-            *data_len = sizeof(buff);
-            std::memcpy(response, &buff, *data_len);
+            uint8_t buff[ipmi::network::IPSRC_SIZE_BYTE + 1] = {};
+            *data_len = sizeof(current_revision);
+            std::memcpy(buff, &current_revision, *data_len);
+            if (getNetworkData(reqptr->parameter, &buff[1], channel) ==
+                IPMI_CC_OK)
+            {
+                *data_len = sizeof(buff);
+                std::memcpy(response, &buff, *data_len);
+            }
+            break;
         }
-    }
-    else if (reqptr->parameter == CIPHER_SUITE_COUNT)
-    {
-        *(static_cast<uint8_t*>(response)) = current_revision;
-        // Byte 1 is reserved byte and does not indicate a cipher suite ID, so
-        // no of cipher suite entry count is one less than the size of the
-        // vector
-        auto count = static_cast<uint8_t>(cipherList.size() - 1);
-        *(static_cast<uint8_t*>(response) + 1) = count;
-        *data_len = sizeof(current_revision) + sizeof(count);
-    }
-    else if (reqptr->parameter == CIPHER_SUITE_ENTRIES)
-    {
-        *(static_cast<uint8_t*>(response)) = current_revision;
-        // Byte 1 is reserved
-        std::copy_n(cipherList.data(), cipherList.size(),
-                    static_cast<uint8_t*>(response) + 1);
-        *data_len =
-            sizeof(current_revision) + static_cast<uint8_t>(cipherList.size());
-    }
-    else
-    {
-        log<level::ERR>("Unsupported parameter",
-                        entry("PARAMETER=0x%x", reqptr->parameter));
-        rc = IPMI_CC_PARM_NOT_SUPPORTED;
+        case CIPHER_SUITE_COUNT:
+        {
+            *(static_cast<uint8_t*>(response)) = current_revision;
+            // Byte 1 is reserved byte and does not indicate a cipher suite ID,
+            // so no of cipher suite entry count is one less than the size of
+            // the vector
+            auto count = static_cast<uint8_t>(cipherList.size() - 1);
+            *(static_cast<uint8_t*>(response) + 1) = count;
+            *data_len = sizeof(current_revision) + sizeof(count);
+            break;
+        }
+        case CIPHER_SUITE_ENTRIES:
+        {
+            *(static_cast<uint8_t*>(response)) = current_revision;
+            // Byte 1 is reserved
+            std::copy_n(cipherList.data(), cipherList.size(),
+                        static_cast<uint8_t*>(response) + 1);
+            *data_len = sizeof(current_revision) +
+                        static_cast<uint8_t>(cipherList.size());
+            break;
+        }
+        default:
+            log<level::ERR>("Unsupported parameter",
+                            entry("PARAMETER=0x%x", reqptr->parameter));
+            rc = IPMI_CC_PARM_NOT_SUPPORTED;
     }
 
     return rc;