X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_permchannels.cpp;h=27026bde9f5c38d94aff4bf1afeb5be9df526fb3;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=58a54f7156f30ad7f93435766c27bcc0ef68fee3;hpb=67a4a9b62355ea57a2f4521ca5fc53bd4eac3a1f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp index 58a54f715..27026bde9 100644 --- a/src/modules/m_permchannels.cpp +++ b/src/modules/m_permchannels.cpp @@ -1,16 +1,23 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2008-2009 Robin Burchell * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + #include "inspircd.h" /* $ModDesc: Provides support for channel mode +P to provide permanent channels */ @@ -37,11 +44,12 @@ static bool WriteDatabase() f = fopen(tempname.c_str(), "w"); if (!f) { - ServerInstance->Logs->Log("m_permchannels",DEFAULT, "permchannels: Cannot create database! %s (%d)", strerror(errno), errno); + ServerInstance->Logs->Log("m_permchannels",LOG_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; } + fputs("# Permchannels DB\n# This file is autogenerated; any changes will be overwritten!\n\n", f); // Now, let's write. for (chan_hash::const_iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); i++) { @@ -87,15 +95,23 @@ static bool WriteDatabase() 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->Logs->Log("m_permchannels",LOG_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; } +#ifdef _WIN32 + if (remove(permchannelsconf.c_str())) + { + ServerInstance->Logs->Log("m_permchannels",LOG_DEFAULT, "permchannels: Cannot remove old database! %s (%d)", strerror(errno), errno); + ServerInstance->SNO->WriteToSnoMask('a', "database: cannot remove old database: %s (%d)", strerror(errno), errno); + return false; + } +#endif // 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->Logs->Log("m_permchannels",LOG_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; } @@ -110,24 +126,15 @@ static bool WriteDatabase() class PermChannel : public ModeHandler { public: - PermChannel(Module* Creator) : ModeHandler(Creator, "permanent", 'P', PARAM_NONE, MODETYPE_CHANNEL) { } + 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) { - if (!source->HasPrivPermission("channels/set-permanent")) - { - source->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - You do not have the required operator privileges", source->nick.c_str()); - return MODEACTION_DENY; - } - if (adding) { if (!channel->IsModeSet('P')) { channel->SetMode('P',true); - - // Save permchannels db if needed. - WriteDatabase(); return MODEACTION_ALLOW; } } @@ -135,33 +142,11 @@ class PermChannel : public ModeHandler { if (channel->IsModeSet('P')) { - if (channel->GetUserCounter() == 0 && !IS_SERVER(source)) + channel->SetMode(this,false); + if (channel->GetUserCounter() == 0) { - /* - * ugh, ugh, UGH! - * - * We can't delete this channel the way things work at the moment, - * because of the following scenario: - * s1:#c <-> s2:#c - * - * s1 has a user in #c, s2 does not. s2 has +P set. s2 has a losing TS. - * - * On netmerge, s2 loses, so s2 removes all modes (including +P) which - * would subsequently delete the channel here causing big fucking problems. - * - * I don't think there's really a way around this, so just deny -P on a 0 user chan. - * -- w00t - * - * delete channel; - */ - return MODEACTION_DENY; + channel->DelUser(ServerInstance->FakeClient); } - - /* 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; } } @@ -173,19 +158,31 @@ class PermChannel : public ModeHandler class ModulePermanentChannels : public Module { PermChannel p; + bool dirty; public: - ModulePermanentChannels() : p(this) + ModulePermanentChannels() : p(this), dirty(false) + { + } + + void init() { - if (!ServerInstance->Modes->AddMode(&p)) - throw ModuleException("Could not add new modes!"); - Implementation eventlist[] = { I_OnChannelPreDelete, I_OnPostTopicChange, I_OnRawMode }; - ServerInstance->Modules->Attach(eventlist, this, 3); + ServerInstance->Modules->AddService(p); + Implementation eventlist[] = { I_OnChannelPreDelete, I_OnPostTopicChange, I_OnRawMode, I_OnRehash, I_OnBackgroundTimer }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); OnRehash(NULL); + + // Load only when there are no linked servers - we set the TS of the channels we + // create to the current time, this can lead to desync because spanningtree has + // no way of knowing what we do + ProtoServerList serverlist; + ServerInstance->PI->GetServerList(serverlist); + if (serverlist.size() < 2) + LoadDatabase(); } - virtual ~ModulePermanentChannels() + CullResult cull() { /* * DelMode can't remove the +P mode on empty channels, or it will break @@ -200,33 +197,39 @@ public: { chan_hash::iterator at = iter; iter++; + FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(c)); ServerInstance->chanlist->erase(at); - delete c; + ServerInstance->GlobalCulls.AddItem(c); } else iter++; } + ServerInstance->Modes->DelMode(&p); + return Module::cull(); } virtual void OnRehash(User *user) + { + permchannelsconf = ServerInstance->Config->ConfValue("permchanneldb")->getString("filename"); + } + + void LoadDatabase() { /* * Process config-defined list of permanent channels. * -- w00t */ - ConfigReader MyConf; - - permchannelsconf = MyConf.ReadValue("permchanneldb", "filename", "", 0, false); - - for (int i = 0; i < MyConf.Enumerate("permchannels"); i++) + 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()) { - ServerInstance->Logs->Log("blah", DEBUG, "Malformed permchannels tag with empty channel name."); + ServerInstance->Logs->Log("m_permchannels", LOG_DEBUG, "Malformed permchannels tag with empty channel name."); continue; } @@ -247,7 +250,7 @@ public: */ c->topicset = 42; } - ServerInstance->Logs->Log("blah", DEBUG, "Added %s with topic %s", channel.c_str(), topic.c_str()); + ServerInstance->Logs->Log("m_permchannels", LOG_DEBUG, "Added %s with topic %s", channel.c_str(), topic.c_str()); if (modes.empty()) continue; @@ -278,8 +281,8 @@ 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(); + if (chan && (chan->IsModeSet('P') || mode == 'P')) + dirty = true; return MOD_RES_PASSTHRU; } @@ -287,12 +290,19 @@ public: 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("Provides support for channel mode +P to provide permanent channels",VF_COMMON|VF_VENDOR); + return Version("Provides support for channel mode +P to provide permanent channels",VF_VENDOR); } virtual ModResult OnChannelPreDelete(Channel *c)