Run modulemanager upgrade to check for updates to third party (and extras) modules...

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

diff --git a/include/inspircd.h b/include/inspircd.h
index 6b13a5ed85d2c9ca094cf5427b2edf80446bceb1..2609f3cc1843a5e8d7cb3fd02c167cadd2a1678c 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -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; }
 };
 
@@ -509,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;
@@ -532,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
@@ -607,11 +611,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
         */