X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Finspircd.h;h=b927f0b1b6edc4df099e9bb217e91715f1cbcb7f;hb=05b111d6a245725c81a314794fb95e8375fb6720;hp=85c2f62e625621ee4e30276fae789aa4cde14695;hpb=9bddcf91ac79f34f8721bbf161f90cc4cc9dbe8c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/inspircd.h b/include/inspircd.h index 85c2f62e6..b927f0b1b 100644 --- a/include/inspircd.h +++ b/include/inspircd.h @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -14,6 +14,11 @@ #ifndef __INSPIRCD_H__ #define __INSPIRCD_H__ +#define _FILE_OFFSET_BITS 64 +#ifndef _LARGEFILE_SOURCE +#define _LARGEFILE_SOURCE +#endif + #ifndef WIN32 #define DllExport #define CoreExport @@ -38,10 +43,12 @@ #include #include #include +#include #include #include #include +#include #include #include #include @@ -66,7 +73,12 @@ typedef std::vector< KeyVal > KeyValList; */ typedef std::multimap< std::string, KeyValList > ConfigDataHash; +class InspIRCd; +extern InspIRCd* ServerInstance; + #include "inspircd_config.h" +#include "inspircd_version.h" +#include "extensible.h" #include "numerics.h" #include "uid.h" #include "users.h" @@ -89,6 +101,8 @@ typedef std::multimap< std::string, KeyValList > ConfigDataHash; #include "configreader.h" #include "inspstring.h" #include "protocol.h" +#include "threadengine.h" +#include "fakeuser.h" #ifndef PATH_MAX #warning Potentially broken system, PATH_MAX undefined @@ -266,7 +280,6 @@ class InspIRCd; DEFINE_HANDLER1(ProcessUserHandler, void, User*); DEFINE_HANDLER2(IsNickHandler, bool, const char*, size_t); DEFINE_HANDLER1(IsIdentHandler, bool, const char*); -DEFINE_HANDLER1(FindDescriptorHandler, User*, int); DEFINE_HANDLER1(FloodQuitUserHandler, void, User*); DEFINE_HANDLER2(IsChannelHandler, bool, const char*, size_t); DEFINE_HANDLER1(IsSIDHandler, bool, const std::string&); @@ -282,10 +295,12 @@ class BanCacheManager; class CoreExport ConfigReaderThread : public Thread { InspIRCd* ServerInstance; - bool do_bail; - std::string TheUserUID; + ServerConfig* Config; + bool done; public: - ConfigReaderThread(InspIRCd* Instance, bool bail, const std::string &useruid) : Thread(), ServerInstance(Instance), do_bail(bail), TheUserUID(useruid) + std::string TheUserUID; + ConfigReaderThread(InspIRCd* Instance, const std::string &useruid) + : Thread(), ServerInstance(Instance), done(false), TheUserUID(useruid) { } @@ -294,6 +309,9 @@ class CoreExport ConfigReaderThread : public Thread } void Run(); + /** Run in the main thread to apply the configuration */ + void Finish(); + bool IsDone() { return done; } }; /** The main class of the irc server. @@ -356,14 +374,6 @@ class CoreExport InspIRCd : public classbase */ 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 @@ -379,7 +389,6 @@ class CoreExport InspIRCd : public classbase ProcessUserHandler HandleProcessUser; IsNickHandler HandleIsNick; IsIdentHandler HandleIsIdent; - FindDescriptorHandler HandleFindDescriptor; FloodQuitUserHandler HandleFloodQuitUser; IsChannelHandler HandleIsChannel; IsSIDHandler HandleIsSID; @@ -390,8 +399,6 @@ class CoreExport InspIRCd : public classbase */ std::map SocketCull; - Mutex* RehashFinishMutex; - /** 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! @@ -400,7 +407,7 @@ class CoreExport InspIRCd : public classbase * hash and set its descriptor to FD_MAGIC_NUMBER so the data * falls into the abyss :p */ - User* FakeClient; + FakeUser* FakeClient; /** Returns the next available UID for this server. */ @@ -450,10 +457,6 @@ class CoreExport InspIRCd : public classbase */ ThreadEngine* Threads; - /** Mutex engine, handles mutexes for threading where required - */ - MutexFactory* Mutexes; - /** The thread/class used to read config files in REHASH and on startup */ ConfigReaderThread* ConfigThread; @@ -505,6 +508,10 @@ class CoreExport InspIRCd : public classbase */ chan_hash* chanlist; + /** List of the open ports + */ + std::vector ports; + /** Set to the current signal recieved */ int s_signal; @@ -528,11 +535,9 @@ class CoreExport InspIRCd : public classbase caller1 ProcessUser; /** Bind all ports specified in the configuration file. - * @param bail True if the function should bail back to the shell on failure - * @param found_ports The actual number of ports found in the config, as opposed to the number actually bound - * @return The number of ports actually bound without error + * @return The number of ports bound without error */ - int BindPorts(bool bail, int &found_ports, FailedPortList &failed_ports); + int BindPorts(FailedPortList &failed_ports); /** Binds a socket on an already open file descriptor * @param sockfd A valid file descriptor of an open socket @@ -603,11 +608,6 @@ class CoreExport InspIRCd : public classbase */ 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 */ @@ -680,13 +680,6 @@ class CoreExport InspIRCd : public classbase */ caller1 IsIdent; - /** Find a username by their file descriptor. - * It is preferred to use this over directly accessing the fd_ref_table array. - * @param socket The file descriptor of a user - * @return A pointer to the user if the user exists locally on this descriptor - */ - caller1 FindDescriptor; - /** Add a dns Resolver class to this server's active set * @param r The resolver to add * @param cached If this value is true, then the cache will @@ -715,7 +708,6 @@ class CoreExport InspIRCd : public classbase * The parameters provided are identical to that sent to the * handler for class cmd_mode. * @param parameters The mode parameters - * @param pcnt The number of items you have given in the first parameter * @param user The user to send error messages to */ void SendMode(const std::vector& parameters, User *user); @@ -775,7 +767,19 @@ class CoreExport InspIRCd : public classbase * @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 @@ -870,6 +874,14 @@ class CoreExport InspIRCd : public classbase */ 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 @@ -929,4 +941,20 @@ class CoreExport InspIRCd : public classbase ENTRYPOINT; +template +class CommandModule : public Module +{ + Cmd cmd; + public: + CommandModule(InspIRCd*) : cmd(this) + { + ServerInstance->AddCommand(&cmd); + } + + Version GetVersion() + { + return Version(cmd.command, VF_VENDOR); + } +}; + #endif