github
/
teleport
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

temp.

pull/105/head
Apex Liu 2017-11-28 03:26:21 +08:00
parent 4ca0d58f1d
commit 6bf1988ef7
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
external/libssh-win-static/libssh.vs2015.sln vendored
View File

@ -1,22 +1,22 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libssh", "libssh.vs2015.vcxproj", "{228F651A-4726-41CE-89B3-5D07CF55909B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x86 = Debug|x86
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{228F651A-4726-41CE-89B3-5D07CF55909B}.Debug|x86.ActiveCfg = Debug|Win32
{228F651A-4726-41CE-89B3-5D07CF55909B}.Debug|x86.Build.0 = Debug|Win32
{228F651A-4726-41CE-89B3-5D07CF55909B}.Release|x86.ActiveCfg = Release|Win32
{228F651A-4726-41CE-89B3-5D07CF55909B}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libssh", "libssh.vs2015.vcxproj", "{228F651A-4726-41CE-89B3-5D07CF55909B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x86 = Debug|x86
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{228F651A-4726-41CE-89B3-5D07CF55909B}.Debug|x86.ActiveCfg = Debug|Win32
{228F651A-4726-41CE-89B3-5D07CF55909B}.Debug|x86.Build.0 = Debug|Win32
{228F651A-4726-41CE-89B3-5D07CF55909B}.Release|x86.ActiveCfg = Release|Win32
{228F651A-4726-41CE-89B3-5D07CF55909B}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

4
server/tp_core/protocol/ssh/ssh_proxy.cpp
View File

@ -86,8 +86,8 @@ void SshProxy::_thread_loop()
{
// 注意，ssh_new()出来的指针，如果遇到停止标志，本函数内部就释放了，否则这个指针交给了SshSession类实例管理，其析构时会释放。
ssh_session sess_to_client = ssh_new();
int verbosity = 4;
ssh_options_set(sess_to_client, SSH_OPTIONS_LOG_VERBOSITY, &verbosity);
// int verbosity = 4;
// ssh_options_set(sess_to_client, SSH_OPTIONS_LOG_VERBOSITY, &verbosity);
ssh_set_blocking(sess_to_client, 1);
struct sockaddr_storage sock_client;

4
server/tp_core/protocol/ssh/ssh_session.cpp
View File

@ -348,8 +348,8 @@ int SshSession::_on_auth_password_request(ssh_session session, const char *user,
// 现在尝试根据session-id获取得到的信息，连接并登录真正的SSH服务器
EXLOGV("[ssh] try to connect to real SSH server %s:%d\n", _this->m_conn_ip.c_str(), _this->m_conn_port);
_this->m_srv_session = ssh_new();
int verbosity = 4;
ssh_options_set(_this->m_srv_session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity);
// int verbosity = 4;
// ssh_options_set(_this->m_srv_session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity);
ssh_set_blocking(_this->m_srv_session, 1);
ssh_options_set(_this->m_srv_session, SSH_OPTIONS_HOST, _this->m_conn_ip.c_str());
int port = (int)_this->m_conn_port;