Update User::exempt all the time we change an E:Line. Brain, can you check I've done...

[user/henk/code/inspircd.git] / include / xline.h

diff --git a/include/xline.h b/include/xline.h
index 0fa6e3f5320194b6c81552611b1cbfa1e510a391..c2c5e54d776967437e9f69f43691abfd0311a097 100644 (file)
--- a/include/xline.h
+++ b/include/xline.h
@@ -33,7 +33,12 @@ const int APPLY_ALL          = APPLY_GLINES | APPLY_KLINES | APPLY_QLINES | APPLY_ZLINES
  */
 class CoreExport XLine : public classbase
 {
-  public:
+ protected:
+
+       InspIRCd* ServerInstance;
+       void DefaultApply(User* u, char line);
+
+ public:
 
        /** Create an XLine.
         * @param s_time The set time
@@ -41,8 +46,8 @@ class CoreExport XLine : public classbase
         * @param src The sender of the xline
         * @param re The reason of the xline
         */
-       XLine(time_t s_time, long d, const char* src, const char* re)
-               : set_time(s_time), duration(d)
+       XLine(InspIRCd* Instance, time_t s_time, long d, const char* src, const char* re)
+               : ServerInstance(Instance), set_time(s_time), duration(d)
        {
                source = strdup(src);
                reason = strdup(re);
@@ -61,6 +66,10 @@ class CoreExport XLine : public classbase
         */
        virtual bool Matches(User *u) = 0;
 
+       virtual bool Matches(const std::string &str);
+
+       virtual void Apply(User* u);
+
        /** The time the line was added.
         */
        time_t set_time;
@@ -80,6 +89,10 @@ class CoreExport XLine : public classbase
        /** Expiry time
         */
        time_t expiry;
+
+       /** Q, K, etc. Don't change this. Constructors set it.
+        */
+       char type;
 };
 
 /** KLine class
@@ -95,10 +108,11 @@ class CoreExport KLine : public XLine
         * @param ident Ident to match
         * @param host Host to match
         */
-       KLine(time_t s_time, long d, const char* src, const char* re, const char* ident, const char* host) : XLine(s_time, d, src, re)
+       KLine(InspIRCd* Instance, time_t s_time, long d, const char* src, const char* re, const char* ident, const char* host) : XLine(Instance, s_time, d, src, re)
        {
                identmask = strdup(ident);
                hostmask = strdup(host);
+               type = 'K';
        }
 
        /** Destructor
@@ -111,6 +125,8 @@ class CoreExport KLine : public XLine
 
        virtual bool Matches(User *u);
 
+       virtual void Apply(User* u);
+
        /** Ident mask
         */
        char* identmask;
@@ -132,10 +148,11 @@ class CoreExport GLine : public XLine
         * @param ident Ident to match
         * @param host Host to match
         */
-       GLine(time_t s_time, long d, const char* src, const char* re, const char* ident, const char* host) : XLine(s_time, d, src, re)
+       GLine(InspIRCd* Instance, time_t s_time, long d, const char* src, const char* re, const char* ident, const char* host) : XLine(Instance, s_time, d, src, re)
        {
                identmask = strdup(ident);
                hostmask = strdup(host);
+               type = 'G';
        }
 
        /** Destructor
@@ -148,6 +165,8 @@ class CoreExport GLine : public XLine
 
        virtual bool Matches(User *u);
 
+       virtual void Apply(User* u);
+
        /** Ident mask
         */
        char* identmask;
@@ -169,10 +188,11 @@ class CoreExport ELine : public XLine
         * @param ident Ident to match
         * @param host Host to match
         */
-       ELine(time_t s_time, long d, const char* src, const char* re, const char* ident, const char* host) : XLine(s_time, d, src, re)
+       ELine(InspIRCd* Instance, time_t s_time, long d, const char* src, const char* re, const char* ident, const char* host) : XLine(Instance, s_time, d, src, re)
        {
                identmask = strdup(ident);
                hostmask = strdup(host);
+               type = 'E';
        }
 
        ~ELine()
@@ -203,9 +223,10 @@ class CoreExport ZLine : public XLine
         * @param re The reason of the xline
         * @param ip IP to match
         */
-       ZLine(time_t s_time, long d, const char* src, const char* re, const char* ip) : XLine(s_time, d, src, re)
+       ZLine(InspIRCd* Instance, time_t s_time, long d, const char* src, const char* re, const char* ip) : XLine(Instance, s_time, d, src, re)
        {
                ipaddr = strdup(ip);
+               type = 'Z';
        }
 
        /** Destructor
@@ -217,6 +238,10 @@ class CoreExport ZLine : public XLine
 
        virtual bool Matches(User *u);
 
+       virtual bool Matches(const std::string &str);
+
+       virtual void Apply(User* u);
+
        /** IP mask
         */
        char* ipaddr;
@@ -234,9 +259,10 @@ class CoreExport QLine : public XLine
         * @param re The reason of the xline
         * @param nickname Nickname to match
         */
-       QLine(time_t s_time, long d, const char* src, const char* re, const char* nickname) : XLine(s_time, d, src, re)
+       QLine(InspIRCd* Instance, time_t s_time, long d, const char* src, const char* re, const char* nickname) : XLine(Instance, s_time, d, src, re)
        {
                nick = strdup(nickname);
+               type = 'Q';
        }
 
        /** Destructor
@@ -248,6 +274,10 @@ class CoreExport QLine : public XLine
        }
        virtual bool Matches(User *u);
 
+       virtual bool Matches(const std::string &str);
+
+       virtual void Apply(User* u);
+
        /** Nickname mask
         */
        char* nick;
@@ -304,6 +334,10 @@ class CoreExport XLineManager
        /** This functor is used by the std::sort() function to keep all lines in order
         */
        static bool XSortComparison (const XLine *one, const XLine *two);
+
+       /** Used to hold XLines which have not yet been applied.
+        */
+       std::vector<XLine *> pending_lines;
  public:
        /* Lists for temporary lines with an expiry time */