2004-05-26 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* IPAddress.cs:
	* IPEndPoint.cs:
	* IPv6Address.cs: no more warnings about IPAddress.Address.

svn path=/trunk/mcs/; revision=28086

diff --git a/mcs/class/System/System.Net/ChangeLog b/mcs/class/System/System.Net/ChangeLog
index 455e7871e73d5ec566499522ec017d3ed7dc31d7..fbba1e28184d416ad93e70b8b3df77eadc828018 100644 (file)
--- a/mcs/class/System/System.Net/ChangeLog
+++ b/mcs/class/System/System.Net/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-26  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * IPAddress.cs:
+       * IPEndPoint.cs:
+       * IPv6Address.cs: no more warnings about IPAddress.Address.
+
 2004-05-18  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * WebException.cs: implemented serialization .ctor and GetObjectData().

diff --git a/mcs/class/System/System.Net/IPAddress.cs b/mcs/class/System/System.Net/IPAddress.cs
index eb74b5d51fd41706a0313ee4be696975dba4a777..059f4418f06322ee98d5cfda63c2541f2b1387d2 100755 (executable)
--- a/mcs/class/System/System.Net/IPAddress.cs
+++ b/mcs/class/System/System.Net/IPAddress.cs
@@ -222,7 +222,7 @@ namespace System.Net {
                        }
                }
 
-               [Obsolete]
+               [Obsolete("This property is obsolete. Use GetAddressBytes.")]
 #endif
                public long Address 
                {
@@ -246,6 +246,10 @@ namespace System.Net {
                        }
                }
 
+               internal long InternalIPv4Address {
+                       get { return address; }
+               }
+               
 #if NET_1_1
                public long ScopeId {
                        get {
@@ -261,25 +265,21 @@ namespace System.Net {
                                _scopeId = value;
                        }
                }
-               public byte[] GetAddressBytes() 
-               {
 
-                       if(_family == AddressFamily.InterNetworkV6)
-                       {
-                               byte[] addressBytes = new byte[16];
-                               Buffer.BlockCopy(_numbers, 0, addressBytes, 0, 16);
+               public byte [] GetAddressBytes () 
+               {
+                       if(_family == AddressFamily.InterNetworkV6) {
+                               byte [] addressBytes = new byte [16];
+                               Buffer.BlockCopy (_numbers, 0, addressBytes, 0, 16);
                                return addressBytes;
-                       }
-                       else
-                       {
-                               return new byte[4] { (byte)(address & 0xFF),
-                                                                          (byte)((address >> 8) & 0xFF),
-                                                                          (byte)((address >> 16) & 0xFF),
-                                                                          (byte)(address >> 24) }; 
+                       } else {
+                               return new byte [4] { (byte)(address & 0xFF),
+                                                    (byte)((address >> 8) & 0xFF),
+                                                    (byte)((address >> 16) & 0xFF),
+                                                    (byte)(address >> 24) }; 
                        }
                }
 #endif
-
                public AddressFamily AddressFamily 
                {
                        get {
@@ -351,10 +351,9 @@ namespace System.Net {
                                if(AddressFamily != otherAddr.AddressFamily)
                                        return false;
 
-                               if(AddressFamily == AddressFamily.InterNetwork)
-                                       return Address == otherAddr.Address;
-                               else
-                               {
+                               if(AddressFamily == AddressFamily.InterNetwork) {
+                                       return address == otherAddr.address;
+                               } else {
                                        ushort[] vals = otherAddr._numbers;
 
                                        for(int i=0; i<8; i++)
@@ -370,7 +369,7 @@ namespace System.Net {
                public override int GetHashCode ()
                {
                        if(_family == AddressFamily.InterNetwork)
-                               return (int)Address;
+                               return (int)address;
                        else
                                return Hash (((((int) _numbers[0]) << 16) + _numbers [1]), 
                                        ((((int) _numbers [2]) << 16) + _numbers [3]),

diff --git a/mcs/class/System/System.Net/IPEndPoint.cs b/mcs/class/System/System.Net/IPEndPoint.cs
index fb0134f31b98805da703a7bc961e89d1ddcb8298..651d7519a4cfdd49f635c661e55c0d46f8eb9aeb 100755 (executable)
--- a/mcs/class/System/System.Net/IPEndPoint.cs
+++ b/mcs/class/System/System.Net/IPEndPoint.cs
@@ -134,11 +134,11 @@ namespace System.Net {
                                        // stores the address
                                        sockaddr [2] = (byte) ((port>>8) & 0xff);
                                        sockaddr [3] = (byte) (port & 0xff);
-
-                                       sockaddr [4] = (byte) (address.Address & 0xff);
-                                       sockaddr [5] = (byte) ((address.Address >> 8) & 0xff);
-                                       sockaddr [6] = (byte) ((address.Address >> 16) & 0xff);
-                                       sockaddr [7] = (byte) ((address.Address >> 24) & 0xff);\r
+                                       long addr = address.InternalIPv4Address;
+                                       sockaddr [4] = (byte) (addr & 0xff);
+                                       sockaddr [5] = (byte) ((addr >> 8) & 0xff);
+                                       sockaddr [6] = (byte) ((addr >> 16) & 0xff);
+                                       sockaddr [7] = (byte) ((addr >> 24) & 0xff);
                                        break;\r
 #if NET_1_1\r
                                case AddressFamily.InterNetworkV6:\r

diff --git a/mcs/class/System/System.Net/IPv6Address.cs b/mcs/class/System/System.Net/IPv6Address.cs
index c7a136821866652568e46e24502dd80d5b51f301..59e2e99fac86f7ce8d71d7f67e892cc547e548b8 100644 (file)
--- a/mcs/class/System/System.Net/IPv6Address.cs
+++ b/mcs/class/System/System.Net/IPv6Address.cs
@@ -107,7 +107,7 @@ namespace System.Net {
                                string ipv4Str = ipString.Substring (pos2 + 1);\r
                                if (ipv4Str.IndexOf ('.') != -1) {\r
                                        try {\r
-                                               long a = IPAddress.Parse (ipv4Str).Address;\r
+                                               long a = IPAddress.Parse (ipv4Str).InternalIPv4Address;\r
                                                addr [6] = (ushort) (((int) (a & 0xff) << 8) + ((int) ((a >> 8) & 0xff)));\r
                                                addr [7] = (ushort) (((int) ((a >> 16) & 0xff) << 8) + ((int) ((a >> 24) & 0xff)));\r
                                                if (ipString [pos2 - 1] == ':') \r
@@ -333,7 +333,7 @@ namespace System.Net {
                                if (address [5] != 0 && address [5] != 0xffff)\r
                                        return false;\r
 \r
-                               long a = ipv4.Address;\r
+                               long a = ipv4.InternalIPv4Address;\r
                                if (address [6] != (ushort) (((int) (a & 0xff) << 8) + ((int) ((a >> 8) & 0xff))) ||\r
                                    address [7] != (ushort) (((int) ((a >> 16) & 0xff) << 8) + ((int) ((a >> 24) & 0xff))))\r
                                        return false;\r