ServicePoint: Use DateTime.UtcNow internally, which avoids looking up the timezone...

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

diff --git a/mcs/class/System/System.Net/ServicePoint.cs b/mcs/class/System/System.Net/ServicePoint.cs
index f9bc2a7f148acaecabc39d65884e50fec3b11a12..2045f00e3601a8874413d1f5e61d80a32fc7e818 100644 (file)
--- a/mcs/class/System/System.Net/ServicePoint.cs
+++ b/mcs/class/System/System.Net/ServicePoint.cs
@@ -55,12 +55,11 @@ namespace System.Net
                bool useConnect;
                object locker = new object ();
                object hostE = new object ();
-#if NET_1_1
                bool useNagle;
-#endif
-#if NET_2_0
                BindIPEndPoint endPointCallback = null;
-#endif
+               bool tcp_keepalive;
+               int tcp_keepalive_time;
+               int tcp_keepalive_interval;
                
                // Constructors
 
@@ -70,7 +69,7 @@ namespace System.Net
                        this.connectionLimit = connectionLimit;
                        this.maxIdleTime = maxIdleTime;                 
                        this.currentConnections = 0;
-                       this.idleSince = DateTime.Now;
+                       this.idleSince = DateTime.UtcNow;
                }
                
                // Properties
@@ -79,7 +78,6 @@ namespace System.Net
                        get { return uri; }
                }
 
-#if NET_2_0
                static Exception GetMustImplement ()
                {
                        return new NotImplementedException ();
@@ -90,7 +88,6 @@ namespace System.Net
                        get { return endPointCallback; }
                        set { endPointCallback = value; }
                }
-#endif
                
                public X509Certificate Certificate {
                        get { return certificate; }
@@ -100,7 +97,6 @@ namespace System.Net
                        get { return clientCertificate; }
                }
 
-#if NET_2_0
                [MonoTODO]
                public int ConnectionLeaseTimeout
                {
@@ -111,7 +107,6 @@ namespace System.Net
                                throw GetMustImplement ();
                        }
                }
-#endif
                
                public int ConnectionLimit {
                        get { return connectionLimit; }
@@ -135,11 +130,11 @@ namespace System.Net
 
                public DateTime IdleSince {
                        get {
-                               return idleSince;
+                               return idleSince.ToLocalTime ();
                        }
                        internal set {
                                lock (locker)
-                                       idleSince = value;
+                                       idleSince = value.ToUniversalTime ();
                        }
                }
                
@@ -156,7 +151,6 @@ namespace System.Net
                        get { return protocolVersion; }
                }
 
-#if NET_2_0
                [MonoTODO]
                public int ReceiveBufferSize
                {
@@ -167,24 +161,21 @@ namespace System.Net
                                throw GetMustImplement ();
                        }
                }
-#endif
                
                public bool SupportsPipelining {
                        get { return HttpVersion.Version11.Equals (protocolVersion); }
                }
 
-#if NET_1_1
+
                public bool Expect100Continue {
                        get { return SendContinue; }
                        set { SendContinue = value; }
                }
 
-               [MonoTODO ("Use me")]
                public bool UseNagleAlgorithm {
                        get { return useNagle; }
                        set { useNagle = value; }
                }
