CA-280679: Fixed issue where the TabPage plugin could not handle Ipv6…

… addresses. Signed-off-by: Konstantina Chremmou <[email protected]>
gangsterrapper22 · Jan 29, 2018 · 19de8c5 · 19de8c5
1 parent 1febd6f
commit 19de8c5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/XenAdmin/Plugins/Placeholders.cs b/XenAdmin/Plugins/Placeholders.cs
@@ -35,6 +35,7 @@
 using XenCenterLib;
 using XenAdmin.XenSearch;
 using XenAPI;
+using System.Net.Sockets;
 
 namespace XenAdmin.Plugins
 {
@@ -191,7 +192,14 @@ public static List<Uri> SubstituteUri(string uri, IXenObject obj)
                     return new List<Uri> { new Uri(u) };
                 }
 
-                return ips.ConvertAll(ip => new Uri(u.Replace(string.Format(PlaceholderFormat, ipAddressName), ip.ToString())));
+                return ips.ConvertAll(ip =>
+                {
+                    var ipstring = ip.AddressIP != null && ip.AddressIP.AddressFamily == AddressFamily.InterNetworkV6
+                        ? string.Format("[{0}]", ip)
+                        : ip.ToString();
+
+                    return new Uri(u.Replace(string.Format(PlaceholderFormat, ipAddressName), ipstring));
+                });
             }
             catch (UriFormatException)
             {

diff --git a/XenCenterLib/ComparableAddress.cs b/XenCenterLib/ComparableAddress.cs
@@ -69,6 +69,8 @@ private bool IsPartialIP
             get { return partialIP != null; }
         }
 
+        public IPAddress AddressIP { get { return addressIP; } }
+
         public static bool TryParse(String candidate, bool allowPartialIP, bool allowName, out ComparableAddress address)
         {
             address = null;