soks4 cleanup

Author: honfika

src/Titanium.Web.Proxy/ProxySocket/Authentication/AuthUserPass.cs

@@ -110,7 +110,7 @@ public override void BeginAuthenticate(HandShakeComplete callback)
         {
             CallBack = callback;
             Server.BeginSend(GetAuthenticationBytes(), 0, GetAuthenticationLength(), SocketFlags.None,
-                new AsyncCallback(this.OnSent), Server);
+                this.OnSent, Server);
             return;
         }
 
@@ -125,7 +125,7 @@ private void OnSent(IAsyncResult ar)
                 if (Server.EndSend(ar) < GetAuthenticationLength())
                     throw new SocketException(10054);
                 Buffer = new byte[2];
-                Server.BeginReceive(Buffer, 0, 2, SocketFlags.None, new AsyncCallback(this.OnReceive), Server);
+                Server.BeginReceive(Buffer, 0, 2, SocketFlags.None, this.OnReceive, Server);
             }
             catch (Exception e)
             {
@@ -152,7 +152,7 @@ private void OnReceive(IAsyncResult ar)
                         throw new ProxyException("Username/password combination not accepted.");
                 else
                     Server.BeginReceive(Buffer, Received, Buffer.Length - Received, SocketFlags.None,
-                        new AsyncCallback(this.OnReceive), Server);
+                        this.OnReceive, Server);
             }
             catch (Exception e)
             {

src/Titanium.Web.Proxy/ProxySocket/HttpsHandler.cs

@@ -170,11 +170,12 @@ public override void Negotiate(string host, int port)
         /// <param name="remoteEP">An IPEndPoint that represents the remote device.</param>
         /// <param name="callback">The method to call when the negotiation is complete.</param>
         /// <param name="proxyEndPoint">The IPEndPoint of the HTTPS proxy server.</param>
+        /// <param name="state">The state.</param>
         /// <returns>An IAsyncProxyResult that references the asynchronous connection.</returns>
         public override IAsyncProxyResult BeginNegotiate(IPEndPoint remoteEP, HandShakeComplete callback,
-            IPEndPoint proxyEndPoint)
+            IPEndPoint proxyEndPoint, object state)
         {
-            return BeginNegotiate(remoteEP.Address.ToString(), remoteEP.Port, callback, proxyEndPoint);
+            return BeginNegotiate(remoteEP.Address.ToString(), remoteEP.Port, callback, proxyEndPoint, state);
         }
 
         /// <summary>
@@ -184,14 +185,15 @@ public override IAsyncProxyResult BeginNegotiate(IPEndPoint remoteEP, HandShakeC
         /// <param name="port">The port to connect to.</param>
         /// <param name="callback">The method to call when the negotiation is complete.</param>
         /// <param name="proxyEndPoint">The IPEndPoint of the HTTPS proxy server.</param>
+        /// <param name="state">The state.</param>
         /// <returns>An IAsyncProxyResult that references the asynchronous connection.</returns>
         public override IAsyncProxyResult BeginNegotiate(string host, int port, HandShakeComplete callback,
-            IPEndPoint proxyEndPoint)
+            IPEndPoint proxyEndPoint, object state)
         {
             ProtocolComplete = callback;
             Buffer = GetConnectBytes(host, port);
-            Server.BeginConnect(proxyEndPoint, new AsyncCallback(this.OnConnect), Server);
-            AsyncResult = new IAsyncProxyResult();
+            Server.BeginConnect(proxyEndPoint, this.OnConnect, Server);
+            AsyncResult = new IAsyncProxyResult(state);
             return AsyncResult;
         }
 
@@ -213,7 +215,7 @@ private void OnConnect(IAsyncResult ar)
 
             try
             {
-                Server.BeginSend(Buffer, 0, Buffer.Length, SocketFlags.None, new AsyncCallback(this.OnConnectSent),
+                Server.BeginSend(Buffer, 0, Buffer.Length, SocketFlags.None, this.OnConnectSent,
                     null);
             }
             catch (Exception e)
@@ -233,7 +235,7 @@ private void OnConnectSent(IAsyncResult ar)
                 HandleEndSend(ar, Buffer.Length);
                 Buffer = new byte[13];
                 Received = 0;
-                Server.BeginReceive(Buffer, 0, 13, SocketFlags.None, new AsyncCallback(this.OnConnectReceive), Server);
+                Server.BeginReceive(Buffer, 0, 13, SocketFlags.None, this.OnConnectReceive, Server);
             }
             catch (Exception e)
             {
@@ -262,7 +264,7 @@ private void OnConnectReceive(IAsyncResult ar)
                 if (Received < 13)
                 {
                     Server.BeginReceive(Buffer, Received, 13 - Received, SocketFlags.None,
-                        new AsyncCallback(this.OnConnectReceive), Server);
+                        this.OnConnectReceive, Server);
                 }
                 else
                 {
@@ -305,7 +307,7 @@ private void ReadUntilHeadersEnd(bool readFirstByte)
             }
             else
             {
-                Server.BeginReceive(Buffer, 0, 1, SocketFlags.None, new AsyncCallback(this.OnEndHeadersReceive),
+                Server.BeginReceive(Buffer, 0, 1, SocketFlags.None, this.OnEndHeadersReceive,
                     Server);
             }
         }