X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=2e3623b4af11f35182231d5782971b9feee67ba3;hb=0377d937c5d1bf20fa0c29d4a41c7fd89502ab38;hp=694601df9376780afdab71c19fb97ab1b4671bba;hpb=de184f9d627d26efebd2da1756b8d1d20656b6ad;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules.cpp b/src/modules.cpp
index 694601df9..2e3623b4a 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.
@@ -25,6 +25,7 @@
 	#include <dirent.h>
 #endif
 
+
 // version is a simple class for holding a modules version number
 Version::Version(const std::string &sversion, int flags, int api_ver)
 : version(sversion), Flags(flags), API(api_ver)
@@ -81,7 +82,7 @@ Event::Event(char* anydata, Module* src, const std::string &eventid) : data(anyd
 
 char* Event::GetData()
 {
-	return (char*)this->data;
+	return this->data;
 }
 
 Module* Event::GetSource()
@@ -106,58 +107,59 @@ std::string Event::GetEventID()
 Module::Module(InspIRCd* Me) : ServerInstance(Me) { }
 Module::~Module() { }
 
-int		Module::OnSendSnotice(char &snomask, std::string &type, const std::string &message) { return 0; }
+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::OnUserJoin(User*, Channel*, bool, 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&) { }
+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>&) { }
 Version		Module::GetVersion() { return Version("Misconfigured", VF_VENDOR, -1); }
 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::OnAccessCheck(User*, User*, Channel*, int) { return MOD_RES_PASSTHRU; }
 void		Module::On005Numeric(std::string&) { }
-int		Module::OnKill(User*, User*, const std::string&) { return 0; }
+ModResult	Module::OnKill(User*, User*, const std::string&) { return MOD_RES_PASSTHRU; }
 void		Module::OnLoadModule(Module*, const std::string&) { }
 void		Module::OnUnloadModule(Module*, const std::string&) { }
 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; }
+ModResult	Module::OnCheckReady(User*) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnUserRegister(User*) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnUserPreKick(User*, User*, Channel*, const std::string&) { return MOD_RES_PASSTHRU; }
 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; }
+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::OnCheckBan(User*, Channel*) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnCheckExtBan(User *, Channel *, char) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnCheckStringExtBan(const std::string &s, Channel *c, char type) { 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::OnLocalTopicChange(User*, Channel*, const std::string&) { return MOD_RES_PASSTHRU; }
 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::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) { }
+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::OnRawSocketAccept(int, irc::sockets::sockaddrs*, irc::sockets::sockaddrs*) { }
 int		Module::OnRawSocketWrite(int, const char*, int) { return 0; }
 void		Module::OnRawSocketClose(int) { }
 void		Module::OnRawSocketConnect(int) { }
@@ -170,33 +172,34 @@ void		Module::OnPostLocalTopicChange(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*, TargetTypeFlags, 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*, TargetTypeFlags, 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&) { }
+std::string	Module::ProtoTranslate(Extensible*) { return "?"; }
 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; }
+ModResult	Module::OnSetAway(User*, const std::string &) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnUserList(User*, Channel*, CUList*&) { return MOD_RES_PASSTHRU; }
+ModResult	Module::OnWhoisLine(User*, User*, int&, std::string&) { return MOD_RES_PASSTHRU; }
 void		Module::OnBuildExemptList(MessageType, Channel*, User*, char, CUList&, const std::string&) { }
 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&) { }
-bool		Module::OnHostCycle(User* user) { return false; }
+ModResult	Module::OnNumeric(User*, unsigned int, const std::string&) { return MOD_RES_PASSTHRU; }
+void		Module::OnHookIO(EventHandler*, ListenSocketBase*) { }
+ModResult	Module::OnHostCycle(User*) { return MOD_RES_PASSTHRU; }
+void		Module::OnSendWhoLine(User*, User*, Channel*, std::string&) { }
 
 ModuleManager::ModuleManager(InspIRCd* Ins) : ModCount(0), Instance(Ins)
 {
@@ -238,7 +241,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);
@@ -246,7 +249,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
@@ -281,22 +284,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;
@@ -315,7 +323,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;
@@ -337,6 +345,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;
 
@@ -369,14 +380,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(Instance->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 (InspIRCd::Match(entry->d_name, filename, NULL))
+				if (InspIRCd::Match(entry->d_name, filename, ascii_case_insensitive_map))
 				{
 					if (!this->Load(entry->d_name))
 						n_match++;
@@ -388,34 +399,27 @@ 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",Instance->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);
 		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);
 		return false;
 	}
