Merge pull request #2274 from esdrubal/udpclientreceive
[mono.git] / mcs / class / System / System.Net.Sockets / Socket.cs
index 4002f96d86d5af606af50565e7bd5413619ca050..8d48b675ae8cf9ed8a03cab67569bb1c49d9033d 100644 (file)
@@ -6,6 +6,7 @@
 //     Gonzalo Paniagua Javier (gonzalo@ximian.com)
 //     Sridhar Kulkarni (sridharkulkarni@gmail.com)
 //     Brian Nickel (brian.nickel@gmail.com)
+//     Ludovic Henry (ludovic@xamarin.com)
 //
 // Copyright (C) 2001, 2002 Phillip Pearson and Ximian, Inc.
 //    http://www.myelin.co.nz
@@ -69,13 +70,13 @@ namespace System.Net.Sockets
 
                int linger_timeout;
 
-               /* the field "safe_handle" is looked up by name by the runtime */
-               SafeSocketHandle safe_handle;
-
                AddressFamily address_family;
                SocketType socket_type;
                ProtocolType protocol_type;
 
+               /* the field "safe_handle" is looked up by name by the runtime */
+               internal SafeSocketHandle safe_handle;
+
                /*
                 * This EndPoint is used when creating new endpoints. Because
                 * there are many types of EndPoints possible,
@@ -85,8 +86,8 @@ namespace System.Net.Sockets
                 */
                internal EndPoint seed_endpoint = null;
 
-               internal Queue readQ = new Queue (2);
-               internal Queue writeQ = new Queue (2);
+               internal Queue<KeyValuePair<IntPtr, IOSelectorJob>> readQ = new Queue<KeyValuePair<IntPtr, IOSelectorJob>> (2);
+               internal Queue<KeyValuePair<IntPtr, IOSelectorJob>> writeQ = new Queue<KeyValuePair<IntPtr, IOSelectorJob>> (2);
 
                internal bool is_blocking = true;
                internal bool is_bound;
@@ -155,10 +156,16 @@ namespace System.Net.Sockets
                        }
                }
 
-               [MonoTODO ("Currently hardcoded to IPv4. Ideally, support v4/v6 dual-stack.")]
+               //
+               // This constructor is used by servers that want to listen for instance on both
+               // ipv4 and ipv6.   Mono has historically done that if you use InterNetworkV6 (at
+               // least on Unix), because that is the default behavior unless the IPV6_V6ONLY
+               // option is explicitly set by using setsockopt (sock, IPPROTO_IPV6, IPV6_ONLY)
+               //
                public Socket (SocketType socketType, ProtocolType protocolType)
-                       : this (AddressFamily.InterNetwork, socketType, protocolType)
+                       : this (AddressFamily.InterNetworkV6, socketType, protocolType)
                {
+                       DualMode = true;
                }
                
                public Socket(AddressFamily addressFamily, SocketType socketType, ProtocolType protocolType)
@@ -194,11 +201,9 @@ namespace System.Net.Sockets
                        this.address_family = addressFamily;
                        this.socket_type = socketType;
                        this.protocol_type = protocolType;
-                       
-                       int error;
-                       var handle = Socket_internal (addressFamily, socketType, protocolType, out error);
 
-                       this.safe_handle = new SafeSocketHandle (handle, true);
+                       int error;
+                       this.safe_handle = new SafeSocketHandle (Socket_internal (addressFamily, socketType, protocolType, out error), true);
 
                        if (error != 0)
                                throw new SocketException (error);
@@ -274,6 +279,7 @@ namespace System.Net.Sockets
 
 #region Properties
 
+               [ObsoleteAttribute ("Use OSSupportsIPv4 instead")]
                public static bool SupportsIPv4 {
                        get { return ipv4_supported == 1; }
                }
@@ -287,6 +293,19 @@ namespace System.Net.Sockets
                public static bool OSSupportsIPv4 {
                        get { return ipv4_supported == 1; }
                }
+#else
+               public static bool OSSupportsIPv4 {
+                       get {
+                               NetworkInterface[] nics = NetworkInterface.GetAllNetworkInterfaces ();
+
+                               foreach (NetworkInterface adapter in nics) {
+                                       if (adapter.Supports (NetworkInterfaceComponent.IPv4))
+                                               return true;
+                               }
+
+                               return false;
+                       }
+               }
 #endif
 
 #if NET_2_1
@@ -465,6 +484,27 @@ namespace System.Net.Sockets
                        }
                }
 
+               public bool DualMode {
+                       get {
+                               if (AddressFamily != AddressFamily.InterNetworkV6) 
+                                       throw new NotSupportedException("This protocol version is not supported");
+
+                               return ((int)GetSocketOption(SocketOptionLevel.IPv6, SocketOptionName.IPv6Only) == 0);
+                       }
+                       set {
+                               if (AddressFamily != AddressFamily.InterNetworkV6) 
+                                       throw new NotSupportedException("This protocol version is not supported");
+
+                               SetSocketOption(SocketOptionLevel.IPv6, SocketOptionName.IPv6Only, value ? 0 : 1);
+                       }
+               }
+
+               private bool IsDualMode {
+                       get {
+                               return AddressFamily == AddressFamily.InterNetworkV6 && DualMode;
+                       }
+               }
+
                [MonoTODO ("This doesn't do anything on Mono yet")]
                public bool UseOnlyOverlappedIO {
                        get { return use_overlapped_io; }
@@ -799,6 +839,48 @@ namespace System.Net.Sockets
 
 #endregion
 
+#region Poll
+
+               public bool Poll (int time_us, SelectMode mode)
+               {
+                       ThrowIfDisposedAndClosed ();
+
+                       if (mode != SelectMode.SelectRead && mode != SelectMode.SelectWrite && mode != SelectMode.SelectError)
+                               throw new NotSupportedException ("'mode' parameter is not valid.");
+
+                       int error;
+                       bool result = Poll_internal (safe_handle, mode, time_us, out error);
+
+                       if (error != 0)
+                               throw new SocketException (error);
+
+                       if (mode == SelectMode.SelectWrite && result && !is_connected) {
+                               /* Update the is_connected state; for non-blocking Connect()
+                                * this is when we can find out that the connect succeeded. */
+                               if ((int) GetSocketOption (SocketOptionLevel.Socket, SocketOptionName.Error) == 0)
+                                       is_connected = true;
+                       }
+
+                       return result;
+               }
+
+               static bool Poll_internal (SafeSocketHandle safeHandle, SelectMode mode, int timeout, out int error)
+               {
+                       bool release = false;
+                       try {
+                               safeHandle.DangerousAddRef (ref release);
+                               return Poll_internal (safeHandle.DangerousGetHandle (), mode, timeout, out error);
+                       } finally {
+                               if (release)
+                                       safeHandle.DangerousRelease ();
+                       }
+               }
+
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               extern static bool Poll_internal (IntPtr socket, SelectMode mode, int timeout, out int error);
+
+#endregion
+
 #region Accept
 
                public Socket Accept()
@@ -867,23 +949,32 @@ namespace System.Net.Sockets
                                        throw new InvalidOperationException ("AcceptSocket: The socket must not be bound or connected.");
                        }
 
-                       e.curSocket = this;
-                       e.Worker.Init (this, e, SocketOperation.Accept);
-
-                       SocketAsyncResult sockares = e.Worker.result;
-
-                       int count;
-                       lock (readQ) {
-                               readQ.Enqueue (e.Worker);
-                               count = readQ.Count;
-                       }
+                       InitSocketAsyncEventArgs (e, AcceptAsyncCallback, e, SocketOperation.Accept);
 
-                       if (count == 1)
-                               socket_pool_queue (SocketAsyncWorker.Dispatcher, sockares);
+                       QueueIOSelectorJob (readQ, e.socket_async_result.Handle, new IOSelectorJob (IOOperation.Read, BeginAcceptCallback, e.socket_async_result));
 
                        return true;
                }
 
+               static AsyncCallback AcceptAsyncCallback = new AsyncCallback (ares => {
+                       SocketAsyncEventArgs e = (SocketAsyncEventArgs) ((SocketAsyncResult) ares).AsyncState;
+
+                       if (Interlocked.Exchange (ref e.in_progress, 0) != 1)
+                               throw new InvalidOperationException ("No operation in progress");
+
+                       try {
+                               e.AcceptSocket = e.current_socket.EndAccept (ares);
+                       } catch (SocketException ex) {
+                               e.SocketError = ex.SocketErrorCode;
+                       } catch (ObjectDisposedException) {
+                               e.SocketError = SocketError.OperationAborted;
+                       } finally {
+                               if (e.AcceptSocket == null)
+                                       e.AcceptSocket = new Socket (e.current_socket.AddressFamily, e.current_socket.SocketType, e.current_socket.ProtocolType, null);
+                               e.Complete ();
+                       }
+               });
+
                public IAsyncResult BeginAccept(AsyncCallback callback, object state)
                {
                        ThrowIfDisposedAndClosed ();
@@ -891,20 +982,27 @@ namespace System.Net.Sockets
                        if (!is_bound || !is_listening)
                                throw new InvalidOperationException ();
 
-                       SocketAsyncResult sockares = new SocketAsyncResult (this, state, callback, SocketOperation.Accept);
+                       SocketAsyncResult sockares = new SocketAsyncResult (this, callback, state, SocketOperation.Accept);
 
-                       int count;
-                       lock (readQ) {
-                               readQ.Enqueue (sockares.Worker);
-                               count = readQ.Count;
-                       }
-
-                       if (count == 1)
-                               socket_pool_queue (SocketAsyncWorker.Dispatcher, sockares);
+                       QueueIOSelectorJob (readQ, sockares.Handle, new IOSelectorJob (IOOperation.Read, BeginAcceptCallback, sockares));
 
                        return sockares;
                }
 
+               static IOAsyncCallback BeginAcceptCallback = new IOAsyncCallback (ares => {
+                       SocketAsyncResult sockares = (SocketAsyncResult) ares;
+                       Socket socket = null;
+
+                       try {
+                               socket = sockares.socket.Accept ();
+                       } catch (Exception e) {
+                               sockares.Complete (e);
+                               return;
+                       }
+
+                       sockares.Complete (socket);
+               });
+
                public IAsyncResult BeginAccept (int receiveSize, AsyncCallback callback, object state)
                {
                        ThrowIfDisposedAndClosed ();
@@ -912,21 +1010,14 @@ namespace System.Net.Sockets
                        if (receiveSize < 0)
                                throw new ArgumentOutOfRangeException ("receiveSize", "receiveSize is less than zero");
 
-                       SocketAsyncResult sockares = new SocketAsyncResult (this, state, callback, SocketOperation.AcceptReceive) {
+                       SocketAsyncResult sockares = new SocketAsyncResult (this, callback, state, SocketOperation.AcceptReceive) {
                                Buffer = new byte [receiveSize],
                                Offset = 0,
                                Size = receiveSize,
                                SockFlags = SocketFlags.None,
                        };
 
-                       int count;
-                       lock (readQ) {
-                               readQ.Enqueue (sockares.Worker);
-                               count = readQ.Count;
-                       }
-
-                       if (count == 1)
-                               socket_pool_queue (SocketAsyncWorker.Dispatcher, sockares);
+                       QueueIOSelectorJob (readQ, sockares.Handle, new IOSelectorJob (IOOperation.Read, BeginAcceptReceiveCallback, sockares));
 
                        return sockares;
                }
@@ -952,8 +1043,8 @@ namespace System.Net.Sockets
                                if (acceptSocket.ProtocolType != ProtocolType.Tcp)
                                        throw new SocketException ((int)SocketError.InvalidArgument);
                        }
-                       
-                       SocketAsyncResult sockares = new SocketAsyncResult (this, state, callback, SocketOperation.AcceptReceive) {
+
+                       SocketAsyncResult sockares = new SocketAsyncResult (this, callback, state, SocketOperation.AcceptReceive) {
                                Buffer = new byte [receiveSize],
                                Offset = 0,
                                Size = receiveSize,
@@ -961,18 +1052,46 @@ namespace System.Net.Sockets
                                AcceptSocket = acceptSocket,
                        };
 
-                       int count;
-                       lock (readQ) {
-                               readQ.Enqueue (sockares.Worker);
-                               count = readQ.Count;
-                       }
-
-                       if (count == 1)
-                               socket_pool_queue (SocketAsyncWorker.Dispatcher, sockares);
+                       QueueIOSelectorJob (readQ, sockares.Handle, new IOSelectorJob (IOOperation.Read, BeginAcceptReceiveCallback, sockares));
 
                        return sockares;
                }
 
+               static IOAsyncCallback BeginAcceptReceiveCallback = new IOAsyncCallback (ares => {
+                       SocketAsyncResult sockares = (SocketAsyncResult) ares;
+                       Socket acc_socket = null;
+
+                       try {
+                               if (sockares.AcceptSocket == null) {
+                                       acc_socket = sockares.socket.Accept ();
+                               } else {
+                                       acc_socket = sockares.AcceptSocket;
+                                       sockares.socket.Accept (acc_socket);
+                               }
+                       } catch (Exception e) {
+                               sockares.Complete (e);
+                               return;
+                       }
+
+                       /* It seems the MS runtime special-cases 0-length requested receive data.  See bug 464201. */
+                       int total = 0;
+                       if (sockares.Size > 0) {
+                               try {
+                                       SocketError error;
+                                       total = acc_socket.Receive_nochecks (sockares.Buffer, sockares.Offset, sockares.Size, sockares.SockFlags, out error);
+                                       if (error != 0) {
+                                               sockares.Complete (new SocketException ((int) error));
+                                               return;
+                                       }
+                               } catch (Exception e) {
+                                       sockares.Complete (e);
+                                       return;
+                               }
+                       }
+
+                       sockares.Complete (acc_socket, total);
+               });
+
                public Socket EndAccept (IAsyncResult result)
                {
                        int bytes;
@@ -1000,7 +1119,7 @@ namespace System.Net.Sockets
                        buffer = sockares.Buffer;
                        bytesTransferred = sockares.Total;
 
-                       return sockares.Socket;
+                       return sockares.AcceptedSocket;
                }
 
                static SafeSocketHandle Accept_internal (SafeSocketHandle safeHandle, out int error, bool blocking)
@@ -1020,1248 +1139,1725 @@ namespace System.Net.Sockets
 
 #endregion
 
-               public IAsyncResult BeginConnect (IPAddress address, int port,
-                                                 AsyncCallback callback,
-                                                 object state)
-               {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+#region Bind
 
-                       if (address == null)
-                               throw new ArgumentNullException ("address");
+               public void Bind (EndPoint local_end)
+               {
+                       ThrowIfDisposedAndClosed ();
 
-                       if (address.ToString ().Length == 0)
-                               throw new ArgumentException ("The length of the IP address is zero");
+                       if (local_end == null)
+                               throw new ArgumentNullException("local_end");
 
-                       if (port <= 0 || port > 65535)
-                               throw new ArgumentOutOfRangeException ("port", "Must be > 0 and < 65536");
+                       int error;
+                       Bind_internal (safe_handle, local_end.Serialize(), out error);
 
-                       if (is_listening)
-                               throw new InvalidOperationException ();
+                       if (error != 0)
+                               throw new SocketException (error);
+                       if (error == 0)
+                               is_bound = true;
 
-                       IPEndPoint iep = new IPEndPoint (address, port);
-                       return(BeginConnect (iep, callback, state));
+                       seed_endpoint = local_end;
                }
 
-               public IAsyncResult BeginConnect (string host, int port,
-                                                 AsyncCallback callback,
-                                                 object state)
+               private static void Bind_internal (SafeSocketHandle safeHandle, SocketAddress sa, out int error)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       bool release = false;
+                       try {
+                               safeHandle.DangerousAddRef (ref release);
+                               Bind_internal (safeHandle.DangerousGetHandle (), sa, out error);
+                       } finally {
+                               if (release)
+                                       safeHandle.DangerousRelease ();
+                       }
+               }
 
-                       if (host == null)
-                               throw new ArgumentNullException ("host");
+               // Creates a new system socket, returning the handle
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               private extern static void Bind_internal(IntPtr sock, SocketAddress sa, out int error);
 
-                       if (address_family != AddressFamily.InterNetwork &&
-                               address_family != AddressFamily.InterNetworkV6)
-                               throw new NotSupportedException ("This method is valid only for sockets in the InterNetwork and InterNetworkV6 families");
+#endregion
 
-                       if (port <= 0 || port > 65535)
-                               throw new ArgumentOutOfRangeException ("port", "Must be > 0 and < 65536");
+#region Listen
 
-                       if (is_listening)
-                               throw new InvalidOperationException ();
+               public void Listen (int backlog)
+               {
+                       ThrowIfDisposedAndClosed ();
 
-                       return BeginConnect (Dns.GetHostAddresses (host), port, callback, state);
-               }
+                       if (!is_bound)
+                               throw new SocketException ((int) SocketError.InvalidArgument);
 
-               public IAsyncResult BeginDisconnect (bool reuseSocket,
-                                                    AsyncCallback callback,
-                                                    object state)
-               {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       int error;
+                       Listen_internal(safe_handle, backlog, out error);
+
+                       if (error != 0)
+                               throw new SocketException (error);
 
-                       SocketAsyncResult req = new SocketAsyncResult (this, state, callback, SocketOperation.Disconnect);
-                       req.ReuseSocket = reuseSocket;
-                       socket_pool_queue (SocketAsyncWorker.Dispatcher, req);
-                       return(req);
+                       is_listening = true;
                }
 
