]> 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 43045f876cf53d4b49ce5eb66799a4b3a4b19dcd..632319ea366a56cbbd3ca371cac870d04f588927 100644 (file)
 #include "inspircd.h"
 #include "configreader.h"
 #include <signal.h>
-#ifndef WIN32
 
+#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>
-#else
+#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 */
-       // 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))
+       {
+               printf("GetModuleFileName() failed.\n");
                return false;
+       }
 
        STARTUPINFO startupinfo;
        PROCESS_INFORMATION procinfo;
@@ -64,31 +63,50 @@ DWORD WindowsForkStart(InspIRCd * Instance)
        // Fill in the startup info struct
        GetStartupInfo(&startupinfo);
 
-       // Create the "startup" event
-       HANDLE fork_event = CreateEvent(0, TRUE, FALSE, "InspStartup");
-       if(!fork_event)
-               return false;
+       /* 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, NULL, 
-               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
+       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);
@@ -108,11 +126,17 @@ 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);
 }
@@ -136,7 +160,7 @@ const char* ExitCodes[] =
                "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 */
@@ -144,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 */
-               "Could not create forked process", /* 14 */
+               "Could not create windows forked process", /* 14 */
                "Received SIGTERM", /* 15 */
 };
 
@@ -463,12 +487,12 @@ InspIRCd::InspIRCd(int argc, char** argv)
 
        struct option longopts[] =
        {
-               { "nofork",             no_argument,            &do_nofork,             1       },
-               { "logfile",    required_argument,      NULL,                   'f'     },
-               { "config",             required_argument,      NULL,                   'c'     },
-               { "debug",              no_argument,            &do_debug,              1       },
-               { "nolog",              no_argument,            &do_nolog,              1       },
-               { "runasroot",  no_argument,            &do_root,               1       },
+               { "nofork",     no_argument,            &do_nofork,     1       },
+               { "logfile",    required_argument,      NULL,           'f'     },
+               { "config",     required_argument,      NULL,           'c'     },
+               { "debug",      no_argument,            &do_debug,      1       },
+               { "nolog",      no_argument,            &do_nolog,      1       },
+               { "runasroot",  no_argument,            &do_root,       1       },
                { "version",    no_argument,            &do_version,    1       },
                { 0, 0, 0, 0 }
        };
@@ -480,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 */