commit 1fe5c834b9ae4f09726dea8a1c7b3a05d87f1344
author Nagaraju Goruganti <ngorugan@in.ibm.com> Thu Sep 21 07:44:17 2017 -0500
committer Nagaraju Goruganti <ngorugan@in.ibm.com> Wed Oct 11 23:25:21 2017 -0500
tree 4fbf65c1fe805165a86cf32c678bf0c0ffc252f9
parent e245e4e932279a112325dae06d7c12cf9e8ed833

Don't set/get zeroconfig address if other IP address is present

Resolves openbmc/openbmc#2265

Change-Id: I65b54358f13231c78b3c6488a59b94bc9323484c
Signed-off-by: Nagaraju Goruganti <ngorugan@in.ibm.com>

apphandler.cpp

diff --git a/apphandler.cpp b/apphandler.cpp
index 210544c..29adfa4 100644
--- a/apphandler.cpp
+++ b/apphandler.cpp
@@ -695,8 +695,11 @@
                             ipmi::network::IP_INTERFACE);
 
                     ipaddress = channelConfig.ipaddr.empty() ?
-                        properties["Address"].get<std::string>() :
-                        channelConfig.ipaddr;
+                                ipmi::getIPAddress(bus,
+                                                   ipmi::network::IP_INTERFACE,
+                                                   ipmi::network::ROOT,
+                                                   ipmi::network::IP_TYPE) :
+                                channelConfig.ipaddr;
 
                     prefix = channelConfig.netmask.empty() ?
                         properties["PrefixLength"].get<uint8_t>() :