* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
class PermChannel : public ModeHandler
{
public:
- PermChannel(InspIRCd* Instance) : ModeHandler(Instance, 'P', 0, 0, false, MODETYPE_CHANNEL, false) { }
+ PermChannel(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'P', 0, 0, false, MODETYPE_CHANNEL, false) { }
- 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 (!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'))
{
if (channel->IsModeSet('P'))
{
- channel->SetMode('P',false);
+ if (channel->GetUserCounter() == 0 && !IS_FAKE(source))
+ {
+ /*
+ * 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;
+ }
- if (channel->GetUserCounter() == 0)
- delete channel;
+ /* for servers, remove +P (to avoid desyncs) but don't bother trying to delete. */
+ channel->SetMode('P',false);
return MODEACTION_ALLOW;
}
}
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);
- 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.
std::string topic = MyConf.ReadValue("permchannels", "topic", i);
std::string modes = MyConf.ReadValue("permchannels", "modes", i);
- 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;
}
if (!c)
{
c = new Channel(ServerInstance, channel, ServerInstance->Time());
- c->SetTopic(NULL, topic, true);
+ 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())
virtual Version GetVersion()
{
- return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+ 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;
}
};