Reset the already_sent IDs during slow garbage collection

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

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index c7ec7a4dbe93528a65fc4039d6a647d7e96f5d32..4d99654e12d7d7a121d028027f01e908582f1f36 100644 (file)
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -66,7 +66,6 @@ class callerid_data
                        // Encode UIDs.
                        oss << "," << (format == FORMAT_USER ? u->nick : u->uuid);
                }
-               oss << std::ends;
                return oss.str();
        }
 };
@@ -222,6 +221,11 @@ public:
                }
        }
 
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
+
        void ListAccept(User* user)
        {
                callerid_data* dat = extInfo.get(user, false);
@@ -344,13 +348,15 @@ private:
 public:
        ModuleCallerID() : cmd(this), myumode(this)
        {
-               OnRehash(NULL);
+       }
 
-               if (!ServerInstance->Modes->AddMode(&myumode))
-                       throw ModuleException("Could not add usermode +g");
+       void init()
+       {
+               OnRehash(NULL);
 
-               ServerInstance->AddCommand(&cmd);
-               ServerInstance->Extensions.Register(&cmd.extInfo);
+               ServerInstance->Modules->AddService(myumode);
+               ServerInstance->Modules->AddService(cmd);
+               ServerInstance->Modules->AddService(cmd.extInfo);
 
                Implementation eventlist[] = { I_OnRehash, I_OnUserPreNick, I_OnUserQuit, I_On005Numeric, I_OnUserPreNotice, I_OnUserPreMessage };
                ServerInstance->Modules->Attach(eventlist, this, 6);