summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/base.h2
-rw-r--r--include/configreader.h4
-rw-r--r--include/dns.h4
-rw-r--r--include/inspircd.h3
-rw-r--r--include/modules.h2
5 files changed, 12 insertions, 3 deletions
diff --git a/include/base.h b/include/base.h
index 0a4456f3a..19222a6f5 100644
--- a/include/base.h
+++ b/include/base.h
@@ -201,7 +201,7 @@ class CoreExport CoreException : public std::exception
* Actually no, it does nothing. Never mind.
* @throws Nothing!
*/
- virtual ~CoreException() throw() {};
+ virtual ~CoreException() throw() {}
/** Returns the reason for the exception.
* The module should probably put something informative here as the user will see this upon failure.
*/
diff --git a/include/configreader.h b/include/configreader.h
index b01a979a7..4a697d05c 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -438,6 +438,10 @@ class CoreExport ServerConfig
*/
std::string HideKillsServer;
+ /** Set to hide kills from clients of ulined servers in snotices.
+ */
+ bool HideULineKills;
+
/** The full pathname and filename of the PID
* file as defined in the configuration.
*/
diff --git a/include/dns.h b/include/dns.h
index de4bcf422..05df6f69c 100644
--- a/include/dns.h
+++ b/include/dns.h
@@ -302,6 +302,10 @@ class CoreExport DNS : public EventHandler
*/
static const int MAX_REQUEST_ID = 0xFFFF;
+ /** Maximum number of entries in cache
+ */
+ static const unsigned int MAX_CACHE_SIZE = 1000;
+
/**
* Currently cached items
*/
diff --git a/include/inspircd.h b/include/inspircd.h
index e2eaf8292..78348ed54 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -779,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()
diff --git a/include/modules.h b/include/modules.h
index 9857012fc..4d4d0871f 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -116,7 +116,7 @@ struct ModResult {
* and numerical comparisons in preprocessor macros if they wish to support
* multiple versions of InspIRCd in one file.
*/
-#define INSPIRCD_VERSION_API 9
+#define INSPIRCD_VERSION_API 10
/**
* This #define allows us to call a method in all