X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_xline_db.cpp;h=09a8c242d35a16723b663f3b60979e4bdbb32b58;hb=8cebe2878f3878afce6f643d93668155cb26801d;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..09a8c242d 100644 --- a/src/modules/m_xline_db.cpp +++ b/src/modules/m_xline_db.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 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. @@ -19,11 +19,17 @@ class ModuleXLineDB : public Module { std::vector xlines; + bool reading_db; // If this is true, addlines are as a result of db reading, so don't bother flushing the db to disk. + // DO REMEMBER TO SET IT, otherwise it's annoying :P public: ModuleXLineDB(InspIRCd* Me) : Module(Me) { - Implementation eventlist[] = { I_OnAddLine, I_OnDelLine }; - ServerInstance->Modules->Attach(eventlist, this, 2); + Implementation eventlist[] = { I_OnAddLine, I_OnDelLine, I_OnExpireLine }; + ServerInstance->Modules->Attach(eventlist, this, 3); + + reading_db = true; + ReadDatabase(); + reading_db = false; } virtual ~ModuleXLineDB() @@ -37,16 +43,13 @@ class ModuleXLineDB : public Module */ void OnAddLine(User* source, XLine* line) { + ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Adding a line"); xlines.push_back(line); - for (std::vector::iterator i = xlines.begin(); i != xlines.end(); i++) + if (!reading_db) { - 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(); } - - WriteDatabase(); } /** Called whenever an xline is deleted. @@ -56,6 +59,17 @@ ServerInstance->Config->ServerName, line->set_time, line->duration, line->reason */ void OnDelLine(User* source, XLine* line) { + RemoveLine(line); + } + + void OnExpireLine(XLine *line) + { + RemoveLine(line); + } + + void RemoveLine(XLine *line) + { + ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Removing a line"); for (std::vector::iterator i = xlines.begin(); i != xlines.end(); i++) { if ((*i) == line) @@ -78,16 +92,16 @@ 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"); + ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Opening temporary database"); f = fopen("xline.db.new", "w"); if (!f) { - ServerInstance->Log(DEBUG, "xlinedb: Cannot create database! %s (%d)", strerror(errno), errno); + ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Cannot create database! %s (%d)", strerror(errno), errno); ServerInstance->SNO->WriteToSnoMask('x', "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 @@ -103,18 +117,18 @@ ServerInstance->Config->ServerName, line->set_time, line->duration, line->reason for (std::vector::iterator i = xlines.begin(); i != xlines.end(); i++) { 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); + fprintf(f, "LINE %s %s %s %lu %lu :%s\n", line->type.c_str(), line->Displayable(), + ServerInstance->Config->ServerName, (unsigned long)line->set_time, (unsigned long)line->duration, line->reason); } - 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->Logs->Log("m_xline_db",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); return false; } @@ -122,7 +136,7 @@ ServerInstance->Config->ServerName, line->set_time, line->duration, line->reason // 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) { - ServerInstance->Log(DEBUG, "xlinedb: Cannot move new to old database! %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('x', "database: cannot replace old with new db: %s (%d)", strerror(errno), errno); return false; } @@ -130,9 +144,102 @@ ServerInstance->Config->ServerName, line->set_time, line->duration, line->reason return true; } + bool ReadDatabase() + { + FILE *f; + char linebuf[MAXBUF]; + unsigned int lineno = 0; + + f = fopen("xline.db", "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('x', "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++; + } + // Smart man might think of initing to 1, and moving this to the bottom. Don't. We use continue in this loop. + lineno++; + + // Inspired by the command parser. :) + irc::tokenstream tokens(linebuf); + int items = 0; + std::string command_p[MAXPARAMETERS]; + std::string tmp; + + while (tokens.GetToken(tmp) && (items < MAXPARAMETERS)) + { + command_p[items] = tmp.c_str(); + 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('x', "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('x', "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].c_str(), command_p[6].c_str(), command_p[2].c_str()); + 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()); + } + } + } + + return true; + } + + + virtual Version GetVersion() { - return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION); + return Version("$Id$", VF_VENDOR, API_VERSION); } };