-		
+
 	Module* newmod = NULL;
 	ircd_module* newhandle = NULL;
 
@@ -429,6 +433,7 @@ bool ModuleManager::Load(const char* filename)
 
 		if (newmod)
 		{
+			newmod->ModuleSourceFile = filename_str;
 			Version v = newmod->GetVersion();
 
 			if (v.API != API_VERSION)
@@ -497,8 +502,17 @@ bool ModuleManager::Load(const char* filename)
 	 * 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, std::pair<ircd_module*, Module*> >::iterator n = Modules.begin(); n != Modules.end(); ++n)
+			n->second.second->Prioritize();
+
+		if (prioritizationState == PRIO_STATE_LAST)
+			break;
+		if (tries == 19)
+			Instance->Logs->Log("MODULE", DEFAULT, "Hook priority dependency loop detected while loading " + filename_str);
+	}
 
 	Instance->BuildISupport();
 	return true;
@@ -543,7 +557,7 @@ bool ModuleManager::Unload(const char* filename)
 
 		this->DetachAll(modfind->second.second);
 
-		Instance->Parser->RemoveCommands(filename);
+		Instance->Parser->RemoveCommands(modfind->second.second);
 
 		delete modfind->second.second;
 		delete modfind->second.first;
@@ -566,12 +580,12 @@ void ModuleManager::LoadAll()
 	char configToken[MAXBUF];
 	ModCount = -1;
 
-	for(int count = 0; count < Instance->Config->ConfValueEnum(Instance->Config->config_data, "module"); count++)
+	for(int count = 0; count < Instance->Config->ConfValueEnum("module"); count++)
 	{
-		Instance->Config->ConfValue(Instance->Config->config_data, "module", "name", count, configToken, MAXBUF);
+		Instance->Config->ConfValue("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))		
+
+		if (!this->Load(configToken))
 		{
 			Instance->Logs->Log("MODULE", DEFAULT, this->LastError());
 			printf_c("\n[\033[1;31m*\033[0m] %s\n\n", this->LastError().c_str());
@@ -593,7 +607,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;
 
@@ -752,28 +766,55 @@ void InspIRCd::AddCommand(Command *f)
 
 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 std::string &LinePrefix, std::stringstream &TextStream)
+void InspIRCd::DumpText(User* user, const char *text, ...)
 {
-	std::string CompleteLine = LinePrefix;
+	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)
+{
+	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)
@@ -809,45 +850,21 @@ const std::vector<std::string> ModuleManager::GetAllModuleNames(int filter)
 
 ConfigReader::ConfigReader(InspIRCd* Instance) : ServerInstance(Instance)
 {
-	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;
-	this->error = 0;
 }
 
 
 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* */ 
+	/* 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))
+
+	if (!ServerInstance->Config->ConfValue(tag, name, default_value, index, result, allow_linefeeds))
 	{
 		this->error = CONF_VALUE_NOT_FOUND;
 	}
@@ -861,7 +878,7 @@ 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);
+	return ServerInstance->Config->ConfValueBool(tag, name, default_value, index);
 }
 
 bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, int index)
@@ -873,19 +890,19 @@ 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))
+
+	if(!ServerInstance->Config->ConfValueInteger(tag, name, default_value, index, result))
 	{
 		this->error = CONF_VALUE_NOT_FOUND;
 		return 0;
 	}
-	
+
 	if ((need_positive) && (result < 0))
 	{
 		this->error = CONF_INT_NEGATIVE;
 		return 0;
 	}
-	
+
 	return result;
 }
 
@@ -901,28 +918,16 @@ long ConfigReader::GetError()
 	return olderr;
 }
 
-void ConfigReader::DumpErrors(bool bail, User* user)
-{
-	ServerInstance->Config->ReportConfigError(this->errorlog->str(), bail, user->uuid);
-}
-
-
 int ConfigReader::Enumerate(const std::string &tag)
 {
-	return ServerInstance->Config->ConfValueEnum(*this->data, tag);
+	return ServerInstance->Config->ConfValueEnum(tag);
 }
 
 int ConfigReader::EnumerateValues(const std::string &tag, int index)
 {
-	return ServerInstance->Config->ConfVarEnum(*this->data, tag, index);
-}
-
-bool ConfigReader::Verify()
-{
-	return this->readerror;
+	return ServerInstance->Config->ConfVarEnum(tag, index);
 }
 
-
 FileReader::FileReader(InspIRCd* Instance, const std::string &filename) : ServerInstance(Instance)
 {
 	LoadFile(filename);