Update make help, configure, and fix build of empty m_* directories

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

diff --git a/include/inspircd.h b/include/inspircd.h
index 0511058a48e4788d3fa37a5882c1f76708d52c5f..b927f0b1b6edc4df099e9bb217e91715f1cbcb7f 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -73,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"
@@ -97,6 +102,7 @@ typedef std::multimap< std::string, KeyValList > ConfigDataHash;
 #include "inspstring.h"
 #include "protocol.h"
 #include "threadengine.h"
+#include "fakeuser.h"
 
 #ifndef PATH_MAX
 #warning Potentially broken system, PATH_MAX undefined
@@ -289,12 +295,12 @@ class BanCacheManager;
 class CoreExport ConfigReaderThread : public Thread
 {
        InspIRCd* ServerInstance;
-       bool do_bail;
+       ServerConfig* Config;
        bool done;
-       std::string TheUserUID;
  public:
-       ConfigReaderThread(InspIRCd* Instance, bool bail, const std::string &useruid)
-               : Thread(), ServerInstance(Instance), do_bail(bail), done(false), TheUserUID(useruid)
+       std::string TheUserUID;
+       ConfigReaderThread(InspIRCd* Instance, const std::string &useruid)
+               : Thread(), ServerInstance(Instance), done(false), TheUserUID(useruid)
        {
        }
 
@@ -303,6 +309,8 @@ class CoreExport ConfigReaderThread : public Thread
        }
 
        void Run();
+       /** Run in the main thread to apply the configuration */
+       void Finish();
        bool IsDone() { return done; }
 };
 
@@ -366,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
@@ -407,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.
         */
@@ -508,6 +508,10 @@ class CoreExport InspIRCd : public classbase
         */
        chan_hash* chanlist;
 
+       /** List of the open ports
+        */
+       std::vector<ListenSocketBase *> ports;
+
        /** Set to the current signal recieved
         */
        int s_signal;
@@ -531,11 +535,9 @@ class CoreExport InspIRCd : public classbase
        caller1<void, User*> 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
@@ -606,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
         */
@@ -770,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
@@ -865,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
@@ -924,4 +941,20 @@ class CoreExport InspIRCd : public classbase
 
 ENTRYPOINT;
 
+template<class Cmd>
+class CommandModule : public Module
+{
+       Cmd cmd;
+ public:
+       CommandModule(InspIRCd*) : cmd(this)
+       {
+               ServerInstance->AddCommand(&cmd);
+       }
+
+       Version GetVersion()
+       {
+               return Version(cmd.command, VF_VENDOR);
+       }
+};
+
 #endif