X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=563e06c28b6498811fb3d9ba43fd007a48f29281;hb=56e1f95a114c2f12bb3e7a00d902d45c6ded2ade;hp=f0ef1f383e467c57191c968225617a70cc6bcddf;hpb=30fcadd1967449ae72da8c6e787c3b9cb9166234;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules.cpp b/src/modules.cpp
index f0ef1f383..563e06c28 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -12,17 +12,13 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "wildcard.h"
-#include "mode.h"
 #include "xline.h"
 #include "socket.h"
 #include "socketengine.h"
 #include "command_parse.h"
 #include "dns.h"
-
+#include "exitcodes.h"
 
 #ifndef WIN32
 	#include <dirent.h>
@@ -195,81 +191,26 @@ void		Module::OnSetAway(userrec* user) { }
 void		Module::OnCancelAway(userrec* user) { }
 int		Module::OnUserList(userrec* user, chanrec* Ptr, CUList* &userlist) { return 0; }
 int		Module::OnWhoisLine(userrec* user, userrec* dest, int &numeric, std::string &text) { return 0; }
-void		Module::OnBuildExemptList(MessageType message_type, chanrec* chan, userrec* sender, char status, CUList &exempt_list) { }
+void		Module::OnBuildExemptList(MessageType message_type, chanrec* chan, userrec* sender, char status, CUList &exempt_list, const std::string &text) { }
 void		Module::OnGarbageCollect() { }
 void		Module::OnBufferFlushed(userrec* user) { }
 
 
-bool InspIRCd::UnloadModule(const char* filename)
+ModuleManager::ModuleManager(InspIRCd* Ins)
+: ModCount(0), Instance(Ins)
 {
-	std::string filename_str = filename;
-	for (unsigned int j = 0; j != Config->module_names.size(); j++)
-	{
-		if (Config->module_names[j] == filename_str)
-		{
-			if (modules[j]->GetVersion().Flags & VF_STATIC)
-			{
-				this->Log(DEFAULT,"Failed to unload STATIC module %s",filename);
-				snprintf(MODERR,MAXBUF,"Module not unloadable (marked static)");
-				return false;
-			}
-			std::pair<int,std::string> intercount = GetInterfaceInstanceCount(modules[j]);
-			if (intercount.first > 0)
-			{
-				this->Log(DEFAULT,"Failed to unload module %s, being used by %d other(s) via interface '%s'",filename, intercount.first, intercount.second.c_str());
-				snprintf(MODERR,MAXBUF,"Module not unloadable (Still in use by %d other module%s which %s using its interface '%s') -- unload dependent modules first!",
-						intercount.first,
-						intercount.first > 1 ? "s" : "",
-						intercount.first > 1 ? "are" : "is",
-						intercount.second.c_str());
-				return false;
-			}
-			/* Give the module a chance to tidy out all its metadata */
-			for (chan_hash::iterator c = this->chanlist->begin(); c != this->chanlist->end(); c++)
-			{
-				modules[j]->OnCleanup(TYPE_CHANNEL,c->second);
-			}
-			for (user_hash::iterator u = this->clientlist->begin(); u != this->clientlist->end(); u++)
-			{
-				modules[j]->OnCleanup(TYPE_USER,u->second);
-			}
-
-			/* Tidy up any dangling resolvers */
-			this->Res->CleanResolvers(modules[j]);
-
-			FOREACH_MOD_I(this,I_OnUnloadModule,OnUnloadModule(modules[j],Config->module_names[j]));
-
-			for(int t = 0; t < 255; t++)
-			{
-				Config->global_implementation[t] -= Config->implement_lists[j][t];
-			}
+}
 
-			/* We have to renumber implement_lists after unload because the module numbers change!
-			 */
-			for(int j2 = j; j2 < 254; j2++)
-			{
-				for(int t = 0; t < 255; t++)
-				{
-					Config->implement_lists[j2][t] = Config->implement_lists[j2+1][t];
-				}
-			}
+ModuleManager::~ModuleManager()
+{
+}
 
-			// found the module
-			Parser->RemoveCommands(filename);
-			this->EraseModule(j);
-			this->EraseFactory(j);
-			this->Log(DEFAULT,"Module %s unloaded",filename);
-			this->ModCount--;
-			BuildISupport();
-			return true;
-		}
-	}
-	this->Log(DEFAULT,"Module %s is not loaded, cannot unload it!",filename);
-	snprintf(MODERR,MAXBUF,"Module not loaded");
-	return false;
+const char* ModuleManager::LastError()
+{
+	return MODERR;
 }
 
