X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=779061e833e005907eaa118658ae4dcbbc342aa7;hb=548162d094e034c35dcb8389043bc6da6ee8481f;hp=9e1d753b3b3118af8c552235e8db6cde5a1316f2;hpb=6cf3fc6b36e2046c36b729530117572ba44aafd7;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 9e1d753b3..779061e83 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -15,8 +15,16 @@ #include "configreader.h" #include #ifndef WIN32 + #include #include +#include + +/* This is just to be completely certain that the change which fixed getrusage on RH7 doesn't break anything else -- Om */ +#ifndef RUSAGE_SELF +#define RUSAGE_SELF 0 +#endif + #endif #include #include @@ -34,8 +42,80 @@ #include #include #else -#include -bool g_starting = true; +static DWORD owner_processid = 0; + +bool WindowsForkStart(InspIRCd * Instance) +{ + /* Windows implementation of fork() :P */ + // Build the command line arguments. + string command_line; + for(int i = 0; i < Instance->Config->argc; ++i) + command_line += Instance->Config->argv[i]; + + char module[MAX_PATH]; + if(!GetModuleFileName(NULL, module, MAX_PATH)) + return false; + + STARTUPINFO startupinfo; + PROCESS_INFORMATION procinfo; + ZeroMemory(&startupinfo, sizeof(STARTUPINFO)); + ZeroMemory(&procinfo, sizeof(PROCESS_INFORMATION)); + + // Fill in the startup info struct + GetStartupInfo(&startupinfo); + + // Create the "startup" event + HANDLE fork_event = CreateEvent(0, TRUE, FALSE, "InspStartup"); + if(!fork_event) + { + printf("CreateEvent: %s\n", dlerror()); + return false; + } + + // Launch our "forked" process. + BOOL bSuccess = CreateProcess ( module, module, + 0, // PROCESS_SECURITY_ATTRIBUTES + 0, // THREAD_SECURITY_ATTRIBUTES + TRUE, // We went to inherit handles. + CREATE_SUSPENDED | // Suspend the primary thread of the new process + CREATE_PRESERVE_CODE_AUTHZ_LEVEL, // Allow us full access to the process + 0, // ENVIRONMENT + 0, // CURRENT_DIRECTORY + &startupinfo, // startup info + &procinfo); // process info + + if(!bSuccess) + return false; + + // Set the owner process id in the target process. + SIZE_T written = 0; + DWORD pid = GetCurrentProcessId(); + if(!WriteProcessMemory(procinfo.hProcess, &owner_processid, &pid, sizeof(DWORD), &written) || written != sizeof(DWORD)) + return false; + + // Resume the other thread (let it start) + ResumeThread(procinfo.hThread); + + // Wait for the new process to kill us. If there is some error, the new process will end and we will end up at the next line. + WaitForSingleObject(procinfo.hProcess, INFINITE); + + // If we hit this it means startup failed. :( + return true; +} + +void WindowsForkKillOwner(InspIRCd * Instance) +{ + HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, owner_processid); + if(!hProcess || !owner_processid) + exit(1); + + // die die die + if(!TerminateProcess(hProcess, 0)) + exit(1); + + CloseHandle(hProcess); +} + #endif using irc::sockets::NonBlocking; @@ -193,7 +273,7 @@ void InspIRCd::Start() { printf_c("\033[1;32mInspire Internet Relay Chat Server, compiled %s at %s\n",__DATE__,__TIME__); printf_c("(C) InspIRCd Development Team.\033[0m\n\n"); - printf_c("Developers:\t\t\033[1;32mBrain, FrostyCoolSlug, w00t, Om, Special, pippijn, peavey\033[0m\n"); + printf_c("Developers:\t\t\033[1;32mBrain, FrostyCoolSlug, w00t, Om, Special, pippijn, peavey, Burlex\033[0m\n"); printf_c("Others:\t\t\t\033[1;32mSee /INFO Output\033[0m\n"); } @@ -344,13 +424,8 @@ std::string InspIRCd::GetRevision() } InspIRCd::InspIRCd(int argc, char** argv) - : ModCount(-1), duration_m(60), duration_h(60*60), duration_d(60*60*24), duration_w(60*60*24*7), duration_y(60*60*24*365), GlobalCulls(this) + : ModCount(-1), GlobalCulls(this) { -#ifdef WINDOWS - WSADATA wsadata; - WSAStartup(MAKEWORD(2,0), &wsadata); -#endif - int found_ports = 0; FailedPortList pl; int do_version = 0, do_nofork = 0, do_debug = 0, do_nolog = 0, do_root = 0; /* flag variables */ @@ -427,6 +502,20 @@ InspIRCd::InspIRCd(int argc, char** argv) Exit(EXIT_STATUS_NOERROR); } +#ifdef WIN32 + + // Handle forking + if(!do_nofork && !owner_processid) + { + if(WindowsForkStart(this)) + Exit(0); + } + + // Set up winsock + WSADATA wsadata; + WSAStartup(MAKEWORD(2,0), &wsadata); + +#endif if (!ServerConfig::FileExists(this->ConfigFileName)) { printf("ERROR: Cannot open config file: %s\nExiting...\n", this->ConfigFileName); @@ -550,16 +639,18 @@ InspIRCd::InspIRCd(int argc, char** argv) Log(DEFAULT,"Keeping pseudo-tty open as we are running in the foreground."); } } +#else + InitIPC(); + if(!Config->nofork) + { + WindowsForkKillOwner(this); + FreeConsole(); + } #endif printf("\nInspIRCd is now running!\n"); Log(DEFAULT,"Startup complete."); this->WritePID(Config->PID); - -#ifdef WINDOWS - InitIPC(); - g_starting = false; -#endif } std::string InspIRCd::GetVersionString() @@ -971,7 +1062,8 @@ void InspIRCd::DoOneIteration(bool process_module_sockets) Timers->TickMissedTimers(TIME); } #ifndef WIN32 - if (!getrusage(0, &ru)) + /* Same change as in cmd_stats.cpp, use RUSAGE_SELF rather than '0' -- Om */ + if (!getrusage(RUSAGE_SELF, &ru)) { gettimeofday(&this->stats->LastSampled, NULL); this->stats->LastCPU = ru.ru_utime; @@ -979,11 +1071,14 @@ void InspIRCd::DoOneIteration(bool process_module_sockets) #else CheckIPC(this); - uptime = Time() - startup_time; - stime = gmtime(&uptime); - snprintf(window_title, 100, "InspIRCd - %u clients, %u accepted connections - Up %u days, %.2u:%.2u:%.2u", - LocalUserCount(), stats->statsAccept, stime->tm_yday, stime->tm_hour, stime->tm_min, stime->tm_sec); - SetConsoleTitle(window_title); + if(Config->nofork) + { + uptime = Time() - startup_time; + stime = gmtime(&uptime); + snprintf(window_title, 100, "InspIRCd - %u clients, %u accepted connections - Up %u days, %.2u:%.2u:%.2u", + LocalUserCount(), stats->statsAccept, stime->tm_yday, stime->tm_hour, stime->tm_min, stime->tm_sec); + SetConsoleTitle(window_title); + } #endif } @@ -1027,9 +1122,6 @@ int InspIRCd::Run() int main(int argc, char** argv) { -#ifdef WINDOWS - ClearConsole(); -#endif SI = new InspIRCd(argc, argv); SI->Run(); delete SI;