Tribes2/T2-CPP
1
0
Fork 0
mirror of https://github.com/Ragora/T2-CPP.git synced 2026-07-15 20:34:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added two bug fixes and features to WatchDog

Browse source 
Replaced clock with time, and fixed the non-unique handle problem.  Also added new register dump for the watchdog to help diagnose possible problems and ways to fix them.
This commit is contained in:
Calvin Balke 2015-06-28 09:18:46 -07:00
parent d18c243231
commit 0da786a426
1 changed files with 57 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

68
Mod Sources/Watchdog/Watchdog/source/dllmain.cpp
View file

@ -2,7 +2,8 @@
#include <SDKDDKVer.h> #include <SDKDDKVer.h>
#include <Windows.h> #include <Windows.h>
#include <time.h> #include <time.h>
#include <stdio.h>
#include <conio.h>
BOOL APIENTRY DllMain( HMODULE hModule, BOOL APIENTRY DllMain( HMODULE hModule,
DWORD ul_reason_for_call, DWORD ul_reason_for_call,
LPVOID lpReserved LPVOID lpReserved
@ -20,26 +21,51 @@ BOOL APIENTRY DllMain( HMODULE hModule,
} }
static bool sDogPetted = false; static bool sDogPetted = false;
static HANDLE sMainThread = NULL; static DWORD mainthreadid=0;
void (*Tprintf)(const char* fmt,...) =
(void (__cdecl *)(const char* fmt,...))
0x425F30;
DWORD WINAPI WatchDogThread(LPVOID lpParam) DWORD WINAPI WatchDogThread(LPVOID lpParam)
{ {
time_t lastPet = clock(); time_t lastPet = time(0);
CONTEXT hamburger;
HANDLE mainThread = OpenThread(THREAD_ALL_ACCESS,false,mainthreadid);
while (true) while (true)
{ {
time_t now = clock(); time_t now = time(0);
time_t seconds = (now - lastPet) / CLOCKS_PER_SEC; double seconds = difftime(now,lastPet);
#ifdef SLOWSERVER
if (!sDogPetted && seconds > 15) // Wait 15 seconds to be extra safe
#else
if (!sDogPetted && seconds > 8) // Wait 8 seconds to be safe if (!sDogPetted && seconds > 8) // Wait 8 seconds to be safe
#endif
{ {
CloseHandle(sMainThread); Tprintf ("Dog has grabbed the hamburger\n");
SuspendThread(mainThread);
GetThreadContext(mainThread, &hamburger); // dog grabs hamburger;
Tprintf ("Dog has grabbed the hamburger again\n");
Tprintf ("Either grab Hamburger back and put dog back on leash, or let dog eat hamburger\n");
Tprintf ("the following text is from the Processor State\n");
FILE * wlog = fopen ("watchdog.log","a");
fprintf (wlog,"EIP: %08X EAX: %08X EBX: %08X ECX: %08X \nEDX: %08X ESI: %08X EDI: %08X\nEBP:%08X ESP:%08X\n", hamburger.Eip, hamburger.Eax, hamburger.Ebx, hamburger.Ecx, hamburger.Edx, hamburger.Esi, hamburger.Edi, hamburger.Ebp, hamburger.Esp);
fclose (wlog);
Tprintf ("EIP: %08X EAX: %08X EBX: %08X ECX: %08X \nEDX: %08X ESI: %08X EDI: %08X\nEBP:%08X ESP:%08X\n", hamburger.Eip, hamburger.Eax, hamburger.Ebx, hamburger.Ecx, hamburger.Edx, hamburger.Esi, hamburger.Edi, hamburger.Ebp, hamburger.Esp);
Tprintf ("Please press enter to try to continue\n or wait for 30 more seconds to kill T2 and write log\n");
Sleep(30000);
if (_kbhit()) {
sDogPetted=true;
ResumeThread(mainThread);
} else {
CloseHandle(mainThread);
exit(0); exit(0);
}
} }
else if (sDogPetted) else if (sDogPetted)
{ {
sDogPetted = false; sDogPetted = false;
lastPet = now; lastPet = now;
} }
Sleep(500);
} }
} }
@ -47,11 +73,30 @@ extern "C"
{ {
__declspec(dllexport) void ModInitialize(void) __declspec(dllexport) void ModInitialize(void)
{ {
sMainThread = GetCurrentThread(); mainthreadid = GetThreadId(GetCurrentThread());
SECURITY_DESCRIPTOR secDescVar;
DWORD threadID; DWORD threadID;
HANDLE token;
LUID debugname;
TOKEN_PRIVILEGES tokenpriv;
HANDLE thread = CreateThread(NULL, 0, WatchDogThread, NULL, 0, &threadID); HANDLE thread = CreateThread(NULL, 0, WatchDogThread, NULL, 0, &threadID);
if (thread==NULL) {
DWORD errorval = GetLastError();
Tprintf ("Error %08X, watchdog is not running properly\n",errorval);
}
OpenThreadToken(thread,TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY,false, &token);
LookupPrivilegeValue(NULL,SE_DEBUG_NAME, &debugname);
tokenpriv.PrivilegeCount = 1;
tokenpriv.Privileges[0].Luid = debugname;
tokenpriv.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
if(AdjustTokenPrivileges(token, FALSE, &tokenpriv, sizeof tokenpriv, NULL, NULL)) {
Tprintf ("watchdog should work now\n");
CloseHandle(token);
} else {
Tprintf ("Error, watchdog won't operate fully, WatchDog needs Admin Privileges for Debug\n");
}
} }
__declspec(dllexport) void ServerProcess(unsigned int deltaTime) __declspec(dllexport) void ServerProcess(unsigned int deltaTime)
@ -60,3 +105,4 @@ extern "C"
} }
} }