.temp.

.idea/encodings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" addBOMForNewFiles="with NO BOM">
+  <component name="Encoding">
     <file url="file://$PROJECT_DIR$/common/libex/include/ex/ex_log.h" charset="GBK" />
     <file url="file://$PROJECT_DIR$/common/libex/include/ex/ex_path.h" charset="GBK" />
     <file url="file://$PROJECT_DIR$/common/libex/include/ex/ex_thread.h" charset="GBK" />
@@ -21,6 +21,7 @@
     <file url="file://$PROJECT_DIR$/server/tp_core/common/ts_membuf.h" charset="GBK" />
     <file url="file://$PROJECT_DIR$/server/tp_core/common/ts_memstream.h" charset="GBK" />
     <file url="file://$PROJECT_DIR$/server/tp_core/core/main.cpp" charset="GBK" />
+    <file url="file://$PROJECT_DIR$/server/tp_core/core/tp_tpp_mgr.h" charset="GBK" />
     <file url="file://$PROJECT_DIR$/server/tp_core/core/ts_env.cpp" charset="GBK" />
     <file url="file://$PROJECT_DIR$/server/tp_core/core/ts_http_rpc.cpp" charset="GBK" />
     <file url="file://$PROJECT_DIR$/server/tp_core/core/ts_http_rpc.h" charset="GBK" />
@@ -29,17 +30,12 @@
     <file url="file://$PROJECT_DIR$/server/tp_core/core/ts_session.h" charset="GBK" />
     <file url="file://$PROJECT_DIR$/server/tp_core/core/ts_web_rpc.cpp" charset="GBK" />
     <file url="file://$PROJECT_DIR$/server/tp_core/core/ts_web_rpc.h" charset="GBK" />
-    <file url="file://$PROJECT_DIR$/server/tp_core/protocol/rdp/librdp/core/config.h" charset="GBK" />
-    <file url="file://$PROJECT_DIR$/server/tp_core/protocol/rdp/librdp/rdp/x224.cpp" charset="GBK" />
-    <file url="file://$PROJECT_DIR$/server/tp_core/protocol/rdp/membuf.cpp" charset="GBK" />
-    <file url="file://$PROJECT_DIR$/server/tp_core/protocol/rdp/membuf.h" charset="GBK" />
     <file url="file://$PROJECT_DIR$/server/tp_core/protocol/rdp/rdp_conn.cpp" charset="GBK" />
     <file url="file://$PROJECT_DIR$/server/tp_core/protocol/rdp/rdp_conn.h" charset="GBK" />
     <file url="file://$PROJECT_DIR$/server/tp_core/protocol/rdp/rdp_package.h" charset="GBK" />
     <file url="file://$PROJECT_DIR$/server/tp_core/protocol/rdp/rdp_proxy.cpp" charset="GBK" />
     <file url="file://$PROJECT_DIR$/server/tp_core/protocol/rdp/rdp_session.cpp" charset="GBK" />
     <file url="file://$PROJECT_DIR$/server/tp_core/protocol/rdp/rdp_session.h" charset="GBK" />
-    <file url="file://$PROJECT_DIR$/server/tp_core/protocol/rdp/transport.cpp" charset="GBK" />
     <file url="file://$PROJECT_DIR$/server/tp_core/protocol/ssh/ssh_proxy.cpp" charset="GBK" />
     <file url="file://$PROJECT_DIR$/server/tp_core/protocol/ssh/ssh_proxy.h" charset="GBK" />
     <file url="file://$PROJECT_DIR$/server/tp_core/protocol/ssh/ssh_recorder.cpp" charset="GBK" />

CMakeCfg.txt

@@ -20,6 +20,8 @@ elseif ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
     set(OS_POSIX 1)
     MESSAGE(STATUS "build on Linux...")
     # add_subdirectory(server/tp_web/src)
+    # set(CMAKE_CXX_STANDARD 11)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
     set(TP_EXTERNAL_RELEASE_DIR "${PROJECT_SOURCE_DIR}/external/linux/release")
 elseif ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
     #    MESSAGE(FATAL_ERROR "unsupported platform: Windows")

common/libex/include/ex/ex_platform.h

@@ -67,6 +67,7 @@
 #	include <fcntl.h>   // O_RDONLY, etc.
 #	include <errno.h>
 #	include <wchar.h>
+#   include <memory>
 #	include <sys/stat.h>
 #	include <sys/types.h>
 #	include <sys/socket.h>

common/libex/include/ex/ex_str.h

@@ -55,7 +55,8 @@ int ex_wcsformat(wchar_t* out_buf, size_t buf_size, const wchar_t* fmt, ...);
 
 #include <string>
 #include <vector>
-#include <ostream>
+//#include <ostream>
+#include <sstream>
 
 typedef std::string ex_astr;
 typedef std::wstring ex_wstr;

server/tp_core/core/ts_http_rpc.cpp

@@ -9,6 +9,7 @@
 extern TppManager g_tpp_mgr;
 
 #include <teleport_const.h>
+#include <sstream>
 
 
 #define HEXTOI(x) (isdigit(x) ? x - '0' : x - 'W')

server/tp_core/protocol/ssh/ssh_session.cpp

@@ -464,8 +464,9 @@ int SshSession::_on_auth_password_request(ssh_session session, const char *user,
     if (_this->m_auth_type != TP_AUTH_TYPE_NONE)
         ssh_options_set(_this->m_srv_session, SSH_OPTIONS_USER, _this->m_acc_name.c_str());
 
-    // default timeout is 10 seconds, it is too short for connect progress, so set it to 60 sec.
+    // default timeout is 10 seconds, it is too short for connect progress, so set it to 120 sec.
-    int _timeout = 60; // 60 sec.
+    // usually when sshd config to UseDNS.
+    int _timeout = 120; // 120 sec.
     ssh_options_set(_this->m_srv_session, SSH_OPTIONS_TIMEOUT, &_timeout);
 
     int rc = 0;
@@ -478,13 +479,13 @@ int SshSession::_on_auth_password_request(ssh_session session, const char *user,
     }
 
     // once the server are connected, change the timeout back to default.
-    _timeout = 30; // in seconds.
+    _timeout = 120; // in seconds.
     ssh_options_set(_this->m_srv_session, SSH_OPTIONS_TIMEOUT, &_timeout);
 
     // get ssh version of host, v1 or v2
     // TODO: libssh-0.8.5 does not support sshv1 anymore.
     _this->m_ssh_ver = ssh_get_version(_this->m_srv_session);
-    EXLOGW("[ssh] real host is SSHv%d\n", _this->m_ssh_ver);
+    //EXLOGW("[ssh] real host is SSHv%d\n", _this->m_ssh_ver);
 
 #if 0
     // check supported auth type by host