Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-23 20:36:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #412 from cheng--zhang/CA-165096-v2

Browse Source 
CA-165096: solve XenCenter slow to find RDP interface
This commit is contained in:
Stephen Turner 2015-03-27 16:25:02 +00:00
commit f14d07d8b8
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
XenAdmin/ConsoleView/XSVNCScreen.cs
View File

@ -354,18 +354,28 @@ namespace XenAdmin.ConsoleView
List<string> ipAddresses = new List<string>();
List<string> ipv6Addresses = new List<string>();
foreach (String key in networks.Keys)
foreach (VIF vif in vm.Connection.ResolveAll(vm.VIFs))
{
if (key.EndsWith("ip")) // IPv4 address
ipAddresses.Add(networks[key]);
else
XenAPI.Network network = vif.Connection.Resolve(vif.network);
XenAPI.Host host = vm.Connection.Resolve(vm.resident_on);
XenAPI.PIF pif = Helpers.FindPIF(network, host);
if (pif.LinkStatus == PIF.LinkState.Connected)
{
if (key.Contains("ipv6")) // IPv6 address, enclose in square brackets
ipv6Addresses.Add(String.Format("[{0}]", networks[key]));
else
continue;
foreach (var networkInfo in networks.Where(n => n.Key.StartsWith(String.Format("{0}/ip", vif.device))))
{
if (networkInfo.Key.EndsWith("ip")) // IPv4 address
ipAddresses.Add(networkInfo.Value);
else
{
if (networkInfo.Key.Contains("ipv6")) // IPv6 address, enclose in square brackets
ipv6Addresses.Add(String.Format("[{0}]", networkInfo.Value));
else
continue;
}
}
}
}
ipAddresses.AddRange(ipv6Addresses); // make sure IPv4 addresses are scanned first (CA-102755)
foreach (String ipAddress in ipAddresses)