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

diff --git a/include/cull_list.h b/include/cull_list.h
index 36a8886a0..adc9fe8d5 100644
--- a/include/cull_list.h
+++ b/include/cull_list.h
@@ -33,7 +33,7 @@
  * 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 +42,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 +50,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,7 +76,7 @@ class CullItem
  * you attempt to add the same user twice, then the second
  * attempt will be ignored.
  */
-class CullList
+class CullList : public classbase
 {
  private:
 	 /** Holds a list of users being quit.
@@ -82,9 +86,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)
@@ -101,7 +108,8 @@ class CullList
 	  * @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