From 2063091706512fdb8f7c53a92a2d0002a3854bb8 Mon Sep 17 00:00:00 2001
From: arition <aritionkb@gmail.com>
Date: Tue, 6 Dec 2016 21:12:34 -0800
Subject: [PATCH] Fix socks5 proxy

---
 src/Renci.SshNet/Session.cs | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/Renci.SshNet/Session.cs b/src/Renci.SshNet/Session.cs
index d1237b46d..08e8a5ce0 100644
--- a/src/Renci.SshNet/Session.cs
+++ b/src/Renci.SshNet/Session.cs
@@ -1973,15 +1973,17 @@ private void ConnectSocks4()
 
         private void ConnectSocks5()
         {
+            var buffer = new byte[1024];
             //  Send socks version number
-            SocketWriteByte(0x05);
+            buffer[0] = 0x05;
 
             //  Send number of supported authentication methods
-            SocketWriteByte(0x02);
+            buffer[1] = 0x02;
 
             //  Send supported authentication methods
-            SocketWriteByte(0x00); //  No authentication
-            SocketWriteByte(0x02); //  Username/Password
+            buffer[2] = 0x00; //  No authentication
+            buffer[3] = 0x02; //  Username/Password
+            SocketAbstraction.Send(_socket, buffer, 0, 4);
 
             var socksVersion = SocketReadByte();
             if (socksVersion != 0x05)
@@ -2034,37 +2036,39 @@ private void ConnectSocks5()
             }
 
             //  Send socks version number
-            SocketWriteByte(0x05);
+            buffer[0] = 0x05;
 
             //  Send command code
-            SocketWriteByte(0x01); //  establish a TCP/IP stream connection
+            buffer[1] = 0x01; //  establish a TCP/IP stream connection
 
             //  Send reserved, must be 0x00
-            SocketWriteByte(0x00);
+            buffer[2] = 0x00;
 
             var ip = DnsAbstraction.GetHostAddresses(ConnectionInfo.Host)[0];
 
             //  Send address type and address
             if (ip.AddressFamily == AddressFamily.InterNetwork)
             {
-                SocketWriteByte(0x01);
-                var address = ip.GetAddressBytes();
-                SocketAbstraction.Send(_socket, address);
+                buffer[3] = 0x01;
             }
             else if (ip.AddressFamily == AddressFamily.InterNetworkV6)
             {
-                SocketWriteByte(0x04);
-                var address = ip.GetAddressBytes();
-                SocketAbstraction.Send(_socket, address);
+                buffer[3] = 0x04;
             }
             else
             {
                 throw new ProxyException(string.Format("SOCKS5: IP address '{0}' is not supported.", ip));
             }
 
+            var address = ip.GetAddressBytes();
+            Array.Copy(address, 0, buffer, 4, address.Length);
+
             //  Send port
-            SocketWriteByte((byte)(ConnectionInfo.Port / 0xFF));
-            SocketWriteByte((byte)(ConnectionInfo.Port % 0xFF));
+            var portBytes = BitConverter.GetBytes(IPAddress.HostToNetworkOrder((short)2202));
+            buffer[4 + address.Length] = portBytes[0];
+            buffer[5 + address.Length] = portBytes[1];
+
+            SocketAbstraction.Send(_socket, buffer, 0, 6 + address.Length);
 
             //  Read Server SOCKS5 version
             if (SocketReadByte() != 5)