]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/inspircd.cpp
Convert more modules
[user/henk/code/inspircd.git] / src / inspircd.cpp
index 7e81df32b9be8e7b669a781ebdd9275367ad2164..632319ea366a56cbbd3ca371cac870d04f588927 100644 (file)
 #include "inspircd.h"
 #include "configreader.h"
 #include <signal.h>
+
 #ifndef WIN32
 #include <dirent.h>
 #include <unistd.h>
+#include <sys/resource.h>
+#include <dlfcn.h>
+#include <getopt.h>
+/* 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 <exception>
 #include <fstream>
 #include "modules.h"
 #include "command_parse.h"
 #include "exitcodes.h"
 
-#ifndef WIN32
-#include <dlfcn.h>
-#include <getopt.h>
+#ifdef WIN32
+
+/* This MUST remain static and delcared outside the class, so that WriteProcessMemory can reference it properly */
+static DWORD owner_processid = 0;
+
+DWORD WindowsForkStart(InspIRCd * Instance)
+{
+       /* Windows implementation of fork() :P */
+
+       char module[MAX_PATH];
+       if(!GetModuleFileName(NULL, module, MAX_PATH))
+       {
+               printf("GetModuleFileName() failed.\n");
+               return false;
+       }
+
+       STARTUPINFO startupinfo;
+       PROCESS_INFORMATION procinfo;
+       ZeroMemory(&startupinfo, sizeof(STARTUPINFO));
+       ZeroMemory(&procinfo, sizeof(PROCESS_INFORMATION));
+
+       // Fill in the startup info struct
+       GetStartupInfo(&startupinfo);
+
+       /* Default creation flags create the processes suspended */
+       DWORD startupflags = CREATE_SUSPENDED;
+
+       /* On windows 2003/XP and above, we can use the value
+        * CREATE_PRESERVE_CODE_AUTHZ_LEVEL which gives more access
+        * to the process which we may require on these operating systems.
+        */
+       OSVERSIONINFO vi;
+       vi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+       GetVersionEx(&vi);
+       if ((vi.dwMajorVersion >= 5) && (vi.dwMinorVersion > 0))
+               startupflags |= CREATE_PRESERVE_CODE_AUTHZ_LEVEL;
+
+       // Launch our "forked" process.
+       BOOL bSuccess = CreateProcess ( module, // Module (exe) filename
+               strdup(GetCommandLine()),       // Command line (exe plus parameters from the OS)
+                                               // NOTE: We cannot return the direct value of the
+                                               // GetCommandLine function here, as the pointer is
+                                               // passed straight to the child process, and will be
+                                               // invalid once we exit as it goes out of context.
+                                               // strdup() seems ok, though.
+               0,                              // PROCESS_SECURITY_ATTRIBUTES
+               0,                              // THREAD_SECURITY_ATTRIBUTES
+               TRUE,                           // We went to inherit handles.
+               startupflags,                   // Allow us full access to the process and suspend it.
+               0,                              // ENVIRONMENT
+               0,                              // CURRENT_DIRECTORY
+               &startupinfo,                   // startup info
+               &procinfo);                     // process info
+
+       if(!bSuccess)
+       {
+               printf("CreateProcess() error: %s\n", dlerror());
+               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))
+       {
+               printf("WriteProcessMemory() failed: %s\n", dlerror());
+               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, default to 14 if this fails.
+       DWORD ExitCode = 14;
+       GetExitCodeProcess(procinfo.hProcess, &ExitCode);
+       CloseHandle(procinfo.hThread);
+       CloseHandle(procinfo.hProcess);
+       return ExitCode;
+}
+
+void WindowsForkKillOwner(InspIRCd * Instance)
+{
+       HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, owner_processid);
+       if(!hProcess || !owner_processid)
+       {
+               printf("Could not open process id %u: %s.\n", owner_processid, dlerror());
+               Instance->Exit(14);
+       }
+
+       // die die die
+       if(!TerminateProcess(hProcess, 0))
+       {
+               printf("Could not TerminateProcess(): %s\n", dlerror());
+               Instance->Exit(14);
+       }
+
+       CloseHandle(hProcess);
+}
+
 #endif
 
 using irc::sockets::NonBlocking;
@@ -46,13 +154,13 @@ InspIRCd* SI = NULL;
 /* Burlex: Moved from exitcodes.h -- due to duplicate symbols */
 const char* ExitCodes[] =
 {
-       "No error", /* 0 */
+               "No error", /* 0 */
                "DIE command", /* 1 */
                "execv() failed", /* 2 */
                "Internal error", /* 3 */
                "Config file error", /* 4 */
                "Logfile error", /* 5 */
-               "Fork failed", /* 6 */
+               "POSIX fork failed", /* 6 */
                "Bad commandline parameters", /* 7 */
                "No ports could be bound", /* 8 */
                "Can't write PID file", /* 9 */
@@ -60,7 +168,7 @@ const char* ExitCodes[] =
                "Refusing to start up as root", /* 11 */
                "Found a <die> tag!", /* 12 */
                "Couldn't load module on startup", /* 13 */
-               "", /* 14 */
+               "Could not create windows forked process", /* 14 */
                "Received SIGTERM", /* 15 */
 };
 
@@ -190,7 +298,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");
 }
 
@@ -204,8 +312,8 @@ void InspIRCd::Rehash(int status)
        SI->Config->Read(false,NULL);
        SI->ResetMaxBans();
        SI->Res->Rehash();
-       SI->BuildISupport();
        FOREACH_MOD_I(SI,I_OnRehash,OnRehash(NULL,""));
