*/
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"
class InspIRCd;
-DEFINE_HANDLER1(ProcessUserHandler, void, User*);
DEFINE_HANDLER2(IsNickHandler, bool, const char*, size_t);
DEFINE_HANDLER1(IsIdentHandler, bool, const char*);
DEFINE_HANDLER1(FloodQuitUserHandler, void, User*);
*/
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(const std::string &useruid)
+ : Thread(), done(false), TheUserUID(useruid)
{
}
}
void Run();
+ /** Run in the main thread to apply the configuration */
+ void Finish();
bool IsDone() { return done; }
};
*/
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
/**** Functors ****/
- ProcessUserHandler HandleProcessUser;
IsNickHandler HandleIsNick;
IsIdentHandler HandleIsIdent;
FloodQuitUserHandler HandleFloodQuitUser;
IsSIDHandler HandleIsSID;
RehashHandler HandleRehash;
- /** BufferedSocket classes pending deletion after being closed.
- * We don't delete these immediately as this may cause a segmentation fault.
- */
- std::map<BufferedSocket*,BufferedSocket*> SocketCull;
-
/** 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!
/** Config file pathname specified on the commandline or via ./configure
*/
- char ConfigFileName[MAXBUF];
+ std::string ConfigFileName;
/** Mode handler, handles mode setting and removal
*/
*/
chan_hash* chanlist;
+ /** List of the open ports
+ */
+ std::vector<ListenSocketBase *> ports;
+
/** Set to the current signal recieved
*/
int s_signal;
*/
time_t Time();
- /** Process a user whos socket has been flagged as active
- * @param cu The user to process
- * @return There is no actual return value, however upon exit, the user 'cu' may have been
- * marked for deletion in the global CullList.
- */
- 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
*/
* @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
*/
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
*/
int Run();
- /** Force all BufferedSockets to be removed which are due to
- * be culled.
- */
- void BufferedSocketCull();
-
/** Adds an extban char to the 005 token.
*/
void AddExtBanChar(char c);
ENTRYPOINT;
+template<class Cmd>
+class CommandModule : public Module
+{
+ Cmd cmd;
+ public:
+ CommandModule() : cmd(this)
+ {
+ ServerInstance->AddCommand(&cmd);
+ }
+
+ Version GetVersion()
+ {
+ return Version(cmd.command, VF_VENDOR);
+ }
+};
+
#endif
projects / user / henk / code / inspircd.git / blobdiff