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 acd2ae469484e9ea790aedea18c566554430300b..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)
 {
@@ -347,6 +348,8 @@ 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
@@ -432,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)
@@ -624,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, bool allow_linefeeds)
+
+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, allow_linefeeds))
+       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;
@@ -662,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;