* +------------------------------------+
*
* InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
void Module::OnUserJoin(User*, Channel*, bool, bool&) { }
void Module::OnPostJoin(User*, Channel*) { }
void Module::OnUserPart(User*, Channel*, std::string&, bool&) { }
-void Module::OnRehash(User*, const std::string&) { }
+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::string&) { }
+void Module::OnMode(User*, void*, int, const std::deque<std::string>&, const std::deque<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 &) { }
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::string&) { }
+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) { }
Detach((Implementation)n, mod);
}
-bool ModuleManager::SetPriority(Module* mod, PriorityState s)
+bool ModuleManager::SetPriority(Module* mod, Priority s)
{
for (size_t n = I_BEGIN + 1; n != I_END; ++n)
SetPriority(mod, (Implementation)n, s);
return true;
}
-bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s, Module** modules, size_t sz)
+bool ModuleManager::SetPriority(Module* mod, Implementation i, Priority s, Module** modules, size_t sz)
{
/** To change the priority of a module, we first find its position in the vector,
* then we find the position of the other modules in the vector that this module
switch (s)
{
/* Dummy value */
- case PRIO_DONTCARE:
+ case PRIORITY_DONTCARE:
swap = false;
break;
/* Module wants to be first, sod everything else */
- case PRIO_FIRST:
+ case PRIORITY_FIRST:
swap_pos = 0;
break;
/* Module is submissive and wants to be last... awww. */
- case PRIO_LAST:
+ case PRIORITY_LAST:
if (EventHandlers[i].empty())
swap_pos = 0;
else
swap_pos = EventHandlers[i].size() - 1;
break;
/* Place this module after a set of other modules */
- case PRIO_AFTER:
+ case PRIORITY_AFTER:
{
/* Find the latest possible position */
swap_pos = 0;
}
break;
/* Place this module before a set of other modules */
- case PRIO_BEFORE:
+ case PRIORITY_BEFORE:
{
swap_pos = EventHandlers[i].size() - 1;
swap = false;
snprintf(modfile,MAXBUF,"%s/%s",Instance->Config->ModPath,filename);
std::string filename_str = filename;
- if (!ServerConfig::DirValid(modfile))
- {
- LastModuleError = "Module " + std::string(filename) + " is not in the module directory that i am configured to look in (is "+Instance->Config->ModPath+" really a symlink?)";
- Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
- return false;
- }
-
if (!ServerConfig::FileExists(modfile))
{
LastModuleError = "Module file could not be found: " + filename_str;
char configToken[MAXBUF];
ModCount = -1;
- for(int count = 0; count < Instance->Config->ConfValueEnum(Instance->Config->config_data, "module"); count++)
+ for(int count = 0; count < Instance->Config->ConfValueEnum("module"); count++)
{
- Instance->Config->ConfValue(Instance->Config->config_data, "module", "name", count, configToken, MAXBUF);
+ Instance->Config->ConfValue("module", "name", count, configToken, MAXBUF);
printf_c("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n",configToken);
if (!this->Load(configToken))
User->WriteServ(CompleteLine);
}
-User* FindDescriptorHandler::Call(int socket)
-{
- return reinterpret_cast<User*>(Server->SE->GetRef(socket));
-}
-
bool InspIRCd::AddResolver(Resolver* r, bool cached)
{
if (!cached)
ConfigReader::ConfigReader(InspIRCd* Instance) : ServerInstance(Instance)
{
- this->errorlog = new std::ostringstream(std::stringstream::in | std::stringstream::out);
- this->error = CONF_NO_ERROR;
- this->data = &ServerInstance->Config->config_data;
- this->privatehash = false;
this->error = 0;
}
ConfigReader::~ConfigReader()
{
- if (this->errorlog)
- delete this->errorlog;
- if(this->privatehash)
- delete this->data;
-}
-
-
-ConfigReader::ConfigReader(InspIRCd* Instance, const std::string &filename) : ServerInstance(Instance)
-{
- ServerInstance->Config->ClearStack();
-
- this->error = CONF_NO_ERROR;
- this->data = new ConfigDataHash;
- this->privatehash = true;
- this->errorlog = new std::ostringstream(std::stringstream::in | std::stringstream::out);
- /*** XXX: This might block! */
- this->readerror = ServerInstance->Config->DoInclude(*this->data, filename, *this->errorlog);
- if (!this->readerror)
- this->error = CONF_FILE_NOT_FOUND;
- this->error = 0;
}
/* Don't need to strlcpy() tag and name anymore, ReadConf() takes const char* */
std::string result;
- if (!ServerInstance->Config->ConfValue(*this->data, tag, name, default_value, index, result, allow_linefeeds))
+ if (!ServerInstance->Config->ConfValue(tag, name, default_value, index, result, allow_linefeeds))
{
this->error = CONF_VALUE_NOT_FOUND;
}
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);
+ return ServerInstance->Config->ConfValueBool(tag, name, default_value, index);
}
bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, int index)
{
int result;
- if(!ServerInstance->Config->ConfValueInteger(*this->data, tag, name, default_value, index, result))
+ if(!ServerInstance->Config->ConfValueInteger(tag, name, default_value, index, result))
{
this->error = CONF_VALUE_NOT_FOUND;
return 0;
return olderr;
}
-void ConfigReader::DumpErrors(bool bail, User* user)
-{
- ServerInstance->Config->ReportConfigError(this->errorlog->str(), bail, user->uuid);
-}
-
-
int ConfigReader::Enumerate(const std::string &tag)
{
- return ServerInstance->Config->ConfValueEnum(*this->data, tag);
+ return ServerInstance->Config->ConfValueEnum(tag);
}
int ConfigReader::EnumerateValues(const std::string &tag, int index)
{
- return ServerInstance->Config->ConfVarEnum(*this->data, tag, index);
+ return ServerInstance->Config->ConfVarEnum(tag, index);
}
-bool ConfigReader::Verify()
-{
- return this->readerror;
-}
-
-
FileReader::FileReader(InspIRCd* Instance, const std::string &filename) : ServerInstance(Instance)
{
LoadFile(filename);
projects / user / henk / code / inspircd.git / blobdiff