Imported Upstream version 5.20.0.180

Former-commit-id: ff953ca879339fe1e1211f7220f563e1342e66cb
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-02-04 20:11:37 +00:00
parent 0e2d47d1c8
commit 0510252385
3360 changed files with 83827 additions and 39243 deletions

View File

@@ -36,13 +36,13 @@ namespace System.Net.NetworkInformation {
[DllImport ("iphlpapi.dll")]
static extern int GetPerAdapterInfo (int IfIndex, Win32_IP_PER_ADAPTER_INFO pPerAdapterInfo, ref int pOutBufLen);
Win32_IP_ADAPTER_INFO ainfo;
Win32_IP_ADAPTER_ADDRESSES addr;
Win32_IP_PER_ADAPTER_INFO painfo;
Win32_MIB_IFROW mib;
public Win32IPv4InterfaceProperties (Win32_IP_ADAPTER_INFO ainfo, Win32_MIB_IFROW mib)
public Win32IPv4InterfaceProperties (Win32_IP_ADAPTER_ADDRESSES addr, Win32_MIB_IFROW mib)
{
this.ainfo = ainfo;
this.addr = addr;
this.mib = mib;
// get per-adapter info.
@@ -67,7 +67,7 @@ namespace System.Net.NetworkInformation {
}
public override bool IsDhcpEnabled {
get { return ainfo.DhcpEnabled != 0; }
get { return addr.DhcpEnabled; }
}
public override bool IsForwardingEnabled {
@@ -80,7 +80,7 @@ namespace System.Net.NetworkInformation {
}
public override bool UsesWins {
get { return ainfo.HaveWins; }
get { return addr.FirstWinsServerAddress != IntPtr.Zero; }
}
}