Fixes found by removing User inheritance from StreamSocket

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / main.h

diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h
index 0144eb4a39fc3ee17a9167f2a2a6b86932959475..02513fb2e6a941ceeec695ad72410b2e09afcbb2 100644 (file)
--- a/src/modules/m_spanningtree/main.h
+++ b/src/modules/m_spanningtree/main.h
@@ -37,6 +37,7 @@ class SpanningTreeUtilities;
 class CacheRefreshTimer;
 class TreeServer;
 class Link;
+class Autoconnect;
 
 /** This is the main class for the spanningtree module
  */
@@ -48,7 +49,7 @@ class ModuleSpanningTree : public Module
        CommandRSQuit* command_rsquit;
        SpanningTreeUtilities* Utils;
 
-       void RedoConfig(Module* mod, const std::string &name);
+       void RedoConfig(Module* mod);
 
  public:
        CacheRefreshTimer *RefreshTimer;
@@ -59,7 +60,7 @@ class ModuleSpanningTree : public Module
 
        /** Constructor
         */
-       ModuleSpanningTree(InspIRCd* Me);
+       ModuleSpanningTree();
 
        /** Shows /LINKS
         */
@@ -113,17 +114,17 @@ class ModuleSpanningTree : public Module
         */
        ModResult HandleRemoteWhois(const std::vector<std::string>& parameters, User* user);
 
-       /** Handle remote MODULES
-        */
-       ModResult HandleModules(const std::vector<std::string>& parameters, User* user);
-
        /** Ping all local servers
         */
        void DoPingChecks(time_t curtime);
 
        /** Connect a server locally
         */
-       void ConnectServer(Link* x);
+       void ConnectServer(Link* x, Autoconnect* y = NULL);
+
+       /** Connect the next autoconnect server
+        */
+       void ConnectServer(Autoconnect* y, bool on_timer);
 
        /** Check if any servers are due to be autoconnected
         */
@@ -160,7 +161,7 @@ class ModuleSpanningTree : public Module
        ModResult OnPreCommand(std::string &command, std::vector<std::string>& parameters, User *user, bool validated, const std::string &original_line);
        void OnPostCommand(const std::string &command, const std::vector<std::string>& parameters, User *user, CmdResult result, const std::string &original_line);
        void OnGetServerDescription(const std::string &servername,std::string &description);
-       void OnUserConnect(User* source);
+       void OnUserConnect(LocalUser* source);
        void OnUserInvite(User* source,User* dest,Channel* channel, time_t);
        void OnPostTopicChange(User* user, Channel* chan, const std::string &topic);
        void OnWallops(User* user, const std::string &text);
@@ -168,7 +169,7 @@ class ModuleSpanningTree : public Module
        void OnUserMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list);
        void OnBackgroundTimer(time_t curtime);
        void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts);
-       ModResult OnChangeLocalUserHost(User* user, const std::string &newhost);
+       void OnChangeHost(User* user, const std::string &newhost);
        void OnChangeName(User* user, const std::string &gecos);
        void OnChangeIdent(User* user, const std::string &ident);
        void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts);
@@ -187,9 +188,10 @@ class ModuleSpanningTree : public Module
        ModResult OnSetAway(User* user, const std::string &awaymsg);
        void ProtoSendMode(void* opaque, TargetTypeFlags target_type, void* target, const std::vector<std::string> &modeline, const std::vector<TranslateType> &translate);
        void ProtoSendMetaData(void* opaque, Extensible* target, const std::string &extname, const std::string &extdata);
-       void OnEvent(Event* event);
-       void OnLoadModule(Module* mod,const std::string &name);
-       void OnUnloadModule(Module* mod,const std::string &name);
+       void OnLoadModule(Module* mod);
+       void OnUnloadModule(Module* mod);
+       ModResult OnAcceptConnection(int newsock, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server);
+       CullResult cull();
        ~ModuleSpanningTree();
        Version GetVersion();
        void Prioritize();