[System]: WebRequest.GetSystemProxy(): Return custom proxy for monodroid.

[mono.git] / mcs / class / System / System.Net / SocketAddress.cs

diff --git a/mcs/class/System/System.Net/SocketAddress.cs b/mcs/class/System/System.Net/SocketAddress.cs
old mode 100755 (executable)
new mode 100644 (file)
index 757a71f..463f275
--- a/mcs/class/System/System.Net/SocketAddress.cs
+++ b/mcs/class/System/System.Net/SocketAddress.cs
@@ -8,6 +8,27 @@
 // (C) Ximian, Inc.  http://www.ximian.com
 //
 
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System.Net.Sockets;
 
 namespace System.Net {
@@ -23,25 +44,25 @@ namespace System.Net {
                        
                        data=new byte[size];
                        data[0]=(byte)family;
-                       data[1]=(byte)size;
+                       data[1]=(byte) ((int) family >> 8);
                }
 
                public SocketAddress (AddressFamily family)
+                       : this (family, 32)
                {
-                       data=new byte[32];
-                       data[0]=(byte)family;
-                       data[1]=(byte)32;
                }
                
+               //LAMESPEC: the MS doc about this class is wrong. The size is not stored in byte 1. Instead
+               // byte [0] and byte [1] hold the family (little endian).
                public AddressFamily Family {
                        get {
-                               return((AddressFamily)data[0]);
+                               return (AddressFamily) (data [0] + (data [1] << 8));
                        }
                }
 
                public int Size {
                        get {
-                               return((int)data[1]);
+                               return data.Length;
                        }
                }
 
@@ -57,7 +78,7 @@ namespace System.Net {
 
                public override string ToString() {
                        string af=((AddressFamily)data[0]).ToString();
-                       int size=(int)data[1];
+                       int size = data.Length;
                        string ret=af+":"+size+":{";
                        
                        for(int i=2; i<size; i++) {
@@ -73,11 +94,11 @@ namespace System.Net {
                        return(ret);
                }
 
-               public override bool Equals (object obj)
+               public override bool Equals (object comparand)
                {
-                       if (obj is System.Net.SocketAddress &&
-                           ((System.Net.SocketAddress) obj).data.Length == data.Length){
-                               byte [] otherData = ((System.Net.SocketAddress) obj).data;
+                       SocketAddress sa = (comparand as SocketAddress);
+                       if ((sa != null) && (sa.data.Length == data.Length)) {
+                               byte [] otherData = sa.data;
                                for (int i = 0; i < data.Length; i++)
                                        if (otherData [i] != data [i])
                                                return false;