Split this up even more, much smaller files that are easier for gcc to digest

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

diff --git a/src/modules.cpp b/src/modules.cpp
index df7c9da40ab248204796ae62fde3777c975872d1..211ce9853693ae67b603838aa8851f1937242aa6 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -109,7 +109,7 @@ void                Module::OnUserDisconnect(userrec* user) { }
 void           Module::OnUserJoin(userrec* user, chanrec* channel) { }
 void           Module::OnPostJoin(userrec* user, chanrec* channel) { }
 void           Module::OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage) { }
-void           Module::OnRehash(const std::string &parameter) { }
+void           Module::OnRehash(userrec* user, const std::string &parameter) { }
 void           Module::OnServerRaw(std::string &raw, bool inbound, userrec* user) { }
 int            Module::OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs) { return 0; }
 void           Module::OnMode(userrec* user, void* dest, int target_type, const std::string &text) { };
@@ -191,6 +191,7 @@ void                Module::OnCancelAway(userrec* user) { };
 int            Module::OnUserList(userrec* user, chanrec* Ptr) { 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::OnGarbageCollect() { };
 
 long InspIRCd::PriorityAfter(const std::string &modulename)
 {
@@ -328,6 +329,10 @@ std::pair<int,std::string> InspIRCd::GetInterfaceInstanceCount(Module* m)
 const std::string& InspIRCd::GetModuleName(Module* m)
 {
        static std::string nothing = ""; /* Prevent compiler warning */
+
+       if (!this->GetModuleCount())
+               return nothing;
+
        for (int i = 0; i <= this->GetModuleCount(); i++)
        {
                if (this->modules[i] == m)
@@ -341,7 +346,10 @@ const std::string& InspIRCd::GetModuleName(Module* m)
 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
@@ -354,7 +362,7 @@ void InspIRCd::RehashServer()
 chanrec* InspIRCd::GetChannelIndex(long index)
 {
        int target = 0;
-       for (chan_hash::iterator n = this->chanlist.begin(); n != this->chanlist.end(); n++, target++)
+       for (chan_hash::iterator n = this->chanlist->begin(); n != this->chanlist->end(); n++, target++)
        {
                if (index == target)
                        return n->second;
@@ -427,9 +435,16 @@ bool InspIRCd::DelModeWatcher(ModeWatcher* mw)
        return this->Modes->DelModeWatcher(mw);
 }
 
-bool InspIRCd::AddResolver(Resolver* r)
+bool InspIRCd::AddResolver(Resolver* r, bool cached)
 {
-       return this->Res->AddResolverClass(r);
+       if (!cached)
+               return this->Res->AddResolverClass(r);
+       else
+       {
+               r->TriggerCachedResult();
+               delete r;
+               return true;
+       }
 }
 
 bool InspIRCd::UserToPseudo(userrec* user, const std::string &message)
@@ -619,30 +634,40 @@ ConfigReader::ConfigReader(InspIRCd* Instance, const std::string &filename) : Se
                this->error = CONF_FILE_NOT_FOUND;
 };
 
-std::string ConfigReader::ReadValue(const std::string &tag, const std::string &name, int index)
+
+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* */ 
        std::string result;
        
-       if (!ServerInstance->Config->ConfValue(*this->data, tag, name, index, result))
+       if (!ServerInstance->Config->ConfValue(*this->data, tag, name, default_value, index, result, allow_linefeeds))
        {
                this->error = CONF_VALUE_NOT_FOUND;
-               return "";
        }
-       
        return result;
 }
 
+std::string ConfigReader::ReadValue(const std::string &tag, const std::string &name, int index, bool allow_linefeeds)
+{
+       return ReadValue(tag, name, "", index, allow_linefeeds);
+}
+
+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);
+}
+
 bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, int index)
 {
-       return ServerInstance->Config->ConfValueBool(*this->data, tag, name, index);
+       return ReadFlag(tag, name, "", index);
 }
 
-long ConfigReader::ReadInteger(const std::string &tag, const std::string &name, int index, bool needs_unsigned)
+
+long ConfigReader::ReadInteger(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool needs_unsigned)
 {
        int result;
        
-       if(!ServerInstance->Config->ConfValueInteger(*this->data, tag, name, index, result))
+       if(!ServerInstance->Config->ConfValueInteger(*this->data, tag, name, default_value, index, result))
        {
                this->error = CONF_VALUE_NOT_FOUND;
                return 0;
@@ -657,6 +682,11 @@ long ConfigReader::ReadInteger(const std::string &tag, const std::string &name,
        return result;
 }
 
+long ConfigReader::ReadInteger(const std::string &tag, const std::string &name, int index, bool needs_unsigned)
+{
+       return ReadInteger(tag, name, "", index, needs_unsigned);
+}
+
 long ConfigReader::GetError()
 {
        long olderr = this->error;
@@ -666,46 +696,7 @@ long ConfigReader::GetError()
 
 void ConfigReader::DumpErrors(bool bail, userrec* user)
 {
-       /* XXX - Duplicated code */
-       
-       if (bail)
-       {
-               printf("There were errors in your configuration:\n%s", this->errorlog->str().c_str());
-               InspIRCd::Exit(ERROR);
-       }
-       else
-       {
-               std::string errors = this->errorlog->str();
-               std::string::size_type start;
-               unsigned int prefixlen;
-               
-               start = 0;
-               /* ":ServerInstance->Config->ServerName NOTICE user->nick :" */
-               prefixlen = strlen(ServerInstance->Config->ServerName) + strlen(user->nick) + 11;
-       
-               if (user)
-               {
-                       user->WriteServ("NOTICE %s :There were errors in the configuration file:",user->nick);
-                       
-                       while(start < errors.length())
-                       {
-                               user->WriteServ("NOTICE %s :%s",user->nick, errors.substr(start, 510 - prefixlen).c_str());
-                               start += 510 - prefixlen;
-                       }
-               }
-               else
-               {
-                       ServerInstance->WriteOpers("There were errors in the configuration file:");
-                       
-                       while(start < errors.length())
-                       {
-                               ServerInstance->WriteOpers(errors.substr(start, 360).c_str());
-                               start += 360;
-                       }
-               }
-
-               return;
-       }
+       ServerInstance->Config->ReportConfigError(this->errorlog->str(), bail, user);
 }