Merge pull request #2034 from alexrp/ctx-cleanup

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

diff --git a/mcs/class/System/System.Net.NetworkInformation/UnicastIPAddressInformationCollection.cs b/mcs/class/System/System.Net.NetworkInformation/UnicastIPAddressInformationCollection.cs
index 282ad04b1492353c5dc866bba66f674bcb30673c..b83959a3faf73ced0c16b365355dc387f135bc35 100644 (file)
--- a/mcs/class/System/System.Net.NetworkInformation/UnicastIPAddressInformationCollection.cs
+++ b/mcs/class/System/System.Net.NetworkInformation/UnicastIPAddressInformationCollection.cs
@@ -1,10 +1,11 @@
 //
 // System.Net.NetworkInformation.UnicastIPAddressInformationCollection
 //
-// 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,16 +26,16 @@
 // 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.Runtime.InteropServices;
 
 namespace System.Net.NetworkInformation {
        public class UnicastIPAddressInformationCollection : ICollection<UnicastIPAddressInformation>,
                                                IEnumerable<UnicastIPAddressInformation> {
 
-               List<UnicastIPAddressInformation> list;
+               List<UnicastIPAddressInformation> list = new List<UnicastIPAddressInformation> ();
 
                protected internal UnicastIPAddressInformationCollection ()
                {
@@ -42,12 +43,16 @@ namespace System.Net.NetworkInformation {
 
                public virtual void Add (UnicastIPAddressInformation 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 (UnicastIPAddressInformation address)
@@ -67,7 +72,9 @@ namespace System.Net.NetworkInformation {
 
                public virtual bool Remove (UnicastIPAddressInformation 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 ()
@@ -87,6 +94,46 @@ namespace System.Net.NetworkInformation {
                        get { return list [index]; }
                }
        }
-}
+
+       class UnicastIPAddressInformationImplCollection : UnicastIPAddressInformationCollection
+       {
+               public static readonly UnicastIPAddressInformationImplCollection Empty = new UnicastIPAddressInformationImplCollection (true);
+
+               bool is_readonly;
+
+               // for static methods
+               UnicastIPAddressInformationImplCollection (bool isReadOnly)
+               {
+                       is_readonly = isReadOnly;
+               }
+
+               public override bool IsReadOnly {
+                       get { return is_readonly; }
+               }
+
+#if !MOBILE
+               public static UnicastIPAddressInformationCollection Win32FromUnicast (int ifIndex, IntPtr ptr)
+               {
+                       UnicastIPAddressInformationImplCollection c = new UnicastIPAddressInformationImplCollection (false);
+                       Win32_IP_ADAPTER_UNICAST_ADDRESS a;
+                       for (IntPtr p = ptr; p != IntPtr.Zero; p = a.Next) {
+                               a = (Win32_IP_ADAPTER_UNICAST_ADDRESS) Marshal.PtrToStructure (p, typeof (Win32_IP_ADAPTER_UNICAST_ADDRESS));
+                               c.Add (new Win32UnicastIPAddressInformation (ifIndex, a));
+                       }
+                       c.is_readonly = true;
+                       return c;
+               }
 #endif
 
+               public static UnicastIPAddressInformationCollection LinuxFromList (List<IPAddress> addresses)
+               {
+                       UnicastIPAddressInformationImplCollection c = new UnicastIPAddressInformationImplCollection (false);
+                       foreach (IPAddress address in addresses) {
+                               c.Add (new LinuxUnicastIPAddressInformation (address));
+                       }
+                       c.is_readonly = true;
+                       return c;
+               }
+       }
+}
+