gsadmin/ssh.net
1
0
Fork 0
mirror of https://github.com/sshnet/SSH.NET.git synced 2026-09-11 13:39:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore HandleSocks5 as before bug triaging.

Browse Source
This commit is contained in:
drieseng
2016-05-22 10:30:12 +02:00
parent 5ba43c72f0
commit 78adac1241
1 changed files with 19 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Renci.SshNet/ForwardedPortDynamic.NET.cs
+19 -40
View File
@@ -565,58 +565,37 @@ namespace Renci.SshNet
Console.WriteLine("ID: " + Thread.CurrentThread.ManagedThreadId + " | After channel open | " + DateTime.Now.ToString("hh:mm:ss.fff") + " => " + stopWatch.ElapsedMilliseconds);
#endif // DEBUG_GERT
var replyBuffer = new byte[10];
replyBuffer[0] = 0x05;
// SocketAbstraction.SendByte(socket, 0x05);
SocketAbstraction.SendByte(socket, 0x05);
if (channel.IsOpen)
{
replyBuffer[1] = 0x00;
// SocketAbstraction.SendByte(socket, 0x00);
SocketAbstraction.SendByte(socket, 0x00);
}
else
{
replyBuffer[1] = 0x01;
//SocketAbstraction.SendByte(socket, 0x01);
#if DEBUG_GERT
Console.WriteLine("ID: " + Thread.CurrentThread.ManagedThreadId + " | Channel not open");
#endif // DEBUG_GERT
SocketAbstraction.SendByte(socket, 0x01);
}
// reserved
replyBuffer[2] = 0x00;
SocketAbstraction.SendByte(socket, 0x00);
// reserved
//SocketAbstraction.SendByte(socket, 0x00);
if (ipAddress.AddressFamily == AddressFamily.InterNetwork)
{
SocketAbstraction.SendByte(socket, 0x01);
}
else if (ipAddress.AddressFamily == AddressFamily.InterNetworkV6)
{
SocketAbstraction.SendByte(socket, 0x04);
}
else
{
throw new NotSupportedException("Not supported address family.");
}
//if (ipAddress.AddressFamily == AddressFamily.InterNetwork)
//{
// SocketAbstraction.SendByte(socket, 0x01);
//}
//else if (ipAddress.AddressFamily == AddressFamily.InterNetworkV6)
//{
// SocketAbstraction.SendByte(socket, 0x04);
//}
//else
//{
// throw new NotSupportedException("Not supported address family.");
//}
// IPv4
replyBuffer[3] = 0x01;
SocketAbstraction.Send(socket, replyBuffer, 0, replyBuffer.Length);
//var addressBytes = IPAddress.Any.GetAddressBytes();
//SocketAbstraction.Send(socket, addressBytes, 0, addressBytes.Length);
//SocketAbstraction.Send(socket, new byte[] {0x00, 0x00}, 0, 2);
//var addressBytes = ipAddress.GetAddressBytes();
//SocketAbstraction.Send(socket, addressBytes, 0, addressBytes.Length);
//SocketAbstraction.Send(socket, portBuffer, 0, portBuffer.Length);
var addressBytes = ipAddress.GetAddressBytes();
SocketAbstraction.Send(socket, addressBytes, 0, addressBytes.Length);
SocketAbstraction.Send(socket, portBuffer, 0, portBuffer.Length);
return true;
}