X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=41e4e2606a3d84a2334bb3bbc841ec4b5e74f27d;hb=1ff26bac16487869af7a5e4ebfa1219096c9327b;hp=ba98ad8651285d47421dd96df36563aaebe2ea0f;hpb=54b2b600de7b6f74d387cb0db55375267572adde;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules.cpp b/src/modules.cpp
index ba98ad865..41e4e2606 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&) { }
@@ -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;
@@ -380,22 +379,22 @@ bool ModuleManager::Load(const char* filename)
 
 	if (!ServerConfig::DirValid(modfile))
 	{
-		LastModuleError = "Module " + filename_str + " is not within the modules directory.";
-		Instance->Log(DEFAULT, LastModuleError);
+		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->Log(DEFAULT, LastModuleError);
+		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->Log(DEFAULT, LastModuleError);
+		Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
 		return false;
 	}
 		
@@ -420,12 +419,12 @@ bool ModuleManager::Load(const char* filename)
 				delete newmod;
 				delete newhandle;
 				LastModuleError = "Unable to load " + filename_str + ": Incorrect module API version: " + ConvToStr(v.API) + " (our version: " + ConvToStr(API_VERSION) + ")";
-				Instance->Log(DEFAULT, LastModuleError);
+				Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
 				return false;
 			}
 			else
 			{
-				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]"));
+				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]"));
 			}
 
 			Modules[filename_str] = std::make_pair(newhandle, newmod);
@@ -434,7 +433,7 @@ bool ModuleManager::Load(const char* filename)
 		{
 			delete newhandle;
 			LastModuleError = "Unable to load " + filename_str + ": Probably missing init_module() entrypoint, but dlsym() didn't notice a problem";
-			Instance->Log(DEFAULT, LastModuleError);
+			Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
 			return false;
 		}
 	}
@@ -447,7 +446,7 @@ bool ModuleManager::Load(const char* filename)
 		if (newhandle)
 			delete newhandle;
 		LastModuleError = "Unable to load " + filename_str + ": Error when loading: " + modexcept.GetReason();
-		Instance->Log(DEFAULT, LastModuleError);
+		Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
 		return false;
 	}
 	catch (FindSymbolException& modexcept)
@@ -458,7 +457,7 @@ bool ModuleManager::Load(const char* filename)
 		if (newhandle)
 			delete newhandle;
 		LastModuleError = "Unable to load " + filename_str + ": Error finding symbol: " + modexcept.GetReason();
-		Instance->Log(DEFAULT, LastModuleError);
+		Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
 		return false;
 	}
 	catch (CoreException& modexcept)
@@ -469,7 +468,7 @@ bool ModuleManager::Load(const char* filename)
 		if (newhandle)
 			delete newhandle;
 		LastModuleError = "Unable to load " + filename_str + ": " + modexcept.GetReason();
-		Instance->Log(DEFAULT, LastModuleError);
+		Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
 		return false;
 	}
 
@@ -497,14 +496,14 @@ bool ModuleManager::Unload(const char* filename)
 		if (modfind->second.second->GetVersion().Flags & VF_STATIC)
 		{
 			LastModuleError = "Module " + filename_str + " not unloadable (marked static)";
-			Instance->Log(DEFAULT, LastModuleError);
+			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->Log(DEFAULT, LastModuleError);
+			Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
 			return false;
 		}
 
@@ -532,14 +531,14 @@ bool ModuleManager::Unload(const char* filename)
 		delete modfind->second.first;
 		Modules.erase(modfind);
 
-		Instance->Log(DEFAULT,"Module %s unloaded",filename);
+		Instance->Logs->Log("MODULE", DEFAULT,"Module %s unloaded",filename);
 		this->ModCount--;
 		Instance->BuildISupport();
 		return true;
 	}
 
 	LastModuleError = "Module " + filename_str + " is not loaded, cannot unload it!";
-	Instance->Log(DEFAULT, LastModuleError);
+	Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
 	return false;
 }
 
@@ -556,7 +555,7 @@ void ModuleManager::LoadAll()
 		
 		if (!this->Load(configToken))		
 		{
-			Instance->Log(DEFAULT, this->LastError());
+			Instance->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);
 		}
@@ -823,11 +822,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;
 }