Return an error when assigning static values to a DHCP enabled NIC
Assigning static IP addresses, subnet masks, and gateway values to a
DHCP enabled NIC should be flagged with an error response to indicate
the operation was not completed successfully.
Tested:
Used some raw commands to witness the return code directly
-- Enable DHCP for NIC 3
ipmitool lan set 3 ipsrc dhcp
-- Assign a static IPv4 Address, expect a failure
ipmitool raw 0xc 1 3 3 192 168 20 12 # returns 0xd5 error message
-- Assign a static IPv4 Subnet mask, expect a failure
ipmitool raw 0xc 1 3 6 255 255 255 0 # returns 0xd5 error message
-- Assign a static IPv4 Gateway, expect a failure
ipmitool raw 0xc 1 3 12 192 168 20 1 # returns 0xd5 error message
-- Enable Static address assignment for NIC 3
ipmitool lan set 3 ipsrc static
-- Assign a static IPv4 Address, expect success
ipmitool raw 0xc 1 3 3 192 168 20 12 # returns successfully
-- Assign a static IPv4 Subnet mask, expect success
ipmitool raw 0xc 1 3 6 255 255 255 0 # returns successfully
-- Assign a static IPv4 Gateway, expect success
ipmitool raw 0xc 1 3 12 192 168 20 1 # returns successfully
IPv4 settings have been updated.
Change-Id: I807ec45a0c86b33dd46bfeb64724b91d5afad408
Signed-off-by: Johnathan Mantey <johnathanx.mantey@intel.com>
diff --git a/transporthandler.cpp b/transporthandler.cpp
index e112668..a3b3c35 100644
--- a/transporthandler.cpp
+++ b/transporthandler.cpp
@@ -1401,6 +1401,10 @@
}
case LanParam::IP:
{
+ if (channelCall<getDHCPProperty>(channel))
+ {
+ return responseCommandNotAvailable();
+ }
in_addr ip;
std::array<uint8_t, sizeof(ip)> bytes;
if (req.unpack(bytes) != 0 || !req.fullyUnpacked())
@@ -1460,6 +1464,10 @@
}
case LanParam::SubnetMask:
{
+ if (channelCall<getDHCPProperty>(channel))
+ {
+ return responseCommandNotAvailable();
+ }
in_addr netmask;
std::array<uint8_t, sizeof(netmask)> bytes;
if (req.unpack(bytes) != 0 || !req.fullyUnpacked())
@@ -1473,6 +1481,10 @@
}
case LanParam::Gateway1:
{
+ if (channelCall<getDHCPProperty>(channel))
+ {
+ return responseCommandNotAvailable();
+ }
in_addr gateway;
std::array<uint8_t, sizeof(gateway)> bytes;
if (req.unpack(bytes) != 0 || !req.fullyUnpacked())