Fix ENCAP stripping, was incorrectly checking for " CHGHOST" and similar commands

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

diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h
index 48677e57d0a94211e77409136c634924051098e1..eb0df03ffe22cbe5296ea2a1851b519fc00e5674 100644 (file)
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -37,22 +37,6 @@ class SpanningTreeUtilities;
        #endif
 #endif
 
-/*
- * Initialises server connections
- */
-class ServerSocketListener : public ListenSocketBase
-{
-       SpanningTreeUtilities *Utils;
-
- public:
-       ServerSocketListener(SpanningTreeUtilities *u, int port, const std::string& addr, const std::string& Hook)
-               : ListenSocketBase(port, addr, "servers", Hook), Utils(u)
-       {
-       }
-
-       virtual void OnAcceptReady(int nfd);
-};
-
 typedef std::map<TreeServer*,TreeServer*> TreeServerList;
 
 /** Contains helper functions and variables for this module,
@@ -90,9 +74,6 @@ class SpanningTreeUtilities : public classbase
        /** This variable represents the root of the server tree
         */
        TreeServer *TreeRoot;
-       /** Represents the server whose command we are processing
-        */
-       FakeUser *ServerUser;
        /** IPs allowed to link to us
         */
        std::vector<std::string> ValidIPs;
@@ -133,7 +114,7 @@ class SpanningTreeUtilities : public classbase
 
        /** Prepare for class destruction
         */
-       bool cull();
+       CullResult cull();
 
        /** Destroy class and free listeners etc
         */
@@ -167,7 +148,7 @@ class SpanningTreeUtilities : public classbase
 
        /** Read the spanningtree module's tags from the config file
         */
-       void ReadConfiguration(bool rebind);
+       void ReadConfiguration();
 
        /** Add a server to the server list for GetListOfServersForChannel
         */