X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fmodules.h;h=72ee2683d29a56b882a50e578afea40f95db0720;hb=ad0828aa6431021df45563d34de9976b2d303098;hp=3e5ace3f43b64e053a4fcef5482df8494c58961f;hpb=9eeae941959511957abd770ed8e11f3ecdcd739e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/modules.h b/include/modules.h
index 3e5ace3f4..72ee2683d 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -23,8 +23,7 @@
  */
 
 
-#ifndef MODULES_H
-#define MODULES_H
+#pragma once
 
 #include "dynamic.h"
 #include "base.h"
@@ -35,7 +34,6 @@
 #include <sstream>
 #include "timer.h"
 #include "mode.h"
-#include "dns.h"
 
 /** Used to define a set of behavior bits for a module
  */
@@ -135,7 +133,7 @@ struct ModResult {
 		} \
 		catch (CoreException& modexcept) \
 		{ \
-			ServerInstance->Logs->Log("MODULE",DEFAULT,"Exception caught: %s",modexcept.GetReason()); \
+			ServerInstance->Logs->Log("MODULE",LOG_DEFAULT,"Exception caught: %s",modexcept.GetReason()); \
 		} \
 		_i = safei; \
 	} \
@@ -162,7 +160,7 @@ do { \
 		} \
 		catch (CoreException& except_ ## n) \
 		{ \
-			ServerInstance->Logs->Log("MODULE",DEFAULT,"Exception caught: %s", (except_ ## n).GetReason()); \
+			ServerInstance->Logs->Log("MODULE",LOG_DEFAULT,"Exception caught: %s", (except_ ## n).GetReason()); \
 			(void) mod_ ## n; /* catch mismatched pairs */ \
 		} \
 	} \
@@ -393,6 +391,11 @@ class CoreExport Module : public classbase, public usecountbase
 	 */
 	DLLManager* ModuleDLLManager;
 
+	/** If true, this module will be unloaded soon, further unload attempts will fail
+	 * Value is used by the ModuleManager internally, you should not modify it
+	 */
+	bool dying;
+
 	/** Default constructor.
 	 * Creates a module class. Don't do any type of hook registration or checks
 	 * for other modules here; do that in init().
@@ -545,7 +548,7 @@ class CoreExport Module : public classbase, public usecountbase
 	 * @param keygiven The key given to join the channel, or an empty string if none was provided
 	 * @return 1 To prevent the join, 0 to allow it.
 	 */
-	virtual ModResult OnUserPreJoin(User* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven);
+	virtual ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven);
 
 	/** Called whenever a user is about to be kicked.
 	 * Returning a value of 1 from this function stops the process immediately, causing no
@@ -911,9 +914,9 @@ class CoreExport Module : public classbase, public usecountbase
 
 	/** Called when a 005 numeric is about to be output.
 	 * The module should modify the 005 numeric if needed to indicate its features.
-	 * @param output The 005 string to be modified if neccessary.
-	 */
-	virtual void On005Numeric(std::string &output);
+	* @param output The 005 map to be modified if neccessary.
+	*/
+	virtual void On005Numeric(std::map<std::string, std::string>& tokens);
 
 	/** Called when a client is disconnected by KILL.
 	 * If a client is killed by a server, e.g. a nickname collision or protocol error,
@@ -1645,5 +1648,3 @@ struct AllModuleList {
 #define COMMAND_INIT(c) MODULE_INIT(CommandModule<c>)
 
 #endif
-
-#endif