X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_permchannels.cpp;h=e27b2cf9c4239152e3a9be63d36035148e10bf1a;hb=63d3e056b742598f48ba9a8df216b06117a37910;hp=85c83940e79eb9899e4a0d15c366a10a8f6c8b62;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp index 85c83940e..e27b2cf9c 100644 --- a/src/modules/m_permchannels.cpp +++ b/src/modules/m_permchannels.cpp @@ -15,15 +15,77 @@ /* $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. + Channel *c = NULL; + + for (chan_hash::const_iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); i++) + { + c = i->second; + + if (c->IsModeSet('P')) + { + fprintf(f, "\n", c->name.c_str(), c->topic.c_str(), c->ChanModes(true)); + } + } + + 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(InspIRCd* Instance, Module* Creator) : ModeHandler(Creator, 'P', PARAM_NONE, MODETYPE_CHANNEL) { } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool sm) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { if (!source->HasPrivPermission("channels/set-permanent")) { @@ -36,6 +98,9 @@ class PermChannel : public ModeHandler if (!channel->IsModeSet('P')) { channel->SetMode('P',true); + + // Save permchannels db if needed. + WriteDatabase(); return MODEACTION_ALLOW; } } @@ -43,7 +108,7 @@ class PermChannel : public ModeHandler { if (channel->IsModeSet('P')) { - if (channel->GetUserCounter() == 0 && !sm) + if (channel->GetUserCounter() == 0 && !IS_FAKE(source)) { /* * ugh, ugh, UGH! @@ -67,6 +132,9 @@ class PermChannel : public ModeHandler /* for servers, remove +P (to avoid desyncs) but don't bother trying to delete. */ channel->SetMode('P',false); + + // Save permchannels db if needed. + WriteDatabase(); return MODEACTION_ALLOW; } } @@ -77,36 +145,53 @@ class PermChannel : public ModeHandler class ModulePermanentChannels : public Module { - PermChannel *p; + PermChannel p; public: - ModulePermanentChannels(InspIRCd* Me) : Module(Me) + ModulePermanentChannels(InspIRCd* Me) : Module(Me), p(Me, this) { - p = new PermChannel(ServerInstance); - if (!ServerInstance->Modes->AddMode(p)) - { - delete p; + if (!ServerInstance->Modes->AddMode(&p)) throw ModuleException("Could not add new modes!"); - } - Implementation eventlist[] = { I_OnChannelPreDelete }; - ServerInstance->Modules->Attach(eventlist, this, 1); + Implementation eventlist[] = { I_OnChannelPreDelete, I_OnPostTopicChange, I_OnRawMode }; + ServerInstance->Modules->Attach(eventlist, this, 3); - OnRehash(NULL, ""); + OnRehash(NULL); } virtual ~ModulePermanentChannels() { - ServerInstance->Modes->DelMode(p); - delete p; + ServerInstance->Modes->DelMode(&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++; + ServerInstance->chanlist->erase(at); + delete c; + } + else + iter++; + } } - 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); + + permchannelsconf = MyConf.ReadValue("permchanneldb", "filename", "", 0, false); + for (int i = 0; i < MyConf.Enumerate("permchannels"); i++) { std::string channel = MyConf.ReadValue("permchannels", "channel", i); @@ -125,7 +210,17 @@ public: { c = new Channel(ServerInstance, 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()) @@ -155,17 +250,31 @@ public: } } + virtual ModResult OnRawMode(User* user, Channel* chan, const char mode, const std::string ¶m, bool adding, int pcnt) + { + if (chan && chan->IsModeSet('P')) + WriteDatabase(); + + return MOD_RES_PASSTHRU; + } + + virtual void OnPostTopicChange(User*, Channel *c, const std::string&) + { + if (c->IsModeSet('P')) + WriteDatabase(); + } + virtual Version GetVersion() { return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION); } - 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; } };