-               void CheckRange (byte[] buffer, int offset, int size)
+               static void Listen_internal (SafeSocketHandle safeHandle, int backlog, out int error)
                {
-                       if (offset < 0)
-                               throw new ArgumentOutOfRangeException ("offset", "offset must be >= 0");
-                               
-                       if (offset > buffer.Length)
-                               throw new ArgumentOutOfRangeException ("offset", "offset must be <= buffer.Length");
-
-                       if (size < 0)                          
-                               throw new ArgumentOutOfRangeException ("size", "size must be >= 0");
-                               
-                       if (size > buffer.Length - offset)
-                               throw new ArgumentOutOfRangeException ("size", "size must be <= buffer.Length - offset");
+                       bool release = false;
+                       try {
+                               safeHandle.DangerousAddRef (ref release);
+                               Listen_internal (safeHandle.DangerousGetHandle (), backlog, out error);
+                       } finally {
+                               if (release)
+                                       safeHandle.DangerousRelease ();
+                       }
                }
-               
-               public IAsyncResult BeginReceive(byte[] buffer, int offset,
-                                                int size,
-                                                SocketFlags socket_flags,
-                                                AsyncCallback callback,
-                                                object state) {
 
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               extern static void Listen_internal (IntPtr sock, int backlog, out int error);
 
-                       if (buffer == null)
-                               throw new ArgumentNullException ("buffer");
+#endregion
 
-                       CheckRange (buffer, offset, size);
+#region Connect
 
-                       SocketAsyncResult req = new SocketAsyncResult (this, state, callback, SocketOperation.Receive);
-                       req.Buffer = buffer;
-                       req.Offset = offset;
-                       req.Size = size;
-                       req.SockFlags = socket_flags;
-                       int count;
-                       lock (readQ) {
-                               readQ.Enqueue (req.Worker);
-                               count = readQ.Count;
-                       }
-                       if (count == 1)
-                               socket_pool_queue (SocketAsyncWorker.Dispatcher, req);
-                       return req;
-               }
-
-               public IAsyncResult BeginReceive (byte[] buffer, int offset,
-                                                 int size, SocketFlags flags,
-                                                 out SocketError error,
-                                                 AsyncCallback callback,
-                                                 object state)
-               {
-                       /* As far as I can tell from the docs and from
-                        * experimentation, a pointer to the
-                        * SocketError parameter is not supposed to be
-                        * saved for the async parts.  And as we don't
-                        * set any socket errors in the setup code, we
-                        * just have to set it to Success.
-                        */
-                       error = SocketError.Success;
-                       return (BeginReceive (buffer, offset, size, flags, callback, state));
+               public void Connect (IPAddress address, int port)
+               {
+                       Connect (new IPEndPoint (address, port));
                }
 
-               [CLSCompliant (false)]
-               public IAsyncResult BeginReceive (IList<ArraySegment<byte>> buffers,
-                                                 SocketFlags socketFlags,
-                                                 AsyncCallback callback,
-                                                 object state)
+               public void Connect (string host, int port)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
-
-                       if (buffers == null)
-                               throw new ArgumentNullException ("buffers");
-
-                       SocketAsyncResult req = new SocketAsyncResult (this, state, callback, SocketOperation.ReceiveGeneric);
-                       req.Buffers = buffers;
-                       req.SockFlags = socketFlags;
-                       int count;
-                       lock(readQ) {
-                               readQ.Enqueue (req.Worker);
-                               count = readQ.Count;
-                       }
-                       if (count == 1)
-                               socket_pool_queue (SocketAsyncWorker.Dispatcher, req);
-                       return req;
-               }
-               
-               [CLSCompliant (false)]
-               public IAsyncResult BeginReceive (IList<ArraySegment<byte>> buffers,
-                                                 SocketFlags socketFlags,
-                                                 out SocketError errorCode,
-                                                 AsyncCallback callback,
-                                                 object state)
-               {
-                       /* I assume the same SocketError semantics as
-                        * above
-                        */
-                       errorCode = SocketError.Success;
-                       return (BeginReceive (buffers, socketFlags, callback, state));
+                       Connect (Dns.GetHostAddresses (host), port);
                }
 
