MetaData rework

[user/henk/code/inspircd.git] / src / modules.cpp

diff --git a/src/modules.cpp b/src/modules.cpp
index 66134e3bc5f3d5efbb75c1662914fc8b5a09a573..ad7efdb06d70f1f670c9e4b47bdf6867d3862f98 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -82,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()
@@ -111,14 +111,14 @@ int               Module::OnSendSnotice(char &snomask, std::string &type, const std::string &
 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::OnPreRehash(User*, const std::string&) { }
 void           Module::OnModuleRehash(User*, const std::string&) { }
 void           Module::OnRehash(User*) { }
 int            Module::OnUserPreJoin(User*, Channel*, const char*, std::string&, const std::string&) { return 0; }
-void           Module::OnMode(User*, void*, int, const std::deque<std::string>&, const std::deque<TranslateType>&) { }
+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 &) { }
@@ -159,7 +159,7 @@ 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) { }
+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) { }
@@ -172,12 +172,11 @@ 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::deque<std::string>&, const std::deque<TranslateType>&) { }
-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&) { }
@@ -197,7 +196,7 @@ 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::OnHookUserIO(User*) { }
 bool           Module::OnHostCycle(User* user) { return false; }
 
 ModuleManager::ModuleManager(InspIRCd* Ins) : ModCount(0), Instance(Ins)
@@ -379,7 +378,7 @@ 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 */
@@ -402,7 +401,7 @@ bool ModuleManager::Load(const char* filename)
        }
 
        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::FileExists(modfile))