diff --git a/external/libssh-win-static/libssh.vs2015.sln b/external/libssh-win-static/libssh.vs2015.sln index 35db56a..9b4e11f 100644 --- a/external/libssh-win-static/libssh.vs2015.sln +++ b/external/libssh-win-static/libssh.vs2015.sln @@ -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 diff --git a/server/tp_core/protocol/ssh/ssh_proxy.cpp b/server/tp_core/protocol/ssh/ssh_proxy.cpp index 6c6b540..c1c248a 100644 --- a/server/tp_core/protocol/ssh/ssh_proxy.cpp +++ b/server/tp_core/protocol/ssh/ssh_proxy.cpp @@ -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; diff --git a/server/tp_core/protocol/ssh/ssh_session.cpp b/server/tp_core/protocol/ssh/ssh_session.cpp index e60ae93..8d58ebc 100644 --- a/server/tp_core/protocol/ssh/ssh_session.cpp +++ b/server/tp_core/protocol/ssh/ssh_session.cpp @@ -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;