-#endif
 
                internal bool SendContinue {
                        get { return sendContinue &&
@@ -192,14 +183,48 @@ namespace System.Net
                        set { sendContinue = value; }
                }
                // Methods
-               
-#if !NET_2_0
-               public override int GetHashCode() 
+
+               public void SetTcpKeepAlive (bool enabled, int keepAliveTime, int keepAliveInterval)
                {
-                       return base.GetHashCode ();
+                       if (enabled) {
+                               if (keepAliveTime <= 0)
+                                       throw new ArgumentOutOfRangeException ("keepAliveTime", "Must be greater than 0");
+                               if (keepAliveInterval <= 0)
+                                       throw new ArgumentOutOfRangeException ("keepAliveInterval", "Must be greater than 0");
+                       }
+
+                       tcp_keepalive = enabled;
+                       tcp_keepalive_time = keepAliveTime;
+                       tcp_keepalive_interval = keepAliveInterval;
                }
-#endif
-               
+
+               internal void KeepAliveSetup (Socket socket)
+               {
+                       if (!tcp_keepalive)
+                               return;
+
+                       byte [] bytes = new byte [12];
+                       PutBytes (bytes, (uint) (tcp_keepalive ? 1 : 0), 0);
+                       PutBytes (bytes, (uint) tcp_keepalive_time, 4);
+                       PutBytes (bytes, (uint) tcp_keepalive_interval, 8);
+                       socket.IOControl (IOControlCode.KeepAliveValues, bytes, null);
+               }
+
+               static void PutBytes (byte [] bytes, uint v, int offset)
+               {
+                       if (BitConverter.IsLittleEndian) {
+                               bytes [offset] = (byte) (v & 0x000000ff);
+                               bytes [offset + 1] = (byte) ((v & 0x0000ff00) >> 8);
+                               bytes [offset + 2] = (byte) ((v & 0x00ff0000) >> 16);
+                               bytes [offset + 3] = (byte) ((v & 0xff000000) >> 24);
+                       } else {
+                               bytes [offset + 3] = (byte) (v & 0x000000ff);
+                               bytes [offset + 2] = (byte) ((v & 0x0000ff00) >> 8);
+                               bytes [offset + 1] = (byte) ((v & 0x00ff0000) >> 16);
+                               bytes [offset] = (byte) ((v & 0xff000000) >> 24);
+                       }
+               }
+
                // Internal Methods
 
                internal bool UsesProxy {
@@ -216,7 +241,7 @@ namespace System.Net
                        get { 
                                return CurrentConnections == 0
                                    && maxIdleTime != Timeout.Infinite
-                                   && DateTime.Now >= IdleSince.AddMilliseconds (maxIdleTime);
+                                   && DateTime.UtcNow >= IdleSince.AddMilliseconds (maxIdleTime);
                        }
                }
 
@@ -271,7 +296,8 @@ namespace System.Net
                {
                        protocolVersion = version;
                }
-#if !TARGET_JVM && !NET_2_1
+
+#if !TARGET_JVM
                WebConnectionGroup GetConnectionGroup (string name)
                {
                        if (name == null)
@@ -298,19 +324,24 @@ namespace System.Net
                        return cnc.SendRequest (request);
                }
 #endif
-#if NET_2_0
-               [MonoNotSupported ("")]
                public bool CloseConnectionGroup (string connectionGroupName)
                {
-                       throw new NotImplementedException ();
+                       lock (locker) {
+                               WebConnectionGroup cncGroup = GetConnectionGroup (connectionGroupName);
+                               if (cncGroup != null) {
+                                       cncGroup.Close ();
+                                       return true;
+                               }
+                       }
+
+                       return false;
                }
-#endif
 
                internal void IncrementConnection ()
                {
                        lock (locker) {
                                currentConnections++;
-                               idleSince = DateTime.Now.AddMilliseconds (1000000);
+                               idleSince = DateTime.UtcNow.AddMilliseconds (1000000);
                        }
                }
 
@@ -319,7 +350,7 @@ namespace System.Net
                        lock (locker) {
                                currentConnections--;
                                if (currentConnections == 0)
-                                       idleSince = DateTime.Now;
+                                       idleSince = DateTime.UtcNow;
                        }
                }
 
@@ -329,7 +360,6 @@ namespace System.Net
                        clientCertificate = client;
                }
 
-#if NET_2_0
                internal bool CallEndPointDelegate (Socket sock, IPEndPoint remote)
                {
                        if (endPointCallback == null)
@@ -365,7 +395,6 @@ namespace System.Net
                                return true;
                        }
                }
-#endif
        }
 }