X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=2dafc88643565cf3729469dc59c4b6db4b61e567;hb=9db7af579c46a9f0379fdf71fb773a0a76a94846;hp=8061248d24b89d60b961e97fb25051b588fe4761;hpb=6a869d0701bbfe3c7a5e370793adfda4b5b45c65;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules.cpp b/src/modules.cpp
index 8061248d2..2dafc8864 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,10 +11,7 @@
  * ---------------------------------------------------
  */
 
-/* $Core */
-
 #include "inspircd.h"
-#include "wildcard.h"
 #include "xline.h"
 #include "socket.h"
 #include "socketengine.h"
@@ -26,19 +23,12 @@
 	#include <dirent.h>
 #endif
 
-// version is a simple class for holding a modules version number
-Version::Version(int major, int minor, int revision, int build, int flags, int api_ver)
-: Major(major), Minor(minor), Revision(revision), Build(build), Flags(flags), API(api_ver)
-{
-}
 
-Request::Request(char* anydata, Module* src, Module* dst)
-: data(anydata), source(src), dest(dst)
+// Version is a simple class for holding a modules version number
+template<>
+VersionBase<API_VERSION>::VersionBase(const std::string &modv, int flags, const std::string& rev)
+: description(modv), version(rev), Flags(flags)
 {
-	/* Ensure that because this module doesnt support ID strings, it doesnt break modules that do
-	 * by passing them uninitialized pointers (could happen)
-	 */
-	id = '\0';
 }
 
 Request::Request(Module* src, Module* dst, const char* idstr)
@@ -46,157 +36,120 @@ Request::Request(Module* src, Module* dst, const char* idstr)
 {
 }
 
-char* Request::GetData()
-{
-	return this->data;
-}
-
-const char* Request::GetId()
+void Request::Send()
 {
-	return this->id;
+	if (dest)
+		dest->OnRequest(*this);
 }
 
-Module* Request::GetSource()
-{
-	return this->source;
-}
+Event::Event(Module* src, const std::string &eventid) : source(src), id(eventid) { }
 
-Module* Request::GetDest()
+void Event::Send()
 {
-	return this->dest;
+	FOREACH_MOD(I_OnEvent,OnEvent(*this));
 }
 
-const char* Request::Send()
-{
-	if (this->dest)
-	{
-		return dest->OnRequest(this);
-	}
-	else
-	{
-		return NULL;
-	}
-}
-
-Event::Event(char* anydata, Module* src, const std::string &eventid) : data(anydata), source(src), id(eventid) { }
-
-char* Event::GetData()
-{
-	return (char*)this->data;
-}
-
-Module* Event::GetSource()
-{
-	return this->source;
-}
-
-char* Event::Send(InspIRCd* ServerInstance)
-{
-	FOREACH_MOD(I_OnEvent,OnEvent(this));
-	return NULL;
-}
+// These declarations define the behavours of the base class Module (which does nothing at all)
 
-std::string Event::GetEventID()
+Module::Module() { }
+CullResult Module::cull()
 {
-	return this->id;
+	return classbase::cull();
 }
+Module::~Module() { }
 
-
-// These declarations define the behavours of the base class Module (which does nothing at all)
-
-		Module::Module(InspIRCd* Me) : ServerInstance(Me) { }
-		Module::~Module() { }
+ModResult	Module::OnSendSnotice(char &snomask, std::string &type, const std::string &message) { return MOD_RES_PASSTHRU; }
 void		Module::OnUserConnect(User*) { }
 void		Module::OnUserQuit(User*, const std::string&, const std::string&) { }
 void		Module::OnUserDisconnect(User*) { }
-void		Module::OnUserJoin(User*, Channel*, bool, bool&) { }
-void		Module::OnPostJoin(User*, Channel*) { }
-void		Module::OnUserPart(User*, Channel*, std::string&, bool&) { }
-void		Module::OnRehash(User*, const std::string&) { }
-void		Module::OnServerRaw(std::string&, bool, User*) { }
-int		Module::OnUserPreJoin(User*, Channel*, const char*, std::string&, const std::string&) { return 0; }
-void		Module::OnMode(User*, void*, int, const std::string&) { }
-Version		Module::GetVersion() { return Version(1,0,0,0,VF_VENDOR,-1); }
+void		Module::OnUserJoin(Membership*, bool, bool, CUList&) { }
+void		Module::OnPostJoin(Membership*) { }
+void		Module::OnUserPart(Membership*, std::string&, CUList&) { }
+void		Module::OnPreRehash(User*, const std::string&) { }
+void		Module::OnModuleRehash(User*, const std::string&) { }
+void		Module::OnRehash(User*) { }
+ModResult	Module::OnUserPreJoin(User*, Channel*, const char*, std::string&, const std::string&) { return MOD_RES_PASSTHRU; }
+void		Module::OnMode(User*, void*, int, const std::vector<std::string>&, const std::vector<TranslateType>&) { }
 void		Module::OnOper(User*, const std::string&) { }
 void		Module::OnPostOper(User*, const std::string&, const std::string &) { }
 void		Module::OnInfo(User*) { }
 void		Module::OnWhois(User*, User*) { }
