X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_permchannels.cpp;h=3b8e5e43c3c6a902fcc964c2631d920189f67fb7;hb=f91a61fa22b239384c31526fd11da1e3030aaa96;hp=a333ea0b0fc6a76329360b3ccabedfe2ec1c8e05;hpb=8de87c2a9b5f5e68caac1ca06b1021ed69cb3d6a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp index a333ea0b0..3b8e5e43c 100644 --- a/src/modules/m_permchannels.cpp +++ b/src/modules/m_permchannels.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2010 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -15,15 +15,104 @@ /* $ModDesc: Provides support for channel mode +P to provide permanent channels */ +// Not in a class due to circular dependancy hell. +static std::string permchannelsconf; +static bool WriteDatabase() +{ + FILE *f; + + if (permchannelsconf.empty()) + { + // Fake success. + return true; + } + + std::string tempname = permchannelsconf + ".tmp"; + + /* + * We need to perform an atomic write so as not to fuck things up. + * So, let's write to a temporary file, flush and sync the FD, then rename the file.. + * -- w00t + */ + f = fopen(tempname.c_str(), "w"); + if (!f) + { + ServerInstance->Logs->Log("m_permchannels",DEFAULT, "permchannels: Cannot create database! %s (%d)", strerror(errno), errno); + ServerInstance->SNO->WriteToSnoMask('a', "database: cannot create new db: %s (%d)", strerror(errno), errno); + return false; + } + + // Now, let's write. + for (chan_hash::const_iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); i++) + { + Channel* chan = i->second; + if (!chan->IsModeSet('P')) + continue; + + char line[1024]; + const char* items[] = + { + "\n" + }; + + int lpos = 0, item = 0, ipos = 0; + while (lpos < 1022 && item < 7) + { + char c = items[item][ipos++]; + if (c == 0) + { + // end of this string; hop to next string, insert a quote + item++; + ipos = 0; + c = '"'; + } + else if (c == '\\' || c == '"') + { + line[lpos++] = '\\'; + } + line[lpos++] = c; + } + line[--lpos] = 0; + fputs(line, f); + } + + int write_error = 0; + write_error = ferror(f); + write_error |= fclose(f); + if (write_error) + { + ServerInstance->Logs->Log("m_permchannels",DEFAULT, "permchannels: Cannot write to new database! %s (%d)", strerror(errno), errno); + ServerInstance->SNO->WriteToSnoMask('a', "database: cannot write to new db: %s (%d)", strerror(errno), errno); + return false; + } + + // Use rename to move temporary to new db - this is guarenteed not to fuck up, even in case of a crash. + if (rename(tempname.c_str(), permchannelsconf.c_str()) < 0) + { + ServerInstance->Logs->Log("m_permchannels",DEFAULT, "permchannels: Cannot move new to old database! %s (%d)", strerror(errno), errno); + ServerInstance->SNO->WriteToSnoMask('a', "database: cannot replace old with new db: %s (%d)", strerror(errno), errno); + return false; + } + + return true; +} + + /** Handles the +P channel mode */ class PermChannel : public ModeHandler { public: - PermChannel(InspIRCd* Instance) : ModeHandler(Instance, 'P', 0, 0, false, MODETYPE_CHANNEL, false) { } + PermChannel(Module* Creator) : ModeHandler(Creator, "permanent", 'P', PARAM_NONE, MODETYPE_CHANNEL) { oper = true; } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { if (adding) { @@ -37,10 +126,11 @@ class PermChannel : public ModeHandler { if (channel->IsModeSet('P')) { - channel->SetMode('P',false); - + channel->SetMode(this,false); if (channel->GetUserCounter() == 0) - delete channel; + { + channel->DelUser(ServerInstance->FakeClient); + } return MODEACTION_ALLOW; } } @@ -51,45 +141,69 @@ class PermChannel : public ModeHandler class ModulePermanentChannels : public Module { - PermChannel *p; + PermChannel p; + bool dirty; public: - ModulePermanentChannels(InspIRCd* Me) : Module(Me) + ModulePermanentChannels() : p(this), dirty(false) { - p = new PermChannel(ServerInstance); - if (!ServerInstance->Modes->AddMode(p)) - { - delete p; - throw ModuleException("Could not add new modes!"); - } - Implementation eventlist[] = { I_OnChannelPreDelete }; - ServerInstance->Modules->Attach(eventlist, this, 1); + } + + void init() + { + ServerInstance->Modules->AddService(p); + Implementation eventlist[] = { I_OnChannelPreDelete, I_OnPostTopicChange, I_OnRawMode, I_OnRehash, I_OnBackgroundTimer }; + ServerInstance->Modules->Attach(eventlist, this, 5); - OnRehash(NULL, ""); + OnRehash(NULL); } - virtual ~ModulePermanentChannels() + CullResult cull() { - ServerInstance->Modes->DelMode(p); - delete p; + /* + * DelMode can't remove the +P mode on empty channels, or it will break + * merging modes with remote servers. Remove the empty channels now as + * we know this is not the case. + */ + chan_hash::iterator iter = ServerInstance->chanlist->begin(); + while (iter != ServerInstance->chanlist->end()) + { + Channel* c = iter->second; + if (c->GetUserCounter() == 0) + { + chan_hash::iterator at = iter; + iter++; + FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(c)); + ServerInstance->chanlist->erase(at); + ServerInstance->GlobalCulls.AddItem(c); + } + else + iter++; + } + ServerInstance->Modes->DelMode(&p); + return Module::cull(); } - virtual void OnRehash(User *user, const std::string ¶meter) + virtual void OnRehash(User *user) { /* * Process config-defined list of permanent channels. * -- w00t */ - ConfigReader MyConf(ServerInstance); - for (int i = 0; i < MyConf.Enumerate("permchannels"); i++) + + permchannelsconf = ServerInstance->Config->ConfValue("permchanneldb")->getString("filename"); + + ConfigTagList permchannels = ServerInstance->Config->ConfTags("permchannels"); + for (ConfigIter i = permchannels.first; i != permchannels.second; ++i) { - std::string channel = MyConf.ReadValue("permchannels", "channel", i); - std::string topic = MyConf.ReadValue("permchannels", "topic", i); - std::string modes = MyConf.ReadValue("permchannels", "modes", i); + ConfigTag* tag = i->second; + std::string channel = tag->getString("channel"); + std::string topic = tag->getString("topic"); + std::string modes = tag->getString("modes"); - if (channel.empty() || topic.empty()) + if (channel.empty()) { - ServerInstance->Logs->Log("blah", DEBUG, "Malformed permchannels tag with empty topic or channel name."); + ServerInstance->Logs->Log("blah", DEBUG, "Malformed permchannels tag with empty channel name."); continue; } @@ -97,8 +211,19 @@ public: if (!c) { - c = new Channel(ServerInstance, channel, ServerInstance->Time()); - c->SetTopic(NULL, topic, true); + c = new Channel(channel, ServerInstance->Time()); + if (!topic.empty()) + { + c->SetTopic(NULL, topic, true); + + /* + * Due to the way protocol works in 1.2, we need to hack the topic TS in such a way that this + * topic will always win over others. + * + * This is scheduled for (proper) fixing in a later release, and can be removed at a later date. + */ + c->topicset = 42; + } ServerInstance->Logs->Log("blah", DEBUG, "Added %s with topic %s", channel.c_str(), topic.c_str()); if (modes.empty()) @@ -128,17 +253,38 @@ public: } } + virtual ModResult OnRawMode(User* user, Channel* chan, const char mode, const std::string ¶m, bool adding, int pcnt) + { + if (chan && (chan->IsModeSet('P') || mode == 'P')) + dirty = true; + + return MOD_RES_PASSTHRU; + } + + virtual void OnPostTopicChange(User*, Channel *c, const std::string&) + { + if (c->IsModeSet('P')) + dirty = true; + } + + void OnBackgroundTimer(time_t) + { + if (dirty) + WriteDatabase(); + dirty = false; + } + virtual Version GetVersion() { - return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION); + return Version("Provides support for channel mode +P to provide permanent channels",VF_VENDOR); } - virtual int OnChannelPreDelete(Channel *c) + virtual ModResult OnChannelPreDelete(Channel *c) { if (c->IsModeSet('P')) - return 1; + return MOD_RES_DENY; - return 0; + return MOD_RES_PASSTHRU; } };