Add IPV6_V6ONLY support

[user/henk/code/inspircd.git] / src / modules / m_xline_db.cpp

diff --git a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp
index fa4d67d59a03c0bfb55928ea396b8c1627c39da3..7bef6e590ba7358eee81a71e5de0b7cbeaed419c 100644 (file)
--- 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-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -22,8 +22,7 @@ class ModuleXLineDB : public Module
        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)
-       {
+       ModuleXLineDB()         {
                Implementation eventlist[] = { I_OnAddLine, I_OnDelLine, I_OnExpireLine };
                ServerInstance->Modules->Attach(eventlist, this, 3);
 
@@ -93,11 +92,11 @@ class ModuleXLineDB : public Module
                 *              -- w00t
                 */
                ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Opening temporary database");
-               f = fopen("xline.db.new", "w");
+               f = fopen("data/xline.db.new", "w");
                if (!f)
                {
                        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);
+                       ServerInstance->SNO->WriteToSnoMask('a', "database: cannot create new db: %s (%d)", strerror(errno), errno);
                        return false;
                }
 
@@ -118,7 +117,7 @@ class ModuleXLineDB : public Module
                {
                        line = (*i);
                        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->Config->ServerName.c_str(), (unsigned long)line->set_time, (unsigned long)line->duration, line->reason.c_str());
                }
 
                ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Finished writing XLines. Checking for error..");
@@ -129,15 +128,15 @@ class ModuleXLineDB : public Module
                if (write_error)
                {
                        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);
+                       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("xline.db.new", "xline.db") < 0)
+               if (rename("data/xline.db.new", "data/xline.db") < 0)
                {
                        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);
+                       ServerInstance->SNO->WriteToSnoMask('a', "database: cannot replace old with new db: %s (%d)", strerror(errno), errno);
                        return false;
                }
 
@@ -150,7 +149,7 @@ class ModuleXLineDB : public Module
                char linebuf[MAXBUF];
                unsigned int lineno = 0;
 
-               f = fopen("xline.db", "r");
+               f = fopen("data/xline.db", "r");
                if (!f)
                {
                        if (errno == ENOENT)
@@ -162,7 +161,7 @@ class ModuleXLineDB : public Module
                        {
                                /* 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);
+                               ServerInstance->SNO->WriteToSnoMask('a', "database: cannot read db: %s (%d)", strerror(errno), errno);
                                return false;
                        }
                }
@@ -191,7 +190,7 @@ class ModuleXLineDB : public Module
 
                        while (tokens.GetToken(tmp) && (items < MAXPARAMETERS))
                        {
-                               command_p[items] = tmp.c_str();
+                               command_p[items] = tmp;
                                items++;
                        }
 
@@ -207,7 +206,7 @@ class ModuleXLineDB : public Module
                                {
                                        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());
+                                       ServerInstance->SNO->WriteToSnoMask('a', "database: I got a database version (%s) I don't understand", command_p[1].c_str());
                                        return false;
                                }
                        }
@@ -218,11 +217,11 @@ class ModuleXLineDB : public Module
 
                                if (!xlf)
                                {
-                                       ServerInstance->SNO->WriteToSnoMask('x', "database: Unknown line type (%s).", command_p[1].c_str());
+                                       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].c_str(), command_p[6].c_str(), command_p[2].c_str());
+                               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))
@@ -232,14 +231,15 @@ class ModuleXLineDB : public Module
                        }
                }
 
+               fclose(f);
                return true;
        }
 
-       
+
 
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
+               return Version("Keeps a dynamic log of all XLines created, and stores them in a seperate conf file (xline.db).", VF_VENDOR);
        }
 };