Fix m_banredirect: (hint: sizeof(f) != sizeof(*f) ;p)

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

diff --git a/include/inspircd.h b/include/inspircd.h
index 28d2d534c127a832f242f7bc15c93ac4f6121383..12030677c221e16e69526eeff36073baaf80549e 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -56,14 +56,6 @@
  */
 #define ETIREDHAMSTERS EAGAIN
 
-/** Delete a pointer, and NULL its value
- */
-template<typename T> inline void DELETE(T* x)
-{
-       delete x;
-       x = NULL;
-}
-
 /** Template function to convert any input type to std::string
  */
 template<typename T> inline std::string ConvNumeric(const T &in)
@@ -77,7 +69,7 @@ template<typename T> inline std::string ConvNumeric(const T &in)
                ++out;
                quotient /= 10;
        }
-       if ( in < 0)
+       if (in < 0)
                *out++ = '-';
        *out = 0;
        std::reverse(res,out);
@@ -98,13 +90,6 @@ inline std::string ConvToStr(const long in)
        return ConvNumeric(in);
 }
 
-/** Template function to convert any input type to std::string
- */
-inline std::string ConvToStr(const unsigned long in)
-{
-       return ConvNumeric(in);
-}
-
 /** Template function to convert any input type to std::string
  */
 inline std::string ConvToStr(const char* in)
@@ -239,6 +224,7 @@ DEFINE_HANDLER1(FloodQuitUserHandler, void, User*);
 
 /* Forward declaration - required */
 class XLineManager;
+class BanCacheManager;
 
 /** The main class of the irc server.
  * This class contains instances of all the other classes
@@ -408,6 +394,11 @@ class CoreExport InspIRCd : public classbase
         */
        ModuleManager* Modules;
 
+       /** BanCacheManager is used to speed up checking of restrictions on connection
+        * to the IRCd.
+        */
+       BanCacheManager *BanCache;
+
        /** Stats class, holds miscellaneous stats counters
         */
        serverstats* stats;
@@ -681,11 +672,6 @@ class CoreExport InspIRCd : public classbase
         */
        int RegisteredUserCount();
 
-       /** Return a count of invisible (umode +i) users only
-        * @return The number of invisible users
-        */
-       int InvisibleUserCount();
-
        /** Return a count of opered (umode +o) users only
         * @return The number of opers
         */
@@ -732,10 +718,9 @@ class CoreExport InspIRCd : public classbase
 
        /** Add a new mode to this server's mode parser
         * @param mh The modehandler to add
-        * @param modechar The mode character this modehandler handles
         * @return True if the mode handler was added
         */
-       bool AddMode(ModeHandler* mh, const unsigned char modechar);
+       bool AddMode(ModeHandler* mh);
 
        /** Add a new mode watcher to this server's mode parser
         * @param mw The modewatcher to add
@@ -808,76 +793,6 @@ class CoreExport InspIRCd : public classbase
         */
        bool IsValidModuleCommand(const std::string &commandname, int pcnt, User* user);
 
-       /** Add a gline and apply it
-        * @param duration How long the line should last
-        * @param source Who set the line
-        * @param reason The reason for the line
-        * @param hostmask The hostmask to set the line against
-        */
-       void AddGLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask);
-
-       /** Add a qline and apply it
-        * @param duration How long the line should last
-        * @param source Who set the line
-        * @param reason The reason for the line
-        * @param nickname The nickmask to set the line against
-        */
-       void AddQLine(long duration, const std::string &source, const std::string &reason, const std::string &nickname);
-
-       /** Add a zline and apply it
-        * @param duration How long the line should last
-        * @param source Who set the line
-        * @param reason The reason for the line
-        * @param ipaddr The ip-mask to set the line against
-        */
-       void AddZLine(long duration, const std::string &source, const std::string &reason, const std::string &ipaddr);
-
-       /** Add a kline and apply it
-        * @param duration How long the line should last
-        * @param source Who set the line
-        * @param reason The reason for the line
-        * @param hostmask The hostmask to set the line against
-        */
-       void AddKLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask);
-
-       /** Add an eline
-        * @param duration How long the line should last
-        * @param source Who set the line
-        * @param reason The reason for the line
-        * @param hostmask The hostmask to set the line against
-        */
-       void AddELine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask);
-
-       /** Delete a gline
-        * @param hostmask The gline to delete
-        * @return True if the item was removed
-        */
-       bool DelGLine(const std::string &hostmask);
-
-       /** Delete a qline
-        * @param nickname The qline to delete
-        * @return True if the item was removed
-        */
-       bool DelQLine(const std::string &nickname);
-
-       /** Delete a zline
-        * @param ipaddr The zline to delete
-        * @return True if the item was removed
-        */
-       bool DelZLine(const std::string &ipaddr);
-
-       /** Delete a kline
-        * @param hostmask The kline to delete
-        * @return True if the item was removed
-        */
-       bool DelKLine(const std::string &hostmask);
-
-       /** Delete an eline
-        * @param hostmask The kline to delete
-        * @return True if the item was removed
-        */
-       bool DelELine(const std::string &hostmask);
-
        /** Return true if the given parameter is a valid nick!user\@host mask
         * @param mask A nick!user\@host masak to match against
         * @return True i the mask is valid