#include "configreader.h"
#include <signal.h>
#ifndef WIN32
+
#include <dirent.h>
#include <unistd.h>
+#include <sys/resource.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 <dlfcn.h>
#include <getopt.h>
#else
-#include <conio.h>
-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;
{
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");
}
}
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 */
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 }
};
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);
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;
-
- // remove the console if in no-fork
- if(!Config->nofork)
- FreeConsole();
-
-#endif
}
std::string InspIRCd::GetVersionString()
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;
projects / user / henk / code / inspircd.git / blobdiff