X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_permchannels.cpp;h=a9c4c8a72779e84602285f854efb31baa9e2bb10;hb=de69e28a4a1aea89e410b693bbbb67890ecb0bd3;hp=647c840b57f4328f14b7bae5b4f29bd09e65c251;hpb=86775e2e98f55b3b88befe2daff0ca23f02f3155;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index 647c840b5..a9c4c8a72 100644
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -15,13 +15,102 @@
 
 /* $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[] =
+		{
+			"<permchannels channel=",
+			chan->name.c_str(),
+			" topic=",
+			chan->topic.c_str(),
+			" modes=",
+			chan->ChanModes(true),
+			">\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, Module* Creator) : ModeHandler(Instance, Creator, 'P', 0, 0, false, MODETYPE_CHANNEL, false) { }
+	PermChannel(Module* Creator) : ModeHandler(Creator, "permanent", 'P', PARAM_NONE, MODETYPE_CHANNEL) { }
 
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
@@ -36,6 +125,9 @@ class PermChannel : public ModeHandler
 			if (!channel->IsModeSet('P'))
 			{
 				channel->SetMode('P',true);
+
+				// Save permchannels db if needed.
+				WriteDatabase();
 				return MODEACTION_ALLOW;
 			}
 		}
@@ -43,7 +135,7 @@ class PermChannel : public ModeHandler
 		{
 			if (channel->IsModeSet('P'))
 			{
-				if (channel->GetUserCounter() == 0 && !IS_FAKE(source))
+				if (channel->GetUserCounter() == 0 && !IS_SERVER(source))
 				{
 					/*
 					 * ugh, ugh, UGH!
@@ -67,6 +159,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;
 			}
 		}
@@ -80,19 +175,18 @@ class ModulePermanentChannels : public Module
 	PermChannel p;
 public:
 
-	ModulePermanentChannels(InspIRCd* Me) : Module(Me), p(Me, this)
+	ModulePermanentChannels() : p(this)
 	{
 		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, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 4);
 
 		OnRehash(NULL);
 	}
 
-	virtual ~ModulePermanentChannels()
+	CullResult cull()
 	{
-		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
@@ -106,12 +200,15 @@ 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)
@@ -120,7 +217,10 @@ public:
 		 * Process config-defined list of permanent channels.
 		 * -- w00t
 		 */
-		ConfigReader MyConf(ServerInstance);
+		ConfigReader MyConf;
+
+		permchannelsconf = MyConf.ReadValue("permchanneldb", "filename", "", 0, false);
+
 		for (int i = 0; i < MyConf.Enumerate("permchannels"); i++)
 		{
 			std::string channel = MyConf.ReadValue("permchannels", "channel", i);
@@ -137,7 +237,7 @@ public:
 
 			if (!c)
 			{
-				c = new Channel(ServerInstance, channel, ServerInstance->Time());
+				c = new Channel(channel, ServerInstance->Time());
 				if (!topic.empty())
 				{
 					c->SetTopic(NULL, topic, true);
@@ -179,9 +279,23 @@ public:
 		}
 	}
 
+	virtual ModResult OnRawMode(User* user, Channel* chan, const char mode, const std::string &param, 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);
+		return Version("Provides support for channel mode +P to provide permanent channels",VF_COMMON|VF_VENDOR);
 	}
 
 	virtual ModResult OnChannelPreDelete(Channel *c)