Sucky stuff

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

diff --git a/src/modules.cpp b/src/modules.cpp
index 96e9bdea5c0912ee33da49997540d57bb29c84c9..e2c1317804658f5cbd35c8a826ff753b7c9b9c03 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -52,32 +52,19 @@ using namespace std;
 
 extern SocketEngine* SE;
 extern ServerConfig *Config;
+extern InspIRCd* ServerInstance;
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
-extern std::vector<std::string> include_stack;
 extern std::vector<InspSocket*> module_sockets;
 
 extern time_t TIME;
-extern int WHOWAS_STALE;
-extern int WHOWAS_MAX;
-extern time_t startup_time;
-extern std::vector<std::string> module_names;
-extern int boundPortCount;
-extern int portCount;
-extern int ports[MAXSOCKS];
-
 class Server;
-
 extern userrec* fd_ref_table[65536];
 
 extern user_hash clientlist;
 extern chan_hash chanlist;
-extern whowas_hash whowas;
 extern command_table cmdlist;
-extern file_cache MOTD;
-extern file_cache RULES;
-extern address_cache IP;                                     
 ExtModeList EMode;
 
 // returns true if an extended mode character is in use
@@ -331,7 +318,12 @@ void Server::AddSocket(InspSocket* sock)
 void Server::RehashServer()
 {
        WriteOpers("*** Rehashing config file");
-       ReadConfig(false,NULL);
+       Config->Read(false,NULL);
+}
+
+ServerConfig* Server::GetConfig()
+{
+       return Config;
 }
 
 void Server::DelSocket(InspSocket* sock)
@@ -536,22 +528,22 @@ bool Server::IsOnChannel(userrec* User, chanrec* Chan)
 
 std::string Server::GetServerName()
 {
-       return getservername();
+       return Config->ServerName;
 }
 
 std::string Server::GetNetworkName()
 {
-       return getnetworkname();
+       return Config->Network;
 }
 
 std::string Server::GetServerDescription()
 {
-       return getserverdesc();
+       return Config->ServerDesc;
 }
 
 Admin Server::GetAdmin()
 {
-       return Admin(getadminname(),getadminemail(),getadminnick());
+       return Admin(Config->AdminName,Config->AdminEmail,Config->AdminNick);
 }
 
 
@@ -728,7 +720,7 @@ Module* Server::FindModule(std::string name)
 {
        for (int i = 0; i <= MODCOUNT; i++)
        {
-               if (module_names[i] == name)
+               if (Config->module_names[i] == name)
                {
                        return modules[i];
                }
@@ -738,10 +730,10 @@ Module* Server::FindModule(std::string name)
 
 ConfigReader::ConfigReader()
 {
-       include_stack.clear();
+       Config->ClearStack();
        this->cache = new std::stringstream(std::stringstream::in | std::stringstream::out);
        this->errorlog = new std::stringstream(std::stringstream::in | std::stringstream::out);
-       this->readerror = LoadConf(CONFIG_FILE,this->cache,this->errorlog);
+       this->readerror = Config->LoadConf(CONFIG_FILE,this->cache,this->errorlog);
        if (!this->readerror)
                this->error = CONF_FILE_NOT_FOUND;
 }
@@ -758,9 +750,10 @@ ConfigReader::~ConfigReader()
 
 ConfigReader::ConfigReader(std::string filename)
 {
+       Config->ClearStack();
        this->cache = new std::stringstream(std::stringstream::in | std::stringstream::out);
        this->errorlog = new std::stringstream(std::stringstream::in | std::stringstream::out);
-       this->readerror = LoadConf(filename.c_str(),this->cache,this->errorlog);
+       this->readerror = Config->LoadConf(filename.c_str(),this->cache,this->errorlog);
        if (!this->readerror)
                this->error = CONF_FILE_NOT_FOUND;
 };
@@ -772,7 +765,7 @@ std::string ConfigReader::ReadValue(std::string tag, std::string name, int index
        char n[MAXBUF];
        strlcpy(t,tag.c_str(),MAXBUF);
        strlcpy(n,name.c_str(),MAXBUF);
-       int res = ReadConf(cache,t,n,index,val);
+       int res = Config->ReadConf(cache,t,n,index,val);
        if (!res)
        {
                this->error = CONF_VALUE_NOT_FOUND;
@@ -788,7 +781,7 @@ bool ConfigReader::ReadFlag(std::string tag, std::string name, int index)
        char n[MAXBUF];
        strlcpy(t,tag.c_str(),MAXBUF);
        strlcpy(n,name.c_str(),MAXBUF);
-       int res = ReadConf(cache,t,n,index,val);
+       int res = Config->ReadConf(cache,t,n,index,val);
        if (!res)
        {
                this->error = CONF_VALUE_NOT_FOUND;
@@ -805,7 +798,7 @@ long ConfigReader::ReadInteger(std::string tag, std::string name, int index, boo
        char n[MAXBUF];
        strlcpy(t,tag.c_str(),MAXBUF);
        strlcpy(n,name.c_str(),MAXBUF);
-       int res = ReadConf(cache,t,n,index,val);
+       int res = Config->ReadConf(cache,t,n,index,val);
        if (!res)
        {
                this->error = CONF_VALUE_NOT_FOUND;
@@ -869,12 +862,12 @@ void ConfigReader::DumpErrors(bool bail, userrec* user)
 
 int ConfigReader::Enumerate(std::string tag)
 {
-       return EnumConf(cache,tag.c_str());
+       return Config->EnumConf(cache,tag.c_str());
 }
 
 int ConfigReader::EnumerateValues(std::string tag, int index)
 {
-       return EnumValues(cache, tag.c_str(), index);
+       return Config->EnumValues(cache, tag.c_str(), index);
 }
 
 bool ConfigReader::Verify()