From 3dacf1edd2e1e623b07819bb483ae61eff3854cd Mon Sep 17 00:00:00 2001 From: brain Date: Mon, 10 Jul 2006 18:22:16 +0000 Subject: Made a load more stuff Extensible which might be of use to someone git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4293 e03df62e-2008-0410-955e-edbf42e46eb7 --- include/base.h | 5 ----- include/configreader.h | 20 ++++++++++---------- include/ctables.h | 2 +- include/dns.h | 2 +- include/globals.h | 2 +- include/inspsocket.h | 2 +- include/mode.h | 4 ++-- include/modules.h | 2 +- include/socketengine.h | 3 ++- include/timer.h | 2 +- 10 files changed, 20 insertions(+), 24 deletions(-) (limited to 'include') diff --git a/include/base.h b/include/base.h index 01b0e9ae1..b808af398 100644 --- a/include/base.h +++ b/include/base.h @@ -83,7 +83,6 @@ public: * * You must provide a key name. The given key name will be removed from the classes data. If * you provide a nonexistent key (case is important) then the function will return false. - * * @return Returns true on success. */ bool Shrink(const std::string &key); @@ -91,7 +90,6 @@ public: /** Get an extension item. * * @param key The key parameter is an arbitary string which identifies the extension data - * * @return If you provide a non-existent key name, the function returns NULL, otherwise a pointer to the item referenced by the key is returned. */ template bool GetExt(const std::string &key, T* &p) @@ -108,12 +106,9 @@ public: return false; } } - //char* GetExt(const std::string &key); /** Get a list of all extension items names. - * * @param list A deque of strings to receive the list - * * @return This function writes a list of all extension items stored in this object by name into the given deque and returns void. */ void GetExtList(std::deque &list); diff --git a/include/configreader.h b/include/configreader.h index 63836056a..3bb7bb4ed 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -5,7 +5,7 @@ * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. * E-mail: * - * + * * * * Written by Craig Edwards, Craig McLure, and others. @@ -54,7 +54,7 @@ struct MultiConfig { * and storage of the configuration data needed to run the ircd, such as * the servername, connect classes, /ADMIN data, MOTDs and filenames etc. */ -class ServerConfig : public classbase +class ServerConfig : public Extensible { private: /** This variable holds the names of all @@ -214,18 +214,18 @@ class ServerConfig : public classbase * handling code, used to read data into a user's * recvQ. */ - int NetBufferSize; + int NetBufferSize; /** The value to be used for listen() backlogs * as default. */ - int MaxConn; + int MaxConn; /** The soft limit value assigned to the irc server. * The IRC server will not allow more than this * number of local users. */ - unsigned int SoftLimit; + unsigned int SoftLimit; /** Maximum number of targets for a multi target command * such as PRIVMSG or KICK @@ -235,20 +235,20 @@ class ServerConfig : public classbase /** The maximum number of /WHO results allowed * in any single /WHO command. */ - int MaxWhoResults; + int MaxWhoResults; /** True if the DEBUG loglevel is selected. */ - int debugging; + int debugging; /** The loglevel in use by the IRC server */ - int LogLevel; + int LogLevel; /** How many seconds to wait before exiting * the program when /DIE is correctly issued. */ - int DieDelay; + int DieDelay; /** True if we're going to hide netsplits as *.net *.split for non-opers */ @@ -271,7 +271,7 @@ class ServerConfig : public classbase /** A list of IP addresses the server is listening * on. */ - char addrs[MAXBUF][255]; + char addrs[MAXBUF][255]; /** The MOTD file, cached in a file_cache type. */ diff --git a/include/ctables.h b/include/ctables.h index c4b5aa335..1b88a911f 100644 --- a/include/ctables.h +++ b/include/ctables.h @@ -26,7 +26,7 @@ class userrec; /** A structure that defines a command */ -class command_t +class command_t : public Extensible { public: /** Command name diff --git a/include/dns.h b/include/dns.h index e907c7e2c..698dce3ea 100644 --- a/include/dns.h +++ b/include/dns.h @@ -30,7 +30,7 @@ struct dns_ip4list { /** The DNS class allows fast nonblocking resolution of hostnames * and ip addresses. It is based heavily upon firedns by Ian Gulliver. */ -class DNS +class DNS : public Extensible { private: in_addr *binip; diff --git a/include/globals.h b/include/globals.h index 9fd7e3705..ce6bde09f 100644 --- a/include/globals.h +++ b/include/globals.h @@ -5,7 +5,7 @@ * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. * E-mail: * - * + * * * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see diff --git a/include/inspsocket.h b/include/inspsocket.h index 9858f0432..56c04373d 100644 --- a/include/inspsocket.h +++ b/include/inspsocket.h @@ -45,7 +45,7 @@ enum InspSocketError { I_ERR_TIMEOUT, I_ERR_SOCKET, I_ERR_CONNECT, I_ERR_BIND, I * and use the InspSocket constructors to establish connections * and bindings. */ -class InspSocket +class InspSocket : public Extensible { protected: diff --git a/include/mode.h b/include/mode.h index 9801f503d..8145ccd32 100644 --- a/include/mode.h +++ b/include/mode.h @@ -69,7 +69,7 @@ enum ModeMasks { * mode is expected to have a parameter, then this is * equivalent to returning MODEACTION_DENY. */ -class ModeHandler +class ModeHandler : public Extensible { protected: /** @@ -189,7 +189,7 @@ class ModeHandler * and attach it to the mode using Server::AddModeWatcher and Server::DelModeWatcher. * A ModeWatcher will be called both before and after the mode change. */ -class ModeWatcher +class ModeWatcher : public Extensible { protected: /** diff --git a/include/modules.h b/include/modules.h index 1ef03f4d3..851fa1b5a 100644 --- a/include/modules.h +++ b/include/modules.h @@ -318,7 +318,7 @@ enum Implementation { I_OnUserConnect, I_OnUserQuit, I_OnUserDisconnect, I_OnUse * its methods will be called when irc server events occur. class inherited from module must be * instantiated by the ModuleFactory class (see relevent section) for the module to be initialised. */ -class Module : public classbase +class Module : public Extensible { public: diff --git a/include/socketengine.h b/include/socketengine.h index 23fbd8d68..bbd34a302 100644 --- a/include/socketengine.h +++ b/include/socketengine.h @@ -64,7 +64,8 @@ const char X_READBIT = 0x80; * settings chosen by the server admin. The current * version supports select, epoll and kqueue. */ -class SocketEngine { +class SocketEngine : public Extensible +{ int EngineHandle; /* Handle to the socket engine if needed */ int CurrentSetSize; /* Current number of descriptors in the engine */ diff --git a/include/timer.h b/include/timer.h index 6a4c9063b..ec00abe4f 100644 --- a/include/timer.h +++ b/include/timer.h @@ -27,7 +27,7 @@ * your object (which you should override) will be called * at the given time. */ -class InspTimer +class InspTimer : public Extensible { private: /** The triggering time -- cgit v1.2.3