summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOdd Stranne <odd@mullvad.net>2018-10-07 21:26:01 +0200
committerOdd Stranne <odd@mullvad.net>2018-10-07 21:26:01 +0200
commit702b16ada63113a8f9e2ee0f1a7d514f0a8803f3 (patch)
tree2765d131dda8993e6551a3e3550d55b173dfffe2
parent2a791b5a050ae028359a5b796a6b6d4abe418d6f (diff)
downloadmullvadvpn-702b16ada63113a8f9e2ee0f1a7d514f0a8803f3.tar.xz
mullvadvpn-702b16ada63113a8f9e2ee0f1a7d514f0a8803f3.zip
Stop tracking DHCP provided name servers
-rw-r--r--windows/windns/src/windns/interfacesnap.cpp4
-rw-r--r--windows/windns/src/windns/interfacesnap.h2
2 files changed, 1 insertions, 5 deletions
diff --git a/windows/windns/src/windns/interfacesnap.cpp b/windows/windns/src/windns/interfacesnap.cpp
index 309296897f..1840776ed3 100644
--- a/windows/windns/src/windns/interfacesnap.cpp
+++ b/windows/windns/src/windns/interfacesnap.cpp
@@ -81,7 +81,7 @@ InterfaceSnap::InterfaceSnap(Protocol protocol, const std::wstring &interfaceGui
// DHCP name servers are the servers most recently supplied by DHCP.
// An adapter can be configured for DHCP and static name servers at the same time.
// Static name servers always have precedence.
- m_dhcpNameServers = GetNameServers(m_interfaceGuid, m_protocol, NameServerType::Dhcp);
+ //m_dhcpNameServers = GetNameServers(m_interfaceGuid, m_protocol, NameServerType::Dhcp);
}
InterfaceSnap::InterfaceSnap(common::serialization::Deserializer &deserializer)
@@ -99,7 +99,6 @@ InterfaceSnap::InterfaceSnap(common::serialization::Deserializer &deserializer)
d >> m_interfaceGuid;
d >> (uint8_t &)m_configuredForDhcp;
d >> m_staticNameServers;
- d >> m_dhcpNameServers;
}
void InterfaceSnap::serialize(common::serialization::Serializer &serializer) const
@@ -110,7 +109,6 @@ void InterfaceSnap::serialize(common::serialization::Serializer &serializer) con
s << m_interfaceGuid;
s << (uint8_t &)m_configuredForDhcp;
s << m_staticNameServers;
- s << m_dhcpNameServers;
}
bool InterfaceSnap::needsOverriding(const std::vector<std::wstring> &enforcedServers) const
diff --git a/windows/windns/src/windns/interfacesnap.h b/windows/windns/src/windns/interfacesnap.h
index 4d1156b615..5159f581eb 100644
--- a/windows/windns/src/windns/interfacesnap.h
+++ b/windows/windns/src/windns/interfacesnap.h
@@ -29,7 +29,5 @@ private:
std::wstring m_interfaceGuid;
bool m_configuredForDhcp;
-
std::vector<std::wstring> m_staticNameServers;
- std::vector<std::wstring> m_dhcpNameServers;
};