-bool InspIRCd::LoadModule(const char* filename)
+bool ModuleManager::Load(const char* filename)
 {
 	/* Do we have a glob pattern in the filename?
 	 * The user wants to load multiple modules which
@@ -278,16 +219,16 @@ bool InspIRCd::LoadModule(const char* filename)
 	if (strchr(filename,'*') || (strchr(filename,'?')))
 	{
 		int n_match = 0;
-		DIR* library = opendir(Config->ModPath);
+		DIR* library = opendir(Instance->Config->ModPath);
 		if (library)
 		{
 			/* Try and locate and load all modules matching the pattern */
 			dirent* entry = NULL;
 			while ((entry = readdir(library)))
 			{
-				if (this->MatchText(entry->d_name, filename))
+				if (Instance->MatchText(entry->d_name, filename))
 				{
-					if (!this->LoadModule(entry->d_name))
+					if (!this->Load(entry->d_name))
 						n_match++;
 				}
 			}
@@ -301,109 +242,122 @@ bool InspIRCd::LoadModule(const char* filename)
 	}
 
 	char modfile[MAXBUF];
-	snprintf(modfile,MAXBUF,"%s/%s",Config->ModPath,filename);
+	snprintf(modfile,MAXBUF,"%s/%s",Instance->Config->ModPath,filename);
 	std::string filename_str = filename;
 
 	if (!ServerConfig::DirValid(modfile))
 	{
-		this->Log(DEFAULT,"Module %s is not within the modules directory.",modfile);
-		snprintf(MODERR,MAXBUF,"Module %s is not within the modules directory.",modfile);
+		snprintf(MODERR, MAXBUF,"Module %s is not within the modules directory.", modfile);
+		Instance->Log(DEFAULT, MODERR);
+		return false;
+	}
+	
+	if (!ServerConfig::FileExists(modfile))
+	{
+		snprintf(MODERR,MAXBUF,"Module file could not be found: %s", modfile);
+		Instance->Log(DEFAULT, MODERR);
+		return false;
+	}
+	
+	if(find(Instance->Config->module_names.begin(), Instance->Config->module_names.end(), filename_str) != Instance->Config->module_names.end())
+	{	
+		Instance->Log(DEFAULT,"Module %s is already loaded, cannot load a module twice!",modfile);
+		snprintf(MODERR, MAXBUF, "Module already loaded");
 		return false;
 	}
-	if (ServerConfig::FileExists(modfile))
+		
+	Module* newmod;
+	ircd_module* newhandle;
+	
+	newmod = NULL;
+	newhandle = NULL;
+		
+	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");
+			
+		handles[this->ModCount+1] = newhandle;
+			
+		newmod = handles[this->ModCount+1]->CallInit();
 
