#include <cmath>
#include <cstring>
#include <climits>
+#include <cstdio>
#include <sstream>
#include <string>
#include "inspstring.h"
#include "protocol.h"
#include "threadengine.h"
+#include "fakeuser.h"
#ifndef PATH_MAX
#warning Potentially broken system, PATH_MAX undefined
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&);
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)
{
}
}
void Run();
+ /** Run in the main thread to apply the configuration */
+ void Finish();
+ bool IsDone() { return done; }
};
/** The main class of the irc server.
ProcessUserHandler HandleProcessUser;
IsNickHandler HandleIsNick;
IsIdentHandler HandleIsIdent;
- FindDescriptorHandler HandleFindDescriptor;
FloodQuitUserHandler HandleFloodQuitUser;
IsChannelHandler HandleIsChannel;
IsSIDHandler HandleIsSID;
*/
std::map<BufferedSocket*,BufferedSocket*> 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!
* 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.
*/
*/
chan_hash* chanlist;
+ /** List of the open ports
+ */
+ std::vector<ListenSocketBase *> ports;
+
/** Set to the current signal recieved
*/
int s_signal;
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
*/
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
*/
*/
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