-int		Module::OnUserPreInvite(User*, User*, Channel*, time_t) { return 0; }
-int		Module::OnUserPreMessage(User*, void*, int, std::string&, char, CUList&) { return 0; }
-int		Module::OnUserPreNotice(User*, void*, int, std::string&, char, CUList&) { return 0; }
-int		Module::OnUserPreNick(User*, const std::string&) { return 0; }
+ModResult	Module::OnUserPreInvite(User*, User*, Channel*, time_t) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnUserPreMessage(User*, void*, int, std::string&, char, CUList&) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnUserPreNotice(User*, void*, int, std::string&, char, CUList&) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnUserPreNick(User*, const std::string&) { return MOD_RES_PASSTHRU; }
 void		Module::OnUserPostNick(User*, const std::string&) { }
-int		Module::OnAccessCheck(User*, User*, Channel*, int) { return ACR_DEFAULT; }
+ModResult	Module::OnPreMode(User*, User*, Channel*, const std::vector<std::string>&) { return MOD_RES_PASSTHRU; }
 void		Module::On005Numeric(std::string&) { }
-int		Module::OnKill(User*, User*, const std::string&) { return 0; }
-void		Module::OnLoadModule(Module*, const std::string&) { }
-void		Module::OnUnloadModule(Module*, const std::string&) { }
+ModResult	Module::OnKill(User*, User*, const std::string&) { return MOD_RES_PASSTHRU; }
+void		Module::OnLoadModule(Module*) { }
+void		Module::OnUnloadModule(Module*) { }
 void		Module::OnBackgroundTimer(time_t) { }
-int		Module::OnPreCommand(std::string&, std::vector<std::string>&, User *, bool, const std::string&) { return 0; }
+ModResult	Module::OnPreCommand(std::string&, std::vector<std::string>&, User *, bool, const std::string&) { return MOD_RES_PASSTHRU; }
 void		Module::OnPostCommand(const std::string&, const std::vector<std::string>&, User *, CmdResult, const std::string&) { }
-bool		Module::OnCheckReady(User*) { return true; }
-int		Module::OnUserRegister(User*) { return 0; }
-int		Module::OnUserPreKick(User*, User*, Channel*, const std::string&) { return 0; }
-void		Module::OnUserKick(User*, User*, Channel*, const std::string&, bool&) { }
-int		Module::OnRawMode(User*, Channel*, const char, const std::string &, bool, int, bool) { return 0; }
-int		Module::OnCheckInvite(User*, Channel*) { return 0; }
-int		Module::OnCheckKey(User*, Channel*, const std::string&) { return 0; }
-int		Module::OnCheckLimit(User*, Channel*) { return 0; }
-int		Module::OnCheckBan(User*, Channel*) { return 0; }
-int		Module::OnCheckExtBan(User *, Channel *, char) { return 0; }
-int		Module::OnCheckStringExtBan(const std::string &s, Channel *c, char type) { return 0; }
-int		Module::OnStats(char, User*, string_list&) { return 0; }
-int		Module::OnChangeLocalUserHost(User*, const std::string&) { return 0; }
-int		Module::OnChangeLocalUserGECOS(User*, const std::string&) { return 0; }
-int		Module::OnLocalTopicChange(User*, Channel*, const std::string&) { return 0; }
-void		Module::OnEvent(Event*) { return; }
-const char*		Module::OnRequest(Request*) { return NULL; }
-int		Module::OnPassCompare(Extensible* ex, const std::string &password, const std::string &input, const std::string& hashtype) { return 0; }
+ModResult	Module::OnCheckReady(User*) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnUserRegister(User*) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnUserPreKick(User*, Membership*, const std::string&) { return MOD_RES_PASSTHRU; }
+void		Module::OnUserKick(User*, Membership*, const std::string&, CUList&) { }
+ModResult	Module::OnRawMode(User*, Channel*, const char, const std::string &, bool, int) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnCheckInvite(User*, Channel*) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnCheckKey(User*, Channel*, const std::string&) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnCheckLimit(User*, Channel*) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnCheckChannelBan(User*, Channel*) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnCheckBan(User*, Channel*, const std::string&) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnExtBanCheck(User*, Channel*, char) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnStats(char, User*, string_list&) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnChangeLocalUserHost(User*, const std::string&) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnChangeLocalUserGECOS(User*, const std::string&) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnPreTopicChange(User*, Channel*, const std::string&) { return MOD_RES_PASSTHRU; }
+void		Module::OnEvent(Event&) { }
+void		Module::OnRequest(Request&) { }
+ModResult	Module::OnPassCompare(Extensible* ex, const std::string &password, const std::string &input, const std::string& hashtype) { return MOD_RES_PASSTHRU; }
 void		Module::OnGlobalOper(User*) { }
 void		Module::OnPostConnect(User*) { }
-int		Module::OnAddBan(User*, Channel*, const std::string &) { return 0; }
-int		Module::OnDelBan(User*, Channel*, const std::string &) { return 0; }
-void		Module::OnRawSocketAccept(int, const std::string&, int) { }
-int		Module::OnRawSocketWrite(int, const char*, int) { return 0; }
-void		Module::OnRawSocketClose(int) { }
-void		Module::OnRawSocketConnect(int) { }
-int		Module::OnRawSocketRead(int, char*, unsigned int, int&) { return 0; }
+ModResult	Module::OnAddBan(User*, Channel*, const std::string &) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnDelBan(User*, Channel*, const std::string &) { return MOD_RES_PASSTHRU; }
+void		Module::OnStreamSocketAccept(StreamSocket*, irc::sockets::sockaddrs*, irc::sockets::sockaddrs*) { }
+int		Module::OnStreamSocketWrite(StreamSocket*, std::string&) { return -1; }
+void		Module::OnStreamSocketClose(StreamSocket*) { }
+void		Module::OnStreamSocketConnect(StreamSocket*) { }
+int		Module::OnStreamSocketRead(StreamSocket*, std::string&) { return -1; }
 void		Module::OnUserMessage(User*, void*, int, const std::string&, char, const CUList&) { }
 void		Module::OnUserNotice(User*, void*, int, const std::string&, char, const CUList&) { }
 void 		Module::OnRemoteKill(User*, User*, const std::string&, const std::string&) { }
 void		Module::OnUserInvite(User*, User*, Channel*, time_t) { }