-		for (unsigned int j = 0; j < Config->module_names.size(); j++)
+		if(newmod)
 		{
-			if (Config->module_names[j] == filename_str)
+			Version v = newmod->GetVersion();
+
+			if (v.API != API_VERSION)
 			{
-				this->Log(DEFAULT,"Module %s is already loaded, cannot load a module twice!",modfile);
-				snprintf(MODERR,MAXBUF,"Module already loaded");
+				delete newmod;
+				Instance->Log(DEFAULT,"Unable to load %s: Incorrect module API version: %d (our version: %d)",modfile,v.API,API_VERSION);
+				snprintf(MODERR,MAXBUF,"Loader/Linker error: Incorrect module API version: %d (our version: %d)",v.API,API_VERSION);
 				return false;
 			}
-		}
-		Module* m = NULL;
-		ircd_module* a = NULL;
-		try
-		{
-			a = new ircd_module(this, modfile);
-			factory[this->ModCount+1] = a;
-			if (factory[this->ModCount+1]->LastError())
+			else
 			{
-				this->Log(DEFAULT,"Unable to load %s: %s",modfile,factory[this->ModCount+1]->LastError());
-				snprintf(MODERR,MAXBUF,"Loader/Linker error: %s",factory[this->ModCount+1]->LastError());
-				return false;
+				Instance->Log(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]"));
 			}
-			if ((long)factory[this->ModCount+1]->factory != -1)
-			{
-				m = factory[this->ModCount+1]->factory->CreateModule(this);
 
-				Version v = m->GetVersion();
-
-				if (v.API != API_VERSION)
-				{
-					delete m;
-					this->Log(DEFAULT,"Unable to load %s: Incorrect module API version: %d (our version: %d)",modfile,v.API,API_VERSION);
-					snprintf(MODERR,MAXBUF,"Loader/Linker error: Incorrect module API version: %d (our version: %d)",v.API,API_VERSION);
-					return false;
-				}
-				else
-				{
-					this->Log(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]"));
-				}
+			modules[this->ModCount+1] = newmod;
+				
+			/* save the module and the module's classfactory, if
+			 * this isnt done, random crashes can occur :/ */
+			Instance->Config->module_names.push_back(filename);
 
-				modules[this->ModCount+1] = m;
-				/* save the module and the module's classfactory, if
-				 * this isnt done, random crashes can occur :/ */
-				Config->module_names.push_back(filename);
-
-				char* x = &Config->implement_lists[this->ModCount+1][0];
-				for(int t = 0; t < 255; t++)
-					x[t] = 0;
+			char* x = &Instance->Config->implement_lists[this->ModCount+1][0];
+			for(int t = 0; t < 255; t++)
+				x[t] = 0;
 
-				modules[this->ModCount+1]->Implements(x);
+			modules[this->ModCount+1]->Implements(x);
 
-				for(int t = 0; t < 255; t++)
-					Config->global_implementation[t] += Config->implement_lists[this->ModCount+1][t];
-			}
-			else
-			{
-				this->Log(DEFAULT,"Unable to load %s",modfile);
-				snprintf(MODERR,MAXBUF,"Factory function failed: Probably missing init_module() entrypoint.");
-				return false;
-			}
+			for(int t = 0; t < 255; t++)
+				Instance->Config->global_implementation[t] += Instance->Config->implement_lists[this->ModCount+1][t];
 		}
-		catch (CoreException& modexcept)
+		else
 		{
-			this->Log(DEFAULT,"Unable to load %s: %s",modfile,modexcept.GetReason());
-			snprintf(MODERR,MAXBUF,"Factory function of %s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+			Instance->Log(DEFAULT, "Unable to load %s",modfile);
+			snprintf(MODERR,MAXBUF, "Probably missing init_module() entrypoint, but dlsym() didn't notice a problem");
 			return false;
 		}
 	}
-	else
+	catch (LoadModuleException& modexcept)
+	{
+		Instance->Log(DEFAULT,"Unable to load %s: %s", modfile, modexcept.GetReason());
+		snprintf(MODERR,MAXBUF,"Loader/Linker error: %s", modexcept.GetReason());
+		return false;
+	}
+	catch (FindSymbolException& modexcept)
 	{
-		this->Log(DEFAULT,"InspIRCd: startup: Module Not Found %s",modfile);
-		snprintf(MODERR,MAXBUF,"Module file could not be found");
+		Instance->Log(DEFAULT,"Unable to load %s: %s", modfile, modexcept.GetReason());
+		snprintf(MODERR,MAXBUF,"Loader/Linker error: %s", modexcept.GetReason());
 		return false;
 	}
