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

@ -79,6 +79,25 @@ namespace System.Net.NetworkInformation {
return c;
}
public static Win32IPAddressCollection FromSocketAddress (Win32_SOCKET_ADDRESS addr)
{
Win32IPAddressCollection c = new Win32IPAddressCollection ();
if (addr.Sockaddr != IntPtr.Zero)
c.InternalAdd (addr.GetIPAddress ());
return c;
}
public static Win32IPAddressCollection FromWinsServer (IntPtr ptr)
{
Win32IPAddressCollection c = new Win32IPAddressCollection ();
Win32_IP_ADAPTER_WINS_SERVER_ADDRESS a;
for (IntPtr p = ptr; p != IntPtr.Zero; p = a.Next) {
a = (Win32_IP_ADAPTER_WINS_SERVER_ADDRESS) Marshal.PtrToStructure (p, typeof (Win32_IP_ADAPTER_WINS_SERVER_ADDRESS));
c.InternalAdd (a.Address.GetIPAddress ());
}
return c;
}
void AddSubsequentlyString (IntPtr head)
{
Win32_IP_ADDR_STRING a;