More comments

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

diff --git a/include/xline.h b/include/xline.h
index 648cccbb040afb049c62f07d58b7dd971eef9cc9..30d8abd3ac1baad3e63d06142c72be5cb1718670 100644 (file)
--- a/include/xline.h
+++ b/include/xline.h
@@ -22,15 +22,16 @@
 #include "users.h"
 #include "channels.h"
 
-const int APPLY_GLINES = 1;
-const int APPLY_KLINES = 2;
-const int APPLY_QLINES = 4;
-const int APPLY_ZLINES = 8;
-const int APPLY_ALL    = APPLY_GLINES | APPLY_KLINES | APPLY_QLINES | APPLY_ZLINES;
+const int APPLY_GLINES         = 1;
+const int APPLY_KLINES         = 2;
+const int APPLY_QLINES         = 4;
+const int APPLY_ZLINES         = 8;
+const int APPLY_PERM_ONLY      = 16;
+const int APPLY_ALL            = APPLY_GLINES | APPLY_KLINES | APPLY_QLINES | APPLY_ZLINES;
 
 /** XLine is the base class for ban lines such as G lines and K lines.
  */
-class XLine : public classbase
+class CoreExport XLine : public classbase
 {
   public:
 
@@ -70,7 +71,7 @@ class XLine : public classbase
 
 /** KLine class
  */
-class KLine : public XLine
+class CoreExport KLine : public XLine
 {
   public:
        /** Hostmask (ident@host) to match against
@@ -94,7 +95,7 @@ class KLine : public XLine
 
 /** GLine class
  */
-class GLine : public XLine
+class CoreExport GLine : public XLine
 {
   public:
        /** Hostmask (ident@host) to match against
@@ -118,12 +119,12 @@ class GLine : public XLine
 
 /** ELine class
  */
-class ELine : public XLine
+class CoreExport ELine : public XLine
 {
   public:
-        /** Hostmask (ident@host) to match against
-         * May contain wildcards.
-         */
+       /** Hostmask (ident@host) to match against
+        * May contain wildcards.
+        */
        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)
        {
                identmask = strdup(ident);
@@ -137,12 +138,12 @@ class ELine : public XLine
        }
 
        char* identmask;
-        char* hostmask;
+       char* hostmask;
 };
 
 /** ZLine class
  */
-class ZLine : public XLine
+class CoreExport ZLine : public XLine
 {
   public:
        /** IP Address (xx.yy.zz.aa) to match against
@@ -163,7 +164,7 @@ class ZLine : public XLine
 
 /** QLine class
  */
-class QLine : public XLine
+class CoreExport QLine : public XLine
 {
   public:
        /** Nickname to match against.
@@ -186,7 +187,11 @@ class ServerConfig;
 class InspIRCd;
 
 bool InitXLine(ServerConfig* conf, const char* tag);
-bool DoneXLine(ServerConfig* conf, const char* tag);
+
+bool DoneZLine(ServerConfig* conf, const char* tag);
+bool DoneQLine(ServerConfig* conf, const char* tag);
+bool DoneKLine(ServerConfig* conf, const char* tag);
+bool DoneELine(ServerConfig* conf, const char* tag);
 
 bool DoZLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types);
 bool DoQLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types);
@@ -197,7 +202,7 @@ typedef std::pair<std::string, std::string> IdentHostPair;
 
 /** XLineManager is a class used to manage glines, klines, elines, zlines and qlines.
  */
-class XLineManager
+class CoreExport XLineManager
 {
  protected:
        /** The owner/creator of this class
@@ -311,64 +316,69 @@ class XLineManager
        bool add_eline(long duration, const char* source, const char* reason, const char* hostmask);
 
        /** Delete a GLine
-        * @return hostmask The host to remove
+        * @param hostmask The host to remove
+        * @param simulate If this is true, don't actually remove the line, just return
         * @return True if the line was deleted successfully
         */
-       bool del_gline(const char* hostmask);
+       bool del_gline(const char* hostmask, bool simulate = false);
 
        /** Delete a QLine
-        * @return nickname The nick to remove
+        * @param nickname The nick to remove
+        * @param simulate If this is true, don't actually remove the line, just return
         * @return True if the line was deleted successfully
         */
-       bool del_qline(const char* nickname);
+       bool del_qline(const char* nickname, bool simulate = false);
 
        /** Delete a ZLine
-        * @return ipaddr The IP to remove
+        * @param ipaddr The IP to remove
+        * @param simulate If this is true, don't actually remove the line, just return
         * @return True if the line was deleted successfully
         */
-       bool del_zline(const char* ipaddr);
+       bool del_zline(const char* ipaddr, bool simulate = false);
 
        /** Delete a KLine
-        * @return hostmask The host to remove
+        * @param hostmask The host to remove
+        * @param simulate If this is true, don't actually remove the line, just return
         * @return True if the line was deleted successfully
         */
-       bool del_kline(const char* hostmask);
+       bool del_kline(const char* hostmask, bool simulate = false);
 
        /** Delete a ELine
-        * @return hostmask The host to remove
+        * @param hostmask The host to remove
+        * @param simulate If this is true, don't actually remove the line, just return
         * @return True if the line was deleted successfully
         */
-       bool del_eline(const char* hostmask);
+       bool del_eline(const char* hostmask, bool simulate = false);
 
        /** Check if a nickname matches a QLine
         * @return nick The nick to check against
         * @return The reason for the line if there is a match, or NULL if there is no match
         */
-       QLine* matches_qline(const char* nick);
+       QLine* matches_qline(const char* nick, bool permonly = false);
 
        /** Check if a hostname matches a GLine
         * @param user The user to check against
         * @return The reason for the line if there is a match, or NULL if there is no match
         */
-       GLine* matches_gline(userrec* user);
+       GLine* matches_gline(userrec* user, bool permonly = false);
 
        /** Check if a IP matches a ZLine
         * @param ipaddr The IP to check against
         * @return The reason for the line if there is a match, or NULL if there is no match
         */
-       ZLine* matches_zline(const char* ipaddr);
+       ZLine* matches_zline(const char* ipaddr, bool permonly = false);
 
        /** Check if a hostname matches a KLine
         * @param user The user to check against
         * @return The reason for the line if there is a match, or NULL if there is no match
         */
-       KLine* matches_kline(userrec* user);
+       KLine* matches_kline(userrec* user, bool permonly = false);
 
        /** Check if a hostname matches a ELine
         * @param user The user to check against
         * @return The reason for the line if there is a match, or NULL if there is no match
         */
-       ELine* matches_exception(userrec* user);
+       ELine* matches_exception(userrec* user, bool permonly = false);
 
        /** Expire any pending non-permenant lines
         */
@@ -377,6 +387,7 @@ class XLineManager
        /** Apply any new lines
         * @param What The types of lines to apply, from the set
         * APPLY_GLINES | APPLY_KLINES | APPLY_QLINES | APPLY_ZLINES | APPLY_ALL
+        * | APPLY_LOCAL_ONLY
         */
        void apply_lines(const int What);
 
@@ -436,3 +447,4 @@ class XLineManager
 };
 
 #endif
+