+	catch (CoreException& modexcept)
+	{
+		Instance->Log(DEFAULT,"Unable to load %s: %s",modfile,modexcept.GetReason());
+		snprintf(MODERR,MAXBUF,"Factory function of %s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+		return false;
+	}
+	
 	this->ModCount++;
-	FOREACH_MOD_I(this,I_OnLoadModule,OnLoadModule(modules[this->ModCount],filename_str));
+	FOREACH_MOD_I(Instance,I_OnLoadModule,OnLoadModule(modules[this->ModCount],filename_str));
 	// now work out which modules, if any, want to move to the back of the queue,
 	// and if they do, move them there.
 	std::vector<std::string> put_to_back;
 	std::vector<std::string> put_to_front;
 	std::map<std::string,std::string> put_before;
 	std::map<std::string,std::string> put_after;
-	for (unsigned int j = 0; j < Config->module_names.size(); j++)
+	for (unsigned int j = 0; j < Instance->Config->module_names.size(); j++)
 	{
 		if (modules[j]->Prioritize() == PRIORITY_LAST)
-			put_to_back.push_back(Config->module_names[j]);
+			put_to_back.push_back(Instance->Config->module_names[j]);
 		else if (modules[j]->Prioritize() == PRIORITY_FIRST)
-			put_to_front.push_back(Config->module_names[j]);
+			put_to_front.push_back(Instance->Config->module_names[j]);
 		else if ((modules[j]->Prioritize() & 0xFF) == PRIORITY_BEFORE)
-			put_before[Config->module_names[j]] = Config->module_names[modules[j]->Prioritize() >> 8];
+			put_before[Instance->Config->module_names[j]] = Instance->Config->module_names[modules[j]->Prioritize() >> 8];
 		else if ((modules[j]->Prioritize() & 0xFF) == PRIORITY_AFTER)
-			put_after[Config->module_names[j]] = Config->module_names[modules[j]->Prioritize() >> 8];
+			put_after[Instance->Config->module_names[j]] = Instance->Config->module_names[modules[j]->Prioritize() >> 8];
 	}
 	for (unsigned int j = 0; j < put_to_back.size(); j++)
 		MoveToLast(put_to_back[j]);
@@ -413,15 +367,246 @@ bool InspIRCd::LoadModule(const char* filename)
 		MoveBefore(j->first,j->second);
 	for (std::map<std::string,std::string>::iterator j = put_after.begin(); j != put_after.end(); j++)
 		MoveAfter(j->first,j->second);
-	BuildISupport();
+	Instance->BuildISupport();
 	return true;
 }
 
