fix Dispose

Author: breakwa11

shadowsocks-csharp/Controller/ProxyAuth.cs

@@ -93,6 +93,8 @@ private void Close()
         {
             CloseSocket(ref _connection);
             CloseSocket(ref _connectionUDP);
+
+            _config = null;
         }
 
         bool AuthConnection(Socket connection, string authUser, string authPass)
@@ -584,6 +586,7 @@ private void Connect()
                     {
                         handler.Start(_remoteHeaderSendBuffer, _remoteHeaderSendBuffer.Length, "socks5");
                     }
+                    Dispose();
                     return;
                 }
             }
@@ -596,9 +599,26 @@ private void Connect()
                 {
                     handler.Start(_remoteHeaderSendBuffer, _remoteHeaderSendBuffer.Length, local_sendback_protocol);
                 }
+                Dispose();
                 return;
             }
+            Dispose();
             Close();
         }
+
+        private void Dispose()
+        {
+            _transfer = null;
+            _IPRange = null;
+
+            _firstPacket = null;
+            _connection = null;
+            _connectionUDP = null;
+
+            _connetionRecvBuffer = null;
+            _remoteHeaderSendBuffer = null;
+
+            httpProxyState = null;
+        }
     }
 }

shadowsocks-csharp/Model/Configuration.cs

@@ -67,7 +67,7 @@ public class PortMapConfigCache
     public class ServerSubscribe
     {
         private static string DEFAULT_FEED_URL = "https://raw.githubusercontent.com/breakwa11/breakwa11.github.io/master/free/freenodeplain.txt";
-        private static string OLD_DEFAULT_FEED_URL = "https://raw.githubusercontent.com/breakwa11/breakwa11.github.io/master/free/freenode.txt";
+        //private static string OLD_DEFAULT_FEED_URL = "https://raw.githubusercontent.com/breakwa11/breakwa11.github.io/master/free/freenode.txt";
 
         public string URL = DEFAULT_FEED_URL;
         public string Group;

shadowsocks-csharp/Obfs/Auth.cs

@@ -183,10 +183,6 @@ public override byte[] ClientPostDecrypt(byte[] plaindata, int datalength, out i
             }
             return outdata;
         }
-
-        public override void Dispose()
-        {
-        }
     }
 
     public class AuthSHA1V2 : VerifySimpleBase
@@ -410,10 +406,6 @@ public override byte[] ClientPostDecrypt(byte[] plaindata, int datalength, out i
             }
             return outdata;
         }
-
-        public override void Dispose()
-        {
-        }
     }
 
     public class AuthSHA1V4 : VerifySimpleBase
@@ -656,10 +648,6 @@ public override byte[] ClientPostDecrypt(byte[] plaindata, int datalength, out i
             }
             return outdata;
         }
-
-        public override void Dispose()
-        {
-        }
     }
 
     public class AuthAES128SHA1 : VerifySimpleBase
@@ -1255,17 +1243,20 @@ public override byte[] ClientUdpPostDecrypt(byte[] plaindata, int datalength, ou
             return plaindata;
         }
 
-        public override void Dispose()
+        protected override void Dispose(bool disposing)
         {
 #if PROTOCOL_STATISTICS
-            if (Server != null && Server.data != null && packet_cnt != null)
+            if (disposing)
             {
-                AuthDataAes128 authData = Server.data as AuthDataAes128;
-                if (authData != null && authData.tree != null)
+                if (Server != null && Server.data != null && packet_cnt != null)
                 {
-                    lock (authData)
+                    AuthDataAes128 authData = Server.data as AuthDataAes128;
+                    if (authData != null && authData.tree != null)
                     {
-                        authData.tree.Update(packet_cnt);
+                        lock (authData)
+                        {
+                            authData.tree.Update(packet_cnt);
+                        }
                     }
                 }
             }

shadowsocks-csharp/Obfs/HttpSimpleObfs.cs

@@ -260,10 +260,6 @@ public override byte[] ClientDecode(byte[] encryptdata, int datalength, out int
                 return outdata;
             }
         }
-
-        public override void Dispose()
-        {
-        }
     }
     public class TlsAuthData
     {
@@ -673,9 +669,5 @@ public override byte[] ClientDecode(byte[] encryptdata, int datalength, out int
                 return encryptdata;
             }
         }
-
-        public override void Dispose()
-        {
-        }
     }
 }

shadowsocks-csharp/Obfs/ObfsBase.cs

@@ -55,7 +55,7 @@ public virtual byte[] ClientUdpPostDecrypt(byte[] plaindata, int datalength, out
             outlength = datalength;
             return plaindata;
         }
-        public abstract void Dispose();
+
         public virtual object InitData()
         {
             return null;
@@ -96,5 +96,29 @@ public int GetTcpMSS()
         {
             return Server.tcp_mss;
         }
+
+
+        #region IDisposable
+        protected bool _disposed;
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            lock (this)
+            {
+                if (_disposed)
+                {
+                    return;
+                }
+                _disposed = true;
+            }
+        }
+        #endregion
+
     }
 }

shadowsocks-csharp/Obfs/Plain.cs

@@ -36,9 +36,5 @@ public override byte[] ClientDecode(byte[] encryptdata, int datalength, out int
             needsendback = false;
             return encryptdata;
         }
-
-        public override void Dispose()
-        {
-        }
     }
 }

shadowsocks-csharp/Obfs/VerifySimpleObfs.cs

@@ -212,10 +212,6 @@ public override byte[] ClientPostDecrypt(byte[] plaindata, int datalength, out i
             }
             return outdata;
         }
-
-        public override void Dispose()
-        {
-        }
     }
 
 }