/** A list of failed port bindings, used for informational purposes on startup */
typedef std::vector<std::pair<std::string, std::string> > FailedPortList;
-/** A cached text file stored with its contents as lines
- */
-typedef std::deque< std::string > file_cache;
-
-/** A configuration key and value pair
- */
-typedef std::pair< std::string, std::string > KeyVal;
-
-/** A list of related configuration keys and values
- */
-typedef std::vector< KeyVal > KeyValList;
-
-/** An entire config file, built up of KeyValLists
- */
-typedef std::multimap< std::string, KeyValList > ConfigDataHash;
+class InspIRCd;
+CoreExport extern InspIRCd* ServerInstance;
#include "inspircd_config.h"
+#include "inspircd_version.h"
+#include "caller.h"
+#include "cull_list.h"
+#include "extensible.h"
#include "numerics.h"
#include "uid.h"
#include "users.h"
#include "mode.h"
#include "socketengine.h"
#include "snomasks.h"
-#include "cull_list.h"
#include "filelogger.h"
#include "caller.h"
#include "modules.h"
* It is used by the InspIRCd class, which internally
* has an instance of it.
*/
-class serverstats : public classbase
+class serverstats
{
public:
/** Number of accepted connections
class InspIRCd;
-DEFINE_HANDLER1(ProcessUserHandler, void, User*);
DEFINE_HANDLER2(IsNickHandler, bool, const char*, size_t);
DEFINE_HANDLER1(IsIdentHandler, bool, const char*);
DEFINE_HANDLER1(FloodQuitUserHandler, void, User*);
*/
class CoreExport ConfigReaderThread : public Thread
{
- InspIRCd* ServerInstance;
ServerConfig* Config;
bool done;
public:
std::string TheUserUID;
- ConfigReaderThread(InspIRCd* Instance, const std::string &useruid)
- : Thread(), ServerInstance(Instance), done(false), TheUserUID(useruid)
+ ConfigReaderThread(const std::string &useruid)
+ : Thread(), done(false), TheUserUID(useruid)
{
}
};
/** The main class of the irc server.
- * This class contains instances of all the other classes
- * in this software, with the exception of the base class,
- * classbase. Amongst other things, it contains a ModeParser,
- * a DNS object, a CommandParser object, and a list of active
- * Module objects, and facilities for Module objects to
- * interact with the core system it implements.
+ * This class contains instances of all the other classes in this software.
+ * Amongst other things, it contains a ModeParser, a DNS object, a CommandParser
+ * object, and a list of active Module objects, and facilities for Module
+ * objects to interact with the core system it implements.
*/
-class CoreExport InspIRCd : public classbase
+class CoreExport InspIRCd
{
private:
/** Holds the current UID. Used to generate the next one.
*/
char ReadBuffer[65535];
- /** Used when connecting clients
- */
- irc::sockets::insp_sockaddr client, server;
-
- /** Used when connecting clients
- */
- socklen_t length;
-
#ifdef WIN32
IPC* WindowsIPC;
#endif
/** Global cull list, will be processed on next iteration
*/
CullList GlobalCulls;
+ /** Actions that must happen outside of the current call stack */
+ ActionList AtomicActions;
/**** Functors ****/
- ProcessUserHandler HandleProcessUser;
IsNickHandler HandleIsNick;
IsIdentHandler HandleIsIdent;
FloodQuitUserHandler HandleFloodQuitUser;
IsSIDHandler HandleIsSID;
RehashHandler HandleRehash;
- /** BufferedSocket classes pending deletion after being closed.
- * We don't delete these immediately as this may cause a segmentation fault.
- */
- std::map<BufferedSocket*,BufferedSocket*> SocketCull;
-
/** Globally accessible fake user record. This is used to force mode changes etc across s2s, etc.. bit ugly, but.. better than how this was done in 1.1
* Reason for it:
* kludge alert!
*/
void BuildISupport();
- /** List of server names we've seen.
- */
- servernamelist servernames;
-
/** Time this ircd was booted
*/
time_t startup_time;
/** Config file pathname specified on the commandline or via ./configure
*/
- char ConfigFileName[MAXBUF];
+ std::string ConfigFileName;
+
+ ExtensionManager Extensions;
/** Mode handler, handles mode setting and removal
*/
*/
ProtocolInterface* PI;
+ /** Holds extensible for user nickforced
+ */
+ LocalIntExt NICKForced;
+
+ /** Holds extensible for user operquit
+ */
+ LocalStringExt OperQuit;
+
/** Get the current time
* Because this only calls time() once every time around the mainloop,
* it is much faster than calling time() directly.
*/
time_t Time();
- /** Process a user whos socket has been flagged as active
- * @param cu The user to process
- * @return There is no actual return value, however upon exit, the user 'cu' may have been
- * marked for deletion in the global CullList.
- */
- caller1<void, User*> ProcessUser;
-
/** Bind all ports specified in the configuration file.
* @return The number of ports bound without error
*/
*/
bool BindSocket(int sockfd, int port, const char* addr, bool dolisten = true);
- /** Adds a server name to the list of servers we've seen
- * @param The servername to add
- */
- void AddServerName(const std::string &servername);
-
- /** Finds a cached char* pointer of a server name,
- * This is used to optimize User by storing only the pointer to the name
- * @param The servername to find
- * @return A pointer to this name, gauranteed to never become invalid
- */
- const char* FindServerNamePtr(const std::string &servername);
-
- /** Returns true if we've seen the given server name before
- * @param The servername to find
- * @return True if we've seen this server name before
- */
- bool FindServerName(const std::string &servername);
-
/** Gets the GECOS (description) field of the given server.
* If the servername is not that of the local server, the name
* is passed to handling modules which will attempt to determine
* @param servername The servername to find the description of
* @return The description of this server, or of the local server
*/
- std::string GetServerDescription(const char* servername);
+ std::string GetServerDescription(const std::string& servername);
/** Find a user in the nick hash.
* If the user cant be found in the nick hash check the uuid hash
*/
Channel* FindChan(const char* chan);
- /** Check for a 'die' tag in the config file, and abort if found
- * @return Depending on the configuration, this function may never return
- */
- void CheckDie();
-
/** Check we aren't running as root, and exit if we are
* @return Depending on the configuration, this function may never return
*/
*/
void RehashServer();
- /** Return the channel whos index number matches that provided
- * @param The index number of the channel to fetch
- * @return A channel record, or NUll if index < 0 or index >= InspIRCd::ChannelCount()
- */
- Channel* GetChannelIndex(long index);
-
/** Dump text to a user target, splitting it appropriately to fit
* @param User the user to dump the text to
* @param LinePrefix text to prefix each complete line with
* @param TextStream the text to send to the user
*/
- void DumpText(User* User, const std::string &LinePrefix, std::stringstream &TextStream);
+ void DumpText(User* user, const std::string &LinePrefix, std::stringstream &TextStream);
+
+ /** Dump text to a user target (local or remote)
+ * @param user the user to dump the text to
+ * @param text the full line of text
+ */
+ void DumpText(User* user, const std::string &text);
+
+ /** Dump text to a user target (local or remote)
+ * @param user the user to dump the text to
+ * @param format the printf format string for the text to send
+ */
+ void DumpText(User* user, const char* format, ...) CUSTOM_PRINTF(3, 4);
/** Check if the given nickmask matches too many users, send errors to the given user
* @param nick A nickmask to match against
* @param server The server to check for uline status
* @return True if the server is a uline OR the string is empty
*/
- bool ULine(const char* server);
+ bool ULine(const std::string& server);
/** Returns true if the uline is 'silent' (doesnt generate
* remote connect notices etc).
*/
- bool SilentULine(const char* server);
+ bool SilentULine(const std::string& server);
/** Returns the subversion revision ID of this ircd
* @return The revision ID or an empty string
*/
void SendWhoisLine(User* user, User* dest, int numeric, const char* format, ...) CUSTOM_PRINTF(5, 6);
+ /** Handle /STATS
+ */
+ void DoStats(char statschar, User* user, string_list &results);
+
+ /** Handle /WHOIS
+ */
+ void DoWhois(User* user, User* dest,unsigned long signon, unsigned long idle, const char* nick);
+
/** Quit a user for excess flood, and if they are not
* fully registered yet, temporarily zline their IP.
* @param current user to quit
*/
int Run();
- /** Force all BufferedSockets to be removed which are due to
- * be culled.
- */
- void BufferedSocketCull();
-
/** Adds an extban char to the 005 token.
*/
void AddExtBanChar(char c);
ENTRYPOINT;
+template<class Cmd>
+class CommandModule : public Module
+{
+ Cmd cmd;
+ public:
+ CommandModule() : cmd(this)
+ {
+ ServerInstance->AddCommand(&cmd);
+ }
+
+ Version GetVersion()
+ {
+ return Version(cmd.command, VF_VENDOR|VF_CORE);
+ }
+};
+
#endif
projects / user / henk / code / inspircd.git / blobdiff