Add commasepstream test case.

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

diff --git a/include/inspircd.h b/include/inspircd.h
index 987272752dc9a603bfb1d2d3196858d282fa723c..ef6c86f285d52d49001e3194a588e0750a41f059 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -97,6 +97,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
@@ -274,7 +275,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&);
@@ -290,12 +290,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)
        {
        }
 
@@ -304,6 +304,8 @@ class CoreExport ConfigReaderThread : public Thread
        }
 
        void Run();
+       /** Run in the main thread to apply the configuration */
+       void Finish();
        bool IsDone() { return done; }
 };
 
@@ -390,7 +392,6 @@ class CoreExport InspIRCd : public classbase
        ProcessUserHandler HandleProcessUser;
        IsNickHandler HandleIsNick;
        IsIdentHandler HandleIsIdent;
-       FindDescriptorHandler HandleFindDescriptor;
        FloodQuitUserHandler HandleFloodQuitUser;
        IsChannelHandler HandleIsChannel;
        IsSIDHandler HandleIsSID;
@@ -409,7 +410,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.
         */
@@ -510,6 +511,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;
@@ -533,11 +538,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
@@ -685,13 +688,6 @@ class CoreExport InspIRCd : public classbase
         */
        caller1<bool, const char*> 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<User*, int> 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