Rename the spanningtree module header to server.

In the future we will have server linking modules that are not the
spanningtree module.

diff --git a/include/modules/server.h b/include/modules/server.h
new file mode 100644 (file)
index 0000000..8e64a3b
--- /dev/null
+++ b/include/modules/server.h
@@ -0,0 +1,41 @@
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#pragma once
+
+#include "event.h"
+
+class ServerEventListener : public Events::ModuleEventListener
+{
+ public:
+       ServerEventListener(Module* mod)
+               : ModuleEventListener(mod, "event/server")
+       {
+       }
+
+       /** Fired when a server finishes burst
+        * @param server Server that recently linked and finished burst
+        */
+       virtual void OnServerLink(const Server* server) { }
+
+        /** Fired when a server splits
+         * @param server Server that split
+         */
+       virtual void OnServerSplit(const Server* server) { }
+};

diff --git a/include/modules/spanningtree.h b/include/modules/spanningtree.h
deleted file mode 100644 (file)
index e71cdf9..0000000
--- a/include/modules/spanningtree.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * InspIRCd -- Internet Relay Chat Daemon
- *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *
- * This file is part of InspIRCd.  InspIRCd is free software: you can
- * redistribute it and/or modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation, version 2.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#pragma once
-
-#include "event.h"
-
-class SpanningTreeEventListener : public Events::ModuleEventListener
-{
- public:
-       SpanningTreeEventListener(Module* mod)
-               : ModuleEventListener(mod, "event/spanningtree")
-       {
-       }
-
-       /** Fired when a server finishes burst
-        * @param server Server that recently linked and finished burst
-        */
-       virtual void OnServerLink(const Server* server) { }
-
-        /** Fired when a server splits
-         * @param server Server that split
-         */
-       virtual void OnServerSplit(const Server* server) { }
-};

diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index d5cf94c0c507ffd889c0c0691a4e51f37fe9e2b9..2a855c74c83f5d19f21704cef35a7a4102fa3090 100644 (file)
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -23,7 +23,7 @@
 #include "modules/account.h"
 #include "modules/sasl.h"
 #include "modules/ssl.h"
-#include "modules/spanningtree.h"
+#include "modules/server.h"
 
 enum
 {
@@ -37,7 +37,7 @@ enum
 
 static std::string sasl_target;
 
-class ServerTracker : public SpanningTreeEventListener
+class ServerTracker : public ServerEventListener
 {
        bool online;
 
@@ -65,7 +65,7 @@ class ServerTracker : public SpanningTreeEventListener
 
  public:
        ServerTracker(Module* mod)
-               : SpanningTreeEventListener(mod)
+               : ServerEventListener(mod)
        {
                Reset();
        }

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 4acd15d6274e5fdb787e215cfc63fcde8aa6b5a4..c244629c113b22ca85eb97736181f54154fa4750 100644 (file)
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -25,7 +25,7 @@
 #include "socket.h"
 #include "xline.h"
 #include "iohook.h"
-#include "modules/spanningtree.h"
+#include "modules/server.h"
 
 #include "resolvers.h"
 #include "main.h"
@@ -40,7 +40,7 @@ ModuleSpanningTree::ModuleSpanningTree()
        : rconnect(this), rsquit(this), map(this)
        , commands(this)
        , currmembid(0)
-       , eventprov(this, "event/spanningtree")
+       , eventprov(this, "event/server")
        , DNS(this, "DNS")
        , loopCall(false)
 {
@@ -642,7 +642,7 @@ void ModuleSpanningTree::OnUnloadModule(Module* mod)
                {
                        TreeServer* server = i->second;
                        if (!server->IsRoot())
-                               FOREACH_MOD_CUSTOM(GetEventProvider(), SpanningTreeEventListener, OnServerSplit, (server));
+                               FOREACH_MOD_CUSTOM(GetEventProvider(), ServerEventListener, OnServerSplit, (server));
                }
                return;
        }

diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index b29bea1346f0d9e0c594135c83e3e46f37962d69..be8660e424c3ce1d6adfd13375fdf04c490d1af0 100644 (file)
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -23,7 +23,7 @@
 #include "inspircd.h"
 #include "xline.h"
 #include "main.h"
-#include "modules/spanningtree.h"
+#include "modules/server.h"
 
 #include "utils.h"
 #include "treeserver.h"
@@ -116,7 +116,7 @@ TreeServer::TreeServer(const std::string& Name, const std::string& Desc, const s
        this->AddHashEntry();
        Parent->Children.push_back(this);
 
-       FOREACH_MOD_CUSTOM(Utils->Creator->GetEventProvider(), SpanningTreeEventListener, OnServerLink, (this));
+       FOREACH_MOD_CUSTOM(Utils->Creator->GetEventProvider(), ServerEventListener, OnServerLink, (this));
 }
 
 void TreeServer::BeginBurst(uint64_t startms)
@@ -206,7 +206,7 @@ void TreeServer::SQuitInternal(unsigned int& num_lost_servers)
        RemoveHash();
 
        if (!Utils->Creator->dying)
-               FOREACH_MOD_CUSTOM(Utils->Creator->GetEventProvider(), SpanningTreeEventListener, OnServerSplit, (this));
+               FOREACH_MOD_CUSTOM(Utils->Creator->GetEventProvider(), ServerEventListener, OnServerSplit, (this));
 }
 
 unsigned int TreeServer::QuitUsers(const std::string& reason)

diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index f9dccf7ce97ae3bd02f4afe17da5404ec1cfb512..a91fbd8ebe46d15756256ec3db7fe46fa4e718b2 100644 (file)
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -24,7 +24,7 @@
 #include "iohook.h"
 
 #include "main.h"
-#include "modules/spanningtree.h"
+#include "modules/server.h"
 #include "utils.h"
 #include "treeserver.h"
 #include "link.h"