X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=5cfbd6f9398ffcb72a02bece83751291a77426e7;hb=87dd84a97265843cfe19f20c207c1c72f38a4f2d;hp=3e7ae9cdfd100c4b3b4714090930410d67fa2676;hpb=da074814501f23680b579feb1ad649c86e8a1348;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules.cpp b/src/modules.cpp
index 3e7ae9cdf..5cfbd6f93 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -106,8 +106,6 @@ std::string Event::GetEventID()
 
 		Module::Module(InspIRCd* Me) : ServerInstance(Me) { }
 		Module::~Module() { }
-void		Module::OnReadConfig(ServerConfig*, ConfigReader*) { }
-int		Module::OnDownloadFile(const std::string&, std::istream*&) { return 0; }
 void		Module::OnUserConnect(User*) { }
 void		Module::OnUserQuit(User*, const std::string&, const std::string&) { }
 void		Module::OnUserDisconnect(User*) { }
@@ -116,7 +114,7 @@ void		Module::OnPostJoin(User*, Channel*) { }
 void		Module::OnUserPart(User*, Channel*, const 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&) { return 0; }
+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::OnOper(User*, const std::string&) { }
@@ -134,8 +132,8 @@ int		Module::OnKill(User*, User*, const std::string&) { return 0; }
 void		Module::OnLoadModule(Module*, const std::string&) { }
 void		Module::OnUnloadModule(Module*, const std::string&) { }
 void		Module::OnBackgroundTimer(time_t) { }
-int		Module::OnPreCommand(const std::string&, const char* const*, int, User *, bool, const std::string&) { return 0; }
-void		Module::OnPostCommand(const std::string&, const char* const*, int, User *, CmdResult, const std::string&) { }
+int		Module::OnPreCommand(const std::string&, const std::vector<std::string>&, User *, bool, const std::string&) { return 0; }
+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; }
@@ -184,8 +182,7 @@ void		Module::OnExpireLine(XLine*) { }
 void 		Module::OnCleanup(int, void*) { }
 int		Module::OnChannelPreDelete(Channel*) { return 0; }
 void		Module::OnChannelDelete(Channel*) { }
-void		Module::OnSetAway(User*) { }
-void		Module::OnCancelAway(User*) { }
+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&) { }
@@ -193,7 +190,9 @@ 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&) { }
 
 ModuleManager::ModuleManager(InspIRCd* Ins) : ModCount(0), Instance(Ins)
 {
@@ -251,7 +250,7 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s,
 	 * on which they want, and we make sure our module is *at least* before or after
 	 * the first or last of this subset, depending again on the type of priority.
 	 */
-	size_t swap_pos;
+	size_t swap_pos = 0;
 	size_t source = 0;
 	bool swap = true;
 	bool found = false;
@@ -357,7 +356,7 @@ bool ModuleManager::Load(const char* filename)
 		{
 			/* Try and locate and load all modules matching the pattern */
 			dirent* entry = NULL;
-			while ((entry = readdir(library)))
+			while (0 != (entry = readdir(library)))
 			{
 				if (Instance->MatchText(entry->d_name, filename))
 				{
@@ -380,7 +379,7 @@ bool ModuleManager::Load(const char* filename)
 
 	if (!ServerConfig::DirValid(modfile))
 	{
-		LastModuleError = "Module " + filename_str + " is not within the modules directory.";
+		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;
 	}
@@ -603,14 +602,12 @@ bool ModuleManager::PublishInterface(const std::string &InterfaceName, Module* M
 		modulelist ml;
 		ml.push_back(Mod);
 		Interfaces[InterfaceName] = std::make_pair(0, ml);
-		return true;
 	}
 	else
 	{
 		iter->second.second.push_back(Mod);
-		return true;
 	}
-	return false;
+	return true;
 }
 
 bool ModuleManager::UnpublishInterface(const std::string &InterfaceName, Module* Mod)
@@ -718,12 +715,12 @@ Channel* InspIRCd::GetChannelIndex(long index)
 
 bool InspIRCd::MatchText(const std::string &sliteral, const std::string &spattern)
 {
-	return match(sliteral.c_str(),spattern.c_str());
+	return match(sliteral, spattern);
 }
 
-CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const char* const* parameters, int pcnt, User* user)
+CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const std::vector<std::string>& parameters, User* user)
 {
-	return this->Parser->CallHandler(commandname,parameters,pcnt,user);
+	return this->Parser->CallHandler(commandname, parameters, user);
 }
 
 bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, User* user)
@@ -740,9 +737,9 @@ void InspIRCd::AddCommand(Command *f)
 	}
 }
 
-void InspIRCd::SendMode(const char* const* parameters, int pcnt, User *user)
+void InspIRCd::SendMode(const std::vector<std::string>& parameters, User *user)
 {
-	this->Modes->Process(parameters,pcnt,user,true);
+	this->Modes->Process(parameters, user, true);
 }
 
 void InspIRCd::DumpText(User* User, const std::string &LinePrefix, std::stringstream &TextStream)
@@ -823,11 +820,8 @@ ConfigReader::ConfigReader(InspIRCd* Instance, const std::string &filename) : Se
 	this->data = new ConfigDataHash;
 	this->privatehash = true;
 	this->errorlog = new std::ostringstream(std::stringstream::in | std::stringstream::out);
-	for (int pass = 0; pass < 2; pass++)
-	{
-		/*** XXX: Can return a 'not ready yet!' code! */
-		this->readerror = ServerInstance->Config->LoadConf(*this->data, filename, *this->errorlog, pass);
-	}
+	/*** XXX: This might block! */
+	this->readerror = ServerInstance->Config->DoInclude(*this->data, filename, *this->errorlog);
 	if (!this->readerror)
 		this->error = CONF_FILE_NOT_FOUND;
 }