mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.0.0.42

Browse Source 
Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpServerChannel.cs
View File

@@ -71,7 +71,12 @@ namespace System.Runtime.Remoting.Channels.Tcp
else {
IPHostEntry he = Dns.Resolve (Dns.GetHostName());
if (he.AddressList.Length == 0) throw new RemotingException ("IP address could not be determined for this host");
host = he.AddressList [0].ToString ();
AddressFamily addressFamily = (Socket.OSSupportsIPv4) ? AddressFamily.InterNetwork : AddressFamily.InterNetworkV6;
IPAddress addr = GetMachineAddress (he, addressFamily);
if (addr != null)
host = addr.ToString ();
else
host = he.AddressList [0].ToString ();
}
}
else
@@ -259,6 +264,22 @@ namespace System.Runtime.Remoting.Channels.Tcp
server_thread.Join ();
server_thread = null;
}
private static IPAddress GetMachineAddress (IPHostEntry host, AddressFamily addressFamily)
{
IPAddress result = null;
if (host != null) {
IPAddress[] addressList = host.AddressList;
for (int i = 0; i < addressList.Length; i++) {
if (addressList[i].AddressFamily == addressFamily) {
result = addressList[i];
break;
}
}
}
return result;
}
}
class ClientConnection