Added an option to adjust hamburger delay

Also removed a typo
This commit is contained in:
Calvin Balke 2015-06-29 14:26:17 -07:00
parent d0224b4d9b
commit 8ec9674ea7

View file

@ -4,9 +4,10 @@
#include <time.h> #include <time.h>
#include <stdio.h> #include <stdio.h>
#include <conio.h> #include <conio.h>
#include <LinkerAPI.h> #include <LinkerAPI.h>
// #define LONGHAMBURGERROUTINE
BOOL APIENTRY DllMain( HMODULE hModule, BOOL APIENTRY DllMain( HMODULE hModule,
DWORD ul_reason_for_call, DWORD ul_reason_for_call,
LPVOID lpReserved LPVOID lpReserved
@ -72,7 +73,7 @@ DWORD WINAPI WatchDogThread(LPVOID lpParam)
{ {
time_t now = time(0); time_t now = time(0);
double seconds = difftime(now,lastPet); double seconds = difftime(now,lastPet);
#ifdef SLOWSERVERa #ifdef SLOWSERVER
if (!sDogPetted && seconds > 15) // Wait 15 seconds to be extra safe if (!sDogPetted && seconds > 15) // Wait 15 seconds to be extra safe
#else #else
if (!sDogPetted && seconds > 8) // Wait 8 seconds to be safe if (!sDogPetted && seconds > 8) // Wait 8 seconds to be safe
@ -89,7 +90,11 @@ DWORD WINAPI WatchDogThread(LPVOID lpParam)
fclose (wlog); fclose (wlog);
Con::printf ("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); Con::printf ("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);
Con::printf ("Please press enter to try to continue, press e to get a torquescript shell, press d to get a hexdump of the last bit of torquescript bytecode to search for in DSO files, or wait for 30 more seconds to kill T2 and write log\n"); Con::printf ("Please press enter to try to continue, press e to get a torquescript shell, press d to get a hexdump of the last bit of torquescript bytecode to search for in DSO files, or wait for 30 more seconds to kill T2 and write log\n");
#ifdef LONGHAMBURGERROUTINE
for (int secondcounter=0;secondcounter<120;secondcounter++) { for (int secondcounter=0;secondcounter<120;secondcounter++) {
#else
for (int secondcounter=0;secondcounter<8;secondcounter++) {
#endif
Sleep(250); Sleep(250);
if (_kbhit()) { if (_kbhit()) {
sDogPetted=true; sDogPetted=true;