X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fcull_list.h;h=96d5a83c5121fec27627d81be95aab6f8f40fcc4;hb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;hp=36a8886a0f53958c0bb48304b44934d7f56e91e7;hpb=b477cc1c3439faa8f50a46a0c5f3dd9082007bec;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/cull_list.h b/include/cull_list.h
index 36a8886a0..96d5a83c5 100644
--- a/include/cull_list.h
+++ b/include/cull_list.h
@@ -28,12 +28,14 @@
 #include "users.h"
 #include "channels.h"
 
+class InspIRCd;
+
 /** The CullItem class holds a user and their quitmessage,
  * and is used internally by the CullList class to compile
  * a list of users which are to be culled when a long
  * operation (such as a netsplit) has completed.
  */
-class CullItem
+class CullItem : public classbase
 {
  private:
 	/** Holds a pointer to the user,
@@ -42,7 +44,7 @@ class CullItem
         userrec* user;
 	/** Holds the quit reason to use for this user.
 	 */
-        std::string reason;
+	std::string reason;
  public:
 	/** Constrcutor.
 	 * Initializes the CullItem with a user pointer
@@ -50,13 +52,17 @@ class CullItem
 	 * @param u The user to add
 	 * @param r The quit reason of the added user
 	 */
-        CullItem(userrec* u, std::string r);
+        CullItem(userrec* u, std::string &r);
+	CullItem(userrec* u, const char* r);
+
+	~CullItem();
+
 	/** Returns a pointer to the user
 	 */
         userrec* GetUser();
 	/** Returns the user's quit reason
 	 */
-        std::string GetReason();
+	std::string& GetReason();
 };
 
 /** The CullList class can be used by modules, and is used
@@ -72,9 +78,12 @@ class CullItem
  * you attempt to add the same user twice, then the second
  * attempt will be ignored.
  */
-class CullList
+class CullList : public classbase
 {
  private:
+	 /** Creator of this CullList
+	  */
+	 InspIRCd* ServerInstance;
 	 /** Holds a list of users being quit.
 	  * See the information for CullItem for
 	  * more information.
@@ -82,9 +91,12 @@ class CullList
          std::vector<CullItem> list;
 	 /** A list of users who have already been
 	  * placed on the list, as a map for fast
-	  * reference.
+	  * reference. When deleting an item, the
+	  * time_t value stored here must match
+	  * the one of the actual userrec, otherwise
+	  * we don't delete it (its a different user)
 	  */
-	 std::map<userrec*,int> exempt;
+	 std::map<userrec*,time_t> exempt;
 	 
 	 /** Check if a user pointer is valid
 	  * (e.g. it exists in the user hash)
@@ -94,14 +106,16 @@ class CullList
 	 /** Constructor.
 	  * Clears the CullList::list and CullList::exempt
 	  * items.
+	  * @param Instance Creator of this CullList object
 	  */
-         CullList();
+         CullList(InspIRCd* Instance);
 	 /** Adds a user to the cull list for later
 	  * removal via QUIT.
 	  * @param user The user to add
 	  * @param reason The quit reason of the user being added
 	  */
-         void AddItem(userrec* user, std::string reason);
+         void AddItem(userrec* user, std::string &reason);
+	 void AddItem(userrec* user, const char* reason);
 	 /** Applies the cull list, quitting all the users
 	  * on the list with their quit reasons all at once.
 	  * This is a very fast operation compared to