-long InspIRCd::PriorityAfter(const std::string &modulename)
+bool ModuleManager::EraseHandle(unsigned int j)
+{
+	ModuleHandleList::iterator iter;
+	
+	if((j < 0) || (j >= handles.size()))
+	{
+		return false;
+	}
+	
+	iter = handles.begin() + j;
+
+	if(*iter)
+	{
+		delete *iter;	
+		handles.erase(iter);
+ 		handles.push_back(NULL);
+	}
+
+	return true;
+}
+
+bool ModuleManager::EraseModule(unsigned int j)
+{
+	bool success = false;
+	
+	{
+		ModuleList::iterator iter;	
+	
+		if((j < 0) || (j >= modules.size()))
+		{
+			return false;
+		}
+	
+		iter = modules.begin() + j;
+
+		if(*iter)
+		{
+			delete *iter;	
+			modules.erase(iter);
+	 		modules.push_back(NULL);
+			success = true;
+		}
+	}
+	
+	{
+		std::vector<std::string>::iterator iter;	
+	
+		if((j < 0) || (j >= Instance->Config->module_names.size()))
+		{
+			return false;
+		}
+	
+		iter = Instance->Config->module_names.begin() + j;
+
+		Instance->Config->module_names.erase(iter);
+		success = true;
+	}
+
+	return success;
+}
+
+void ModuleManager::MoveTo(std::string modulename,int slot)
+{
+	unsigned int v2 = 256;
+	
+	for (unsigned int v = 0; v < Instance->Config->module_names.size(); v++)
+	{
+		if (Instance->Config->module_names[v] == modulename)
+		{
+			// found an instance, swap it with the item at the end
+			v2 = v;
+			break;
+		}
+	}
+	if ((v2 != (unsigned int)slot) && (v2 < 256))
+	{
+		// Swap the module names over
+		Instance->Config->module_names[v2] = Instance->Config->module_names[slot];
+		Instance->Config->module_names[slot] = modulename;
+		// now swap the module factories
+		ircd_module* temp = handles[v2];
+		handles[v2] = handles[slot];
+		handles[slot] = temp;
+		// now swap the module objects
+		Module* temp_module = modules[v2];
+		modules[v2] = modules[slot];
+		modules[slot] = temp_module;
+		// now swap the implement lists (we dont
+		// need to swap the global or recount it)
+		for (int n = 0; n < 255; n++)
+		{
+			char x = Instance->Config->implement_lists[v2][n];
+			Instance->Config->implement_lists[v2][n] = Instance->Config->implement_lists[slot][n];
+			Instance->Config->implement_lists[slot][n] = x;
+		}
+	}
+}
+
+void ModuleManager::MoveAfter(std::string modulename, std::string after)
+{
+	for (unsigned int v = 0; v < Instance->Config->module_names.size(); v++)
+	{
+		if (Instance->Config->module_names[v] == after)
+		{
+			MoveTo(modulename, v);
+			return;
+		}
+	}
+}
+
+void ModuleManager::MoveBefore(std::string modulename, std::string before)
+{
+	for (unsigned int v = 0; v < Instance->Config->module_names.size(); v++)
+	{
+		if (Instance->Config->module_names[v] == before)
+		{
+			if (v > 0)
+			{
+				MoveTo(modulename, v-1);
+			}
+			else
+			{
+				MoveTo(modulename, v);
+			}
+			return;
+		}
+	}
+}
+
+void ModuleManager::MoveToFirst(std::string modulename)
+{
+	MoveTo(modulename,0);
+}
+
+void ModuleManager::MoveToLast(std::string modulename)
+{
+	MoveTo(modulename,this->GetCount());
+}
+
+bool ModuleManager::Unload(const char* filename)
+{
+	std::string filename_str = filename;
+	for (unsigned int j = 0; j != Instance->Config->module_names.size(); j++)
+	{
+		if (Instance->Config->module_names[j] == filename_str)
+		{
+			if (modules[j]->GetVersion().Flags & VF_STATIC)
+			{
+				Instance->Log(DEFAULT,"Failed to unload STATIC module %s",filename);
+				snprintf(MODERR,MAXBUF,"Module not unloadable (marked static)");
+				return false;
+			}
+			std::pair<int,std::string> intercount = GetInterfaceInstanceCount(modules[j]);
+			if (intercount.first > 0)
+			{
+				Instance->Log(DEFAULT,"Failed to unload module %s, being used by %d other(s) via interface '%s'",filename, intercount.first, intercount.second.c_str());
+				snprintf(MODERR,MAXBUF,"Module not unloadable (Still in use by %d other module%s which %s using its interface '%s') -- unload dependent modules first!",
+						intercount.first,
+						intercount.first > 1 ? "s" : "",
+						intercount.first > 1 ? "are" : "is",
+						intercount.second.c_str());
+				return false;
+			}
+			/* Give the module a chance to tidy out all its metadata */
+			for (chan_hash::iterator c = Instance->chanlist->begin(); c != Instance->chanlist->end(); c++)
+			{
+				modules[j]->OnCleanup(TYPE_CHANNEL,c->second);
+			}
+			for (user_hash::iterator u = Instance->clientlist->begin(); u != Instance->clientlist->end(); u++)
+			{
+				modules[j]->OnCleanup(TYPE_USER,u->second);
+			}
+
+			/* Tidy up any dangling resolvers */
+			Instance->Res->CleanResolvers(modules[j]);
+
+			FOREACH_MOD_I(Instance,I_OnUnloadModule,OnUnloadModule(modules[j],Instance->Config->module_names[j]));
+
+			for(int t = 0; t < 255; t++)
+			{
+				Instance->Config->global_implementation[t] -= Instance->Config->implement_lists[j][t];
+			}
+
+			/* We have to renumber implement_lists after unload because the module numbers change!
+			 */
+			for(int j2 = j; j2 < 254; j2++)
+			{
+				for(int t = 0; t < 255; t++)
+				{
+					Instance->Config->implement_lists[j2][t] = Instance->Config->implement_lists[j2+1][t];
+				}
+			}
+
+			// found the module
+			Instance->Parser->RemoveCommands(filename);
+			this->EraseModule(j);
+			this->EraseHandle(j);
+			Instance->Log(DEFAULT,"Module %s unloaded",filename);
+			this->ModCount--;
+			Instance->BuildISupport();
+			return true;
+		}
+	}
+	Instance->Log(DEFAULT,"Module %s is not loaded, cannot unload it!",filename);
+	snprintf(MODERR,MAXBUF,"Module not loaded");
+	return false;
+}
+
+/* We must load the modules AFTER initializing the socket engine, now */
+void ModuleManager::LoadAll()
 {
-	for (unsigned int j = 0; j < this->Config->module_names.size(); j++)
+	char configToken[MAXBUF];
+	Instance->Config->module_names.clear();
+	ModCount = -1;
+
+	for(int count = 0; count < Instance->Config->ConfValueEnum(Instance->Config->config_data, "module"); count++)
+	{
+		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))		
+		{
+			Instance->Log(DEFAULT,"There was an error loading the module '%s': %s", configToken, this->LastError());
+			printf_c("\n[\033[1;31m*\033[0m] There was an error loading the module '%s': %s\n\n", configToken, this->LastError());
+			Instance->Exit(EXIT_STATUS_MODULE);
+		}
+	}
+	printf_c("\nA total of \033[1;32m%d\033[0m module%s been loaded.\n", (this->GetCount()+1), (this->GetCount()+1) == 1 ? " has" : "s have");
+	Instance->Log(DEFAULT,"Total loaded modules: %d", this->GetCount());
+}
+
+long ModuleManager::PriorityAfter(const std::string &modulename)
+{
+	for (unsigned int j = 0; j < Instance->Config->module_names.size(); j++)
 	{
-		if (this->Config->module_names[j] == modulename)
+		if (Instance->Config->module_names[j] == modulename)
 		{
 			return ((j << 8) | PRIORITY_AFTER);
 		}
@@ -429,11 +614,11 @@ long InspIRCd::PriorityAfter(const std::string &modulename)
 	return PRIORITY_DONTCARE;
 }
 
-long InspIRCd::PriorityBefore(const std::string &modulename)
+long ModuleManager::PriorityBefore(const std::string &modulename)
 {
-	for (unsigned int j = 0; j < this->Config->module_names.size(); j++)
+	for (unsigned int j = 0; j < Instance->Config->module_names.size(); j++)
 	{
-		if (this->Config->module_names[j] == modulename)
+		if (Instance->Config->module_names[j] == modulename)
 		{
 			return ((j << 8) | PRIORITY_BEFORE);
 		}
@@ -441,7 +626,7 @@ long InspIRCd::PriorityBefore(const std::string &modulename)
 	return PRIORITY_DONTCARE;
 }
 
-bool InspIRCd::PublishFeature(const std::string &FeatureName, Module* Mod)
+bool ModuleManager::PublishFeature(const std::string &FeatureName, Module* Mod)
 {
 	if (Features.find(FeatureName) == Features.end())
 	{
@@ -451,7 +636,7 @@ bool InspIRCd::PublishFeature(const std::string &FeatureName, Module* Mod)
 	return false;
 }
 
-bool InspIRCd::UnpublishFeature(const std::string &FeatureName)
+bool ModuleManager::UnpublishFeature(const std::string &FeatureName)
 {
 	featurelist::iterator iter = Features.find(FeatureName);
 	
@@ -462,7 +647,7 @@ bool InspIRCd::UnpublishFeature(const std::string &FeatureName)
 	return true;
 }
 
-Module* InspIRCd::FindFeature(const std::string &FeatureName)
+Module* ModuleManager::FindFeature(const std::string &FeatureName)
 {
 	featurelist::iterator iter = Features.find(FeatureName);
 
@@ -472,7 +657,7 @@ Module* InspIRCd::FindFeature(const std::string &FeatureName)
 	return iter->second;
 }
 
-bool InspIRCd::PublishInterface(const std::string &InterfaceName, Module* Mod)
+bool ModuleManager::PublishInterface(const std::string &InterfaceName, Module* Mod)
 {
 	interfacelist::iterator iter = Interfaces.find(InterfaceName);
 
@@ -491,7 +676,7 @@ bool InspIRCd::PublishInterface(const std::string &InterfaceName, Module* Mod)
 	return false;
 }
 
-bool InspIRCd::UnpublishInterface(const std::string &InterfaceName, Module* Mod)
+bool ModuleManager::UnpublishInterface(const std::string &InterfaceName, Module* Mod)
 {
 	interfacelist::iterator iter = Interfaces.find(InterfaceName);
 
@@ -511,7 +696,7 @@ bool InspIRCd::UnpublishInterface(const std::string &InterfaceName, Module* Mod)
 	return false;
 }
 
-modulelist* InspIRCd::FindInterface(const std::string &InterfaceName)
+modulelist* ModuleManager::FindInterface(const std::string &InterfaceName)
 {
 	interfacelist::iterator iter = Interfaces.find(InterfaceName);
 	if (iter == Interfaces.end())
@@ -520,7 +705,7 @@ modulelist* InspIRCd::FindInterface(const std::string &InterfaceName)
 		return &(iter->second.second);
 }
 
-void InspIRCd::UseInterface(const std::string &InterfaceName)
+void ModuleManager::UseInterface(const std::string &InterfaceName)
 {
 	interfacelist::iterator iter = Interfaces.find(InterfaceName);
 	if (iter != Interfaces.end())
@@ -528,14 +713,14 @@ void InspIRCd::UseInterface(const std::string &InterfaceName)
 
 }
 
-void InspIRCd::DoneWithInterface(const std::string &InterfaceName)
+void ModuleManager::DoneWithInterface(const std::string &InterfaceName)
 {
 	interfacelist::iterator iter = Interfaces.find(InterfaceName);
 	if (iter != Interfaces.end())
 		iter->second.first--;
 }
 
-std::pair<int,std::string> InspIRCd::GetInterfaceInstanceCount(Module* m)
+std::pair<int,std::string> ModuleManager::GetInterfaceInstanceCount(Module* m)
 {
 	for (interfacelist::iterator iter = Interfaces.begin(); iter != Interfaces.end(); iter++)
 	{
@@ -550,32 +735,23 @@ std::pair<int,std::string> InspIRCd::GetInterfaceInstanceCount(Module* m)
 	return std::make_pair(0, "");
 }
 
-const std::string& InspIRCd::GetModuleName(Module* m)
+const std::string& ModuleManager::GetModuleName(Module* m)
 {
 	static std::string nothing; /* Prevent compiler warning */
 
-	if (!this->GetModuleCount())
+	if (!this->GetCount())
 		return nothing;
 
-	for (int i = 0; i <= this->GetModuleCount(); i++)
+	for (int i = 0; i <= this->GetCount(); i++)
 	{
 		if (this->modules[i] == m)
 		{
-			return this->Config->module_names[i];
+			return Instance->Config->module_names[i];
 		}
 	}
 	return nothing; /* As above */
 }
 
-void InspIRCd::RehashServer()
-{
-	this->WriteOpers("*** Rehashing config file");
-	this->RehashUsersAndChans();
-	this->Config->Read(false,NULL);
-	this->ResetMaxBans();
-	this->Res->Rehash();
-}
-
 /* 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
@@ -639,9 +815,9 @@ void InspIRCd::DumpText(userrec* User, const std::string &LinePrefix, stringstre
 	User->WriteServ(CompleteLine);
 }
 
-userrec* InspIRCd::FindDescriptor(int socket)
+userrec* FindDescriptorHandler::Call(int socket)
 {
-	return reinterpret_cast<userrec*>(this->SE->GetRef(socket));
+	return reinterpret_cast<userrec*>(Server->SE->GetRef(socket));
 }
 
 bool InspIRCd::AddMode(ModeHandler* mh, const unsigned char mode)
@@ -761,11 +937,11 @@ bool InspIRCd::IsValidMask(const std::string &mask)
 	return true;
 }
 
-Module* InspIRCd::FindModule(const std::string &name)
+Module* ModuleManager::Find(const std::string &name)
 {
-	for (int i = 0; i <= this->GetModuleCount(); i++)
+	for (int i = 0; i <= this->GetCount(); i++)
 	{
-		if (this->Config->module_names[i] == name)
+		if (Instance->Config->module_names[i] == name)
 		{
 			return this->modules[i];
 		}
@@ -780,7 +956,7 @@ ConfigReader::ConfigReader(InspIRCd* Instance) : ServerInstance(Instance)
 	 * default one we can just use the global config data - pre-parsed!
 	 */
 	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;
 }
@@ -789,9 +965,9 @@ ConfigReader::ConfigReader(InspIRCd* Instance) : ServerInstance(Instance)
 ConfigReader::~ConfigReader()
 {
 	if (this->errorlog)
-		DELETE(this->errorlog);
+		delete this->errorlog;
 	if(this->privatehash)
-		DELETE(this->data);
+		delete this->data;
 }
 
 
@@ -799,6 +975,7 @@ ConfigReader::ConfigReader(InspIRCd* Instance, const std::string &filename) : Se
 {
 	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);
@@ -836,7 +1013,7 @@ bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, int
 }
 
 
-long ConfigReader::ReadInteger(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool needs_unsigned)
+int ConfigReader::ReadInteger(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool need_positive)
 {
 	int result;
 	
@@ -846,18 +1023,18 @@ long ConfigReader::ReadInteger(const std::string &tag, const std::string &name,
 		return 0;
 	}
 	
-	if ((needs_unsigned) && (result < 0))
+	if ((need_positive) && (result < 0))
 	{
-		this->error = CONF_NOT_UNSIGNED;
+		this->error = CONF_INT_NEGATIVE;
 		return 0;
 	}
 	
 	return result;
 }
 
-long ConfigReader::ReadInteger(const std::string &tag, const std::string &name, int index, bool needs_unsigned)
+int ConfigReader::ReadInteger(const std::string &tag, const std::string &name, int index, bool need_positive)
 {
-	return ReadInteger(tag, name, "", index, needs_unsigned);
+	return ReadInteger(tag, name, "", index, need_positive);
 }
 
 long ConfigReader::GetError()
@@ -954,5 +1131,3 @@ int FileReader::FileSize()
 {
 	return fc.size();
 }
-
-