-void		Module::OnPostLocalTopicChange(User*, Channel*, const std::string&) { }
+void		Module::OnPostTopicChange(User*, Channel*, const std::string&) { }
 void		Module::OnGetServerDescription(const std::string&, std::string&) { }
 void		Module::OnSyncUser(User*, Module*, void*) { }
 void		Module::OnSyncChannel(Channel*, Module*, void*) { }
-void		Module::ProtoSendMode(void*, int, void*, const std::string&) { }
-void		Module::OnSyncChannelMetaData(Channel*, Module*, void*, const std::string&, bool) { }
-void		Module::OnSyncUserMetaData(User*, Module*, void*, const std::string&, bool) { }
-void		Module::OnSyncOtherMetaData(Module*, void*, bool) { }
-void		Module::OnDecodeMetaData(int, void*, const std::string&, const std::string&) { }
-void		Module::ProtoSendMetaData(void*, int, void*, const std::string&, const std::string&) { }
+void		Module::OnSyncNetwork(Module*, void*) { }
+void		Module::ProtoSendMode(void*, TargetTypeFlags, void*, const std::vector<std::string>&, const std::vector<TranslateType>&) { }
+void		Module::OnDecodeMetaData(Extensible*, const std::string&, const std::string&) { }
+void		Module::ProtoSendMetaData(void*, Extensible*, const std::string&, const std::string&) { }
 void		Module::OnWallops(User*, const std::string&) { }
 void		Module::OnChangeHost(User*, const std::string&) { }
 void		Module::OnChangeName(User*, const std::string&) { }
+void		Module::OnChangeIdent(User*, const std::string&) { }
 void		Module::OnAddLine(User*, XLine*) { }
 void		Module::OnDelLine(User*, XLine*) { }
 void		Module::OnExpireLine(XLine*) { }
 void 		Module::OnCleanup(int, void*) { }
-int		Module::OnChannelPreDelete(Channel*) { return 0; }
+ModResult	Module::OnChannelPreDelete(Channel*) { return MOD_RES_PASSTHRU; }
 void		Module::OnChannelDelete(Channel*) { }
-int		Module::OnSetAway(User*, const std::string &) { return 0; }
-int		Module::OnUserList(User*, Channel*, CUList*&) { return 0; }
-int		Module::OnWhoisLine(User*, User*, int&, std::string&) { return 0; }
-void		Module::OnBuildExemptList(MessageType, Channel*, User*, char, CUList&, const std::string&) { }
+ModResult	Module::OnSetAway(User*, const std::string &) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnUserList(User*, Channel*) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnWhoisLine(User*, User*, int&, std::string&) { return MOD_RES_PASSTHRU; }
+void		Module::OnBuildNeighborList(User*, UserChanList&, std::map<User*,bool>&) { }
 void		Module::OnGarbageCollect() { }
-void		Module::OnBufferFlushed(User*) { }
 void 		Module::OnText(User*, void*, int, const std::string&, char, CUList&) { }
 void		Module::OnRunTestSuite() { }
-void		Module::OnNamesListItem(User*, User*, Channel*, std::string&, std::string&) { }
-int		Module::OnNumeric(User*, unsigned int, const std::string&) { return 0; }
-void		Module::OnHookUserIO(User*, const std::string&) { }
+void		Module::OnNamesListItem(User*, Membership*, std::string&, std::string&) { }
+ModResult	Module::OnNumeric(User*, unsigned int, const std::string&) { return MOD_RES_PASSTHRU; }
+void		Module::OnHookIO(StreamSocket*, ListenSocketBase*) { }
+void		Module::OnSendWhoLine(User*, User*, Channel*, std::string&) { }
+ModResult	Module::OnChannelRestrictionApply(User*, Channel*, const char*) { return MOD_RES_PASSTHRU; }
 
-ModuleManager::ModuleManager(InspIRCd* Ins) : ModCount(0), Instance(Ins)
+ModuleManager::ModuleManager() : ModCount(0)
 {
 }
 
@@ -236,7 +189,7 @@ void ModuleManager::DetachAll(Module* mod)
 		Detach((Implementation)n, mod);
 }
 
-bool ModuleManager::SetPriority(Module* mod, PriorityState s)
+bool ModuleManager::SetPriority(Module* mod, Priority s)
 {
 	for (size_t n = I_BEGIN + 1; n != I_END; ++n)
 		SetPriority(mod, (Implementation)n, s);
@@ -244,7 +197,7 @@ bool ModuleManager::SetPriority(Module* mod, PriorityState s)
 	return true;
 }
 
-bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s, Module** modules, size_t sz)
+bool ModuleManager::SetPriority(Module* mod, Implementation i, Priority s, Module** modules, size_t sz)
 {
 	/** To change the priority of a module, we first find its position in the vector,
 	 * then we find the position of the other modules in the vector that this module
@@ -279,22 +232,27 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s,
 	switch (s)
 	{
 		/* Dummy value */
-		case PRIO_DONTCARE:
+		case PRIORITY_DONTCARE:
 			swap = false;
 		break;
 		/* Module wants to be first, sod everything else */
-		case PRIO_FIRST:
-			swap_pos = 0;
+		case PRIORITY_FIRST:
+			if (prioritizationState != PRIO_STATE_FIRST)
+				swap = false;
+			else
+				swap_pos = 0;
 		break;
-		/* Module is submissive and wants to be last... awww. */
-		case PRIO_LAST:
-			if (EventHandlers[i].empty())
+		/* Module wants to be last. */
+		case PRIORITY_LAST:
+			if (prioritizationState != PRIO_STATE_FIRST)
+				swap = false;
+			else if (EventHandlers[i].empty())
 				swap_pos = 0;
 			else
 				swap_pos = EventHandlers[i].size() - 1;
 		break;
 		/* Place this module after a set of other modules */
-		case PRIO_AFTER:
+		case PRIORITY_AFTER:
 		{
 			/* Find the latest possible position */
 			swap_pos = 0;
@@ -313,7 +271,7 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s,
 		}
 		break;
 		/* Place this module before a set of other modules */
-		case PRIO_BEFORE:
+		case PRIORITY_BEFORE:
 		{
 			swap_pos = EventHandlers[i].size() - 1;
 			swap = false;
@@ -335,6 +293,9 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s,
 	/* Do we need to swap? */
 	if (swap && (swap_pos != source))
 	{
+		// We are going to change positions; we'll need to run again to verify all requirements
+		if (prioritizationState == PRIO_STATE_LAST)
+			prioritizationState = PRIO_STATE_AGAIN;
 		/* Suggestion from Phoenix, "shuffle" the modules to better retain call order */
 		int incrmnt = 1;
 
@@ -367,14 +328,14 @@ bool ModuleManager::Load(const char* filename)
 	if (strchr(filename,'*') || (strchr(filename,'?')))
 	{
 		int n_match = 0;
-		DIR* library = opendir(Instance->Config->ModPath);
+		DIR* library = opendir(ServerInstance->Config->ModPath.c_str());
 		if (library)
 		{
 			/* Try and locate and load all modules matching the pattern */
 			dirent* entry = NULL;
 			while (0 != (entry = readdir(library)))
 			{
-				if (Instance->MatchText(entry->d_name, filename))
+				if (InspIRCd::Match(entry->d_name, filename, ascii_case_insensitive_map))
 				{
 					if (!this->Load(entry->d_name))
 						n_match++;
@@ -386,195 +347,268 @@ bool ModuleManager::Load(const char* filename)
 		 * to load (but wont abort when it encounters a bad one) and when 1 or
 		 * more modules were actually loaded.
 		 */
-		return (n_match > 0);
+		return (n_match > 0 ? false : true);
 	}
 
 	char modfile[MAXBUF];
-	snprintf(modfile,MAXBUF,"%s/%s",Instance->Config->ModPath,filename);
+	snprintf(modfile,MAXBUF,"%s/%s",ServerInstance->Config->ModPath.c_str(),filename);
 	std::string filename_str = filename;
 
-	if (!ServerConfig::DirValid(modfile))
-	{
-		LastModuleError = "Module " + std::string(filename) + " is not in the module directory that i am configured to look in (is "+Instance->Config->ModPath+" really a symlink?)";
-		Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
-		return false;
-	}
-	
 	if (!ServerConfig::FileExists(modfile))
 	{
 		LastModuleError = "Module file could not be found: " + filename_str;
-		Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
+		ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
 		return false;
 	}
-	
+
 	if (Modules.find(filename_str) != Modules.end())
-	{	
+	{
 		LastModuleError = "Module " + filename_str + " is already loaded, cannot load a module twice!";
-		Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
+		ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
 		return false;
 	}
-		
+
 	Module* newmod = NULL;
-	ircd_module* newhandle = NULL;
+	DLLManager* newhandle = new DLLManager(modfile);
 
 	try
 	{
-		/* This will throw a CoreException if there's a problem loading
-		 * the module file or getting a pointer to the init_module symbol.
-		 */
-		newhandle = new ircd_module(Instance, modfile, "init_module");
-		newmod = newhandle->CallInit();
+		newmod = newhandle->callInit();
 
 		if (newmod)
 		{
+			newmod->ModuleSourceFile = filename_str;
+			newmod->ModuleDLLManager = newhandle;
 			Version v = newmod->GetVersion();
 
-			if (v.API != API_VERSION)
-			{
-				DetachAll(newmod);
-				delete newmod;
-				delete newhandle;
-				LastModuleError = "Unable to load " + filename_str + ": Incorrect module API version: " + ConvToStr(v.API) + " (our version: " + ConvToStr(API_VERSION) + ")";
-				Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
-				return false;
-			}
-			else
-			{
-				Instance->Logs->Log("MODULE", DEFAULT,"New module introduced: %s (API version %d, Module version %d.%d.%d.%d)%s", filename, v.API, v.Major, v.Minor, v.Revision, v.Build, (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]"));
-			}
+			ServerInstance->Logs->Log("MODULE", DEFAULT,"New module introduced: %s (Module version %s)%s",
+				filename, v.version.c_str(), (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]"));
 
-			Modules[filename_str] = std::make_pair(newhandle, newmod);
+			Modules[filename_str] = newmod;
 		}
 		else
 		{
+			LastModuleError = "Unable to load " + filename_str + ": " + newhandle->LastError();
+			ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
 			delete newhandle;
-			LastModuleError = "Unable to load " + filename_str + ": Probably missing init_module() entrypoint, but dlsym() didn't notice a problem";
-			Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
 			return false;
 		}
 	}
-	/** XXX: Is there anything we can do about this mess? -- Brain */
-	catch (LoadModuleException& modexcept)
-	{
-		DetachAll(newmod);
-		if (newmod)
-			delete newmod;
-		if (newhandle)
-			delete newhandle;
-		LastModuleError = "Unable to load " + filename_str + ": Error when loading: " + modexcept.GetReason();
-		Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
-		return false;
-	}
-	catch (FindSymbolException& modexcept)
-	{
-		DetachAll(newmod);
-		if (newmod)
-			delete newmod;
-		if (newhandle)
-			delete newhandle;
-		LastModuleError = "Unable to load " + filename_str + ": Error finding symbol: " + modexcept.GetReason();
-		Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
-		return false;
-	}
 	catch (CoreException& modexcept)
 	{
-		DetachAll(newmod);
-		if (newmod)
-			delete newmod;
-		if (newhandle)
-			delete newhandle;
+		// failure in module constructor
+		delete newmod;
+		delete newhandle;
 		LastModuleError = "Unable to load " + filename_str + ": " + modexcept.GetReason();
-		Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
+		ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
 		return false;
 	}
 
 	this->ModCount++;
-	FOREACH_MOD_I(Instance,I_OnLoadModule,OnLoadModule(newmod, filename_str));
+	FOREACH_MOD(I_OnLoadModule,OnLoadModule(newmod));
 
 	/* We give every module a chance to re-prioritize when we introduce a new one,
 	 * not just the one thats loading, as the new module could affect the preference
 	 * of others
 	 */
-	for (std::map<std::string, std::pair<ircd_module*, Module*> >::iterator n = Modules.begin(); n != Modules.end(); ++n)
-		n->second.second->Prioritize();
+	for(int tries = 0; tries < 20; tries++)
+	{
+		prioritizationState = tries > 0 ? PRIO_STATE_LAST : PRIO_STATE_FIRST;
+		for (std::map<std::string, Module*>::iterator n = Modules.begin(); n != Modules.end(); ++n)
+			n->second->Prioritize();
+
+		if (prioritizationState == PRIO_STATE_LAST)
+			break;
+		if (tries == 19)
+			ServerInstance->Logs->Log("MODULE", DEFAULT, "Hook priority dependency loop detected while loading " + filename_str);
+	}
 
-	Instance->BuildISupport();
+	ServerInstance->BuildISupport();
 	return true;
 }
 
-bool ModuleManager::Unload(const char* filename)
+bool ModuleManager::CanUnload(Module* mod)
 {
-	std::string filename_str(filename);
-	std::map<std::string, std::pair<ircd_module*, Module*> >::iterator modfind = Modules.find(filename);
+	std::map<std::string, Module*>::iterator modfind = Modules.find(mod->ModuleSourceFile);
 
-	if (modfind != Modules.end())
+	if (modfind == Modules.end() || modfind->second != mod)
 	{
-		if (modfind->second.second->GetVersion().Flags & VF_STATIC)
-		{
-			LastModuleError = "Module " + filename_str + " not unloadable (marked static)";
-			Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
-			return false;
-		}
-		std::pair<int,std::string> intercount = GetInterfaceInstanceCount(modfind->second.second);
-		if (intercount.first > 0)
-		{
-			LastModuleError = "Failed to unload module " + filename_str + ", being used by " + ConvToStr(intercount.first) + " other(s) via interface '" + intercount.second + "'";
-			Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
-			return false;
-		}
+		LastModuleError = "Module " + mod->ModuleSourceFile + " is not loaded, cannot unload it!";
+		ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
+		return false;
+	}
+	if (mod->GetVersion().Flags & VF_STATIC)
+	{
+		LastModuleError = "Module " + mod->ModuleSourceFile + " not unloadable (marked static)";
+		ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
+		return false;
+	}
+	std::pair<int,std::string> intercount = GetInterfaceInstanceCount(mod);
+	if (intercount.first > 0)
+	{
+		LastModuleError = "Failed to unload module " + mod->ModuleSourceFile + ", being used by " + ConvToStr(intercount.first) + " other(s) via interface '" + intercount.second + "'";
+		ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
+		return false;
+	}
+	return true;
+}
 
-		/* Give the module a chance to tidy out all its metadata */
-		for (chan_hash::iterator c = Instance->chanlist->begin(); c != Instance->chanlist->end(); c++)
-		{
-			modfind->second.second->OnCleanup(TYPE_CHANNEL,c->second);
-		}
-		for (user_hash::iterator u = Instance->Users->clientlist->begin(); u != Instance->Users->clientlist->end(); u++)
-		{
-			modfind->second.second->OnCleanup(TYPE_USER,u->second);
-		}
+void ModuleManager::DoSafeUnload(Module* mod)
+{
+	std::map<std::string, Module*>::iterator modfind = Modules.find(mod->ModuleSourceFile);
 
-		/* Tidy up any dangling resolvers */
-		Instance->Res->CleanResolvers(modfind->second.second);
+	std::vector<ExtensionItem*> items;
+	ServerInstance->Extensions.BeginUnregister(modfind->second, items);
+	/* Give the module a chance to tidy out all its metadata */
+	for (chan_hash::iterator c = ServerInstance->chanlist->begin(); c != ServerInstance->chanlist->end(); c++)
+	{
+		mod->OnCleanup(TYPE_CHANNEL,c->second);
+		c->second->doUnhookExtensions(items);
+		const UserMembList* users = c->second->GetUsers();
+		for(UserMembCIter mi = users->begin(); mi != users->end(); mi++)
+			mi->second->doUnhookExtensions(items);
+	}
+	for (user_hash::iterator u = ServerInstance->Users->clientlist->begin(); u != ServerInstance->Users->clientlist->end(); u++)
+	{
+		mod->OnCleanup(TYPE_USER,u->second);
+		u->second->doUnhookExtensions(items);
+	}
 
+	/* Tidy up any dangling resolvers */
+	ServerInstance->Res->CleanResolvers(mod);
 
-		FOREACH_MOD_I(Instance,I_OnUnloadModule,OnUnloadModule(modfind->second.second, modfind->first));
+	FOREACH_MOD(I_OnUnloadModule,OnUnloadModule(mod));
 
-		this->DetachAll(modfind->second.second);
+	DetachAll(mod);
 
-		Instance->Parser->RemoveCommands(filename);
+	Modules.erase(modfind);
+	ServerInstance->GlobalCulls.AddItem(mod);
 
-		delete modfind->second.second;
-		delete modfind->second.first;
-		Modules.erase(modfind);
+	ServerInstance->Logs->Log("MODULE", DEFAULT,"Module %s unloaded",mod->ModuleSourceFile.c_str());
+	this->ModCount--;
+	ServerInstance->BuildISupport();
+}
 
-		Instance->Logs->Log("MODULE", DEFAULT,"Module %s unloaded",filename);
-		this->ModCount--;
-		Instance->BuildISupport();
-		return true;
-	}
+namespace {
+	struct UnloadAction : public HandlerBase0<void>
+	{
+		Module* const mod;
+		UnloadAction(Module* m) : mod(m) {}
+		void Call()
+		{
+			DLLManager* dll = mod->ModuleDLLManager;
+			ServerInstance->Modules->DoSafeUnload(mod);
+			ServerInstance->GlobalCulls.Apply();
+			delete dll;
+			ServerInstance->GlobalCulls.AddItem(this);
+		}
+	};
 
-	LastModuleError = "Module " + filename_str + " is not loaded, cannot unload it!";
-	Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
-	return false;
+	struct ReloadAction : public HandlerBase0<void>
+	{
+		Module* const mod;
+		HandlerBase1<void, bool>* const callback;
+		ReloadAction(Module* m, HandlerBase1<void, bool>* c)
+			: mod(m), callback(c) {}
+		void Call()
+		{
+			DLLManager* dll = mod->ModuleDLLManager;
+			std::string name = mod->ModuleSourceFile;
+			ServerInstance->Modules->DoSafeUnload(mod);
+			ServerInstance->GlobalCulls.Apply();
+			delete dll;
+			bool rv = ServerInstance->Modules->Load(name.c_str());
+			callback->Call(rv);
+			ServerInstance->GlobalCulls.AddItem(this);
+		}
+	};
+}
+
+bool ModuleManager::Unload(Module* mod)
+{
+	if (!CanUnload(mod))
+		return false;
+	ServerInstance->AtomicActions.AddAction(new UnloadAction(mod));
+	return true;
+}
+
+void ModuleManager::Reload(Module* mod, HandlerBase1<void, bool>* callback)
+{
+	if (CanUnload(mod))
+		ServerInstance->AtomicActions.AddAction(new ReloadAction(mod, callback));
+	else
+		callback->Call(false);
 }
 
 /* We must load the modules AFTER initializing the socket engine, now */
 void ModuleManager::LoadAll()
 {
-	char configToken[MAXBUF];
-	ModCount = -1;
+	ModCount = 0;
+
+	printf("\nLoading core commands");
+	fflush(stdout);
 
-	for(int count = 0; count < Instance->Config->ConfValueEnum(Instance->Config->config_data, "module"); count++)
+	DIR* library = opendir(ServerInstance->Config->ModPath.c_str());
+	if (library)
 	{
-		Instance->Config->ConfValue(Instance->Config->config_data, "module", "name", count, configToken, MAXBUF);
-		printf_c("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n",configToken);
-		
-		if (!this->Load(configToken))		
+		dirent* entry = NULL;
+		while (0 != (entry = readdir(library)))
 		{
-			Instance->Logs->Log("MODULE", DEFAULT, this->LastError());
+			if (InspIRCd::Match(entry->d_name, "cmd_*.so", ascii_case_insensitive_map))
+			{
+				printf(".");
+				fflush(stdout);
+
+				if (!Load(entry->d_name))
+				{
+					ServerInstance->Logs->Log("MODULE", DEFAULT, this->LastError());
+					printf_c("\n[\033[1;31m*\033[0m] %s\n\n", this->LastError().c_str());
+					ServerInstance->Exit(EXIT_STATUS_MODULE);
+				}
+			}
+		}
+		closedir(library);
+		printf("\n");
+	}
+
+	for(int count = 0;; count++)
+	{
+		ConfigTag* tag = ServerInstance->Config->ConfValue("module", count);
+		if (!tag)
+			break;
+		std::string name = tag->getString("name");
+		printf_c("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n",name.c_str());
+
+		if (!this->Load(name.c_str()))
+		{
+			ServerInstance->Logs->Log("MODULE", DEFAULT, this->LastError());
 			printf_c("\n[\033[1;31m*\033[0m] %s\n\n", this->LastError().c_str());
-			Instance->Exit(EXIT_STATUS_MODULE);
+			ServerInstance->Exit(EXIT_STATUS_MODULE);
+		}
+	}
+}
+
+void ModuleManager::UnloadAll()
+{
+	/* We do this more than once, so that any service providers get a
+	 * chance to be unhooked by the modules using them, but then get
+	 * a chance to be removed themsleves.
+	 *
+	 * Note: this deliberately does NOT delete the DLLManager objects
+	 */
+	for (int tries = 0; tries < 4; tries++)
+	{
+		std::map<std::string, Module*>::iterator i = Modules.begin();
+		while (i != Modules.end())
+		{
+			std::map<std::string, Module*>::iterator me = i++;
+			if (CanUnload(me->second))
+			{
+				ServerInstance->GlobalCulls.AddItem(me->second);
+				Modules.erase(me);
+			}
 		}
+		ServerInstance->GlobalCulls.Apply();
 	}
 }
 
@@ -591,7 +625,7 @@ bool ModuleManager::PublishFeature(const std::string &FeatureName, Module* Mod)
 bool ModuleManager::UnpublishFeature(const std::string &FeatureName)
 {
 	featurelist::iterator iter = Features.find(FeatureName);
-	
+
 	if (iter == Features.end())
 		return false;
 
@@ -702,38 +736,15 @@ const std::string& ModuleManager::GetModuleName(Module* m)
 {
 	static std::string nothing;
 
-	for (std::map<std::string, std::pair<ircd_module*, Module*> >::iterator n = Modules.begin(); n != Modules.end(); ++n)
+	for (std::map<std::string, Module*>::iterator n = Modules.begin(); n != Modules.end(); ++n)
 	{
-		if (n->second.second == m)
+		if (n->second == m)
 			return n->first;
 	}
 
 	return nothing;
 }
 
-/* This is ugly, yes, but hash_map's arent designed to be
- * addressed in this manner, and this is a bit of a kludge.
- * Luckily its a specialist function and rarely used by
- * many modules (in fact, it was specially created to make
- * m_safelist possible, initially).
- */
-
-Channel* InspIRCd::GetChannelIndex(long index)
-{
-	int target = 0;
-	for (chan_hash::iterator n = this->chanlist->begin(); n != this->chanlist->end(); n++, target++)
-	{
-		if (index == target)
-			return n->second;
-	}
-	return NULL;
-}
-
-bool InspIRCd::MatchText(const std::string &sliteral, const std::string &spattern)
-{
-	return match(sliteral, spattern);
-}
-
 CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const std::vector<std::string>& parameters, User* user)
 {
 	return this->Parser->CallHandler(commandname, parameters, user);
@@ -746,37 +757,63 @@ bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, Us
 
 void InspIRCd::AddCommand(Command *f)
 {
-	if (!this->Parser->CreateCommand(f))
+	if (!this->Parser->AddCommand(f))
 	{
-		ModuleException err("Command "+std::string(f->command)+" already exists.");
-		throw (err);
+		throw ModuleException("Command "+std::string(f->command)+" already exists.");
 	}
 }
 
 void InspIRCd::SendMode(const std::vector<std::string>& parameters, User *user)
 {
-	this->Modes->Process(parameters, user, true);
+	this->Modes->Process(parameters, user);
+}
+
+void InspIRCd::DumpText(User* user, const std::string &text)
+{
+	if (IS_LOCAL(user))
+	{
+		user->Write(text);
+	}
+	else
+	{
+		PI->PushToClient(user, text);
+	}
+}
+
+void InspIRCd::DumpText(User* user, const char *text, ...)
+{
+	va_list argsPtr;
+	char line[MAXBUF];
+
+	va_start(argsPtr, text);
+	vsnprintf(line, MAXBUF, text, argsPtr);
+	va_end(argsPtr);
+
+	DumpText(user, std::string(line));
 }
 
-void InspIRCd::DumpText(User* User, const std::string &LinePrefix, std::stringstream &TextStream)
+void InspIRCd::DumpText(User* user, const std::string &LinePrefix, std::stringstream &TextStream)
 {
-	std::string CompleteLine = LinePrefix;
+	char line[MAXBUF];
+	int start_pos = LinePrefix.length();
+	int pos = start_pos;
+	memcpy(line, LinePrefix.data(), pos);
 	std::string Word;
 	while (TextStream >> Word)
 	{
-		if (CompleteLine.length() + Word.length() + 3 > 500)
+		int len = Word.length();
+		if (pos + len + 12 > MAXBUF)
 		{
-			User->WriteServ(CompleteLine);
-			CompleteLine = LinePrefix;
+			line[pos] = '\0';
+			DumpText(user, std::string(line));
+			pos = start_pos;
 		}
-		CompleteLine = CompleteLine + Word + " ";
+		line[pos] = ' ';
+		memcpy(line + pos + 1, Word.data(), len);
+		pos += len + 1;
 	}
-	User->WriteServ(CompleteLine);
-}
-
-User* FindDescriptorHandler::Call(int socket)
-{
-	return reinterpret_cast<User*>(Server->SE->GetRef(socket));
+	line[pos] = '\0';
+	DumpText(user, std::string(line));
 }
 
 bool InspIRCd::AddResolver(Resolver* r, bool cached)
@@ -793,62 +830,39 @@ bool InspIRCd::AddResolver(Resolver* r, bool cached)
 
 Module* ModuleManager::Find(const std::string &name)
 {
-	std::map<std::string, std::pair<ircd_module*, Module*> >::iterator modfind = Modules.find(name);
+	std::map<std::string, Module*>::iterator modfind = Modules.find(name);
 
 	if (modfind == Modules.end())
 		return NULL;
 	else
-		return modfind->second.second;
+		return modfind->second;
 }
 
 const std::vector<std::string> ModuleManager::GetAllModuleNames(int filter)
 {
 	std::vector<std::string> retval;
-	for (std::map<std::string, std::pair<ircd_module*, Module*> >::iterator x = Modules.begin(); x != Modules.end(); ++x)
-		if (!filter || (x->second.second->GetVersion().Flags & filter))
+	for (std::map<std::string, Module*>::iterator x = Modules.begin(); x != Modules.end(); ++x)
+		if (!filter || (x->second->GetVersion().Flags & filter))
 			retval.push_back(x->first);
 	return retval;
 }
 
-ConfigReader::ConfigReader(InspIRCd* Instance) : ServerInstance(Instance)
+ConfigReader::ConfigReader()
 {
-	this->errorlog = new std::ostringstream(std::stringstream::in | std::stringstream::out);
-	this->error = CONF_NO_ERROR;
-	this->data = &ServerInstance->Config->config_data;
-	this->privatehash = false;
+	this->error = 0;
 }
 
 
 ConfigReader::~ConfigReader()
 {
-	if (this->errorlog)
-		delete this->errorlog;
-	if(this->privatehash)
-		delete this->data;
-}
-
-
-ConfigReader::ConfigReader(InspIRCd* Instance, const std::string &filename) : ServerInstance(Instance)
-{
-	ServerInstance->Config->ClearStack();
-
-	this->error = CONF_NO_ERROR;
-	this->data = new ConfigDataHash;
-	this->privatehash = true;
-	this->errorlog = new std::ostringstream(std::stringstream::in | std::stringstream::out);
-	/*** XXX: This might block! */
-	this->readerror = ServerInstance->Config->DoInclude(*this->data, filename, *this->errorlog);
-	if (!this->readerror)
-		this->error = CONF_FILE_NOT_FOUND;
 }
 
 
 std::string ConfigReader::ReadValue(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool allow_linefeeds)
 {
-	/* Don't need to strlcpy() tag and name anymore, ReadConf() takes const char* */ 
-	std::string result;
-	
-	if (!ServerInstance->Config->ConfValue(*this->data, tag, name, default_value, index, result, allow_linefeeds))
+	/* Don't need to strlcpy() tag and name anymore, ReadConf() takes const char* */
+	std::string result = default_value;
+	if (!ServerInstance->Config->ConfValue(tag, index)->readString(name, result, allow_linefeeds))
 	{
 		this->error = CONF_VALUE_NOT_FOUND;
 	}
@@ -862,7 +876,8 @@ std::string ConfigReader::ReadValue(const std::string &tag, const std::string &n
 
 bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, const std::string &default_value, int index)
 {
-	return ServerInstance->Config->ConfValueBool(*this->data, tag, name, default_value, index);
+	bool def = (default_value == "yes");
+	return ServerInstance->Config->ConfValue(tag, index)->getBool(name, def);
 }
 
 bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, int index)
@@ -873,20 +888,15 @@ bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, int
 
 int ConfigReader::ReadInteger(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool need_positive)
 {
-	int result;
-	
-	if(!ServerInstance->Config->ConfValueInteger(*this->data, tag, name, default_value, index, result))
-	{
-		this->error = CONF_VALUE_NOT_FOUND;
-		return 0;
-	}
-	
+	int v = atoi(default_value.c_str());
+	int result = ServerInstance->Config->ConfValue(tag, index)->getInt(name, v);
+
 	if ((need_positive) && (result < 0))
 	{
 		this->error = CONF_INT_NEGATIVE;
 		return 0;
 	}
-	
+
 	return result;
 }
 
@@ -902,34 +912,21 @@ long ConfigReader::GetError()
 	return olderr;
 }
 
-void ConfigReader::DumpErrors(bool bail, User* user)
-{
-	ServerInstance->Config->ReportConfigError(this->errorlog->str(), bail, user);
-}
-
-
 int ConfigReader::Enumerate(const std::string &tag)
 {
-	return ServerInstance->Config->ConfValueEnum(*this->data, tag);
+	ServerInstance->Logs->Log("MODULE", DEBUG, "Module is using ConfigReader::Enumerate on %s; this is slow!",
+		tag.c_str());
+	int i=0;
+	while (ServerInstance->Config->ConfValue(tag, i)) i++;
+	return i;
 }
 
-int ConfigReader::EnumerateValues(const std::string &tag, int index)
-{
-	return ServerInstance->Config->ConfVarEnum(*this->data, tag, index);
-}
-
-bool ConfigReader::Verify()
-{
-	return this->readerror;
-}
-
-
-FileReader::FileReader(InspIRCd* Instance, const std::string &filename) : ServerInstance(Instance)
+FileReader::FileReader(const std::string &filename)
 {
 	LoadFile(filename);
 }
 
-FileReader::FileReader(InspIRCd* Instance) : ServerInstance(Instance)
+FileReader::FileReader()
 {
 }