X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_xline_db.cpp;h=2237b0d081e8036217606e7a3c22de29d7b0942e;hb=fc4fc43ec232407b38d7ca182cb92c5cac4287aa;hp=af011173a42ca300d66a604675918d6feed53e2c;hpb=27c6e9c76ecf069521b0a561241cf362134a3eef;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp index af011173a..2237b0d08 100644 --- a/src/modules/m_xline_db.cpp +++ b/src/modules/m_xline_db.cpp @@ -1,29 +1,52 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2008 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" #include "xline.h" +/* $ModConfig: + * Specify the filename for the xline database here*/ /* $ModDesc: Keeps a dynamic log of all XLines created, and stores them in a seperate conf file (xline.db). */ class ModuleXLineDB : public Module { - std::vector xlines; + bool dirty; + std::string xlinedbpath; public: - ModuleXLineDB(InspIRCd* Me) : Module(Me) + void init() { - Implementation eventlist[] = { I_OnAddLine, I_OnDelLine }; - ServerInstance->Modules->Attach(eventlist, this, 2); + /* Load the configuration + * Note: + * this is on purpose not in the OnRehash() method. It would be non-trivial to change the database on-the-fly. + * Imagine a scenario where the new file already exists. Merging the current XLines with the existing database is likely a bad idea + * ...and so is discarding all current in-memory XLines for the ones in the database. + */ + ConfigTag* Conf = ServerInstance->Config->ConfValue("xlinedb"); + xlinedbpath = Conf->getString("filename", DATA_PATH "/xline.db"); + + // Read xlines before attaching to events + ReadDatabase(); + + Implementation eventlist[] = { I_OnAddLine, I_OnDelLine, I_OnExpireLine, I_OnBackgroundTimer }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); + dirty = false; } virtual ~ModuleXLineDB() @@ -37,16 +60,7 @@ class ModuleXLineDB : public Module */ void OnAddLine(User* source, XLine* line) { - xlines.push_back(line); - - for (std::vector::iterator i = xlines.begin(); i != xlines.end(); i++) - { - line = (*i); - ServerInstance->WriteOpers("%s %s %s %lu %lu :%s", line->type.c_str(), line->Displayable(), -ServerInstance->Config->ServerName, line->set_time, line->duration, line->reason); - } - - WriteDatabase(); + dirty = true; } /** Called whenever an xline is deleted. @@ -56,16 +70,21 @@ ServerInstance->Config->ServerName, line->set_time, line->duration, line->reason */ void OnDelLine(User* source, XLine* line) { - for (std::vector::iterator i = xlines.begin(); i != xlines.end(); i++) + dirty = true; + } + + void OnExpireLine(XLine *line) + { + dirty = true; + } + + void OnBackgroundTimer(time_t now) + { + if (dirty) { - if ((*i) == line) - { - xlines.erase(i); - break; - } + if (WriteDatabase()) + dirty = false; } - - WriteDatabase(); } bool WriteDatabase() @@ -78,16 +97,17 @@ ServerInstance->Config->ServerName, line->set_time, line->duration, line->reason * Technically, that means that this can block, but I have *never* seen that. * -- w00t */ - ServerInstance->Log(DEBUG, "xlinedb: Opening temporary database"); - f = fopen("xline.db.new", "w"); + ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Opening temporary database"); + std::string xlinenewdbpath = xlinedbpath + ".new"; + f = fopen(xlinenewdbpath.c_str(), "w"); if (!f) { - ServerInstance->Log(DEBUG, "xlinedb: Cannot create database! %s (%d)", strerror(errno), errno); - ServerInstance->SNO->WriteToSnoMask('x', "database: cannot create new db: %s (%d)", strerror(errno), errno); + ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Cannot create database! %s (%d)", strerror(errno), errno); + ServerInstance->SNO->WriteToSnoMask('a', "database: cannot create new db: %s (%d)", strerror(errno), errno); return false; } - ServerInstance->Log(DEBUG, "xlinedb: Opened. Writing.."); + ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Opened. Writing.."); /* * Now, much as I hate writing semi-unportable formats, additional @@ -99,40 +119,143 @@ ServerInstance->Config->ServerName, line->set_time, line->duration, line->reason fprintf(f, "VERSION 1\n"); // Now, let's write. - XLine *line; - for (std::vector::iterator i = xlines.begin(); i != xlines.end(); i++) + std::vector types = ServerInstance->XLines->GetAllTypes(); + for (std::vector::const_iterator it = types.begin(); it != types.end(); ++it) { - line = (*i); - fprintf(f, "%s %s %s %lu %lu :%s\n", line->type.c_str(), line->Displayable(), - ServerInstance->Config->ServerName, line->set_time, line->duration, line->reason); + XLineLookup* lookup = ServerInstance->XLines->GetAll(*it); + if (!lookup) + continue; // Not possible as we just obtained the list from XLineManager + + for (LookupIter i = lookup->begin(); i != lookup->end(); ++i) + { + XLine* line = i->second; + fprintf(f, "LINE %s %s %s %lu %lu :%s\n", line->type.c_str(), line->Displayable(), + ServerInstance->Config->ServerName.c_str(), (unsigned long)line->set_time, (unsigned long)line->duration, line->reason.c_str()); + } } - ServerInstance->Log(DEBUG, "xlinedb: Finished writing XLines. Checking for error.."); + ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Finished writing XLines. Checking for error.."); int write_error = 0; write_error = ferror(f); write_error |= fclose(f); if (write_error) { - ServerInstance->Log(DEBUG, "xlinedb: Cannot write to new database! %s (%d)", strerror(errno), errno); - ServerInstance->SNO->WriteToSnoMask('x', "database: cannot write to new db: %s (%d)", strerror(errno), errno); + ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: 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 + remove(xlinedbpath.c_str()); +#endif // Use rename to move temporary to new db - this is guarenteed not to fuck up, even in case of a crash. - if (rename("xline.db.new", "xline.db") < 0) + if (rename(xlinenewdbpath.c_str(), xlinedbpath.c_str()) < 0) { - ServerInstance->Log(DEBUG, "xlinedb: Cannot move new to old database! %s (%d)", strerror(errno), errno); - ServerInstance->SNO->WriteToSnoMask('x', "database: cannot replace old with new db: %s (%d)", strerror(errno), errno); + ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: 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; } + bool ReadDatabase() + { + FILE *f; + char linebuf[MAXBUF]; + + f = fopen(xlinedbpath.c_str(), "r"); + if (!f) + { + if (errno == ENOENT) + { + /* xline.db doesn't exist, fake good return value (we don't care about this) */ + return true; + } + else + { + /* this might be slightly more problematic. */ + ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Cannot read database! %s (%d)", strerror(errno), errno); + ServerInstance->SNO->WriteToSnoMask('a', "database: cannot read db: %s (%d)", strerror(errno), errno); + return false; + } + } + + while (fgets(linebuf, MAXBUF, f)) + { + char *c = linebuf; + + while (c && *c) + { + if (*c == '\n') + { + *c = '\0'; + } + + c++; + } + + // Inspired by the command parser. :) + irc::tokenstream tokens(linebuf); + int items = 0; + std::string command_p[7]; + std::string tmp; + + while (tokens.GetToken(tmp) && (items < 7)) + { + command_p[items] = tmp; + items++; + } + + ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Processing %s", linebuf); + + if (command_p[0] == "VERSION") + { + if (command_p[1] == "1") + { + ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Reading db version %s", command_p[1].c_str()); + } + else + { + fclose(f); + ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: I got database version %s - I don't understand it", command_p[1].c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "database: I got a database version (%s) I don't understand", command_p[1].c_str()); + return false; + } + } + else if (command_p[0] == "LINE") + { + // Mercilessly stolen from spanningtree + XLineFactory* xlf = ServerInstance->XLines->GetFactory(command_p[1]); + + if (!xlf) + { + ServerInstance->SNO->WriteToSnoMask('a', "database: Unknown line type (%s).", command_p[1].c_str()); + continue; + } + + XLine* xl = xlf->Generate(ServerInstance->Time(), atoi(command_p[5].c_str()), command_p[3], command_p[6], command_p[2]); + xl->SetCreateTime(atoi(command_p[4].c_str())); + + if (ServerInstance->XLines->AddLine(xl, NULL)) + { + ServerInstance->SNO->WriteToSnoMask('x', "database: Added a line of type %s", command_p[1].c_str()); + } + else + delete xl; + } + } + + fclose(f); + return true; + } + + + virtual Version GetVersion() { - return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION); + return Version("Keeps a dynamic log of all XLines created, and stores them in a separate conf file (xline.db).", VF_VENDOR); } };