github
/
teleport
mirror of https://github.com/tp4a/teleport
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix FreeRDP call param for MacOS.

pull/236/head v3.5.5-beta
Apex Liu 2020-06-05 19:20:36 +08:00
parent 771f3cdd33
commit eeedf21323
1 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
client/tp_assist_macos/src/csrc/ts_http_rpc.cpp
View File

@ -596,18 +596,25 @@ void TsHttpRpc::_rpc_func_run_client(const ex_astr& func_args, ex_astr& buf) {
s_arg = g_cfg.rdp.cmdline; s_arg = g_cfg.rdp.cmdline;
sid = "02" + real_sid; sid = "02" + real_sid;
s_argv.push_back("/f"); // s_argv.push_back("/f");
ex_astr _tmp_pass = "/p:"; s_argv.push_back("/sec:tls");
_tmp_pass += szPwd; s_argv.push_back("-wallpaper");
s_argv.push_back("-themes");
// Ignore certificate
s_argv.push_back("/cert-ignore");
// Automatically accept certificate on first connect
s_argv.push_back("/cert-tofu");
ex_astr _tmp_pass = "/p:PLACEHOLDER";
//_tmp_pass += szPwd;
s_argv.push_back(_tmp_pass); s_argv.push_back(_tmp_pass);
#if 0 //#if 0
//s_argv.push_back(s_exec.c_str()); //s_argv.push_back(s_exec.c_str());
{ {
ex_astr username = "02" + real_sid; // ex_astr username = "02" + real_sid;
// s_argv.push_back("/u:"); // s_argv.push_back("/u:");
// s_argv.push_back(username.c_str()); // s_argv.push_back(username.c_str());
@ -616,10 +623,17 @@ void TsHttpRpc::_rpc_func_run_client(const ex_astr& func_args, ex_astr& buf) {
s_argv.push_back("/f"); s_argv.push_back("/f");
} }
else { else {
char sz_size[64] = {0}; // char sz_size[64] = {0};
ex_strformat(sz_size, 63, "%dx%d", rdp_w, rdp_h); // ex_strformat(sz_size, 63, "%dx%d", rdp_w, rdp_h);
s_argv.push_back("-g"); // s_argv.push_back("-g");
s_argv.push_back(sz_size); // s_argv.push_back(sz_size);
char sz_width[64] = {0};
ex_strformat(sz_width, 63, "/w:%d", rdp_w);
s_argv.push_back(sz_width);
char sz_height[64] = {0};
ex_strformat(sz_height, 63, "/h:%d", rdp_h);
s_argv.push_back(sz_height);
} }
if (flag_console && rdp_console) if (flag_console && rdp_console)
@ -634,14 +648,14 @@ void TsHttpRpc::_rpc_func_run_client(const ex_astr& func_args, ex_astr& buf) {
// s_argv.push_back("+drives"); // s_argv.push_back("+drives");
// else // else
// s_argv.push_back("-drives"); // s_argv.push_back("-drives");
//
{ // {
char sz_temp[128] = {0}; // char sz_temp[128] = {0};
ex_strformat(sz_temp, 127, "%s:%d", teleport_ip.c_str(), teleport_port); // ex_strformat(sz_temp, 127, "%s:%d", teleport_ip.c_str(), teleport_port);
s_argv.push_back(sz_temp); // s_argv.push_back(sz_temp);
// }
} }
} //#endif
#endif
} }
else if (pro_type == TP_PROTOCOL_TYPE_SSH) { else if (pro_type == TP_PROTOCOL_TYPE_SSH) {
//============================================== //==============================================