X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=67c90b128b401e3dbd045f11dd3564d62ef08cf5;hb=075bb82c3ebdf4e77f14134ca8343631dd4cfbcd;hp=6ea939e50180f90a4aa4105dd52907f860037946;hpb=15b51c2ecc81e06c0efb537bec968f7c5acd2ed4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules.cpp b/src/modules.cpp index 6ea939e50..67c90b128 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -27,8 +27,8 @@ // version is a simple class for holding a modules version number -Version::Version(const std::string &sversion, int flags, int api_ver) -: version(sversion), Flags(flags), API(api_ver) +Version::Version(const std::string &modv, int flags, int api_ver, const std::string& rev) +: description(modv), version(rev), Flags(flags), API(api_ver) { } @@ -82,7 +82,7 @@ Event::Event(char* anydata, Module* src, const std::string &eventid) : data(anyd char* Event::GetData() { - return (char*)this->data; + return this->data; } Module* Event::GetSource() @@ -90,7 +90,7 @@ Module* Event::GetSource() return this->source; } -char* Event::Send(InspIRCd* ServerInstance) +char* Event::Send() { FOREACH_MOD(I_OnEvent,OnEvent(this)); return NULL; @@ -104,101 +104,101 @@ std::string Event::GetEventID() // These declarations define the behavours of the base class Module (which does nothing at all) -Module::Module(InspIRCd* Me) : ServerInstance(Me) { } +Module::Module() { } Module::~Module() { } -int Module::OnSendSnotice(char &snomask, std::string &type, const std::string &message) { return 0; } +ModResult Module::OnSendSnotice(char &snomask, std::string &type, const std::string &message) { return MOD_RES_PASSTHRU; } void Module::OnUserConnect(User*) { } void Module::OnUserQuit(User*, const std::string&, const std::string&) { } void Module::OnUserDisconnect(User*) { } -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&) { } -int Module::OnUserPreJoin(User*, Channel*, const char*, std::string&, const std::string&) { return 0; } -void Module::OnMode(User*, void*, int, const std::deque&, const std::deque&) { } -Version Module::GetVersion() { return Version("Misconfigured", VF_VENDOR, -1); } +void Module::OnUserJoin(Membership*, bool, bool, CUList&) { } +void Module::OnPostJoin(Membership*) { } +void Module::OnUserPart(Membership*, std::string&, CUList&) { } +void Module::OnPreRehash(User*, const std::string&) { } +void Module::OnModuleRehash(User*, const std::string&) { } +void Module::OnRehash(User*) { } +ModResult Module::OnUserPreJoin(User*, Channel*, const char*, std::string&, const std::string&) { return MOD_RES_PASSTHRU; } +void Module::OnMode(User*, void*, int, const std::vector&, const std::vector&) { } void Module::OnOper(User*, const std::string&) { } void Module::OnPostOper(User*, const std::string&, const std::string &) { } void Module::OnInfo(User*) { } void Module::OnWhois(User*, User*) { } -int Module::OnUserPreInvite(User*, User*, Channel*, time_t) { return 0; } -int Module::OnUserPreMessage(User*, void*, int, std::string&, char, CUList&) { return 0; } -int Module::OnUserPreNotice(User*, void*, int, std::string&, char, CUList&) { return 0; } -int Module::OnUserPreNick(User*, const std::string&) { return 0; } +ModResult Module::OnUserPreInvite(User*, User*, Channel*, time_t) { return MOD_RES_PASSTHRU; } +ModResult Module::OnUserPreMessage(User*, void*, int, std::string&, char, CUList&) { return MOD_RES_PASSTHRU; } +ModResult Module::OnUserPreNotice(User*, void*, int, std::string&, char, CUList&) { return MOD_RES_PASSTHRU; } +ModResult Module::OnUserPreNick(User*, const std::string&) { return MOD_RES_PASSTHRU; } void Module::OnUserPostNick(User*, const std::string&) { } -int Module::OnAccessCheck(User*, User*, Channel*, int) { return ACR_DEFAULT; } +ModResult Module::OnPreMode(User*, User*, Channel*, const std::vector&) { return MOD_RES_PASSTHRU; } void Module::On005Numeric(std::string&) { } -int Module::OnKill(User*, User*, const std::string&) { return 0; } +ModResult Module::OnKill(User*, User*, const std::string&) { return MOD_RES_PASSTHRU; } void Module::OnLoadModule(Module*, const std::string&) { } void Module::OnUnloadModule(Module*, const std::string&) { } void Module::OnBackgroundTimer(time_t) { } -int Module::OnPreCommand(std::string&, std::vector&, User *, bool, const std::string&) { return 0; } +ModResult Module::OnPreCommand(std::string&, std::vector&, User *, bool, const std::string&) { return MOD_RES_PASSTHRU; } void Module::OnPostCommand(const std::string&, const std::vector&, User *, CmdResult, const std::string&) { } -bool Module::OnCheckReady(User*) { return true; } -int Module::OnUserRegister(User*) { return 0; } -int Module::OnUserPreKick(User*, User*, Channel*, const std::string&) { return 0; } -void Module::OnUserKick(User*, User*, Channel*, const std::string&, bool&) { } -int Module::OnRawMode(User*, Channel*, const char, const std::string &, bool, int, bool) { return 0; } -int Module::OnCheckInvite(User*, Channel*) { return 0; } -int Module::OnCheckKey(User*, Channel*, const std::string&) { return 0; } -int Module::OnCheckLimit(User*, Channel*) { return 0; } -int Module::OnCheckBan(User*, Channel*) { return 0; } -int Module::OnCheckExtBan(User *, Channel *, char) { return 0; } -int Module::OnCheckStringExtBan(const std::string &s, Channel *c, char type) { return 0; } -int Module::OnStats(char, User*, string_list&) { return 0; } -int Module::OnChangeLocalUserHost(User*, const std::string&) { return 0; } -int Module::OnChangeLocalUserGECOS(User*, const std::string&) { return 0; } -int Module::OnLocalTopicChange(User*, Channel*, const std::string&) { return 0; } +ModResult Module::OnCheckReady(User*) { return MOD_RES_PASSTHRU; } +ModResult Module::OnUserRegister(User*) { return MOD_RES_PASSTHRU; } +ModResult Module::OnUserPreKick(User*, Membership*, const std::string&) { return MOD_RES_PASSTHRU; } +void Module::OnUserKick(User*, Membership*, const std::string&, CUList&) { } +ModResult Module::OnRawMode(User*, Channel*, const char, const std::string &, bool, int) { return MOD_RES_PASSTHRU; } +ModResult Module::OnCheckInvite(User*, Channel*) { return MOD_RES_PASSTHRU; } +ModResult Module::OnCheckKey(User*, Channel*, const std::string&) { return MOD_RES_PASSTHRU; } +ModResult Module::OnCheckLimit(User*, Channel*) { return MOD_RES_PASSTHRU; } +ModResult Module::OnCheckChannelBan(User*, Channel*) { return MOD_RES_PASSTHRU; } +ModResult Module::OnCheckBan(User*, Channel*, const std::string&) { return MOD_RES_PASSTHRU; } +ModResult Module::OnExtBanCheck(User*, Channel*, char) { return MOD_RES_PASSTHRU; } +ModResult Module::OnStats(char, User*, string_list&) { return MOD_RES_PASSTHRU; } +ModResult Module::OnChangeLocalUserHost(User*, const std::string&) { return MOD_RES_PASSTHRU; } +ModResult Module::OnChangeLocalUserGECOS(User*, const std::string&) { return MOD_RES_PASSTHRU; } +ModResult Module::OnPreTopicChange(User*, Channel*, const std::string&) { return MOD_RES_PASSTHRU; } void Module::OnEvent(Event*) { return; } const char* Module::OnRequest(Request*) { return NULL; } -int Module::OnPassCompare(Extensible* ex, const std::string &password, const std::string &input, const std::string& hashtype) { return 0; } +ModResult Module::OnPassCompare(Extensible* ex, const std::string &password, const std::string &input, const std::string& hashtype) { return MOD_RES_PASSTHRU; } void Module::OnGlobalOper(User*) { } void Module::OnPostConnect(User*) { } -int Module::OnAddBan(User*, Channel*, const std::string &) { return 0; } -int Module::OnDelBan(User*, Channel*, const std::string &) { return 0; } -void Module::OnRawSocketAccept(int, const std::string&, int) { } -int Module::OnRawSocketWrite(int, const char*, int) { return 0; } -void Module::OnRawSocketClose(int) { } -void Module::OnRawSocketConnect(int) { } -int Module::OnRawSocketRead(int, char*, unsigned int, int&) { return 0; } +ModResult Module::OnAddBan(User*, Channel*, const std::string &) { return MOD_RES_PASSTHRU; } +ModResult Module::OnDelBan(User*, Channel*, const std::string &) { return MOD_RES_PASSTHRU; } +void Module::OnStreamSocketAccept(StreamSocket*, irc::sockets::sockaddrs*, irc::sockets::sockaddrs*) { } +int Module::OnStreamSocketWrite(StreamSocket*, std::string&) { return -1; } +void Module::OnStreamSocketClose(StreamSocket*) { } +void Module::OnStreamSocketConnect(StreamSocket*) { } +int Module::OnStreamSocketRead(StreamSocket*, std::string&) { return -1; } void Module::OnUserMessage(User*, void*, int, const std::string&, char, const CUList&) { } void Module::OnUserNotice(User*, void*, int, const std::string&, char, const CUList&) { } void Module::OnRemoteKill(User*, User*, const std::string&, const std::string&) { } void Module::OnUserInvite(User*, User*, Channel*, time_t) { } -void Module::OnPostLocalTopicChange(User*, Channel*, const std::string&) { } +void Module::OnPostTopicChange(User*, Channel*, 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::deque&, const std::deque&) { } -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) { } -void Module::OnDecodeMetaData(int, void*, const std::string&, const std::string&) { } -void Module::ProtoSendMetaData(void*, TargetTypeFlags, void*, const std::string&, const std::string&) { } +void Module::OnSyncNetwork(Module*, void*) { } +void Module::ProtoSendMode(void*, TargetTypeFlags, void*, const std::vector&, const std::vector&) { } +void Module::OnDecodeMetaData(Extensible*, const std::string&, const std::string&) { } +void Module::ProtoSendMetaData(void*, Extensible*, const std::string&, const std::string&) { } void Module::OnWallops(User*, const std::string&) { } void Module::OnChangeHost(User*, const std::string&) { } void Module::OnChangeName(User*, const std::string&) { } +void Module::OnChangeIdent(User*, const std::string&) { } void Module::OnAddLine(User*, XLine*) { } void Module::OnDelLine(User*, XLine*) { } void Module::OnExpireLine(XLine*) { } void Module::OnCleanup(int, void*) { } -int Module::OnChannelPreDelete(Channel*) { return 0; } +ModResult Module::OnChannelPreDelete(Channel*) { return MOD_RES_PASSTHRU; } void Module::OnChannelDelete(Channel*) { } -int Module::OnSetAway(User*, const std::string &) { return 0; } -int Module::OnUserList(User*, Channel*, CUList*&) { return 0; } -int Module::OnWhoisLine(User*, User*, int&, std::string&) { return 0; } +ModResult Module::OnSetAway(User*, const std::string &) { return MOD_RES_PASSTHRU; } +ModResult Module::OnUserList(User*, Channel*) { return MOD_RES_PASSTHRU; } +ModResult Module::OnWhoisLine(User*, User*, int&, std::string&) { return MOD_RES_PASSTHRU; } void Module::OnBuildExemptList(MessageType, Channel*, User*, char, CUList&, const std::string&) { } void Module::OnGarbageCollect() { } -void Module::OnBufferFlushed(User*) { } void Module::OnText(User*, void*, int, const std::string&, char, CUList&) { } void Module::OnRunTestSuite() { } -void Module::OnNamesListItem(User*, User*, Channel*, std::string&, std::string&) { } -int Module::OnNumeric(User*, unsigned int, const std::string&) { return 0; } -void Module::OnHookUserIO(User*, const std::string&) { } -bool Module::OnHostCycle(User* user) { return false; } +void Module::OnNamesListItem(User*, Membership*, std::string&, std::string&) { } +ModResult Module::OnNumeric(User*, unsigned int, const std::string&) { return MOD_RES_PASSTHRU; } +void Module::OnHookIO(StreamSocket*, ListenSocketBase*) { } +ModResult Module::OnHostCycle(User*) { return MOD_RES_PASSTHRU; } +void Module::OnSendWhoLine(User*, User*, Channel*, std::string&) { } -ModuleManager::ModuleManager(InspIRCd* Ins) : ModCount(0), Instance(Ins) +ModuleManager::ModuleManager() : ModCount(0) { } @@ -286,11 +286,16 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, Priority s, Modul break; /* Module wants to be first, sod everything else */ case PRIORITY_FIRST: - swap_pos = 0; + if (prioritizationState != PRIO_STATE_FIRST) + swap = false; + else + swap_pos = 0; break; - /* Module is submissive and wants to be last... awww. */ + /* Module wants to be last. */ case PRIORITY_LAST: - if (EventHandlers[i].empty()) + if (prioritizationState != PRIO_STATE_FIRST) + swap = false; + else if (EventHandlers[i].empty()) swap_pos = 0; else swap_pos = EventHandlers[i].size() - 1; @@ -337,6 +342,9 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, Priority s, Modul /* Do we need to swap? */ if (swap && (swap_pos != source)) { + // We are going to change positions; we'll need to run again to verify all requirements + if (prioritizationState == PRIO_STATE_LAST) + prioritizationState = PRIO_STATE_AGAIN; /* Suggestion from Phoenix, "shuffle" the modules to better retain call order */ int incrmnt = 1; @@ -369,7 +377,7 @@ bool ModuleManager::Load(const char* filename) if (strchr(filename,'*') || (strchr(filename,'?'))) { int n_match = 0; - DIR* library = opendir(Instance->Config->ModPath); + DIR* library = opendir(ServerInstance->Config->ModPath.c_str()); if (library) { /* Try and locate and load all modules matching the pattern */ @@ -392,27 +400,20 @@ bool ModuleManager::Load(const char* filename) } char modfile[MAXBUF]; - snprintf(modfile,MAXBUF,"%s/%s",Instance->Config->ModPath,filename); + snprintf(modfile,MAXBUF,"%s/%s",ServerInstance->Config->ModPath.c_str(),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; - Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); + ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } if (Modules.find(filename_str) != Modules.end()) { LastModuleError = "Module " + filename_str + " is already loaded, cannot load a module twice!"; - Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); + ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } @@ -424,11 +425,12 @@ bool ModuleManager::Load(const char* filename) /* This will throw a CoreException if there's a problem loading * the module file or getting a pointer to the init_module symbol. */ - newhandle = new ircd_module(Instance, modfile, "init_module"); + newhandle = new ircd_module(modfile, "init_module"); newmod = newhandle->CallInit(); if (newmod) { + newmod->ModuleSourceFile = filename_str; Version v = newmod->GetVersion(); if (v.API != API_VERSION) @@ -437,12 +439,12 @@ bool ModuleManager::Load(const char* filename) delete newmod; delete newhandle; LastModuleError = "Unable to load " + filename_str + ": Incorrect module API version: " + ConvToStr(v.API) + " (our version: " + ConvToStr(API_VERSION) + ")"; - Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); + ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } else { - Instance->Logs->Log("MODULE", DEFAULT,"New module introduced: %s (API version %d, Module version %s)%s", filename, v.API, v.version.c_str(), (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]")); + ServerInstance->Logs->Log("MODULE", DEFAULT,"New module introduced: %s (API version %d, Module version %s)%s", filename, v.API, v.version.c_str(), (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]")); } Modules[filename_str] = std::make_pair(newhandle, newmod); @@ -451,7 +453,7 @@ bool ModuleManager::Load(const char* filename) { delete newhandle; LastModuleError = "Unable to load " + filename_str + ": Probably missing init_module() entrypoint, but dlsym() didn't notice a problem"; - Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); + ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } } @@ -464,7 +466,7 @@ bool ModuleManager::Load(const char* filename) if (newhandle) delete newhandle; LastModuleError = "Unable to load " + filename_str + ": Error when loading: " + modexcept.GetReason(); - Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); + ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } catch (FindSymbolException& modexcept) @@ -475,7 +477,7 @@ bool ModuleManager::Load(const char* filename) if (newhandle) delete newhandle; LastModuleError = "Unable to load " + filename_str + ": Error finding symbol: " + modexcept.GetReason(); - Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); + ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } catch (CoreException& modexcept) @@ -486,21 +488,30 @@ bool ModuleManager::Load(const char* filename) if (newhandle) delete newhandle; LastModuleError = "Unable to load " + filename_str + ": " + modexcept.GetReason(); - Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); + ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } this->ModCount++; - FOREACH_MOD_I(Instance,I_OnLoadModule,OnLoadModule(newmod, filename_str)); + FOREACH_MOD(I_OnLoadModule,OnLoadModule(newmod, filename_str)); /* We give every module a chance to re-prioritize when we introduce a new one, * not just the one thats loading, as the new module could affect the preference * of others */ - for (std::map >::iterator n = Modules.begin(); n != Modules.end(); ++n) - n->second.second->Prioritize(); + for(int tries = 0; tries < 20; tries++) + { + prioritizationState = tries > 0 ? PRIO_STATE_LAST : PRIO_STATE_FIRST; + for (std::map >::iterator n = Modules.begin(); n != Modules.end(); ++n) + n->second.second->Prioritize(); - Instance->BuildISupport(); + if (prioritizationState == PRIO_STATE_LAST) + break; + if (tries == 19) + ServerInstance->Logs->Log("MODULE", DEFAULT, "Hook priority dependency loop detected while loading " + filename_str); + } + + ServerInstance->BuildISupport(); return true; } @@ -514,49 +525,54 @@ bool ModuleManager::Unload(const char* filename) if (modfind->second.second->GetVersion().Flags & VF_STATIC) { LastModuleError = "Module " + filename_str + " not unloadable (marked static)"; - Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); + ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } std::pair intercount = GetInterfaceInstanceCount(modfind->second.second); if (intercount.first > 0) { LastModuleError = "Failed to unload module " + filename_str + ", being used by " + ConvToStr(intercount.first) + " other(s) via interface '" + intercount.second + "'"; - Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); + ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } + std::vector items = Extensible::BeginUnregister(modfind->second.second); /* Give the module a chance to tidy out all its metadata */ - for (chan_hash::iterator c = Instance->chanlist->begin(); c != Instance->chanlist->end(); c++) + for (chan_hash::iterator c = ServerInstance->chanlist->begin(); c != ServerInstance->chanlist->end(); c++) { modfind->second.second->OnCleanup(TYPE_CHANNEL,c->second); + c->second->doUnhookExtensions(items); + const UserMembList* users = c->second->GetUsers(); + for(UserMembCIter mi = users->begin(); mi != users->end(); mi++) + mi->second->doUnhookExtensions(items); } - for (user_hash::iterator u = Instance->Users->clientlist->begin(); u != Instance->Users->clientlist->end(); u++) + for (user_hash::iterator u = ServerInstance->Users->clientlist->begin(); u != ServerInstance->Users->clientlist->end(); u++) { modfind->second.second->OnCleanup(TYPE_USER,u->second); + u->second->doUnhookExtensions(items); } /* Tidy up any dangling resolvers */ - Instance->Res->CleanResolvers(modfind->second.second); - + ServerInstance->Res->CleanResolvers(modfind->second.second); - FOREACH_MOD_I(Instance,I_OnUnloadModule,OnUnloadModule(modfind->second.second, modfind->first)); + FOREACH_MOD(I_OnUnloadModule,OnUnloadModule(modfind->second.second, modfind->first)); this->DetachAll(modfind->second.second); - Instance->Parser->RemoveCommands(filename); + ServerInstance->Parser->RemoveCommands(modfind->second.second); delete modfind->second.second; delete modfind->second.first; Modules.erase(modfind); - Instance->Logs->Log("MODULE", DEFAULT,"Module %s unloaded",filename); + ServerInstance->Logs->Log("MODULE", DEFAULT,"Module %s unloaded",filename); this->ModCount--; - Instance->BuildISupport(); + ServerInstance->BuildISupport(); return true; } LastModuleError = "Module " + filename_str + " is not loaded, cannot unload it!"; - Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); + ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } @@ -566,16 +582,42 @@ void ModuleManager::LoadAll() char configToken[MAXBUF]; ModCount = -1; - for(int count = 0; count < Instance->Config->ConfValueEnum(Instance->Config->config_data, "module"); count++) + printf("\nLoading core commands"); + fflush(stdout); + + DIR* library = opendir(ServerInstance->Config->ModPath.c_str()); + if (library) + { + dirent* entry = NULL; + while (0 != (entry = readdir(library))) + { + if (InspIRCd::Match(entry->d_name, "cmd_*.so", ascii_case_insensitive_map)) + { + printf("."); + fflush(stdout); + + if (!Load(entry->d_name)) + { + ServerInstance->Logs->Log("MODULE", DEFAULT, this->LastError()); + printf_c("\n[\033[1;31m*\033[0m] %s\n\n", this->LastError().c_str()); + ServerInstance->Exit(EXIT_STATUS_MODULE); + } + } + } + closedir(library); + printf("\n"); + } + + for(int count = 0; count < ServerInstance->Config->ConfValueEnum("module"); count++) { - Instance->Config->ConfValue(Instance->Config->config_data, "module", "name", count, configToken, MAXBUF); + ServerInstance->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)) { - Instance->Logs->Log("MODULE", DEFAULT, this->LastError()); + ServerInstance->Logs->Log("MODULE", DEFAULT, this->LastError()); printf_c("\n[\033[1;31m*\033[0m] %s\n\n", this->LastError().c_str()); - Instance->Exit(EXIT_STATUS_MODULE); + ServerInstance->Exit(EXIT_STATUS_MODULE); } } } @@ -752,28 +794,55 @@ void InspIRCd::AddCommand(Command *f) void InspIRCd::SendMode(const std::vector& parameters, User *user) { - this->Modes->Process(parameters, user, true); + this->Modes->Process(parameters, user); } -void InspIRCd::DumpText(User* User, const std::string &LinePrefix, std::stringstream &TextStream) +void InspIRCd::DumpText(User* user, const std::string &text) { - std::string CompleteLine = LinePrefix; + if (IS_LOCAL(user)) + { + user->Write(text); + } + else + { + PI->PushToClient(user, text); + } +} + +void InspIRCd::DumpText(User* user, const char *text, ...) +{ + va_list argsPtr; + char line[MAXBUF]; + + va_start(argsPtr, text); + vsnprintf(line, MAXBUF, text, argsPtr); + va_end(argsPtr); + + DumpText(user, std::string(line)); +} + +void InspIRCd::DumpText(User* user, const std::string &LinePrefix, std::stringstream &TextStream) +{ + char line[MAXBUF]; + int start_pos = LinePrefix.length(); + int pos = start_pos; + memcpy(line, LinePrefix.data(), pos); std::string Word; while (TextStream >> Word) { - if (CompleteLine.length() + Word.length() + 3 > 500) + int len = Word.length(); + if (pos + len + 12 > MAXBUF) { - User->WriteServ(CompleteLine); - CompleteLine = LinePrefix; + line[pos] = '\0'; + DumpText(user, std::string(line)); + pos = start_pos; } - CompleteLine = CompleteLine + Word + " "; + line[pos] = ' '; + memcpy(line + pos + 1, Word.data(), len); + pos += len + 1; } - User->WriteServ(CompleteLine); -} - -User* FindDescriptorHandler::Call(int socket) -{ - return reinterpret_cast(Server->SE->GetRef(socket)); + line[pos] = '\0'; + DumpText(user, std::string(line)); } bool InspIRCd::AddResolver(Resolver* r, bool cached) @@ -807,38 +876,14 @@ const std::vector ModuleManager::GetAllModuleNames(int filter) return retval; } -ConfigReader::ConfigReader(InspIRCd* Instance) : ServerInstance(Instance) +ConfigReader::ConfigReader() { - 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; } @@ -847,7 +892,7 @@ std::string ConfigReader::ReadValue(const std::string &tag, const std::string &n /* 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; } @@ -861,7 +906,7 @@ std::string ConfigReader::ReadValue(const std::string &tag, const std::string &n 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) @@ -874,7 +919,7 @@ int ConfigReader::ReadInteger(const std::string &tag, const std::string &name, c { 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; @@ -901,34 +946,22 @@ long ConfigReader::GetError() 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); -} - -bool ConfigReader::Verify() -{ - return this->readerror; + return ServerInstance->Config->ConfVarEnum(tag, index); } - -FileReader::FileReader(InspIRCd* Instance, const std::string &filename) : ServerInstance(Instance) +FileReader::FileReader(const std::string &filename) { LoadFile(filename); } -FileReader::FileReader(InspIRCd* Instance) : ServerInstance(Instance) +FileReader::FileReader() { }