Rename DnsConfig -> InterfaceConfig and complement with DHCP setting

2 files changed, 18 insertions, 4 deletions

diff --git a/windows/windns/src/windns/dnsconfig.cpp b/windows/windns/src/windns/interfaceconfig.cpp
index f233d17d1d..6cffb4ffe8 100644
--- a/windows/windns/src/windns/dnsconfig.cpp
+++ b/windows/windns/src/windns/interfaceconfig.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
-#include "dnsconfig.h"
+#include "interfaceconfig.h"
 #include "windns/comhelpers.h"
 
-DnsConfig::DnsConfig(CComPtr<IWbemClassObject> instance)
+InterfaceConfig::InterfaceConfig(CComPtr<IWbemClassObject> instance)
 {
 	//
 	// V_xxx macros seem to require an l-value so access the correct field directly instead.
@@ -10,6 +10,8 @@ DnsConfig::DnsConfig(CComPtr<IWbemClassObject> instance)
 
 	m_configIndex = ComGetPropertyAlways(instance, L"Index").ulVal;
 
+	m_dhcp = ComGetPropertyAlways(instance, L"DHCPEnabled").boolVal;
+
 	m_interfaceIndex = ComGetPropertyAlways(instance, L"InterfaceIndex").ulVal;
 	m_interfaceGuid = ComConvertString(ComGetPropertyAlways(instance, L"SettingID").bstrVal);
 
diff --git a/windows/windns/src/windns/dnsconfig.h b/windows/windns/src/windns/interfaceconfig.h
index 7727f2fff8..4e0af5c482 100644
--- a/windows/windns/src/windns/dnsconfig.h
+++ b/windows/windns/src/windns/interfaceconfig.h
@@ -8,18 +8,28 @@
 #include <atlbase.h>
 #include <wbemidl.h>
 
-class DnsConfig
+class InterfaceConfig
 {
 public:
 
 	// instance = Win32_NetworkAdapterConfiguration.
-	explicit DnsConfig(CComPtr<IWbemClassObject> instance);
+	explicit InterfaceConfig(CComPtr<IWbemClassObject> instance);
+
+	void updateServers(const InterfaceConfig &rhs)
+	{
+		m_servers = rhs.m_servers;
+	}
 
 	uint32_t configIndex() const
 	{
 		return m_configIndex;
 	}
 
+	bool dhcp() const
+	{
+		return m_dhcp;
+	}
+
 	uint32_t interfaceIndex() const
 	{
 		return m_interfaceIndex;
@@ -39,6 +49,8 @@ private:
 
 	uint32_t m_configIndex;
 
+	bool m_dhcp;
+
 	uint32_t m_interfaceIndex;
 	std::wstring m_interfaceGuid;