X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Finspircd.h;h=78348ed54c4957d411c97a6a657d0c13eee8f4c7;hb=584cbe80152ed3bb8cdbedc41c43d63cd10ca799;hp=c06a28043b4be3154ea91c3b28010922f846bd90;hpb=74ee9af96639323d852a8b15be72ee9974e0a826;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/inspircd.h b/include/inspircd.h
index c06a28043..78348ed54 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -31,10 +31,9 @@
 #define _LARGEFILE_SOURCE
 #endif
 
-#ifndef WIN32
+#ifndef _WIN32
 #define DllExport
 #define CoreExport
-#define printf_c printf
 #else
 #include "inspircd_win32wrapper.h"
 /** Windows defines these already */
@@ -48,6 +47,7 @@
 #endif
 
 // Required system headers.
+#include <csignal>
 #include <ctime>
 #include <cstdarg>
 #include <algorithm>
@@ -55,7 +55,7 @@
 #include <cstring>
 #include <climits>
 #include <cstdio>
-#ifndef WIN32
+#ifndef _WIN32
 #include <unistd.h>
 #endif
 
@@ -71,6 +71,7 @@
 #include "inspircd_config.h"
 #include "inspircd_version.h"
 #include "typedefs.h"
+#include "consolecolors.h"
 
 CoreExport extern InspIRCd* ServerInstance;
 
@@ -169,7 +170,7 @@ inline std::string ConvToStr(const bool in)
  */
 inline std::string ConvToStr(char in)
 {
-	return std::string(in,1);
+	return std::string(1, in);
 }
 
 /** Template function to convert any input type to std::string
@@ -232,12 +233,24 @@ class serverstats
 	/** Total bytes of data received
 	 */
 	unsigned long statsRecv;
+#ifdef _WIN32
+	/** Cpu usage at last sample
+	*/
+	FILETIME LastCPU;
+	/** Time QP sample was read
+	*/
+	LARGE_INTEGER LastSampled;
+	/** QP frequency
+	*/
+	LARGE_INTEGER QPFrequency;
+#else
 	/** Cpu usage at last sample
 	 */
 	timeval LastCPU;
 	/** Time last sample was read
 	 */
 	timespec LastSampled;
+#endif
 	/** The constructor initializes all the counts to zero
 	 */
 	serverstats()
@@ -308,10 +321,6 @@ class CoreExport InspIRCd
 	 */
 	char ReadBuffer[65535];
 
-#ifdef WIN32
-	IPC* WindowsIPC;
-#endif
-
  public:
 
 	/** Global cull list, will be processed on next iteration
@@ -446,7 +455,7 @@ class CoreExport InspIRCd
 
 	/** Set to the current signal recieved
 	 */
-	int s_signal;
+	static sig_atomic_t s_signal;
 
 	/** Protocol interface, overridden by server protocol modules
 	 */
@@ -698,6 +707,16 @@ class CoreExport InspIRCd
 	 */
 	bool IsValidMask(const std::string &mask);
 
+	/** Strips all color codes from the given string
+	 * @param sentence The string to strip from
+	 */
+	static void StripColor(std::string &sentence);
+
+	/** Parses color codes from string values to actual color codes
+	 * @param input The data to process
+	 */
+	static void ProcessColors(file_cache& input);
+
 	/** Rehash the local server
 	 */
 	void RehashServer();
@@ -760,9 +779,10 @@ class CoreExport InspIRCd
 
 	/** Attempt to write the process id to a given file
 	 * @param filename The PID file to attempt to write to
+	 * @param exitonfail If true and the PID fail cannot be written log to stdout and exit, otherwise only log on failure
 	 * @return This function may bail if the file cannot be written
 	 */
-	void WritePID(const std::string &filename);
+	void WritePID(const std::string& filename, bool exitonfail = true);
 
 	/** This constructor initialises all the subsystems and reads the config file.
 	 * @param argc The argument count passed to main()