+       SI->BuildISupport();
 }
 
 void InspIRCd::ResetMaxBans()
@@ -265,26 +373,7 @@ void InspIRCd::QuickExit(int status)
 bool InspIRCd::DaemonSeed()
 {
 #ifdef WINDOWS
-       // Create process, with argument --service
-       STARTUPINFO si;
-       PROCESS_INFORMATION pi;
-       memset(&si, 0, sizeof(si));
-       memset(&pi, 0, sizeof(pi));
-       SHELLEXECUTEINFO sh = {0};
-       sh.cbSize = sizeof(sh);
-       sh.fMask = SEE_MASK_NOCLOSEPROCESS;
-       sh.hwnd = 0;
-       sh.lpVerb = 0;
-       sh.lpDirectory = 0;
-       sh.hInstApp = 0;
-       sh.nShow = SW_SHOW;
-       sh.lpFile = "inspircd.exe";
-       sh.lpParameters = "--service";
-       if(!ShellExecuteEx(&sh))
-               return false;
-
-       CloseHandle(sh.hProcess);
-       exit(0);
+       printf_c("InspIRCd Process ID: \033[1;32m%lu\033[0m\n", GetCurrentProcessId());
        return true;
 #else
        signal(SIGTERM, InspIRCd::QuickExit);
@@ -361,16 +450,11 @@ 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, is_service = 0;    /* flag variables */
+       int do_version = 0, do_nofork = 0, do_debug = 0, do_nolog = 0, do_root = 0;    /* flag variables */
        char c = 0;
 
        modules.resize(255);
@@ -388,6 +472,8 @@ InspIRCd::InspIRCd(int argc, char** argv)
        this->Config->argv = argv;
        this->Config->argc = argc;
 
+       chdir(Config->GetFullProgDir().c_str());
+
        this->Config->opertypes.clear();
        this->Config->operclass.clear();
        this->SNO = new SnomaskManager(this);
@@ -408,7 +494,6 @@ InspIRCd::InspIRCd(int argc, char** argv)
                { "nolog",      no_argument,            &do_nolog,      1       },
                { "runasroot",  no_argument,            &do_root,       1       },
                { "version",    no_argument,            &do_version,    1       },
-               { "service",    no_argument,            &is_service,    1       },
                { 0, 0, 0, 0 }
        };
 
@@ -419,12 +504,10 @@ InspIRCd::InspIRCd(int argc, char** argv)
                        case 'f':
                                /* Log filename was set */
                                strlcpy(LogFileName, optarg, MAXBUF);
-                               printf("LOG: Setting logfile to %s\n", LogFileName);
                        break;
                        case 'c':
                                /* Config filename was set */
                                strlcpy(ConfigFileName, optarg, MAXBUF);
-                               printf("CONFIG: Setting config file to %s\n", ConfigFileName);
                        break;
                        case 0:
                                /* getopt_long_only() set an int variable, just keep going */
@@ -437,17 +520,27 @@ InspIRCd::InspIRCd(int argc, char** argv)
                }
        }
 
-#ifdef WINDOWS
-       if(is_service)
-               FreeConsole();
-#endif
-
        if (do_version)
        {
                printf("\n%s r%s\n", VERSION, REVISION);
                Exit(EXIT_STATUS_NOERROR);
        }
 
+#ifdef WIN32
+
+       // Handle forking
+       if(!do_nofork && !owner_processid)
+       {
+               DWORD ExitCode = WindowsForkStart(this);
+               if(ExitCode)
+                       Exit(ExitCode);
+       }
+
+       // 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);
@@ -492,7 +585,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
 
        if (!Config->nofork)
        {
-               if (!is_service && !this->DaemonSeed())
+               if (!this->DaemonSeed())
                {
                        printf("ERROR: could not go into daemon mode. Shutting down.\n");
                        Log(DEFAULT,"ERROR: could not go into daemon mode. Shutting down.");
@@ -571,15 +664,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();
-#endif
 }
 
 std::string InspIRCd::GetVersionString()
@@ -955,6 +1051,10 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
 {
 #ifndef WIN32
        static rusage ru;
+#else
+       static time_t uptime;
+       static struct tm * stime;
+       static char window_title[100];
 #endif
 
        /* time() seems to be a pretty expensive syscall, so avoid calling it too much.
@@ -987,13 +1087,23 @@ 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;
                }
 #else
                CheckIPC(this);
+
+               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
        }
 
@@ -1128,7 +1238,7 @@ void FileLogger::WriteLogLine(const std::string &line)
        {
                int written = fprintf(log,"%s",buffer.c_str());
 #ifdef WINDOWS
-               buffer = "";
+               buffer.clear();
 #else
                if ((written >= 0) && (written < (int)buffer.length()))
                {
@@ -1143,7 +1253,7 @@ void FileLogger::WriteLogLine(const std::string &line)
                else
                {
                        /* Wrote the whole buffer, and no need for write callback */
-                       buffer = "";
+                       buffer.clear();
                }
 #endif
                if (writeops++ % 20)
@@ -1174,7 +1284,7 @@ void FileLogger::Close()
                fclose(log);
        }
 
-       buffer = "";
+       buffer.clear();
 }
 
 FileLogger::FileLogger(InspIRCd* Instance, FILE* logfile) : ServerInstance(Instance), log(logfile), writeops(0)
@@ -1183,7 +1293,7 @@ FileLogger::FileLogger(InspIRCd* Instance, FILE* logfile) : ServerInstance(Insta
        {
                irc::sockets::NonBlocking(fileno(log));
                this->SetFd(fileno(log));
-               buffer = "";
+               buffer.clear();
        }
 }