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;
void Server::RehashServer()
{
WriteOpers("*** Rehashing config file");
- ReadConfig(false,NULL);
+ Config->Read(false,NULL);
}
void Server::DelSocket(InspSocket* sock)
{
for (int i = 0; i <= MODCOUNT; i++)
{
- if (module_names[i] == name)
+ if (Config->module_names[i] == name)
{
return modules[i];
}
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;
}
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;
};
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;
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;
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;
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()