Imported Upstream version 6.8.0.73

Former-commit-id: d18deab1b47cfd3ad8cba82b3f37d00eec2170af
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-12-10 18:00:56 +00:00
parent bceda29824
commit 73ee7591e8
1043 changed files with 16271 additions and 22080 deletions

View File

@ -38,8 +38,6 @@ namespace System.Net.NetworkInformation {
public const int AF_INET = 2;
public const int AF_INET6 = 23;
// FIXME: it might be getting wrong table. I'm getting
// different results from .NET 2.0.
unsafe void FillTcpTable (out List<Win32_MIB_TCPROW> tab4, out List<Win32_MIB_TCP6ROW> tab6)
{
tab4 = new List<Win32_MIB_TCPROW> ();
@ -305,16 +303,16 @@ namespace System.Net.NetworkInformation {
{
public TcpState State;
public uint LocalAddr;
public int LocalPort;
public uint LocalPort;
public uint RemoteAddr;
public int RemotePort;
public uint RemotePort;
public IPEndPoint LocalEndPoint {
get { return new IPEndPoint (LocalAddr, LocalPort); }
get { return new IPEndPoint (LocalAddr, ntohs((ushort)LocalPort)); }
}
public IPEndPoint RemoteEndPoint {
get { return new IPEndPoint (RemoteAddr, RemotePort); }
get { return new IPEndPoint (RemoteAddr, ntohs((ushort)RemotePort)); }
}
public TcpConnectionInformation TcpInfo {
@ -328,17 +326,17 @@ namespace System.Net.NetworkInformation {
public TcpState State;
public Win32_IN6_ADDR LocalAddr;
public uint LocalScopeId;
public int LocalPort;
public uint LocalPort;
public Win32_IN6_ADDR RemoteAddr;
public uint RemoteScopeId;
public int RemotePort;
public uint RemotePort;
public IPEndPoint LocalEndPoint {
get { return new IPEndPoint (new IPAddress (LocalAddr.Bytes, LocalScopeId), LocalPort); }
get { return new IPEndPoint (new IPAddress (LocalAddr.Bytes, LocalScopeId), ntohs((ushort)LocalPort)); }
}
public IPEndPoint RemoteEndPoint {
get { return new IPEndPoint (new IPAddress (RemoteAddr.Bytes, RemoteScopeId), RemotePort); }
get { return new IPEndPoint (new IPAddress (RemoteAddr.Bytes, RemoteScopeId), ntohs((ushort)RemotePort)); }
}
public TcpConnectionInformation TcpInfo {
@ -362,10 +360,10 @@ namespace System.Net.NetworkInformation {
{
public Win32_IN6_ADDR LocalAddr;
public uint LocalScopeId;
public int LocalPort;
public uint LocalPort;
public IPEndPoint LocalEndPoint {
get { return new IPEndPoint (new IPAddress (LocalAddr.Bytes, LocalScopeId), LocalPort); }
get { return new IPEndPoint (new IPAddress (LocalAddr.Bytes, LocalScopeId), ntohs((ushort)LocalPort)); }
}
}
}