Imported Upstream version 3.10.0

Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
This commit is contained in:
Jo Shields
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions

View File

@ -143,9 +143,6 @@ namespace System.Net.Sockets
}
#if !NET_2_1 || MOBILE
#if TARGET_JVM
[MonoNotSupported ("Not supported since Socket.ReceiveTimeout is not supported")]
#endif
public override int ReadTimeout
{
get {
@ -179,9 +176,6 @@ namespace System.Net.Sockets
}
#if !NET_2_1 || MOBILE
#if TARGET_JVM
[MonoNotSupported ("Not supported since Socket.SendTimeout is not supported")]
#endif
public override int WriteTimeout
{
get {
@ -431,12 +425,6 @@ namespace System.Net.Sockets
throw new ObjectDisposedException (GetType().FullName);
}
#if TARGET_JVM
public void ChangeToSSLSocket()
{
socket.ChangeToSSL();
}
#endif
}
}

View File

@ -68,12 +68,10 @@ namespace System.Net.Sockets
sockets.Add (null);
}
#if !TARGET_JVM
[MethodImplAttribute(MethodImplOptions.InternalCall)]
private extern static void Select_internal (ref Socket [] sockets,
int microSeconds,
out int error);
#endif
public static void Select (IList checkRead, IList checkWrite, IList checkError, int microSeconds)
{
var list = new List<Socket> ();
@ -200,11 +198,9 @@ namespace System.Net.Sockets
}
#endif
#if !TARGET_JVM
// Returns the amount of data waiting to be read on socket
[MethodImplAttribute(MethodImplOptions.InternalCall)]
private extern static int Available_internal(IntPtr socket, out int error);
#endif
public int Available {
get {
@ -404,11 +400,9 @@ namespace System.Net.Sockets
}
}
#if !TARGET_JVM
// Returns the local endpoint details in addr and port
[MethodImplAttribute(MethodImplOptions.InternalCall)]
private extern static SocketAddress LocalEndPoint_internal(IntPtr socket, int family, out int error);
#endif
// Wish: support non-IP endpoints.
public EndPoint LocalEndPoint {

View File

@ -37,15 +37,10 @@ namespace System.Net.Sockets
[Serializable]
public class SocketException : Win32Exception
{
#if TARGET_JVM
public SocketException ()
: base (-2147467259)
#else
[MethodImplAttribute (MethodImplOptions.InternalCall)]
private static extern int WSAGetLastError_internal ();
public SocketException ()
: base (WSAGetLastError_internal ())
#endif
{
}

View File

@ -901,14 +901,12 @@ namespace System.Net.Sockets {
}
}
#if !TARGET_JVM
// Creates a new system socket, returning the handle
[MethodImplAttribute(MethodImplOptions.InternalCall)]
private extern IntPtr Socket_internal(AddressFamily family,
SocketType type,
ProtocolType proto,
out int error);
#endif
public Socket(AddressFamily addressFamily, SocketType socketType, ProtocolType protocolType)
{
@ -964,12 +962,10 @@ namespace System.Net.Sockets {
get { return address_family; }
}
#if !TARGET_JVM
[MethodImplAttribute(MethodImplOptions.InternalCall)]
private extern static void Blocking_internal(IntPtr socket,
bool block,
out int error);
#endif
public bool Blocking {
get {

View File

@ -130,9 +130,6 @@ namespace System.Net.Sockets
get { return client.Connected; }
}
#if TARGET_JVM
[MonoNotSupported ("Not supported as Socket.ExclusiveAddressUse is not supported")]
#endif
public bool ExclusiveAddressUse {
get {
return(client.ExclusiveAddressUse);
@ -372,25 +369,16 @@ namespace System.Net.Sockets
client.EndConnect (asyncResult);
}
#if TARGET_JVM
[MonoNotSupported ("Not supported as Socket.BeginConnect is not supported")]
#endif
public IAsyncResult BeginConnect (IPAddress address, int port, AsyncCallback requestCallback, object state)
{
return client.BeginConnect (address, port, requestCallback, state);
}
#if TARGET_JVM
[MonoNotSupported ("Not supported as Socket.BeginConnect is not supported")]
#endif
public IAsyncResult BeginConnect (IPAddress[] addresses, int port, AsyncCallback requestCallback, object state)
{
return client.BeginConnect (addresses, port, requestCallback, state);
}
#if TARGET_JVM
[MonoNotSupported ("Not supported as Socket.BeginConnect is not supported")]
#endif
public IAsyncResult BeginConnect (string host, int port, AsyncCallback requestCallback, object state)
{
return client.BeginConnect (host, port, requestCallback, state);

View File

@ -148,9 +148,6 @@ namespace System.Net.Sockets
/// Specifies whether the TcpListener allows only one
/// underlying socket to listen to a specific port
/// </summary>
#if TARGET_JVM
[MonoNotSupported ("Not supported as Socket.ExclusiveAddressUse is not supported")]
#endif
public bool ExclusiveAddressUse
{
get {

View File

@ -520,9 +520,6 @@ namespace System.Net.Sockets
}
}
#if TARGET_JVM
[MonoNotSupported ("Not supported as Socket.DontFragment is not supported")]
#endif
public bool DontFragment
{
get {
@ -533,9 +530,6 @@ namespace System.Net.Sockets
}
}
#if TARGET_JVM
[MonoNotSupported ("Not supported as Socket.EnableBroadcast is not supported")]
#endif
public bool EnableBroadcast
{
get {
@ -546,9 +540,6 @@ namespace System.Net.Sockets
}
}
#if TARGET_JVM
[MonoNotSupported ("Not supported as Socket.ExclusiveAddressUse is not supported")]
#endif
public bool ExclusiveAddressUse
{
get {
@ -559,9 +550,6 @@ namespace System.Net.Sockets
}
}
#if TARGET_JVM
[MonoNotSupported ("Not supported as Socket.MulticastLoopback is not supported")]
#endif
public bool MulticastLoopback
{
get {
@ -572,9 +560,6 @@ namespace System.Net.Sockets
}
}
#if TARGET_JVM
[MonoNotSupported ("Not supported as Socket.Ttl is not supported")]
#endif
public short Ttl
{
get {