Merge pull request #439 from mono-soc-2012/garyb/iconfix

[mono.git] / mcs / class / System / System.Net.NetworkInformation / IPAddressCollection.cs

diff --git a/mcs/class/System/System.Net.NetworkInformation/IPAddressCollection.cs b/mcs/class/System/System.Net.NetworkInformation/IPAddressCollection.cs
index b714220e0a0e6a57c12a02717a6623b560f170dd..69b05505403740965fca5ba724cf79e59ac5bc3e 100644 (file)
--- a/mcs/class/System/System.Net.NetworkInformation/IPAddressCollection.cs
+++ b/mcs/class/System/System.Net.NetworkInformation/IPAddressCollection.cs
@@ -1,10 +1,11 @@
 //
 // System.Net.NetworkInformation.IPAddressCollection
 //
-// Author:
+// Authors:
 //     Gonzalo Paniagua Javier (gonzalo@novell.com)
+//     Atsushi Enomoto (atsushi@ximian.com)
 //
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
+// Copyright (c) 2006-2007 Novell, Inc. (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -25,27 +26,38 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_0
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Net;
+using System.Runtime.InteropServices;
 
 namespace System.Net.NetworkInformation {
        public class IPAddressCollection : ICollection<IPAddress>, IEnumerable<IPAddress>, IEnumerable {
-               List<IPAddress> list;
+               IList <IPAddress> list = new List<IPAddress> ();
 
                protected internal IPAddressCollection ()
                {
                }
 
+               internal void SetReadOnly ()
+               {
+                       if (!IsReadOnly)
+                               list = ((List<IPAddress>) list).AsReadOnly ();
+               }
+
                public virtual void Add (IPAddress address)
                {
-                       throw new NotSupportedException ("The collection is read-only.");
+                       if (IsReadOnly)
+                               throw new NotSupportedException ("The collection is read-only.");
+                       list.Add (address);
                }
 
                public virtual void Clear ()
                {
-                       throw new NotSupportedException ("The collection is read-only.");
+                       if (IsReadOnly)
+                               throw new NotSupportedException ("The collection is read-only.");
+                       list.Clear ();
                }
 
                public virtual bool Contains (IPAddress address)
@@ -65,7 +77,9 @@ namespace System.Net.NetworkInformation {
 
                public virtual bool Remove (IPAddress address)
                {
-                       throw new NotSupportedException ("The collection is read-only.");
+                       if (IsReadOnly)
+                               throw new NotSupportedException ("The collection is read-only.");
+                       return list.Remove (address);
                }
 
                IEnumerator IEnumerable.GetEnumerator ()
@@ -78,13 +92,82 @@ namespace System.Net.NetworkInformation {
                }
 
                public virtual bool IsReadOnly {
-                       get { return true; }
+                       get { return list.IsReadOnly; }
                }
 
                public virtual IPAddress this [int index] {
                        get { return list [index]; }
                }
        }
+
+       class Win32IPAddressCollection : IPAddressCollection
+       {
+               public static readonly Win32IPAddressCollection Empty = new Win32IPAddressCollection (IntPtr.Zero);
+
+               bool is_readonly;
+
+               // for static methods
+               Win32IPAddressCollection ()
+               {
+               }
+
+               public Win32IPAddressCollection (params IntPtr [] heads)
+               {
+                       foreach (IntPtr head in heads)
+                               AddSubsequentlyString (head);
+                       is_readonly = true;
+               }
+
+               public Win32IPAddressCollection (params Win32_IP_ADDR_STRING [] al)
+               {
+                       foreach (Win32_IP_ADDR_STRING a in al) {
+                               if (String.IsNullOrEmpty (a.IpAddress))
+                                       continue;
+                               Add (IPAddress.Parse (a.IpAddress));
+                               AddSubsequentlyString (a.Next);
+                       }
+                       is_readonly = true;
+               }
+
+               public static Win32IPAddressCollection FromAnycast (IntPtr ptr)
+               {
+                       Win32IPAddressCollection c = new Win32IPAddressCollection ();
+                       Win32_IP_ADAPTER_ANYCAST_ADDRESS a;
+                       for (IntPtr p = ptr; p != IntPtr.Zero; p = a.Next) {
+                               a = (Win32_IP_ADAPTER_ANYCAST_ADDRESS) Marshal.PtrToStructure (p, typeof (Win32_IP_ADAPTER_ANYCAST_ADDRESS));
+                               c.Add (a.Address.GetIPAddress ());
+                       }
+                       c.is_readonly = true;
+                       return c;
+               }
+
+               public static Win32IPAddressCollection FromDnsServer (IntPtr ptr)
+               {
+                       Win32IPAddressCollection c = new Win32IPAddressCollection ();
+                       Win32_IP_ADAPTER_DNS_SERVER_ADDRESS a;
+                       for (IntPtr p = ptr; p != IntPtr.Zero; p = a.Next) {
+                               a = (Win32_IP_ADAPTER_DNS_SERVER_ADDRESS) Marshal.PtrToStructure (p, typeof (Win32_IP_ADAPTER_DNS_SERVER_ADDRESS));
+// FIXME: It somehow fails here. Looks like there is something wrong.
+//if (a.Address.Sockaddr == IntPtr.Zero) throw new Exception ("pointer " + p + " a.length " + a.Address.SockaddrLength);
+                               c.Add (a.Address.GetIPAddress ());
+                       }
+                       c.is_readonly = true;
+                       return c;
+               }
+
+               void AddSubsequentlyString (IntPtr head)
+               {
+                       Win32_IP_ADDR_STRING a;
+                       for (IntPtr p = head; p != IntPtr.Zero; p = a.Next) {
+                               a = (Win32_IP_ADDR_STRING) Marshal.PtrToStructure (p, typeof (Win32_IP_ADDR_STRING));
+                               Add (IPAddress.Parse (a.IpAddress));
+                       }
+               }
+
+               public override bool IsReadOnly {
+                       get { return is_readonly; }
+               }
+       }
 }
-#endif
+