-               public IAsyncResult BeginReceiveFrom(byte[] buffer, int offset,
-                                                    int size,
-                                                    SocketFlags socket_flags,
-                                                    ref EndPoint remote_end,
-                                                    AsyncCallback callback,
-                                                    object state) {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+               public void Connect (IPAddress[] addresses, int port)
+               {
+                       ThrowIfDisposedAndClosed ();
 
-                       if (buffer == null)
-                               throw new ArgumentNullException ("buffer");
+                       if (addresses == null)
+                               throw new ArgumentNullException ("addresses");
+                       if (this.AddressFamily != AddressFamily.InterNetwork && this.AddressFamily != AddressFamily.InterNetworkV6)
+                               throw new NotSupportedException ("This method is only valid for addresses in the InterNetwork or InterNetworkV6 families");
+                       if (is_listening)
+                               throw new InvalidOperationException ();
 
-                       if (remote_end == null)
-                               throw new ArgumentNullException ("remote_end");
+                       // FIXME: do non-blocking sockets Poll here?
+                       int error = 0;
+                       foreach (IPAddress address in addresses) {
+                               IPEndPoint iep = new IPEndPoint (address, port);
 
-                       CheckRange (buffer, offset, size);
+                               Connect_internal (safe_handle, iep.Serialize (), out error);
+                               if (error == 0) {
+                                       is_connected = true;
+                                       is_bound = true;
+                                       seed_endpoint = iep;
+                                       return;
+                               }
+                               if (error != (int)SocketError.InProgress && error != (int)SocketError.WouldBlock)
+                                       continue;
 
-                       SocketAsyncResult req = new SocketAsyncResult (this, state, callback, SocketOperation.ReceiveFrom);
-                       req.Buffer = buffer;
-                       req.Offset = offset;
-                       req.Size = size;
-                       req.SockFlags = socket_flags;
-                       req.EndPoint = remote_end;
-                       int count;
-                       lock (readQ) {
-                               readQ.Enqueue (req.Worker);
-                               count = readQ.Count;
+                               if (!is_blocking) {
+                                       Poll (-1, SelectMode.SelectWrite);
+                                       error = (int)GetSocketOption (SocketOptionLevel.Socket, SocketOptionName.Error);
+                                       if (error == 0) {
+                                               is_connected = true;
+                                               is_bound = true;
+                                               seed_endpoint = iep;
+                                               return;
+                                       }
+                               }
                        }
-                       if (count == 1)
-                               socket_pool_queue (SocketAsyncWorker.Dispatcher, req);
-                       return req;
+
+                       if (error != 0)
+                               throw new SocketException (error);
                }
 
-               [MonoTODO]
-               public IAsyncResult BeginReceiveMessageFrom (
-                       byte[] buffer, int offset, int size,
-                       SocketFlags socketFlags, ref EndPoint remoteEP,
-                       AsyncCallback callback, object state)
+
+               public void Connect (EndPoint remoteEP)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
-
-                       if (buffer == null)
-                               throw new ArgumentNullException ("buffer");
+                       ThrowIfDisposedAndClosed ();
 
                        if (remoteEP == null)
                                throw new ArgumentNullException ("remoteEP");
 
-                       CheckRange (buffer, offset, size);
+                       IPEndPoint ep = remoteEP as IPEndPoint;
+                       /* Dgram uses Any to 'disconnect' */
+                       if (ep != null && socket_type != SocketType.Dgram) {
+                               if (ep.Address.Equals (IPAddress.Any) || ep.Address.Equals (IPAddress.IPv6Any))
+                                       throw new SocketException ((int) SocketError.AddressNotAvailable);
+                       }
 
-                       throw new NotImplementedException ();
+                       if (is_listening)
+                               throw new InvalidOperationException ();
+
+                       SocketAddress serial = remoteEP.Serialize ();
+
+                       int error = 0;
+                       Connect_internal (safe_handle, serial, out error);
+
+                       if (error == 0 || error == 10035)
+                               seed_endpoint = remoteEP; // Keep the ep around for non-blocking sockets
+
+                       if (error != 0) {
+                               if (is_closed)
+                                       error = SOCKET_CLOSED_CODE;
+                               throw new SocketException (error);
+                       }
+
+                       is_connected = !(socket_type == SocketType.Dgram && ep != null && (ep.Address.Equals (IPAddress.Any) || ep.Address.Equals (IPAddress.IPv6Any)));
+                       is_bound = true;
                }
 
-               public IAsyncResult BeginSend (byte[] buffer, int offset, int size, SocketFlags socket_flags,
-                                              AsyncCallback callback, object state)
+               public bool ConnectAsync (SocketAsyncEventArgs e)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       // NO check is made whether e != null in MS.NET (NRE is thrown in such case)
 
-                       if (buffer == null)
-                               throw new ArgumentNullException ("buffer");
+                       ThrowIfDisposedAndClosed ();
 
-                       CheckRange (buffer, offset, size);
+                       if (is_listening)
+                               throw new InvalidOperationException ("You may not perform this operation after calling the Listen method.");
+                       if (e.RemoteEndPoint == null)
+                               throw new ArgumentNullException ("remoteEP");
 
-                       if (!is_connected)
-                               throw new SocketException ((int)SocketError.NotConnected);
+                       InitSocketAsyncEventArgs (e, ConnectAsyncCallback, e, SocketOperation.Connect);
 
-                       SocketAsyncResult req = new SocketAsyncResult (this, state, callback, SocketOperation.Send);
-                       req.Buffer = buffer;
-                       req.Offset = offset;
-                       req.Size = size;
-                       req.SockFlags = socket_flags;
-                       int count;
-                       lock (writeQ) {
-                               writeQ.Enqueue (req.Worker);
-                               count = writeQ.Count;
+                       try {
+                               IPAddress [] addresses;
+                               SocketAsyncResult ares;
+
+                               if (!GetCheckedIPs (e, out addresses)) {
+                                       e.socket_async_result.EndPoint = e.RemoteEndPoint;
+                                       ares = (SocketAsyncResult) BeginConnect (e.RemoteEndPoint, ConnectAsyncCallback, e);
+                               } else {
+                                       DnsEndPoint dep = (e.RemoteEndPoint as DnsEndPoint);
+                                       e.socket_async_result.Addresses = addresses;
+                                       e.socket_async_result.Port = dep.Port;
+                                       ares = (SocketAsyncResult) BeginConnect (addresses, dep.Port, ConnectAsyncCallback, e);
+                               }
+
+                               if (ares.IsCompleted && ares.CompletedSynchronously) {
+                                       ares.CheckIfThrowDelayedException ();
+                                       return false;
+                               }
+                       } catch (Exception exc) {
+                               e.socket_async_result.Complete (exc, true);
+                               return false;
                        }
-                       if (count == 1)
-                               socket_pool_queue (SocketAsyncWorker.Dispatcher, req);
-                       return req;
+
+                       return true;
                }
 
-               public IAsyncResult BeginSend (byte[] buffer, int offset,
-                                              int size,
-                                              SocketFlags socketFlags,
-                                              out SocketError errorCode,
-                                              AsyncCallback callback,
-                                              object state)
-               {
-                       if (!is_connected) {
-                               errorCode = SocketError.NotConnected;
-                               throw new SocketException ((int)errorCode);
+               static AsyncCallback ConnectAsyncCallback = new AsyncCallback (ares => {
+                       SocketAsyncEventArgs e = (SocketAsyncEventArgs) ((SocketAsyncResult) ares).AsyncState;
+
+                       if (Interlocked.Exchange (ref e.in_progress, 0) != 1)
+                               throw new InvalidOperationException ("No operation in progress");
+
+                       try {
+                               e.current_socket.EndConnect (ares);
+                       } catch (SocketException se) {
+                               e.SocketError = se.SocketErrorCode;
+                       } catch (ObjectDisposedException) {
+                               e.SocketError = SocketError.OperationAborted;
+                       } finally {
+                               e.Complete ();
                        }
-                       
-                       errorCode = SocketError.Success;
-                       
-                       return (BeginSend (buffer, offset, size, socketFlags, callback,
-                               state));
+               });
+
+               public IAsyncResult BeginConnect (IPAddress address, int port, AsyncCallback callback, object state)
+               {
+                       ThrowIfDisposedAndClosed ();
+
+                       if (address == null)
+                               throw new ArgumentNullException ("address");
+                       if (address.ToString ().Length == 0)
+                               throw new ArgumentException ("The length of the IP address is zero");
+                       if (port <= 0 || port > 65535)
+                               throw new ArgumentOutOfRangeException ("port", "Must be > 0 and < 65536");
+                       if (is_listening)
+                               throw new InvalidOperationException ();
+
+                       return BeginConnect (new IPEndPoint (address, port), callback, state);
                }
 
-               public IAsyncResult BeginSend (IList<ArraySegment<byte>> buffers,
-                                              SocketFlags socketFlags,
-                                              AsyncCallback callback,
-                                              object state)
+               public IAsyncResult BeginConnect (string host, int port, AsyncCallback callback, object state)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       ThrowIfDisposedAndClosed ();
 
-                       if (buffers == null)
-                               throw new ArgumentNullException ("buffers");
+                       if (host == null)
+                               throw new ArgumentNullException ("host");
+                       if (address_family != AddressFamily.InterNetwork && address_family != AddressFamily.InterNetworkV6)
+                               throw new NotSupportedException ("This method is valid only for sockets in the InterNetwork and InterNetworkV6 families");
+                       if (port <= 0 || port > 65535)
+                               throw new ArgumentOutOfRangeException ("port", "Must be > 0 and < 65536");
+                       if (is_listening)
+                               throw new InvalidOperationException ();
 
-                       if (!is_connected)
-                               throw new SocketException ((int)SocketError.NotConnected);
+                       return BeginConnect (Dns.GetHostAddresses (host), port, callback, state);
+               }
 
-                       SocketAsyncResult req = new SocketAsyncResult (this, state, callback, SocketOperation.SendGeneric);
-                       req.Buffers = buffers;
-                       req.SockFlags = socketFlags;
-                       int count;
-                       lock (writeQ) {
-                               writeQ.Enqueue (req.Worker);
-                               count = writeQ.Count;
+               public IAsyncResult BeginConnect (EndPoint end_point, AsyncCallback callback, object state)
+               {
+                       ThrowIfDisposedAndClosed ();
+
+                       if (end_point == null)
+                               throw new ArgumentNullException ("end_point");
+
+                       SocketAsyncResult sockares = new SocketAsyncResult (this, callback, state, SocketOperation.Connect) {
+                               EndPoint = end_point,
+                       };
+
+                       // Bug #75154: Connect() should not succeed for .Any addresses.
+                       if (end_point is IPEndPoint) {
+                               IPEndPoint ep = (IPEndPoint) end_point;
+                               if (ep.Address.Equals (IPAddress.Any) || ep.Address.Equals (IPAddress.IPv6Any)) {
+                                       sockares.Complete (new SocketException ((int) SocketError.AddressNotAvailable), true);
+                                       return sockares;
+                               }
                        }
-                       if (count == 1)
-                               socket_pool_queue (SocketAsyncWorker.Dispatcher, req);
-                       return req;
+
+                       int error = 0;
+
+                       if (connect_in_progress) {
+                               // This could happen when multiple IPs are used
+                               // Calling connect() again will reset the connection attempt and cause
+                               // an error. Better to just close the socket and move on.
+                               connect_in_progress = false;
+                               safe_handle.Dispose ();
+                               safe_handle = new SafeSocketHandle (Socket_internal (address_family, socket_type, protocol_type, out error), true);
+                               if (error != 0)
+                                       throw new SocketException (error);
+                       }
+
+                       bool blk = is_blocking;
+                       if (blk)
+                               Blocking = false;
+                       Connect_internal (safe_handle, end_point.Serialize (), out error);
+                       if (blk)
+                               Blocking = true;
+
+                       if (error == 0) {
+                               // succeeded synch
+                               is_connected = true;
+                               is_bound = true;
+                               sockares.Complete (true);
+                               return sockares;
+                       }
+
+                       if (error != (int) SocketError.InProgress && error != (int) SocketError.WouldBlock) {
+                               // error synch
+                               is_connected = false;
+                               is_bound = false;
+                               sockares.Complete (new SocketException (error), true);
+                               return sockares;
+                       }
+
+                       // continue asynch
+                       is_connected = false;
+                       is_bound = false;
+                       connect_in_progress = true;
+
+                       IOSelector.Add (sockares.Handle, new IOSelectorJob (IOOperation.Write, BeginConnectCallback, sockares));
+
+                       return sockares;
                }
 
-               [CLSCompliant (false)]
-               public IAsyncResult BeginSend (IList<ArraySegment<byte>> buffers,
-                                              SocketFlags socketFlags,
-                                              out SocketError errorCode,
-                                              AsyncCallback callback,
-                                              object state)
+               public IAsyncResult BeginConnect (IPAddress[] addresses, int port, AsyncCallback callback, object state)
                {
-                       if (!is_connected) {
-                               errorCode = SocketError.NotConnected;
-                               throw new SocketException ((int)errorCode);
-                       }
-                       
-                       errorCode = SocketError.Success;
-                       return (BeginSend (buffers, socketFlags, callback, state));
+                       ThrowIfDisposedAndClosed ();
+
+                       if (addresses == null)
+                               throw new ArgumentNullException ("addresses");
+                       if (addresses.Length == 0)
+                               throw new ArgumentException ("Empty addresses list");
+                       if (this.AddressFamily != AddressFamily.InterNetwork && this.AddressFamily != AddressFamily.InterNetworkV6)
+                               throw new NotSupportedException ("This method is only valid for addresses in the InterNetwork or InterNetworkV6 families");
+                       if (port <= 0 || port > 65535)
+                               throw new ArgumentOutOfRangeException ("port", "Must be > 0 and < 65536");
+                       if (is_listening)
+                               throw new InvalidOperationException ();
+
+                       SocketAsyncResult sockares = new SocketAsyncResult (this, callback, state, SocketOperation.Connect) {
+                               Addresses = addresses,
+                               Port = port,
+                       };
+
+                       is_connected = false;
+
+                       return BeginMConnect (sockares);
                }
 
-               delegate void SendFileHandler (string fileName, byte [] preBuffer, byte [] postBuffer, TransmitFileOptions flags);
+               internal IAsyncResult BeginMConnect (SocketAsyncResult sockares)
+               {
+                       SocketAsyncResult ares = null;
+                       Exception exc = null;
+                       AsyncCallback callback;
 
-               sealed class SendFileAsyncResult : IAsyncResult {
-                       IAsyncResult ares;
-                       SendFileHandler d;
+                       for (int i = sockares.CurrentAddress; i < sockares.Addresses.Length; i++) {
+                               try {
+                                       sockares.CurrentAddress++;
 
-                       public SendFileAsyncResult (SendFileHandler d, IAsyncResult ares)
-                       {
-                               this.d = d;
-                               this.ares = ares;
+                                       ares = (SocketAsyncResult) BeginConnect (new IPEndPoint (sockares.Addresses [i], sockares.Port), null, sockares);
+                                       if (ares.IsCompleted && ares.CompletedSynchronously) {
+                                               ares.CheckIfThrowDelayedException ();
+
+                                               callback = ares.AsyncCallback;
+                                               if (callback != null)
+                                                       ThreadPool.UnsafeQueueUserWorkItem (_ => callback (ares), null);
+                                       }
+
+                                       break;
+                               } catch (Exception e) {
+                                       exc = e;
+                                       ares = null;
+                               }
                        }
 
-                       public object AsyncState {
-                               get { return ares.AsyncState; }
+                       if (ares == null)
+                               throw exc;
+
+                       return sockares;
+               }
+
+               static IOAsyncCallback BeginConnectCallback = new IOAsyncCallback (ares => {
+                       SocketAsyncResult sockares = (SocketAsyncResult) ares;
+
+                       if (sockares.EndPoint == null) {
+                               sockares.Complete (new SocketException ((int)SocketError.AddressNotAvailable));
+                               return;
                        }
 
-                       public WaitHandle AsyncWaitHandle {
-                               get { return ares.AsyncWaitHandle; }
+                       SocketAsyncResult mconnect = sockares.AsyncState as SocketAsyncResult;
+                       bool is_mconnect = mconnect != null && mconnect.Addresses != null;
+
+                       try {
+                               EndPoint ep = sockares.EndPoint;
+                               int error_code = (int) sockares.socket.GetSocketOption (SocketOptionLevel.Socket, SocketOptionName.Error);
+
+                               if (error_code == 0) {
+                                       if (is_mconnect)
+                                               sockares = mconnect;
+
+                                       sockares.socket.seed_endpoint = ep;
+                                       sockares.socket.is_connected = true;
+                                       sockares.socket.is_bound = true;
+                                       sockares.socket.connect_in_progress = false;
+                                       sockares.error = 0;
+                                       sockares.Complete ();
+                                       return;
+                               }
+
+                               if (!is_mconnect) {
+                                       sockares.socket.connect_in_progress = false;
+                                       sockares.Complete (new SocketException (error_code));
+                                       return;
+                               }
+
+                               if (mconnect.CurrentAddress >= mconnect.Addresses.Length) {
+                                       mconnect.Complete (new SocketException (error_code));
+                                       return;
+                               }
+
+                               mconnect.socket.BeginMConnect (mconnect);
+                       } catch (Exception e) {
+                               sockares.socket.connect_in_progress = false;
+
+                               if (is_mconnect)
+                                       sockares = mconnect;
+
+                               sockares.Complete (e);
+                               return;
                        }
+               });
 
-                       public bool CompletedSynchronously {
-                               get { return ares.CompletedSynchronously; }
+               public void EndConnect (IAsyncResult result)
+               {
+                       ThrowIfDisposedAndClosed ();
+
+                       SocketAsyncResult sockares = ValidateEndIAsyncResult (result, "EndConnect", "result");
+
+                       if (!sockares.IsCompleted)
+                               sockares.AsyncWaitHandle.WaitOne();
+
+                       sockares.CheckIfThrowDelayedException();
+               }
+
+               static void Connect_internal (SafeSocketHandle safeHandle, SocketAddress sa, out int error)
+               {
+                       try {
+                               safeHandle.RegisterForBlockingSyscall ();
+                               Connect_internal (safeHandle.DangerousGetHandle (), sa, out error);
+                       } finally {
+                               safeHandle.UnRegisterForBlockingSyscall ();
                        }
+               }
 
-                       public bool IsCompleted {
-                               get { return ares.IsCompleted; }
+               /* Connects to the remote address */
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               extern static void Connect_internal(IntPtr sock, SocketAddress sa, out int error);
+
+               /* Returns :
+                *  - false when it is ok to use RemoteEndPoint
+                *  - true when addresses must be used (and addresses could be null/empty) */
+               bool GetCheckedIPs (SocketAsyncEventArgs e, out IPAddress [] addresses)
+               {
+                       addresses = null;
+
+                       // Connect to the first address that match the host name, like:
+                       // http://blogs.msdn.com/ncl/archive/2009/07/20/new-ncl-features-in-net-4-0-beta-2.aspx
+                       // while skipping entries that do not match the address family
+                       DnsEndPoint dep = e.RemoteEndPoint as DnsEndPoint;
+                       if (dep != null) {
+                               addresses = Dns.GetHostAddresses (dep.Host);
+                               return true;
+                       } else {
+                               e.ConnectByNameError = null;
+                               return false;
                        }
+               }
 
-                       public SendFileHandler Delegate {
-                               get { return d; }
+#endregion
+
+#region Disconnect
+
+               /* According to the docs, the MS runtime will throw PlatformNotSupportedException
+                * if the platform is newer than w2k.  We should be able to cope... */
+               public void Disconnect (bool reuseSocket)
+               {
+                       ThrowIfDisposedAndClosed ();
+
+                       int error = 0;
+                       Disconnect_internal (safe_handle, reuseSocket, out error);
+
+                       if (error != 0) {
+                               if (error == 50) {
+                                       /* ERROR_NOT_SUPPORTED */
+                                       throw new PlatformNotSupportedException ();
+                               } else {
+                                       throw new SocketException (error);
+                               }
                        }
 
-                       public IAsyncResult Original {
-                               get { return ares; }
+                       is_connected = false;
+                       if (reuseSocket) {
+                               /* Do managed housekeeping here... */
                        }
                }
 
-               public IAsyncResult BeginSendFile (string fileName,
-                                                  AsyncCallback callback,
-                                                  object state)
+               public bool DisconnectAsync (SocketAsyncEventArgs e)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       // NO check is made whether e != null in MS.NET (NRE is thrown in such case)
 
-                       if (!is_connected)
-                               throw new NotSupportedException ();
+                       ThrowIfDisposedAndClosed ();
 
-                       if (!File.Exists (fileName))
-                               throw new FileNotFoundException ();
+                       InitSocketAsyncEventArgs (e, DisconnectAsyncCallback, e, SocketOperation.Disconnect);
 
-                       return BeginSendFile (fileName, null, null, 0, callback, state);
+                       IOSelector.Add (e.socket_async_result.Handle, new IOSelectorJob (IOOperation.Write, BeginDisconnectCallback, e.socket_async_result));
+
+                       return true;
                }
 
-               public IAsyncResult BeginSendFile (string fileName,
-                                                  byte[] preBuffer,
-                                                  byte[] postBuffer,
-                                                  TransmitFileOptions flags,
-                                                  AsyncCallback callback,
-                                                  object state)
+               static AsyncCallback DisconnectAsyncCallback = new AsyncCallback (ares => {
+                       SocketAsyncEventArgs e = (SocketAsyncEventArgs) ((SocketAsyncResult) ares).AsyncState;
+
+                       if (Interlocked.Exchange (ref e.in_progress, 0) != 1)
+                               throw new InvalidOperationException ("No operation in progress");
+
+                       try {
+                               e.current_socket.EndDisconnect (ares);
+                       } catch (SocketException ex) {
+                               e.SocketError = ex.SocketErrorCode;
+                       } catch (ObjectDisposedException) {
+                               e.SocketError = SocketError.OperationAborted;
+                       } finally {
+                               e.Complete ();
+                       }
+               });
+
+               public IAsyncResult BeginDisconnect (bool reuseSocket, AsyncCallback callback, object state)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       ThrowIfDisposedAndClosed ();
 
-                       if (!is_connected)
-                               throw new NotSupportedException ();
+                       SocketAsyncResult sockares = new SocketAsyncResult (this, callback, state, SocketOperation.Disconnect) {
+                               ReuseSocket = reuseSocket,
+                       };
 
-                       if (!File.Exists (fileName))
-                               throw new FileNotFoundException ();
+                       IOSelector.Add (sockares.Handle, new IOSelectorJob (IOOperation.Write, BeginDisconnectCallback, sockares));
 
-                       SendFileHandler d = new SendFileHandler (SendFile);
-                       return new SendFileAsyncResult (d, d.BeginInvoke (fileName, preBuffer, postBuffer, flags, ar => {
-                               SendFileAsyncResult sfar = new SendFileAsyncResult (d, ar);
-                               callback (sfar);
-                       }, state));
+                       return sockares;
                }
 
-               public IAsyncResult BeginSendTo(byte[] buffer, int offset,
-                                               int size,
-                                               SocketFlags socket_flags,
-                                               EndPoint remote_end,
-                                               AsyncCallback callback,
-                                               object state) {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+               static IOAsyncCallback BeginDisconnectCallback = new IOAsyncCallback (ares => {
+                       SocketAsyncResult sockares = (SocketAsyncResult) ares;
 
-                       if (buffer == null)
-                               throw new ArgumentNullException ("buffer");
+                       try {
+                               sockares.socket.Disconnect (sockares.ReuseSocket);
+                       } catch (Exception e) {
+                               sockares.Complete (e);
+                               return;
+                       }
 
-                       CheckRange (buffer, offset, size);
+                       sockares.Complete ();
+               });
 
-                       SocketAsyncResult req = new SocketAsyncResult (this, state, callback, SocketOperation.SendTo);
-                       req.Buffer = buffer;
-                       req.Offset = offset;
-                       req.Size = size;
-                       req.SockFlags = socket_flags;
-                       req.EndPoint = remote_end;
-                       int count;
-                       lock (writeQ) {
-                               writeQ.Enqueue (req.Worker);
-                               count = writeQ.Count;
-                       }
-                       if (count == 1)
-                               socket_pool_queue (SocketAsyncWorker.Dispatcher, req);
-                       return req;
-               }
+               public void EndDisconnect (IAsyncResult asyncResult)
+               {
+                       ThrowIfDisposedAndClosed ();
 
-               // Creates a new system socket, returning the handle
-               [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               private extern static void Bind_internal(IntPtr sock,
-                                                        SocketAddress sa,
-                                                        out int error);
+                       SocketAsyncResult sockares = ValidateEndIAsyncResult (asyncResult, "EndDisconnect", "asyncResult");
 
-               private static void Bind_internal (SafeSocketHandle safeHandle,
-                                                        SocketAddress sa,
-                                                        out int error)
+                       if (!sockares.IsCompleted)
+                               sockares.AsyncWaitHandle.WaitOne ();
+
+                       sockares.CheckIfThrowDelayedException ();
+               }
+
+               static void Disconnect_internal (SafeSocketHandle safeHandle, bool reuse, out int error)
                {
                        bool release = false;
                        try {
                                safeHandle.DangerousAddRef (ref release);
-                               Bind_internal (safeHandle.DangerousGetHandle (), sa, out error);
+                               Disconnect_internal (safeHandle.DangerousGetHandle (), reuse, out error);
                        } finally {
                                if (release)
                                        safeHandle.DangerousRelease ();
                        }
                }
 
-               public void Bind(EndPoint local_end) {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               extern static void Disconnect_internal (IntPtr sock, bool reuse, out int error);
 
-                       if (local_end == null)
-                               throw new ArgumentNullException("local_end");
-                       
-                       int error;
-                       
-                       Bind_internal (safe_handle, local_end.Serialize(), out error);
-                       if (error != 0)
-                               throw new SocketException (error);
-                       if (error == 0)
-                               is_bound = true;
-                       
-                       seed_endpoint = local_end;
+#endregion
+
+#region Receive
+
+               public int Receive (byte [] buffer)
+               {
+                       return Receive (buffer, SocketFlags.None);
                }
 
-               public void Connect (IPAddress address, int port)
+               public int Receive (byte [] buffer, SocketFlags flags)
                {
-                       Connect (new IPEndPoint (address, port));
+                       ThrowIfDisposedAndClosed ();
+                       ThrowIfBufferNull (buffer);
+                       ThrowIfBufferOutOfRange (buffer, 0, buffer.Length);
+
+                       SocketError error;
+                       int ret = Receive_nochecks (buffer, 0, buffer.Length, flags, out error);
+
+                       if (error != SocketError.Success) {
+                               if (error == SocketError.WouldBlock && is_blocking) // This might happen when ReceiveTimeout is set
+                                       throw new SocketException ((int) error, TIMEOUT_EXCEPTION_MSG);
+                               throw new SocketException ((int) error);
+                       }
+
+                       return ret;
                }
-               
-               public void Connect (IPAddress[] addresses, int port)
+
+               public int Receive (byte [] buffer, int size, SocketFlags flags)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       ThrowIfDisposedAndClosed ();
+                       ThrowIfBufferNull (buffer);
+                       ThrowIfBufferOutOfRange (buffer, 0, size);
 
-                       if (addresses == null)
-                               throw new ArgumentNullException ("addresses");
+                       SocketError error;
+                       int ret = Receive_nochecks (buffer, 0, size, flags, out error);
 
-                       if (this.AddressFamily != AddressFamily.InterNetwork &&
-                               this.AddressFamily != AddressFamily.InterNetworkV6)
-                               throw new NotSupportedException ("This method is only valid for addresses in the InterNetwork or InterNetworkV6 families");
+                       if (error != SocketError.Success) {
+                               if (error == SocketError.WouldBlock && is_blocking) // This might happen when ReceiveTimeout is set
+                                       throw new SocketException ((int) error, TIMEOUT_EXCEPTION_MSG);
+                               throw new SocketException ((int) error);
+                       }
 
-                       if (is_listening)
-                               throw new InvalidOperationException ();
+                       return ret;
+               }
 
-                       /* FIXME: do non-blocking sockets Poll here? */
-                       int error = 0;
-                       foreach (IPAddress address in addresses) {
-                               IPEndPoint iep = new IPEndPoint (address, port);
-                               SocketAddress serial = iep.Serialize ();
-                               
-                               Connect_internal (safe_handle, serial, out error);
-                               if (error == 0) {
-                                       is_connected = true;
-                                       is_bound = true;
-                                       seed_endpoint = iep;
-                                       return;
-                               } else if (error != (int)SocketError.InProgress &&
-                                          error != (int)SocketError.WouldBlock) {
-                                       continue;
-                               }
-                               
-                               if (!is_blocking) {
-                                       Poll (-1, SelectMode.SelectWrite);
-                                       error = (int)GetSocketOption (SocketOptionLevel.Socket, SocketOptionName.Error);
-                                       if (error == 0) {
-                                               is_connected = true;
-                                               is_bound = true;
-                                               seed_endpoint = iep;
-                                               return;
-                                       }
+               public int Receive (byte [] buffer, int offset, int size, SocketFlags flags)
+               {
+                       ThrowIfDisposedAndClosed ();
+                       ThrowIfBufferNull (buffer);
+                       ThrowIfBufferOutOfRange (buffer, offset, size);
+
+                       SocketError error;
+                       int ret = Receive_nochecks (buffer, offset, size, flags, out error);
+
+                       if (error != SocketError.Success) {
+                               if (error == SocketError.WouldBlock && is_blocking) // This might happen when ReceiveTimeout is set
+                                       throw new SocketException ((int) error, TIMEOUT_EXCEPTION_MSG);
+                               throw new SocketException ((int) error);
+                       }
+
+                       return ret;
+               }
+
+               public int Receive (byte [] buffer, int offset, int size, SocketFlags flags, out SocketError error)
+               {
+                       ThrowIfDisposedAndClosed ();
+                       ThrowIfBufferNull (buffer);
+                       ThrowIfBufferOutOfRange (buffer, offset, size);
+
+                       return Receive_nochecks (buffer, offset, size, flags, out error);
+               }
+
+               public int Receive (IList<ArraySegment<byte>> buffers)
+               {
+                       SocketError error;
+                       int ret = Receive (buffers, SocketFlags.None, out error);
+
+                       if (error != SocketError.Success)
+                               throw new SocketException ((int) error);
+
+                       return ret;
+               }
+
+               [CLSCompliant (false)]
+               public int Receive (IList<ArraySegment<byte>> buffers, SocketFlags socketFlags)
+               {
+                       SocketError error;
+                       int ret = Receive (buffers, socketFlags, out error);
+
+                       if (error != SocketError.Success)
+                               throw new SocketException ((int) error);
+
+                       return(ret);
+               }
+
+               [CLSCompliant (false)]
+               public int Receive (IList<ArraySegment<byte>> buffers, SocketFlags socketFlags, out SocketError errorCode)
+               {
+                       ThrowIfDisposedAndClosed ();
+
+                       if (buffers == null || buffers.Count == 0)
+                               throw new ArgumentNullException ("buffers");
+
+                       int numsegments = buffers.Count;
+                       int nativeError;
+                       int ret;
+
+                       /* Only example I can find of sending a byte array reference directly into an internal
+                        * call is in System.Runtime.Remoting/System.Runtime.Remoting.Channels.Ipc.Win32/NamedPipeSocket.cs,
+                        * so taking a lead from that... */
+                       WSABUF[] bufarray = new WSABUF[numsegments];
+                       GCHandle[] gch = new GCHandle[numsegments];
+
+                       for (int i = 0; i < numsegments; i++) {
+                               ArraySegment<byte> segment = buffers[i];
+
+                               if (segment.Offset < 0 || segment.Count < 0 || segment.Count > segment.Array.Length - segment.Offset)
+                                       throw new ArgumentOutOfRangeException ("segment");
+
+                               gch[i] = GCHandle.Alloc (segment.Array, GCHandleType.Pinned);
+                               bufarray[i].len = segment.Count;
+                               bufarray[i].buf = Marshal.UnsafeAddrOfPinnedArrayElement (segment.Array, segment.Offset);
+                       }
+
+                       try {
+                               ret = Receive_internal (safe_handle, bufarray, socketFlags, out nativeError);
+                       } finally {
+                               for (int i = 0; i < numsegments; i++) {
+                                       if (gch[i].IsAllocated)
+                                               gch[i].Free ();
                                }
                        }
-                       if (error != 0)
-                               throw new SocketException (error);
+
+                       errorCode = (SocketError) nativeError;
+
+                       return ret;
                }
 
-               public void Connect (string host, int port)
-               {
-                       IPAddress [] addresses = Dns.GetHostAddresses (host);
-                       Connect (addresses, port);
+               public bool ReceiveAsync (SocketAsyncEventArgs e)
+               {
+                       // NO check is made whether e != null in MS.NET (NRE is thrown in such case)
+
+                       ThrowIfDisposedAndClosed ();
+
+                       // LAME SPEC: the ArgumentException is never thrown, instead an NRE is
+                       // thrown when e.Buffer and e.BufferList are null (works fine when one is
+                       // set to a valid object)
+                       if (e.Buffer == null && e.BufferList == null)
+                               throw new NullReferenceException ("Either e.Buffer or e.BufferList must be valid buffers.");
+
+                       if (e.Buffer == null) {
+                               InitSocketAsyncEventArgs (e, ReceiveAsyncCallback, e, SocketOperation.ReceiveGeneric);
+
+                               e.socket_async_result.Buffers = e.BufferList;
+
+                               QueueIOSelectorJob (readQ, e.socket_async_result.Handle, new IOSelectorJob (IOOperation.Read, BeginReceiveGenericCallback, e.socket_async_result));
+                       } else {
+                               InitSocketAsyncEventArgs (e, ReceiveAsyncCallback, e, SocketOperation.Receive);
+
+                               e.socket_async_result.Buffer = e.Buffer;
+                               e.socket_async_result.Offset = e.Offset;
+                               e.socket_async_result.Size = e.Count;
+
+                               QueueIOSelectorJob (readQ, e.socket_async_result.Handle, new IOSelectorJob (IOOperation.Read, BeginReceiveCallback, e.socket_async_result));
+                       }
+
+                       return true;
+               }
+
+               static AsyncCallback ReceiveAsyncCallback = new AsyncCallback (ares => {
+                       SocketAsyncEventArgs e = (SocketAsyncEventArgs) ((SocketAsyncResult) ares).AsyncState;
+
+                       if (Interlocked.Exchange (ref e.in_progress, 0) != 1)
+                               throw new InvalidOperationException ("No operation in progress");
+
+                       try {
+                               e.BytesTransferred = e.current_socket.EndReceive (ares);
+                       } catch (SocketException se){
+                               e.SocketError = se.SocketErrorCode;
+                       } catch (ObjectDisposedException) {
+                               e.SocketError = SocketError.OperationAborted;
+                       } finally {
+                               e.Complete ();
+                       }
+               });
+
+               public IAsyncResult BeginReceive (byte[] buffer, int offset, int size, SocketFlags socket_flags, AsyncCallback callback, object state)
+               {
+                       ThrowIfDisposedAndClosed ();
+                       ThrowIfBufferNull (buffer);
+                       ThrowIfBufferOutOfRange (buffer, offset, size);
+
+                       SocketAsyncResult sockares = new SocketAsyncResult (this, callback, state, SocketOperation.Receive) {
+                               Buffer = buffer,
+                               Offset = offset,
+                               Size = size,
+                               SockFlags = socket_flags,
+                       };
+
+                       QueueIOSelectorJob (readQ, sockares.Handle, new IOSelectorJob (IOOperation.Read, BeginReceiveCallback, sockares));
+
+                       return sockares;
+               }
+
+               public IAsyncResult BeginReceive (byte[] buffer, int offset, int size, SocketFlags flags, out SocketError error, AsyncCallback callback, object state)
+               {
+                       /* As far as I can tell from the docs and from experimentation, a pointer to the
+                        * SocketError parameter is not supposed to be saved for the async parts.  And as we don't
+                        * set any socket errors in the setup code, we just have to set it to Success. */
+                       error = SocketError.Success;
+                       return BeginReceive (buffer, offset, size, flags, callback, state);
+               }
+
+               static IOAsyncCallback BeginReceiveCallback = new IOAsyncCallback (ares => {
+                       SocketAsyncResult sockares = (SocketAsyncResult) ares;
+                       int total = 0;
+
+                       try {
+                               total = Receive_internal (sockares.socket.safe_handle, sockares.Buffer, sockares.Offset, sockares.Size, sockares.SockFlags, out sockares.error);
+                       } catch (Exception e) {
+                               sockares.Complete (e);
+                               return;
+                       }
+
+                       sockares.Complete (total);
+               });
+
+               [CLSCompliant (false)]
+               public IAsyncResult BeginReceive (IList<ArraySegment<byte>> buffers, SocketFlags socketFlags, AsyncCallback callback, object state)
+               {
+                       ThrowIfDisposedAndClosed ();
+
+                       if (buffers == null)
+                               throw new ArgumentNullException ("buffers");
+
+                       SocketAsyncResult sockares = new SocketAsyncResult (this, callback, state, SocketOperation.ReceiveGeneric) {
+                               Buffers = buffers,
+                               SockFlags = socketFlags,
+                       };
+
+                       QueueIOSelectorJob (readQ, sockares.Handle, new IOSelectorJob (IOOperation.Read, BeginReceiveGenericCallback, sockares));
+
+                       return sockares;
+               }
+
+               [CLSCompliant (false)]
+               public IAsyncResult BeginReceive (IList<ArraySegment<byte>> buffers, SocketFlags socketFlags, out SocketError errorCode, AsyncCallback callback, object state)
+               {
+                       /* I assume the same SocketError semantics as above */
+                       errorCode = SocketError.Success;
+                       return BeginReceive (buffers, socketFlags, callback, state);
+               }
+
+               static IOAsyncCallback BeginReceiveGenericCallback = new IOAsyncCallback (ares => {
+                       SocketAsyncResult sockares = (SocketAsyncResult) ares;
+                       int total = 0;
+
+                       try {
+                               total = sockares.socket.Receive (sockares.Buffers, sockares.SockFlags);
+                       } catch (Exception e) {
+                               sockares.Complete (e);
+                               return;
+                       }
+
+                       sockares.Complete (total);
+               });
+
+               public int EndReceive (IAsyncResult result)
+               {
+                       SocketError error;
+                       int bytesReceived = EndReceive (result, out error);
+
+                       if (error != SocketError.Success) {
+                               if (error != SocketError.WouldBlock && error != SocketError.InProgress)
+                                       is_connected = false;
+                               throw new SocketException ((int)error);
+                       }
+
+                       return bytesReceived;
+               }
+
+               public int EndReceive (IAsyncResult asyncResult, out SocketError errorCode)
+               {
+                       ThrowIfDisposedAndClosed ();
+
+                       SocketAsyncResult sockares = ValidateEndIAsyncResult (asyncResult, "EndReceive", "asyncResult");
+
+                       if (!sockares.IsCompleted)
+                               sockares.AsyncWaitHandle.WaitOne ();
+
+                       // If no socket error occurred, call CheckIfThrowDelayedException in case there are other
+                       // kinds of exceptions that should be thrown.
+                       if ((errorCode = sockares.ErrorCode) == SocketError.Success)
+                               sockares.CheckIfThrowDelayedException();
+
+                       return sockares.Total;
+               }
+
+               int Receive_nochecks (byte [] buf, int offset, int size, SocketFlags flags, out SocketError error)
+               {
+                       int nativeError;
+                       int ret = Receive_internal (safe_handle, buf, offset, size, flags, out nativeError);
+
+                       error = (SocketError) nativeError;
+                       if (error != SocketError.Success && error != SocketError.WouldBlock && error != SocketError.InProgress) {
+                               is_connected = false;
+                               is_bound = false;
+                       } else {
+                               is_connected = true;
+                       }
+
+                       return ret;
                }
 
-               public bool DisconnectAsync (SocketAsyncEventArgs e)
+               static int Receive_internal (SafeSocketHandle safeHandle, WSABUF[] bufarray, SocketFlags flags, out int error)
                {
-                       // NO check is made whether e != null in MS.NET (NRE is thrown in such case)
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
-
-                       e.curSocket = this;
-                       e.Worker.Init (this, e, SocketOperation.Disconnect);
-                       socket_pool_queue (SocketAsyncWorker.Dispatcher, e.Worker.result);
-                       return true;
+                       try {
+                               safeHandle.RegisterForBlockingSyscall ();
+                               return Receive_internal (safeHandle.DangerousGetHandle (), bufarray, flags, out error);
+                       } finally {
+                               safeHandle.UnRegisterForBlockingSyscall ();
+                       }
                }
 
-               [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               extern static void Disconnect_internal(IntPtr sock, bool reuse, out int error);
+               [MethodImplAttribute (MethodImplOptions.InternalCall)]
+               extern static int Receive_internal (IntPtr sock, WSABUF[] bufarray, SocketFlags flags, out int error);
 
-               private static void Disconnect_internal(SafeSocketHandle safeHandle, bool reuse, out int error)
+               static int Receive_internal (SafeSocketHandle safeHandle, byte[] buffer, int offset, int count, SocketFlags flags, out int error)
                {
-                       bool release = false;
                        try {
-                               safeHandle.DangerousAddRef (ref release);
-                               Disconnect_internal (safeHandle.DangerousGetHandle (), reuse, out error);
+                               safeHandle.RegisterForBlockingSyscall ();
+                               return Receive_internal (safeHandle.DangerousGetHandle (), buffer, offset, count, flags, out error);
                        } finally {
-                               if (release)
-                                       safeHandle.DangerousRelease ();
+                               safeHandle.UnRegisterForBlockingSyscall ();
                        }
                }
 
-               /* According to the docs, the MS runtime will throw
-                * PlatformNotSupportedException if the platform is
-                * newer than w2k.  We should be able to cope...
-                */
-               public void Disconnect (bool reuseSocket)
-               {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               extern static int Receive_internal(IntPtr sock, byte[] buffer, int offset, int count, SocketFlags flags, out int error);
 
-                       int error = 0;
-                       
-                       Disconnect_internal (safe_handle, reuseSocket, out error);
+#endregion
 
-                       if (error != 0) {
-                               if (error == 50) {
-                                       /* ERROR_NOT_SUPPORTED */
-                                       throw new PlatformNotSupportedException ();
-                               } else {
-                                       throw new SocketException (error);
-                               }
-                       }
+#region ReceiveFrom
 
-                       is_connected = false;
-                       
-                       if (reuseSocket) {
-                               /* Do managed housekeeping here... */
-                       }
+               public int ReceiveFrom (byte [] buffer, ref EndPoint remoteEP)
+               {
+                       ThrowIfDisposedAndClosed ();
+                       ThrowIfBufferNull (buffer);
+
+                       return ReceiveFrom (buffer, 0, buffer.Length, SocketFlags.None, ref remoteEP);
                }
 
-#if !MOBILE
-               [MonoLimitation ("We do not support passing sockets across processes, we merely allow this API to pass the socket across AppDomains")]
-               public SocketInformation DuplicateAndClose (int targetProcessId)
+               public int ReceiveFrom (byte [] buffer, SocketFlags flags, ref EndPoint remoteEP)
                {
-                       var si = new SocketInformation ();
-                       si.Options =
-                               (is_listening      ? SocketInformationOptions.Listening : 0) |
-                               (is_connected      ? SocketInformationOptions.Connected : 0) |
-                               (is_blocking       ? 0 : SocketInformationOptions.NonBlocking) |
-                               (use_overlapped_io ? SocketInformationOptions.UseOnlyOverlappedIO : 0);
-
-                       si.ProtocolInformation = Mono.DataConverter.Pack ("iiiil", (int)address_family, (int)socket_type, (int)protocol_type, is_bound ? 1 : 0, (long)Handle);
-                       safe_handle = null;
+                       ThrowIfDisposedAndClosed ();
+                       ThrowIfBufferNull (buffer);
 
-                       return si;
+                       return ReceiveFrom (buffer, 0, buffer.Length, flags, ref remoteEP);
                }
-#endif
-       
-
 
-               public void EndConnect (IAsyncResult result)
+               public int ReceiveFrom (byte [] buffer, int size, SocketFlags flags, ref EndPoint remoteEP)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       ThrowIfDisposedAndClosed ();
+                       ThrowIfBufferNull (buffer);
+                       ThrowIfBufferOutOfRange (buffer, 0, size);
 
-                       if (result == null)
-                               throw new ArgumentNullException ("result");
+                       return ReceiveFrom (buffer, 0, size, flags, ref remoteEP);
+               }
 
-                       SocketAsyncResult req = result as SocketAsyncResult;
-                       if (req == null)
-                               throw new ArgumentException ("Invalid IAsyncResult", "result");
+               public int ReceiveFrom (byte [] buffer, int offset, int size, SocketFlags flags, ref EndPoint remoteEP)
+               {
+                       ThrowIfDisposedAndClosed ();
+                       ThrowIfBufferNull (buffer);
+                       ThrowIfBufferOutOfRange (buffer, offset, size);
 
-                       if (Interlocked.CompareExchange (ref req.EndCalled, 1, 0) == 1)
-                               throw InvalidAsyncOp ("EndConnect");
-                       if (!result.IsCompleted)
-                               result.AsyncWaitHandle.WaitOne();
+                       if (remoteEP == null)
+                               throw new ArgumentNullException ("remoteEP");
 
-                       req.CheckIfThrowDelayedException();
+                       int error;
+                       return ReceiveFrom_nochecks_exc (buffer, offset, size, flags, ref remoteEP, true, out error);
                }
 
-               public void EndDisconnect (IAsyncResult asyncResult)
+               public bool ReceiveFromAsync (SocketAsyncEventArgs e)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       ThrowIfDisposedAndClosed ();
 
-                       if (asyncResult == null)
-                               throw new ArgumentNullException ("asyncResult");
+                       // We do not support recv into multiple buffers yet
+                       if (e.BufferList != null)
+                               throw new NotSupportedException ("Mono doesn't support using BufferList at this point.");
+                       if (e.RemoteEndPoint == null)
+                               throw new ArgumentNullException ("remoteEP", "Value cannot be null.");
 
-                       SocketAsyncResult req = asyncResult as SocketAsyncResult;
-                       if (req == null)
-                               throw new ArgumentException ("Invalid IAsyncResult", "asyncResult");
+                       InitSocketAsyncEventArgs (e, ReceiveFromAsyncCallback, e, SocketOperation.ReceiveFrom);
+
+                       e.socket_async_result.Buffer = e.Buffer;
+                       e.socket_async_result.Offset = e.Offset;
+                       e.socket_async_result.Size = e.Count;
+                       e.socket_async_result.EndPoint = e.RemoteEndPoint;
+                       e.socket_async_result.SockFlags = e.SocketFlags;
 
-                       if (Interlocked.CompareExchange (ref req.EndCalled, 1, 0) == 1)
-                               throw InvalidAsyncOp ("EndDisconnect");
-                       if (!asyncResult.IsCompleted)
-                               asyncResult.AsyncWaitHandle.WaitOne ();
+                       QueueIOSelectorJob (readQ, e.socket_async_result.Handle, new IOSelectorJob (IOOperation.Read, BeginReceiveFromCallback, e.socket_async_result));
 
-                       req.CheckIfThrowDelayedException ();
+                       return true;
                }
 
-               [MonoTODO]
-               public int EndReceiveMessageFrom (IAsyncResult asyncResult,
-                                                 ref SocketFlags socketFlags,
-                                                 ref EndPoint endPoint,
-                                                 out IPPacketInformation ipPacketInformation)
+               static AsyncCallback ReceiveFromAsyncCallback = new AsyncCallback (ares => {
+                       SocketAsyncEventArgs e = (SocketAsyncEventArgs) ((SocketAsyncResult) ares).AsyncState;
+
+                       if (Interlocked.Exchange (ref e.in_progress, 0) != 1)
+                               throw new InvalidOperationException ("No operation in progress");
+
+                       try {
+                               e.BytesTransferred = e.current_socket.EndReceiveFrom (ares, ref e.remote_ep);
+                       } catch (SocketException ex) {
+                               e.SocketError = ex.SocketErrorCode;
+                       } catch (ObjectDisposedException) {
+                               e.SocketError = SocketError.OperationAborted;
+                       } finally {
+                               e.Complete ();
+                       }
+               });
+
+               public IAsyncResult BeginReceiveFrom (byte[] buffer, int offset, int size, SocketFlags socket_flags, ref EndPoint remote_end, AsyncCallback callback, object state)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       ThrowIfDisposedAndClosed ();
+                       ThrowIfBufferNull (buffer);
+                       ThrowIfBufferOutOfRange (buffer, offset, size);
 
-                       if (asyncResult == null)
-                               throw new ArgumentNullException ("asyncResult");
+                       if (remote_end == null)
+                               throw new ArgumentNullException ("remote_end");
 
-                       if (endPoint == null)
-                               throw new ArgumentNullException ("endPoint");
+                       SocketAsyncResult sockares = new SocketAsyncResult (this, callback, state, SocketOperation.ReceiveFrom) {
+                               Buffer = buffer,
+                               Offset = offset,
+                               Size = size,
+                               SockFlags = socket_flags,
+                               EndPoint = remote_end,
+                       };
 
-                       SocketAsyncResult req = asyncResult as SocketAsyncResult;
-                       if (req == null)
-                               throw new ArgumentException ("Invalid IAsyncResult", "asyncResult");
+                       QueueIOSelectorJob (readQ, sockares.Handle, new IOSelectorJob (IOOperation.Read, BeginReceiveFromCallback, sockares));
 
-                       if (Interlocked.CompareExchange (ref req.EndCalled, 1, 0) == 1)
-                               throw InvalidAsyncOp ("EndReceiveMessageFrom");
-                       throw new NotImplementedException ();
+                       return sockares;
                }
 
-               public void EndSendFile (IAsyncResult asyncResult)
+               static IOAsyncCallback BeginReceiveFromCallback = new IOAsyncCallback (ares => {
+                       SocketAsyncResult sockares = (SocketAsyncResult) ares;
+                       int total = 0;
+
+                       try {
+                               int error;
+                               total = sockares.socket.ReceiveFrom_nochecks_exc (sockares.Buffer, sockares.Offset, sockares.Size, sockares.SockFlags, ref sockares.EndPoint, true, out error);
+                       } catch (Exception e) {
+                               sockares.Complete (e);
+                               return;
+                       }
+
+                       sockares.Complete (total);
+               });
+
+               public int EndReceiveFrom(IAsyncResult result, ref EndPoint end_point)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       ThrowIfDisposedAndClosed ();
 
-                       if (asyncResult == null)
-                               throw new ArgumentNullException ("asyncResult");
+                       if (end_point == null)
+                               throw new ArgumentNullException ("remote_end");
 
-                       SendFileAsyncResult ares = asyncResult as SendFileAsyncResult;
-                       if (ares == null)
-                               throw new ArgumentException ("Invalid IAsyncResult", "asyncResult");
+                       SocketAsyncResult sockares = ValidateEndIAsyncResult (result, "EndReceiveFrom", "result");
 
-                       ares.Delegate.EndInvoke (ares.Original);
+                       if (!sockares.IsCompleted)
+                               sockares.AsyncWaitHandle.WaitOne();
+
+                       sockares.CheckIfThrowDelayedException();
+
+                       end_point = sockares.EndPoint;
+
+                       return sockares.Total;
                }
 
-               public int EndSendTo (IAsyncResult result)
+               internal int ReceiveFrom_nochecks_exc (byte [] buf, int offset, int size, SocketFlags flags, ref EndPoint remote_end, bool throwOnError, out int error)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       SocketAddress sockaddr = remote_end.Serialize();
+
+                       int cnt = ReceiveFrom_internal (safe_handle, buf, offset, size, flags, ref sockaddr, out error);
+
+                       SocketError err = (SocketError) error;
+                       if (err != 0) {
+                               if (err != SocketError.WouldBlock && err != SocketError.InProgress) {
+                                       is_connected = false;
+                               } else if (err == SocketError.WouldBlock && is_blocking) { // This might happen when ReceiveTimeout is set
+                                       if (throwOnError)       
+                                               throw new SocketException ((int) SocketError.TimedOut, TIMEOUT_EXCEPTION_MSG);
+                                       error = (int) SocketError.TimedOut;
+                                       return 0;
+                               }
+
+                               if (throwOnError)
+                                       throw new SocketException (error);
 
-                       if (result == null)
-                               throw new ArgumentNullException ("result");
+                               return 0;
+                       }
 
-                       SocketAsyncResult req = result as SocketAsyncResult;
-                       if (req == null)
-                               throw new ArgumentException ("Invalid IAsyncResult", "result");
+                       is_connected = true;
+                       is_bound = true;
 
-                       if (Interlocked.CompareExchange (ref req.EndCalled, 1, 0) == 1)
-                               throw InvalidAsyncOp ("EndSendTo");
-                       if (!result.IsCompleted)
-                               result.AsyncWaitHandle.WaitOne();
+                       /* If sockaddr is null then we're a connection oriented protocol and should ignore the
+                        * remote_end parameter (see MSDN documentation for Socket.ReceiveFrom(...) ) */
+                       if (sockaddr != null) {
+                               /* Stupidly, EndPoint.Create() is an instance method */
+                               remote_end = remote_end.Create (sockaddr);
+                       }
 
-                       req.CheckIfThrowDelayedException();
-                       return req.Total;
-               }
+                       seed_endpoint = remote_end;
 
-               [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               private extern static void GetSocketOption_arr_internal(IntPtr socket,
-                       SocketOptionLevel level, SocketOptionName name, ref byte[] byte_val,
-                       out int error);
+                       return cnt;
+               }
 
-               private static void GetSocketOption_arr_internal (SafeSocketHandle safeHandle,
-                       SocketOptionLevel level, SocketOptionName name, ref byte[] byte_val,
-                       out int error)
+               static int ReceiveFrom_internal (SafeSocketHandle safeHandle, byte[] buffer, int offset, int count, SocketFlags flags, ref SocketAddress sockaddr, out int error)
                {
-                       bool release = false;
                        try {
-                               safeHandle.DangerousAddRef (ref release);
-                               GetSocketOption_arr_internal (safeHandle.DangerousGetHandle (), level, name, ref byte_val, out error);
+                               safeHandle.RegisterForBlockingSyscall ();
+                               return ReceiveFrom_internal (safeHandle.DangerousGetHandle (), buffer, offset, count, flags, ref sockaddr, out error);
                        } finally {
-                               if (release)
-                                       safeHandle.DangerousRelease ();
+                               safeHandle.UnRegisterForBlockingSyscall ();
                        }
                }
 
-               public void GetSocketOption (SocketOptionLevel optionLevel, SocketOptionName optionName, byte [] optionValue)
-               {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               extern static int ReceiveFrom_internal(IntPtr sock, byte[] buffer, int offset, int count, SocketFlags flags, ref SocketAddress sockaddr, out int error);
 
-                       if (optionValue == null)
-                               throw new SocketException ((int) SocketError.Fault,
-                                       "Error trying to dereference an invalid pointer");
+#endregion
 
-                       int error;
+#region ReceiveMessageFrom
 
-                       GetSocketOption_arr_internal (safe_handle, optionLevel, optionName, ref optionValue,
-                               out error);
-                       if (error != 0)
-                               throw new SocketException (error);
+               [MonoTODO ("Not implemented")]
+               public int ReceiveMessageFrom (byte[] buffer, int offset, int size, ref SocketFlags socketFlags, ref EndPoint remoteEP, out IPPacketInformation ipPacketInformation)
+               {
+                       ThrowIfDisposedAndClosed ();
+                       ThrowIfBufferNull (buffer);
+                       ThrowIfBufferOutOfRange (buffer, offset, size);
+
+                       if (remoteEP == null)
+                               throw new ArgumentNullException ("remoteEP");
+
+                       // FIXME: figure out how we get hold of the IPPacketInformation
+                       throw new NotImplementedException ();
                }
 
-               public byte [] GetSocketOption (SocketOptionLevel optionLevel, SocketOptionName optionName, int length)
+               [MonoTODO ("Not implemented")]
+               public bool ReceiveMessageFromAsync (SocketAsyncEventArgs e)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
-
-                       byte[] byte_val=new byte[length];
-                       int error;
+                       // NO check is made whether e != null in MS.NET (NRE is thrown in such case)
 
-                       GetSocketOption_arr_internal (safe_handle, optionLevel, optionName, ref byte_val,
-                               out error);
-                       if (error != 0)
-                               throw new SocketException (error);
+                       ThrowIfDisposedAndClosed ();
 
-                       return(byte_val);
+                       throw new NotImplementedException ();
                }
 
-               // See Socket.IOControl, WSAIoctl documentation in MSDN. The
-               // common options between UNIX and Winsock are FIONREAD,
-               // FIONBIO and SIOCATMARK. Anything else will depend on the
-               // system except SIO_KEEPALIVE_VALS which is properly handled
-               // on both windows and linux.
-               [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               extern static int WSAIoctl (IntPtr sock, int ioctl_code, byte [] input,
-                       byte [] output, out int error);
-
-               private static int WSAIoctl (SafeSocketHandle safeHandle, int ioctl_code, byte [] input,
-                       byte [] output, out int error)
+               [MonoTODO]
+               public IAsyncResult BeginReceiveMessageFrom (byte[] buffer, int offset, int size, SocketFlags socketFlags, ref EndPoint remoteEP, AsyncCallback callback, object state)
                {
-                       bool release = false;
-                       try {
-                               safeHandle.DangerousAddRef (ref release);
-                               return WSAIoctl (safeHandle.DangerousGetHandle (), ioctl_code, input, output, out error);
-                       } finally {
-                               if (release)
-                                       safeHandle.DangerousRelease ();
-                       }
+                       ThrowIfDisposedAndClosed ();
+                       ThrowIfBufferNull (buffer);
+                       ThrowIfBufferOutOfRange (buffer, offset, size);
+
+                       if (remoteEP == null)
+                               throw new ArgumentNullException ("remoteEP");
+
+                       throw new NotImplementedException ();
                }
 
-               public int IOControl (int ioctl_code, byte [] in_value, byte [] out_value)
+               [MonoTODO]
+               public int EndReceiveMessageFrom (IAsyncResult asyncResult, ref SocketFlags socketFlags, ref EndPoint endPoint, out IPPacketInformation ipPacketInformation)
                {
-                       if (is_disposed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       ThrowIfDisposedAndClosed ();
 
-                       int error;
-                       int result = WSAIoctl (safe_handle, ioctl_code, in_value, out_value,
-                               out error);
+                       if (endPoint == null)
+                               throw new ArgumentNullException ("endPoint");
 
-                       if (error != 0)
-                               throw new SocketException (error);
-                       
-                       if (result == -1)
-                               throw new InvalidOperationException ("Must use Blocking property instead.");
+                       SocketAsyncResult sockares = ValidateEndIAsyncResult (asyncResult, "EndReceiveMessageFrom", "asyncResult");
 
-                       return result;
+                       throw new NotImplementedException ();
                }
 
-               public int IOControl (IOControlCode ioControlCode, byte[] optionInValue, byte[] optionOutValue)
+#endregion
+
+#region Send
+
+               public int Send (byte [] buffer)
                {
-                       return IOControl ((int) ioControlCode, optionInValue, optionOutValue);
-               }
+                       ThrowIfDisposedAndClosed ();
+                       ThrowIfBufferNull (buffer);
+                       ThrowIfBufferOutOfRange (buffer, 0, buffer.Length);
 
-               [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               private extern static void Listen_internal(IntPtr sock, int backlog, out int error);
+                       SocketError error;
+                       int ret = Send_nochecks (buffer, 0, buffer.Length, SocketFlags.None, out error);
+
+                       if (error != SocketError.Success)
+                               throw new SocketException ((int) error);
+
+                       return ret;
+               }
 
-               private static void Listen_internal (SafeSocketHandle safeHandle, int backlog, out int error)
+               public int Send (byte [] buffer, SocketFlags flags)
                {
-                       bool release = false;
-                       try {
-                               safeHandle.DangerousAddRef (ref release);
-                               Listen_internal (safeHandle.DangerousGetHandle (), backlog, out error);
-                       } finally {
-                               if (release)
-                                       safeHandle.DangerousRelease ();
-                       }
+                       ThrowIfDisposedAndClosed ();
+                       ThrowIfBufferNull (buffer);
+                       ThrowIfBufferOutOfRange (buffer, 0, buffer.Length);
+
+                       SocketError error;
+                       int ret = Send_nochecks (buffer, 0, buffer.Length, flags, out error);
+
+                       if (error != SocketError.Success)
+                               throw new SocketException ((int) error);
+
+                       return ret;
                }
 
-               public void Listen (int backlog)
+               public int Send (byte [] buffer, int size, SocketFlags flags)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
-
-                       if (!is_bound)
-                               throw new SocketException ((int)SocketError.InvalidArgument);
+                       ThrowIfDisposedAndClosed ();
+                       ThrowIfBufferNull (buffer);
+                       ThrowIfBufferOutOfRange (buffer, 0, size);
 
-                       int error;
-                       Listen_internal(safe_handle, backlog, out error);
+                       SocketError error;
+                       int ret = Send_nochecks (buffer, 0, size, flags, out error);
 
-                       if (error != 0)
-                               throw new SocketException (error);
+                       if (error != SocketError.Success)
+                               throw new SocketException ((int) error);
 
-                       is_listening = true;
+                       return ret;
                }
 
-               public bool Poll (int time_us, SelectMode mode)
+               public int Send (byte [] buffer, int offset, int size, SocketFlags flags)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       ThrowIfDisposedAndClosed ();
+                       ThrowIfBufferNull (buffer);
+                       ThrowIfBufferOutOfRange (buffer, offset, size);
 
-                       if (mode != SelectMode.SelectRead &&
-                           mode != SelectMode.SelectWrite &&
-                           mode != SelectMode.SelectError)
-                               throw new NotSupportedException ("'mode' parameter is not valid.");
+                       SocketError error;
+                       int ret = Send_nochecks (buffer, offset, size, flags, out error);
 
-                       int error;
-                       bool result = Poll_internal (safe_handle, mode, time_us, out error);
-                       if (error != 0)
-                               throw new SocketException (error);
+                       if (error != SocketError.Success)
+                               throw new SocketException ((int) error);
 
-                       if (mode == SelectMode.SelectWrite && result && !is_connected) {
-                               /* Update the is_connected state; for
-                                * non-blocking Connect()s this is
-                                * when we can find out that the
-                                * connect succeeded.
-                                */
-                               if ((int)GetSocketOption (SocketOptionLevel.Socket, SocketOptionName.Error) == 0) {
-                                       is_connected = true;
-                               }
-                       }
-                       
-                       return result;
+                       return ret;
                }
 
-               public int Receive (byte [] buffer)
+               public int Send (byte [] buffer, int offset, int size, SocketFlags flags, out SocketError error)
                {
-                       return Receive (buffer, SocketFlags.None);
+                       ThrowIfDisposedAndClosed ();
+                       ThrowIfBufferNull (buffer);
+                       ThrowIfBufferOutOfRange (buffer, offset, size);
+
+                       return Send_nochecks (buffer, offset, size, flags, out error);
                }
 
-               public int Receive (byte [] buffer, SocketFlags flags)
+               public
+               int Send (IList<ArraySegment<byte>> buffers)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       SocketError error;
+                       int ret = Send (buffers, SocketFlags.None, out error);
 
-                       if (buffer == null)
-                               throw new ArgumentNullException ("buffer");
+                       if (error != SocketError.Success)
+                               throw new SocketException ((int) error);
+
+                       return ret;
+               }
 
+               public
+               int Send (IList<ArraySegment<byte>> buffers, SocketFlags socketFlags)
+               {
                        SocketError error;
+                       int ret = Send (buffers, socketFlags, out error);
 
-                       int ret = Receive_nochecks (buffer, 0, buffer.Length, flags, out error);
-                       
-                       if (error != SocketError.Success) {
-                               if (error == SocketError.WouldBlock && is_blocking) // This might happen when ReceiveTimeout is set
-                                       throw new SocketException ((int) error, TIMEOUT_EXCEPTION_MSG);
+                       if (error != SocketError.Success)
                                throw new SocketException ((int) error);
-                       }
 
                        return ret;
                }
 
-               public int Receive (byte [] buffer, int size, SocketFlags flags)
+               [CLSCompliant (false)]
+               public int Send (IList<ArraySegment<byte>> buffers, SocketFlags socketFlags, out SocketError errorCode)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       ThrowIfDisposedAndClosed ();
 
-                       if (buffer == null)
-                               throw new ArgumentNullException ("buffer");
+                       if (buffers == null)
+                               throw new ArgumentNullException ("buffers");
+                       if (buffers.Count == 0)
+                               throw new ArgumentException ("Buffer is empty", "buffers");
 
-                       CheckRange (buffer, 0, size);
+                       int numsegments = buffers.Count;
+                       int nativeError;
+                       int ret;
 
-                       SocketError error;
+                       WSABUF[] bufarray = new WSABUF[numsegments];
+                       GCHandle[] gch = new GCHandle[numsegments];
 
-                       int ret = Receive_nochecks (buffer, 0, size, flags, out error);
-                       
-                       if (error != SocketError.Success) {
-                               if (error == SocketError.WouldBlock && is_blocking) // This might happen when ReceiveTimeout is set
-                                       throw new SocketException ((int) error, TIMEOUT_EXCEPTION_MSG);
-                               throw new SocketException ((int) error);
+                       for(int i = 0; i < numsegments; i++) {
+                               ArraySegment<byte> segment = buffers[i];
+
+                               if (segment.Offset < 0 || segment.Count < 0 || segment.Count > segment.Array.Length - segment.Offset)
+                                       throw new ArgumentOutOfRangeException ("segment");
+
+                               gch[i] = GCHandle.Alloc (segment.Array, GCHandleType.Pinned);
+                               bufarray[i].len = segment.Count;
+                               bufarray[i].buf = Marshal.UnsafeAddrOfPinnedArrayElement (segment.Array, segment.Offset);
                        }
 
+                       try {
+                               ret = Send_internal (safe_handle, bufarray, socketFlags, out nativeError);
+                       } finally {
+                               for(int i = 0; i < numsegments; i++) {
+                                       if (gch[i].IsAllocated) {
+                                               gch[i].Free ();
+                                       }
+                               }
+                       }
+
+                       errorCode = (SocketError)nativeError;
+
                        return ret;
                }
 
-               public int Receive (byte [] buffer, int offset, int size, SocketFlags flags)
+               int Send_nochecks (byte [] buf, int offset, int size, SocketFlags flags, out SocketError error)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       if (size == 0) {
+                               error = SocketError.Success;
+                               return 0;
+                       }
 
-                       if (buffer == null)
-                               throw new ArgumentNullException ("buffer");
+                       int nativeError;
+                       int ret = Send_internal (safe_handle, buf, offset, size, flags, out nativeError);
 
-                       CheckRange (buffer, offset, size);
-                       
-                       SocketError error;
+                       error = (SocketError)nativeError;
 
-                       int ret = Receive_nochecks (buffer, offset, size, flags, out error);
-                       
-                       if (error != SocketError.Success) {
-                               if (error == SocketError.WouldBlock && is_blocking) // This might happen when ReceiveTimeout is set
-                                       throw new SocketException ((int) error, TIMEOUT_EXCEPTION_MSG);
-                               throw new SocketException ((int) error);
+                       if (error != SocketError.Success && error != SocketError.WouldBlock && error != SocketError.InProgress) {
+                               is_connected = false;
+                               is_bound = false;
+                       } else {
+                               is_connected = true;
                        }
 
                        return ret;
                }
 
-               public int Receive (byte [] buffer, int offset, int size, SocketFlags flags, out SocketError error)
+               public bool SendAsync (SocketAsyncEventArgs e)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       // NO check is made whether e != null in MS.NET (NRE is thrown in such case)
 
-                       if (buffer == null)
-                               throw new ArgumentNullException ("buffer");
+                       ThrowIfDisposedAndClosed ();
 
-                       CheckRange (buffer, offset, size);
-                       
-                       return Receive_nochecks (buffer, offset, size, flags, out error);
-               }
+                       if (e.Buffer == null && e.BufferList == null)
+                               throw new NullReferenceException ("Either e.Buffer or e.BufferList must be valid buffers.");
 
-               public bool ReceiveFromAsync (SocketAsyncEventArgs e)
-               {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       if (e.Buffer == null) {
+                               InitSocketAsyncEventArgs (e, SendAsyncCallback, e, SocketOperation.SendGeneric);
 
-                       // We do not support recv into multiple buffers yet
-                       if (e.BufferList != null)
-                               throw new NotSupportedException ("Mono doesn't support using BufferList at this point.");
-                       if (e.RemoteEndPoint == null)
-                               throw new ArgumentNullException ("remoteEP", "Value cannot be null.");
+                               e.socket_async_result.Buffers = e.BufferList;
 
-                       e.curSocket = this;
-                       e.Worker.Init (this, e, SocketOperation.ReceiveFrom);
-                       SocketAsyncResult res = e.Worker.result;
-                       res.Buffer = e.Buffer;
-                       res.Offset = e.Offset;
-                       res.Size = e.Count;
-                       res.EndPoint = e.RemoteEndPoint;
-                       res.SockFlags = e.SocketFlags;
-                       int count;
-                       lock (readQ) {
-                               readQ.Enqueue (e.Worker);
-                               count = readQ.Count;
+                               QueueIOSelectorJob (writeQ, e.socket_async_result.Handle, new IOSelectorJob (IOOperation.Write, BeginSendGenericCallback, e.socket_async_result));
+                       } else {
+                               InitSocketAsyncEventArgs (e, SendAsyncCallback, e, SocketOperation.Send);
+
+                               e.socket_async_result.Buffer = e.Buffer;
+                               e.socket_async_result.Offset = e.Offset;
+                               e.socket_async_result.Size = e.Count;
+
+                               QueueIOSelectorJob (writeQ, e.socket_async_result.Handle, new IOSelectorJob (IOOperation.Write, s => BeginSendCallback ((SocketAsyncResult) s, 0), e.socket_async_result));
                        }
-                       if (count == 1)
-                               socket_pool_queue (SocketAsyncWorker.Dispatcher, res);
+
                        return true;
                }
 
-               public int ReceiveFrom (byte [] buffer, ref EndPoint remoteEP)
+               static AsyncCallback SendAsyncCallback = new AsyncCallback (ares => {
+                       SocketAsyncEventArgs e = (SocketAsyncEventArgs) ((SocketAsyncResult) ares).AsyncState;
+
+                       if (Interlocked.Exchange (ref e.in_progress, 0) != 1)
+                               throw new InvalidOperationException ("No operation in progress");
+
+                       try {
+                               e.BytesTransferred = e.current_socket.EndSend (ares);
+                       } catch (SocketException se){
+                               e.SocketError = se.SocketErrorCode;
+                       } catch (ObjectDisposedException) {
+                               e.SocketError = SocketError.OperationAborted;
+                       } finally {
+                               e.Complete ();
+                       }
+               });
+
+               public IAsyncResult BeginSend (byte[] buffer, int offset, int size, SocketFlags socketFlags, out SocketError errorCode, AsyncCallback callback, object state)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       if (!is_connected) {
+                               errorCode = SocketError.NotConnected;
+                               throw new SocketException ((int) errorCode);
+                       }
 
-                       if (buffer == null)
-                               throw new ArgumentNullException ("buffer");
+                       errorCode = SocketError.Success;
+                       return BeginSend (buffer, offset, size, socketFlags, callback, state);
+               }
 
-                       if (remoteEP == null)
-                               throw new ArgumentNullException ("remoteEP");
+               public IAsyncResult BeginSend (byte[] buffer, int offset, int size, SocketFlags socket_flags, AsyncCallback callback, object state)
+               {
+                       ThrowIfDisposedAndClosed ();
+                       ThrowIfBufferNull (buffer);
+                       ThrowIfBufferOutOfRange (buffer, offset, size);
+
+                       if (!is_connected)
+                               throw new SocketException ((int)SocketError.NotConnected);
+
+                       SocketAsyncResult sockares = new SocketAsyncResult (this, callback, state, SocketOperation.Send) {
+                               Buffer = buffer,
+                               Offset = offset,
+                               Size = size,
+                               SockFlags = socket_flags,
+                       };
+
+                       QueueIOSelectorJob (writeQ, sockares.Handle, new IOSelectorJob (IOOperation.Write, s => BeginSendCallback ((SocketAsyncResult) s, 0), sockares));
 
-                       return ReceiveFrom_nochecks (buffer, 0, buffer.Length, SocketFlags.None, ref remoteEP);
+                       return sockares;
                }
 
-               public int ReceiveFrom (byte [] buffer, SocketFlags flags, ref EndPoint remoteEP)
+               static void BeginSendCallback (SocketAsyncResult sockares, int sent_so_far)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       int total = 0;
 
-                       if (buffer == null)
-                               throw new ArgumentNullException ("buffer");
+                       try {
+                               total = Socket.Send_internal (sockares.socket.safe_handle, sockares.Buffer, sockares.Offset, sockares.Size, sockares.SockFlags, out sockares.error);
+                       } catch (Exception e) {
+                               sockares.Complete (e);
+                               return;
+                       }
 
-                       if (remoteEP == null)
-                               throw new ArgumentNullException ("remoteEP");
+                       if (sockares.error == 0) {
+                               sent_so_far += total;
+                               sockares.Offset += total;
+                               sockares.Size -= total;
+
+                               if (sockares.socket.is_disposed) {
+                                       sockares.Complete (total);
+                                       return;
+                               }
 
-                       return ReceiveFrom_nochecks (buffer, 0, buffer.Length, flags, ref remoteEP);
+                               if (sockares.Size > 0) {
+                                       IOSelector.Add (sockares.Handle, new IOSelectorJob (IOOperation.Write, s => BeginSendCallback ((SocketAsyncResult) s, sent_so_far), sockares));
+                                       return; // Have to finish writing everything. See bug #74475.
+                               }
+
+                               sockares.Total = sent_so_far;
+                       }
+
+                       sockares.Complete (total);
                }
 
-               public int ReceiveFrom (byte [] buffer, int size, SocketFlags flags,
-                                       ref EndPoint remoteEP)
+               public IAsyncResult BeginSend (IList<ArraySegment<byte>> buffers, SocketFlags socketFlags, AsyncCallback callback, object state)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       ThrowIfDisposedAndClosed ();
 
-                       if (buffer == null)
-                               throw new ArgumentNullException ("buffer");
+                       if (buffers == null)
+                               throw new ArgumentNullException ("buffers");
+                       if (!is_connected)
+                               throw new SocketException ((int)SocketError.NotConnected);
 
-                       if (remoteEP == null)
-                               throw new ArgumentNullException ("remoteEP");
+                       SocketAsyncResult sockares = new SocketAsyncResult (this, callback, state, SocketOperation.SendGeneric) {
+                               Buffers = buffers,
+                               SockFlags = socketFlags,
+                       };
 
-                       if (size < 0 || size > buffer.Length)
-                               throw new ArgumentOutOfRangeException ("size");
+                       QueueIOSelectorJob (writeQ, sockares.Handle, new IOSelectorJob (IOOperation.Write, BeginSendGenericCallback, sockares));
 
-                       return ReceiveFrom_nochecks (buffer, 0, size, flags, ref remoteEP);
+                       return sockares;
                }
 
-               [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               private extern static int RecvFrom_internal(IntPtr sock,
-                                                           byte[] buffer,
-                                                           int offset,
-                                                           int count,
-                                                           SocketFlags flags,
-                                                           ref SocketAddress sockaddr,
-                                                           out int error);
-
-               private static int RecvFrom_internal (SafeSocketHandle safeHandle,
-                                                           byte[] buffer,
-                                                           int offset,
-                                                           int count,
-                                                           SocketFlags flags,
-                                                           ref SocketAddress sockaddr,
-                                                           out int error)
+               [CLSCompliant (false)]
+               public IAsyncResult BeginSend (IList<ArraySegment<byte>> buffers, SocketFlags socketFlags, out SocketError errorCode, AsyncCallback callback, object state)
                {
+                       if (!is_connected) {
+                               errorCode = SocketError.NotConnected;
+                               throw new SocketException ((int)errorCode);
+                       }
+
+                       errorCode = SocketError.Success;
+                       return BeginSend (buffers, socketFlags, callback, state);
+               }
+
+               static IOAsyncCallback BeginSendGenericCallback = new IOAsyncCallback (ares => {
+                       SocketAsyncResult sockares = (SocketAsyncResult) ares;
+                       int total = 0;
+
                        try {
-                               safeHandle.RegisterForBlockingSyscall ();
-                               return RecvFrom_internal (safeHandle.DangerousGetHandle (), buffer, offset, count, flags, ref sockaddr, out error);
-                       } finally {
-                               safeHandle.UnRegisterForBlockingSyscall ();
+                               total = sockares.socket.Send (sockares.Buffers, sockares.SockFlags);
+                       } catch (Exception e) {
+                               sockares.Complete (e);
+                               return;
+                       }
+
+                       sockares.Complete (total);
+               });
+
+               public int EndSend (IAsyncResult result)
+               {
+                       SocketError error;
+                       int bytesSent = EndSend (result, out error);
+
+                       if (error != SocketError.Success) {
+                               if (error != SocketError.WouldBlock && error != SocketError.InProgress)
+                                       is_connected = false;
+                               throw new SocketException ((int)error);
                        }
+
+                       return bytesSent;
                }
 
-               public int ReceiveFrom (byte [] buffer, int offset, int size, SocketFlags flags,
-                                       ref EndPoint remoteEP)
+               public int EndSend (IAsyncResult asyncResult, out SocketError errorCode)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       ThrowIfDisposedAndClosed ();
 
-                       if (buffer == null)
-                               throw new ArgumentNullException ("buffer");
+                       SocketAsyncResult sockares = ValidateEndIAsyncResult (asyncResult, "EndSend", "asyncResult");
 
-                       if (remoteEP == null)
-                               throw new ArgumentNullException ("remoteEP");
+                       if (!sockares.IsCompleted)
+                               sockares.AsyncWaitHandle.WaitOne ();
 
-                       CheckRange (buffer, offset, size);
+                       /* If no socket error occurred, call CheckIfThrowDelayedException in
+                        * case there are other kinds of exceptions that should be thrown.*/
+                       if ((errorCode = sockares.ErrorCode) == SocketError.Success)
+                               sockares.CheckIfThrowDelayedException ();
 
-                       return ReceiveFrom_nochecks (buffer, offset, size, flags, ref remoteEP);
+                       return sockares.Total;
                }
 
-               internal int ReceiveFrom_nochecks (byte [] buf, int offset, int size, SocketFlags flags,
-                                                  ref EndPoint remote_end)
+               static int Send_internal (SafeSocketHandle safeHandle, WSABUF[] bufarray, SocketFlags flags, out int error)
                {
-                       int error;
-                       return ReceiveFrom_nochecks_exc (buf, offset, size, flags, ref remote_end, true, out error);
+                       bool release = false;
+                       try {
+                               safeHandle.DangerousAddRef (ref release);
+                               return Send_internal (safeHandle.DangerousGetHandle (), bufarray, flags, out error);
+                       } finally {
+                               if (release)
+                                       safeHandle.DangerousRelease ();
+                       }
                }
 
-               internal int ReceiveFrom_nochecks_exc (byte [] buf, int offset, int size, SocketFlags flags,
-                                                  ref EndPoint remote_end, bool throwOnError, out int error)
-               {
-                       SocketAddress sockaddr = remote_end.Serialize();
-                       int cnt = RecvFrom_internal (safe_handle, buf, offset, size, flags, ref sockaddr, out error);
-                       SocketError err = (SocketError) error;
-                       if (err != 0) {
-                               if (err != SocketError.WouldBlock && err != SocketError.InProgress)
-                                       is_connected = false;
-                               else if (err == SocketError.WouldBlock && is_blocking) { // This might happen when ReceiveTimeout is set
-                                       if (throwOnError)       
-                                               throw new SocketException ((int) SocketError.TimedOut, TIMEOUT_EXCEPTION_MSG);
-                                       error = (int) SocketError.TimedOut;
-                                       return 0;
-                               }
+               [MethodImplAttribute (MethodImplOptions.InternalCall)]
+               extern static int Send_internal (IntPtr sock, WSABUF[] bufarray, SocketFlags flags, out int error);
 
-                               if (throwOnError)
-                                       throw new SocketException (error);
-                               return 0;
+               static int Send_internal (SafeSocketHandle safeHandle, byte[] buf, int offset, int count, SocketFlags flags, out int error)
+               {
+                       try {
+                               safeHandle.RegisterForBlockingSyscall ();
+                               return Send_internal (safeHandle.DangerousGetHandle (), buf, offset, count, flags, out error);
+                       } finally {
+                               safeHandle.UnRegisterForBlockingSyscall ();
                        }
+               }
 
-                       is_connected = true;
-                       is_bound = true;
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               extern static int Send_internal(IntPtr sock, byte[] buf, int offset, int count, SocketFlags flags, out int error);
+
+#endregion
+
+#region SendTo
+
+               public int SendTo (byte [] buffer, EndPoint remote_end)
+               {
+                       ThrowIfDisposedAndClosed ();
+                       ThrowIfBufferNull (buffer);
 
-                       // If sockaddr is null then we're a connection
-                       // oriented protocol and should ignore the
-                       // remote_end parameter (see MSDN
-                       // documentation for Socket.ReceiveFrom(...) )
-                       
-                       if ( sockaddr != null ) {
-                               // Stupidly, EndPoint.Create() is an
-                               // instance method
-                               remote_end = remote_end.Create (sockaddr);
-                       }
-                       
-                       seed_endpoint = remote_end;
-                       
-                       return cnt;
+                       return SendTo (buffer, 0, buffer.Length, SocketFlags.None, remote_end);
                }
 
-               [MonoTODO ("Not implemented")]
-               public bool ReceiveMessageFromAsync (SocketAsyncEventArgs e)
+               public int SendTo (byte [] buffer, SocketFlags flags, EndPoint remote_end)
                {
-                       // NO check is made whether e != null in MS.NET (NRE is thrown in such case)
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
-                       
-                       throw new NotImplementedException ();
+                       ThrowIfDisposedAndClosed ();
+                       ThrowIfBufferNull (buffer);
+
+                       return SendTo (buffer, 0, buffer.Length, flags, remote_end);
                }
-               
-               [MonoTODO ("Not implemented")]
-               public int ReceiveMessageFrom (byte[] buffer, int offset,
-                                              int size,
-                                              ref SocketFlags socketFlags,
-                                              ref EndPoint remoteEP,
-                                              out IPPacketInformation ipPacketInformation)
-               {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
 
-                       if (buffer == null)
-                               throw new ArgumentNullException ("buffer");
+               public int SendTo (byte [] buffer, int size, SocketFlags flags, EndPoint remote_end)
+               {
+                       return SendTo (buffer, 0, size, flags, remote_end);
+               }
 
-                       if (remoteEP == null)
-                               throw new ArgumentNullException ("remoteEP");
+               public int SendTo (byte [] buffer, int offset, int size, SocketFlags flags, EndPoint remote_end)
+               {
+                       ThrowIfDisposedAndClosed ();
+                       ThrowIfBufferNull (buffer);
+                       ThrowIfBufferOutOfRange (buffer, offset, size);
 
-                       CheckRange (buffer, offset, size);
+                       if (remote_end == null)
+                               throw new ArgumentNullException("remote_end");
 
-                       /* FIXME: figure out how we get hold of the
-                        * IPPacketInformation
-                        */
-                       throw new NotImplementedException ();
+                       return SendTo_nochecks (buffer, offset, size, flags, remote_end);
                }
 
-               [MonoTODO ("Not implemented")]
-               public bool SendPacketsAsync (SocketAsyncEventArgs e)
+               public bool SendToAsync (SocketAsyncEventArgs e)
                {
                        // NO check is made whether e != null in MS.NET (NRE is thrown in such case)
-                       
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
-                       
-                       throw new NotImplementedException ();
-               }
 
-               public int Send (byte [] buf)
-               {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       ThrowIfDisposedAndClosed ();
 
-                       if (buf == null)
-                               throw new ArgumentNullException ("buf");
+                       if (e.BufferList != null)
+                               throw new NotSupportedException ("Mono doesn't support using BufferList at this point.");
+                       if (e.RemoteEndPoint == null)
+                               throw new ArgumentNullException ("remoteEP", "Value cannot be null.");
 
-                       SocketError error;
+                       InitSocketAsyncEventArgs (e, SendToAsyncCallback, e, SocketOperation.SendTo);
 
-                       int ret = Send_nochecks (buf, 0, buf.Length, SocketFlags.None, out error);
+                       e.socket_async_result.Buffer = e.Buffer;
+                       e.socket_async_result.Offset = e.Offset;
+                       e.socket_async_result.Size = e.Count;
+                       e.socket_async_result.SockFlags = e.SocketFlags;
+                       e.socket_async_result.EndPoint = e.RemoteEndPoint;
 
-                       if (error != SocketError.Success)
-                               throw new SocketException ((int) error);
+                       QueueIOSelectorJob (writeQ, e.socket_async_result.Handle, new IOSelectorJob (IOOperation.Write, s => BeginSendToCallback ((SocketAsyncResult) s, 0), e.socket_async_result));
 
-                       return ret;
+                       return true;
                }
 
-               public int Send (byte [] buf, SocketFlags flags)
-               {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+               static AsyncCallback SendToAsyncCallback = new AsyncCallback (ares => {
+                       SocketAsyncEventArgs e = (SocketAsyncEventArgs) ((SocketAsyncResult) ares).AsyncState;
 
-                       if (buf == null)
-                               throw new ArgumentNullException ("buf");
+                       if (Interlocked.Exchange (ref e.in_progress, 0) != 1)
+                               throw new InvalidOperationException ("No operation in progress");
 
-                       SocketError error;
+                       try {
+                               e.BytesTransferred = e.current_socket.EndSendTo (ares);
+                       } catch (SocketException ex) {
+                               e.SocketError = ex.SocketErrorCode;
+                       } catch (ObjectDisposedException) {
+                               e.SocketError = SocketError.OperationAborted;
+                       } finally {
+                               e.Complete ();
+                       }
+               });
 
-                       int ret = Send_nochecks (buf, 0, buf.Length, flags, out error);
+               public IAsyncResult BeginSendTo(byte[] buffer, int offset, int size, SocketFlags socket_flags, EndPoint remote_end, AsyncCallback callback, object state)
+               {
+                       ThrowIfDisposedAndClosed ();
+                       ThrowIfBufferNull (buffer);
+                       ThrowIfBufferOutOfRange (buffer, offset, size);
+
+                       SocketAsyncResult sockares = new SocketAsyncResult (this, callback, state, SocketOperation.SendTo) {
+                               Buffer = buffer,
+                               Offset = offset,
+                               Size = size,
+                               SockFlags = socket_flags,
+                               EndPoint = remote_end,
+                       };
 
-                       if (error != SocketError.Success)
-                               throw new SocketException ((int) error);
+                       QueueIOSelectorJob (writeQ, sockares.Handle, new IOSelectorJob (IOOperation.Write, s => BeginSendToCallback ((SocketAsyncResult) s, 0), sockares));
 
-                       return ret;
+                       return sockares;
                }
 
-               public int Send (byte [] buf, int size, SocketFlags flags)
+               static void BeginSendToCallback (SocketAsyncResult sockares, int sent_so_far)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
-
-                       if (buf == null)
-                               throw new ArgumentNullException ("buf");
-
-                       CheckRange (buf, 0, size);
+                       int total = 0;
+                       try {
+                               total = sockares.socket.SendTo_nochecks (sockares.Buffer, sockares.Offset, sockares.Size, sockares.SockFlags, sockares.EndPoint);
 
-                       SocketError error;
+                               if (sockares.error == 0) {
+                                       sent_so_far += total;
+                                       sockares.Offset += total;
+                                       sockares.Size -= total;
+                               }
 
-                       int ret = Send_nochecks (buf, 0, size, flags, out error);
+                               if (sockares.Size > 0) {
+                                       IOSelector.Add (sockares.Handle, new IOSelectorJob (IOOperation.Write, s => BeginSendToCallback ((SocketAsyncResult) s, sent_so_far), sockares));
+                                       return; // Have to finish writing everything. See bug #74475.
+                               }
 
-                       if (error != SocketError.Success)
-                               throw new SocketException ((int) error);
+                               sockares.Total = sent_so_far;
+                       } catch (Exception e) {
+                               sockares.Complete (e);
+                               return;
+                       }
 
-                       return ret;
+                       sockares.Complete ();
                }
 
-               public int Send (byte [] buf, int offset, int size, SocketFlags flags)
+               public int EndSendTo (IAsyncResult result)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
-
-                       if (buf == null)
-                               throw new ArgumentNullException ("buffer");
-
-                       CheckRange (buf, offset, size);
+                       ThrowIfDisposedAndClosed ();
 
-                       SocketError error;
+                       SocketAsyncResult sockares = ValidateEndIAsyncResult (result, "EndSendTo", "result");
 
-                       int ret = Send_nochecks (buf, offset, size, flags, out error);
+                       if (!sockares.IsCompleted)
+                               sockares.AsyncWaitHandle.WaitOne();
 
-                       if (error != SocketError.Success)
-                               throw new SocketException ((int) error);
+                       sockares.CheckIfThrowDelayedException();
 
-                       return ret;
+                       return sockares.Total;
                }
 
-               public int Send (byte [] buf, int offset, int size, SocketFlags flags, out SocketError error)
+               int SendTo_nochecks (byte [] buffer, int offset, int size, SocketFlags flags, EndPoint remote_end)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       int error;
+                       int ret = SendTo_internal (safe_handle, buffer, offset, size, flags, remote_end.Serialize (), out error);
 
-                       if (buf == null)
-                               throw new ArgumentNullException ("buffer");
+                       SocketError err = (SocketError) error;
+                       if (err != 0) {
+                               if (err != SocketError.WouldBlock && err != SocketError.InProgress)
+                                       is_connected = false;
+                               throw new SocketException (error);
+                       }
 
-                       CheckRange (buf, offset, size);
+                       is_connected = true;
+                       is_bound = true;
+                       seed_endpoint = remote_end;
 
-                       return Send_nochecks (buf, offset, size, flags, out error);
+                       return ret;
                }
 
-               [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               private extern static bool SendFile (IntPtr sock, string filename, byte [] pre_buffer, byte [] post_buffer, TransmitFileOptions flags);
-
-               private static bool SendFile (SafeSocketHandle safeHandle, string filename, byte [] pre_buffer, byte [] post_buffer, TransmitFileOptions flags)
+               static int SendTo_internal (SafeSocketHandle safeHandle, byte[] buffer, int offset, int count, SocketFlags flags, SocketAddress sa, out int error)
                {
                        try {
                                safeHandle.RegisterForBlockingSyscall ();
-                               return SendFile (safeHandle.DangerousGetHandle (), filename, pre_buffer, post_buffer, flags);
+                               return SendTo_internal (safeHandle.DangerousGetHandle (), buffer, offset, count, flags, sa, out error);
                        } finally {
                                safeHandle.UnRegisterForBlockingSyscall ();
                        }
                }
 
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               extern static int SendTo_internal (IntPtr sock, byte[] buffer, int offset, int count, SocketFlags flags, SocketAddress sa, out int error);
+
+#endregion
+
+#region SendFile
+
                public void SendFile (string fileName)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       ThrowIfDisposedAndClosed ();
 
                        if (!is_connected)
                                throw new NotSupportedException ();
-
                        if (!is_blocking)
                                throw new InvalidOperationException ();
 
@@ -2270,16 +2866,14 @@ namespace System.Net.Sockets
 
                public void SendFile (string fileName, byte[] preBuffer, byte[] postBuffer, TransmitFileOptions flags)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       ThrowIfDisposedAndClosed ();
 
                        if (!is_connected)
                                throw new NotSupportedException ();
-
                        if (!is_blocking)
                                throw new InvalidOperationException ();
 
-                       if (!SendFile (safe_handle, fileName, preBuffer, postBuffer, flags)) {
+                       if (!SendFile_internal (safe_handle, fileName, preBuffer, postBuffer, flags)) {
                                SocketException exc = new SocketException ();
                                if (exc.ErrorCode == 2 || exc.ErrorCode == 3)
                                        throw new FileNotFoundException ();
@@ -2287,159 +2881,229 @@ namespace System.Net.Sockets
                        }
                }
 
-               public bool SendToAsync (SocketAsyncEventArgs e)
+               public IAsyncResult BeginSendFile (string fileName, AsyncCallback callback, object state)
                {
-                       // NO check is made whether e != null in MS.NET (NRE is thrown in such case)
-                       
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
-                       if (e.BufferList != null)
-                               throw new NotSupportedException ("Mono doesn't support using BufferList at this point.");
-                       if (e.RemoteEndPoint == null)
-                               throw new ArgumentNullException ("remoteEP", "Value cannot be null.");
+                       ThrowIfDisposedAndClosed ();
 
-                       e.curSocket = this;
-                       e.Worker.Init (this, e, SocketOperation.SendTo);
-                       SocketAsyncResult res = e.Worker.result;
-                       res.Buffer = e.Buffer;
-                       res.Offset = e.Offset;
-                       res.Size = e.Count;
-                       res.SockFlags = e.SocketFlags;
-                       res.EndPoint = e.RemoteEndPoint;
-                       int count;
-                       lock (writeQ) {
-                               writeQ.Enqueue (e.Worker);
-                               count = writeQ.Count;
+                       if (!is_connected)
+                               throw new NotSupportedException ();
+                       if (!File.Exists (fileName))
+                               throw new FileNotFoundException ();
+
+                       return BeginSendFile (fileName, null, null, 0, callback, state);
+               }
+
+               public IAsyncResult BeginSendFile (string fileName, byte[] preBuffer, byte[] postBuffer, TransmitFileOptions flags, AsyncCallback callback, object state)
+               {
+                       ThrowIfDisposedAndClosed ();
+
+                       if (!is_connected)
+                               throw new NotSupportedException ();
+                       if (!File.Exists (fileName))
+                               throw new FileNotFoundException ();
+
+                       SendFileHandler handler = new SendFileHandler (SendFile);
+
+                       return new SendFileAsyncResult (handler, handler.BeginInvoke (fileName, preBuffer, postBuffer, flags, ar => callback (new SendFileAsyncResult (handler, ar)), state));
+               }
+
+               public void EndSendFile (IAsyncResult asyncResult)
+               {
+                       ThrowIfDisposedAndClosed ();
+
+                       if (asyncResult == null)
+                               throw new ArgumentNullException ("asyncResult");
+
+                       SendFileAsyncResult ares = asyncResult as SendFileAsyncResult;
+                       if (ares == null)
+                               throw new ArgumentException ("Invalid IAsyncResult", "asyncResult");
+
+                       ares.Delegate.EndInvoke (ares.Original);
+               }
+
+               static bool SendFile_internal (SafeSocketHandle safeHandle, string filename, byte [] pre_buffer, byte [] post_buffer, TransmitFileOptions flags)
+               {
+                       try {
+                               safeHandle.RegisterForBlockingSyscall ();
+                               return SendFile_internal (safeHandle.DangerousGetHandle (), filename, pre_buffer, post_buffer, flags);
+                       } finally {
+                               safeHandle.UnRegisterForBlockingSyscall ();
                        }
-                       if (count == 1)
-                               socket_pool_queue (SocketAsyncWorker.Dispatcher, res);
-                       return true;
                }
-               
-               public int SendTo (byte [] buffer, EndPoint remote_end)
+
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               extern static bool SendFile_internal (IntPtr sock, string filename, byte [] pre_buffer, byte [] post_buffer, TransmitFileOptions flags);
+
+               delegate void SendFileHandler (string fileName, byte [] preBuffer, byte [] postBuffer, TransmitFileOptions flags);
+
+               sealed class SendFileAsyncResult : IAsyncResult {
+                       IAsyncResult ares;
+                       SendFileHandler d;
+
+                       public SendFileAsyncResult (SendFileHandler d, IAsyncResult ares)
+                       {
+                               this.d = d;
+                               this.ares = ares;
+                       }
+
+                       public object AsyncState {
+                               get { return ares.AsyncState; }
+                       }
+
+                       public WaitHandle AsyncWaitHandle {
+                               get { return ares.AsyncWaitHandle; }
+                       }
+
+                       public bool CompletedSynchronously {
+                               get { return ares.CompletedSynchronously; }
+                       }
+
+                       public bool IsCompleted {
+                               get { return ares.IsCompleted; }
+                       }
+
+                       public SendFileHandler Delegate {
+                               get { return d; }
+                       }
+
+                       public IAsyncResult Original {
+                               get { return ares; }
+                       }
+               }
+
+#endregion
+
+#region SendPackets
+
+               [MonoTODO ("Not implemented")]
+               public bool SendPacketsAsync (SocketAsyncEventArgs e)
+               {
+                       // NO check is made whether e != null in MS.NET (NRE is thrown in such case)
+
+                       ThrowIfDisposedAndClosed ();
+
+                       throw new NotImplementedException ();
+               }
+
+#endregion
+
+#region DuplicateAndClose
+
+#if !MOBILE
+               [MonoLimitation ("We do not support passing sockets across processes, we merely allow this API to pass the socket across AppDomains")]
+               public SocketInformation DuplicateAndClose (int targetProcessId)
+               {
+                       var si = new SocketInformation ();
+                       si.Options =
+                               (is_listening      ? SocketInformationOptions.Listening : 0) |
+                               (is_connected      ? SocketInformationOptions.Connected : 0) |
+                               (is_blocking       ? 0 : SocketInformationOptions.NonBlocking) |
+                               (use_overlapped_io ? SocketInformationOptions.UseOnlyOverlappedIO : 0);
+
+                       si.ProtocolInformation = Mono.DataConverter.Pack ("iiiil", (int)address_family, (int)socket_type, (int)protocol_type, is_bound ? 1 : 0, (long)Handle);
+                       safe_handle = null;
+
+                       return si;
+               }
+#endif
+
+#endregion
+
+#region GetSocketOption
+
+               public void GetSocketOption (SocketOptionLevel optionLevel, SocketOptionName optionName, byte [] optionValue)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       ThrowIfDisposedAndClosed ();
 
-                       if (buffer == null)
-                               throw new ArgumentNullException ("buffer");
+                       if (optionValue == null)
+                               throw new SocketException ((int) SocketError.Fault, "Error trying to dereference an invalid pointer");
 
-                       if (remote_end == null)
-                               throw new ArgumentNullException ("remote_end");
+                       int error;
+                       GetSocketOption_arr_internal (safe_handle, optionLevel, optionName, ref optionValue, out error);
 
-                       return SendTo_nochecks (buffer, 0, buffer.Length, SocketFlags.None, remote_end);
+                       if (error != 0)
+                               throw new SocketException (error);
                }
 
-               public int SendTo (byte [] buffer, SocketFlags flags, EndPoint remote_end)
+               public byte [] GetSocketOption (SocketOptionLevel optionLevel, SocketOptionName optionName, int length)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       ThrowIfDisposedAndClosed ();
 
-                       if (buffer == null)
-                               throw new ArgumentNullException ("buffer");
+                       int error;
+                       byte[] byte_val = new byte [length];
+                       GetSocketOption_arr_internal (safe_handle, optionLevel, optionName, ref byte_val, out error);
 
-                       if (remote_end == null)
-                               throw new ArgumentNullException ("remote_end");
-                               
-                       return SendTo_nochecks (buffer, 0, buffer.Length, flags, remote_end);
+                       if (error != 0)
+                               throw new SocketException (error);
+
+                       return byte_val;
                }
 
-               public int SendTo (byte [] buffer, int size, SocketFlags flags, EndPoint remote_end)
+               public object GetSocketOption (SocketOptionLevel optionLevel, SocketOptionName optionName)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
-
-                       if (buffer == null)
-                               throw new ArgumentNullException ("buffer");
+                       ThrowIfDisposedAndClosed ();
 
-                       if (remote_end == null)
-                               throw new ArgumentNullException ("remote_end");
+                       int error;
+                       object obj_val;
+                       GetSocketOption_obj_internal (safe_handle, optionLevel, optionName, out obj_val, out error);
 
-                       CheckRange (buffer, 0, size);
+                       if (error != 0)
+                               throw new SocketException (error);
 
-                       return SendTo_nochecks (buffer, 0, size, flags, remote_end);
+                       if (optionName == SocketOptionName.Linger)
+                               return (LingerOption) obj_val;
+                       else if (optionName == SocketOptionName.AddMembership || optionName == SocketOptionName.DropMembership)
+                               return (MulticastOption) obj_val;
+                       else if (obj_val is int)
+                               return (int) obj_val;
+                       else
+                               return obj_val;
                }
 
-               [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               private extern static int SendTo_internal(IntPtr sock,
-                                                         byte[] buffer,
-                                                         int offset,
-                                                         int count,
-                                                         SocketFlags flags,
-                                                         SocketAddress sa,
-                                                         out int error);
-
-               private static int SendTo_internal (SafeSocketHandle safeHandle,
-                                                         byte[] buffer,
-                                                         int offset,
-                                                         int count,
-                                                         SocketFlags flags,
-                                                         SocketAddress sa,
-                                                         out int error)
+               static void GetSocketOption_arr_internal (SafeSocketHandle safeHandle, SocketOptionLevel level, SocketOptionName name, ref byte[] byte_val, out int error)
                {
+                       bool release = false;
                        try {
-                               safeHandle.RegisterForBlockingSyscall ();
-                               return SendTo_internal (safeHandle.DangerousGetHandle (), buffer, offset, count, flags, sa, out error);
+                               safeHandle.DangerousAddRef (ref release);
+                               GetSocketOption_arr_internal (safeHandle.DangerousGetHandle (), level, name, ref byte_val, out error);
                        } finally {
-                               safeHandle.UnRegisterForBlockingSyscall ();
+                               if (release)
+                                       safeHandle.DangerousRelease ();
                        }
                }
 
-               public int SendTo (byte [] buffer, int offset, int size, SocketFlags flags,
-                                  EndPoint remote_end)
-               {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
-
-                       if (buffer == null)
-                               throw new ArgumentNullException ("buffer");
-
-                       if (remote_end == null)
-                               throw new ArgumentNullException("remote_end");
-
-                       CheckRange (buffer, offset, size);
-
-                       return SendTo_nochecks (buffer, offset, size, flags, remote_end);
-               }
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               extern static void GetSocketOption_arr_internal(IntPtr socket, SocketOptionLevel level, SocketOptionName name, ref byte[] byte_val, out int error);
 
-               internal int SendTo_nochecks (byte [] buffer, int offset, int size, SocketFlags flags,
-                                             EndPoint remote_end)
+               static void GetSocketOption_obj_internal (SafeSocketHandle safeHandle, SocketOptionLevel level, SocketOptionName name, out object obj_val, out int error)
                {
-                       SocketAddress sockaddr = remote_end.Serialize ();
-
-                       int ret, error;
-
-                       ret = SendTo_internal (safe_handle, buffer, offset, size, flags, sockaddr, out error);
+                       bool release = false;
+                       try {
+                               safeHandle.DangerousAddRef (ref release);
+                               GetSocketOption_obj_internal (safeHandle.DangerousGetHandle (), level, name, out obj_val, out error);
+                       } finally {
+                               if (release)
+                                       safeHandle.DangerousRelease ();
+                       }
+               }
 
-                       SocketError err = (SocketError) error;
-                       if (err != 0) {
-                               if (err != SocketError.WouldBlock && err != SocketError.InProgress)
-                                       is_connected = false;
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               extern static void GetSocketOption_obj_internal(IntPtr socket, SocketOptionLevel level, SocketOptionName name, out object obj_val, out int error);
 
-                               throw new SocketException (error);
-                       }
+#endregion
 
-                       is_connected = true;
-                       is_bound = true;
-                       seed_endpoint = remote_end;
-                       
-                       return ret;
-               }
+#region SetSocketOption
 
                public void SetSocketOption (SocketOptionLevel optionLevel, SocketOptionName optionName, byte [] optionValue)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       ThrowIfDisposedAndClosed ();
 
                        // I'd throw an ArgumentNullException, but this is what MS does.
                        if (optionValue == null)
-                               throw new SocketException ((int) SocketError.Fault,
-                                       "Error trying to dereference an invalid pointer");
-                       
-                       int error;
+                               throw new SocketException ((int) SocketError.Fault, "Error trying to dereference an invalid pointer");
 
-                       SetSocketOption_internal (safe_handle, optionLevel, optionName, null,
-                                                optionValue, 0, out error);
+                       int error;
+                       SetSocketOption_internal (safe_handle, optionLevel, optionName, null, optionValue, 0, out error);
 
                        if (error != 0) {
                                if (error == (int) SocketError.InvalidArgument)
@@ -2450,13 +3114,12 @@ namespace System.Net.Sockets
 
                public void SetSocketOption (SocketOptionLevel optionLevel, SocketOptionName optionName, object optionValue)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       ThrowIfDisposedAndClosed ();
 
                        // NOTE: if a null is passed, the byte[] overload is used instead...
                        if (optionValue == null)
                                throw new ArgumentNullException("optionValue");
-                       
+
                        int error;
 
                        if (optionLevel == SocketOptionLevel.Socket && optionName == SocketOptionName.Linger) {
@@ -2487,12 +3150,12 @@ namespace System.Net.Sockets
 
                public void SetSocketOption (SocketOptionLevel optionLevel, SocketOptionName optionName, bool optionValue)
                {
-                       if (is_disposed && is_closed)
-                               throw new ObjectDisposedException (GetType ().ToString ());
+                       ThrowIfDisposedAndClosed ();
 
                        int error;
-                       int int_val = (optionValue) ? 1 : 0;
+                       int int_val = optionValue ? 1 : 0;
                        SetSocketOption_internal (safe_handle, optionLevel, optionName, null, null, int_val, out error);
+
                        if (error != 0) {
                                if (error == (int) SocketError.InvalidArgument)
                                        throw new ArgumentException ();
@@ -2500,6 +3163,190 @@ namespace System.Net.Sockets
                        }
                }
 
+               public void SetSocketOption (SocketOptionLevel optionLevel, SocketOptionName optionName, int optionValue)
+               {
+                       ThrowIfDisposedAndClosed ();
+
+                       int error;
+                       SetSocketOption_internal (safe_handle, optionLevel, optionName, null, null, optionValue, out error);
+
+                       if (error != 0) {
+                               throw new SocketException (error);
+                       }
+               }
+
+               static void SetSocketOption_internal (SafeSocketHandle safeHandle, SocketOptionLevel level, SocketOptionName name, object obj_val, byte [] byte_val, int int_val, out int error)
+               {
+                       bool release = false;
+                       try {
+                               safeHandle.DangerousAddRef (ref release);
+                               SetSocketOption_internal (safeHandle.DangerousGetHandle (), level, name, obj_val, byte_val, int_val, out error);
+                       } finally {
+                               if (release)
+                                       safeHandle.DangerousRelease ();
+                       }
+               }
+
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               extern static void SetSocketOption_internal (IntPtr socket, SocketOptionLevel level, SocketOptionName name, object obj_val, byte [] byte_val, int int_val, out int error);
+
+#endregion
+
+#region IOControl
+
+               public int IOControl (int ioctl_code, byte [] in_value, byte [] out_value)
+               {
+                       if (is_disposed)
+                               throw new ObjectDisposedException (GetType ().ToString ());
+
+                       int error;
+                       int result = IOControl_internal (safe_handle, ioctl_code, in_value, out_value, out error);
+
+                       if (error != 0)
+                               throw new SocketException (error);
+                       if (result == -1)
+                               throw new InvalidOperationException ("Must use Blocking property instead.");
+
+                       return result;
+               }
+
+               public int IOControl (IOControlCode ioControlCode, byte[] optionInValue, byte[] optionOutValue)
+               {
+                       return IOControl ((int) ioControlCode, optionInValue, optionOutValue);
+               }
+
+               static int IOControl_internal (SafeSocketHandle safeHandle, int ioctl_code, byte [] input, byte [] output, out int error)
+               {
+                       bool release = false;
+                       try {
+                               safeHandle.DangerousAddRef (ref release);
+                               return IOControl_internal (safeHandle.DangerousGetHandle (), ioctl_code, input, output, out error);
+                       } finally {
+                               if (release)
+                                       safeHandle.DangerousRelease ();
+                       }
+               }
+
+               /* See Socket.IOControl, WSAIoctl documentation in MSDN. The common options between UNIX
+                * and Winsock are FIONREAD, FIONBIO and SIOCATMARK. Anything else will depend on the system
+                * except SIO_KEEPALIVE_VALS which is properly handled on both windows and linux. */
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               extern static int IOControl_internal (IntPtr sock, int ioctl_code, byte [] input, byte [] output, out int error);
+
+#endregion
+
+#region Close
+
+               public void Close ()
+               {
+                       linger_timeout = 0;
+                       Dispose ();
+               }
+
+               public void Close (int timeout)
+               {
+                       linger_timeout = timeout;
+                       Dispose ();
+               }
+
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               internal extern static void Close_internal (IntPtr socket, out int error);
+
+#endregion
+
+#region Shutdown
+
+               public void Shutdown (SocketShutdown how)
+               {
+                       ThrowIfDisposedAndClosed ();
+
+                       if (!is_connected)
+                               throw new SocketException (10057); // Not connected
+
+                       int error;
+                       Shutdown_internal (safe_handle, how, out error);
+
+                       if (error != 0)
+                               throw new SocketException (error);
+               }
+
+               static void Shutdown_internal (SafeSocketHandle safeHandle, SocketShutdown how, out int error)
+               {
+                       bool release = false;
+                       try {
+                               safeHandle.DangerousAddRef (ref release);
+                               Shutdown_internal (safeHandle.DangerousGetHandle (), how, out error);
+                       } finally {
+                               if (release)
+                                       safeHandle.DangerousRelease ();
+                       }
+               }
+
+               [MethodImplAttribute (MethodImplOptions.InternalCall)]
+               internal extern static void Shutdown_internal (IntPtr socket, SocketShutdown how, out int error);
+
+#endregion
+
+#region Dispose
+
+               protected virtual void Dispose (bool disposing)
+               {
+                       if (is_disposed)
+                               return;
+
+                       is_disposed = true;
+                       bool was_connected = is_connected;
+                       is_connected = false;
+
+                       if (safe_handle != null) {
+                               is_closed = true;
+                               IntPtr x = Handle;
+
+                               if (was_connected)
+                                       Linger (x);
+
+                               safe_handle.Dispose ();
+                       }
+               }
+
+               public void Dispose ()
+               {
+                       Dispose (true);
+                       GC.SuppressFinalize (this);
+               }
+
+               void Linger (IntPtr handle)
+               {
+                       if (!is_connected || linger_timeout <= 0)
+                               return;
+
+                       /* We don't want to receive any more data */
+                       int error;
+                       Shutdown_internal (handle, SocketShutdown.Receive, out error);
+
+                       if (error != 0)
+                               return;
+
+                       int seconds = linger_timeout / 1000;
+                       int ms = linger_timeout % 1000;
+                       if (ms > 0) {
+                               /* If the other end closes, this will return 'true' with 'Available' == 0 */
+                               Poll_internal (handle, SelectMode.SelectRead, ms * 1000, out error);
+                               if (error != 0)
+                                       return;
+                       }
+
+                       if (seconds > 0) {
+                               LingerOption linger = new LingerOption (true, seconds);
+                               SetSocketOption_internal (handle, SocketOptionLevel.Socket, SocketOptionName.Linger, linger, null, 0, out error);
+                               /* Not needed, we're closing upon return */
+                               //if (error != 0)
+                               //      return;
+                       }
+               }
+
+#endregion
+
                void ThrowIfDisposedAndClosed (Socket socket)
                {
                        if (socket.is_disposed && socket.is_closed)
@@ -2512,6 +3359,24 @@ namespace System.Net.Sockets
                                throw new ObjectDisposedException (GetType ().ToString ());
                }
 
+               void ThrowIfBufferNull (byte[] buffer)
+               {
+                       if (buffer == null)
+                               throw new ArgumentNullException ("buffer");
+               }
+
+               void ThrowIfBufferOutOfRange (byte[] buffer, int offset, int size)
+               {
+                       if (offset < 0)
+                               throw new ArgumentOutOfRangeException ("offset", "offset must be >= 0");
+                       if (offset > buffer.Length)
+                               throw new ArgumentOutOfRangeException ("offset", "offset must be <= buffer.Length");
+                       if (size < 0)
+                               throw new ArgumentOutOfRangeException ("size", "size must be >= 0");
+                       if (size > buffer.Length - offset)
+                               throw new ArgumentOutOfRangeException ("size", "size must be <= buffer.Length - offset");
+               }
+
                void ThrowIfUdp ()
                {
 #if !NET_2_1 || MOBILE
@@ -2529,10 +3394,68 @@ namespace System.Net.Sockets
                        if (sockares == null)
                                throw new ArgumentException ("Invalid IAsyncResult", argName);
                        if (Interlocked.CompareExchange (ref sockares.EndCalled, 1, 0) == 1)
-                               throw InvalidAsyncOp (methodName);
+                               throw new InvalidOperationException (methodName + " can only be called once per asynchronous operation");
 
                        return sockares;
                }
+
+               void QueueIOSelectorJob (Queue<KeyValuePair<IntPtr, IOSelectorJob>> queue, IntPtr handle, IOSelectorJob job)
+               {
+                       int count;
+                       lock (queue) {
+                               queue.Enqueue (new KeyValuePair<IntPtr, IOSelectorJob> (handle, job));
+                               count = queue.Count;
+                       }
+
+                       if (count == 1)
+                               IOSelector.Add (handle, job);
+               }
+
+               void InitSocketAsyncEventArgs (SocketAsyncEventArgs e, AsyncCallback callback, object state, SocketOperation operation)
+               {
+                       e.socket_async_result.Init (this, callback, state, operation);
+
+                       e.current_socket = this;
+                       e.SetLastOperation (SocketOperationToSocketAsyncOperation (operation));
+                       e.SocketError = SocketError.Success;
+                       e.BytesTransferred = 0;
+               }
+
+               SocketAsyncOperation SocketOperationToSocketAsyncOperation (SocketOperation op)
+               {
+                       switch (op) {
+                       case SocketOperation.Connect:
+                               return SocketAsyncOperation.Connect;
+                       case SocketOperation.Accept:
+                               return SocketAsyncOperation.Accept;
+                       case SocketOperation.Disconnect:
+                               return SocketAsyncOperation.Disconnect;
+                       case SocketOperation.Receive:
+                       case SocketOperation.ReceiveGeneric:
+                               return SocketAsyncOperation.Receive;
+                       case SocketOperation.ReceiveFrom:
+                               return SocketAsyncOperation.ReceiveFrom;
+                       case SocketOperation.Send:
+                       case SocketOperation.SendGeneric:
+                               return SocketAsyncOperation.Send;
+                       case SocketOperation.SendTo:
+                               return SocketAsyncOperation.SendTo;
+                       default:
+                               throw new NotImplementedException (String.Format ("Operation {0} is not implemented", op));
+                       }
+               }
+
+               [StructLayout (LayoutKind.Sequential)]
+               struct WSABUF {
+                       public int len;
+                       public IntPtr buf;
+               }
+
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               internal static extern void cancel_blocking_socket_operation (Thread thread);
+
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               internal static extern bool SupportsPortReuse ();
        }
 }