Make VF_OPTCOMMON module mismatches a fatal link error by default

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / treesocket1.cpp

diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 8b6ffb60e9c7b30303cf0590ee20bf1929c6dcf0..e77e6717e6fea4ec5ad07eaa5fb941a5367f6952 100644 (file)
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -16,17 +16,17 @@
 #include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "transport.h"
-#include "m_hash.h"
+#include "../transport.h"
+#include "../m_hash.h"
 #include "socketengine.h"
 
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/resolvers.h"
-#include "m_spanningtree/handshaketimer.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "link.h"
+#include "treesocket.h"
+#include "resolvers.h"
+#include "handshaketimer.h"
 
 /* $ModDep: m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_hash.h m_spanningtree/handshaketimer.h */
 
@@ -39,6 +39,7 @@
 TreeSocket::TreeSocket(SpanningTreeUtilities* Util, InspIRCd* SI, std::string shost, int iport, unsigned long maxtime, const std::string &ServerName, const std::string &bindto, Module* HookMod)
        : BufferedSocket(SI, shost, iport, maxtime, bindto), Utils(Util), Hook(HookMod)
 {
+       age = SI->Time();
        myhost = ServerName;
        theirchallenge.clear();
        ourchallenge.clear();
@@ -56,6 +57,7 @@ TreeSocket::TreeSocket(SpanningTreeUtilities* Util, InspIRCd* SI, std::string sh
 TreeSocket::TreeSocket(SpanningTreeUtilities* Util, InspIRCd* SI, int newfd, char* ip, Module* HookMod)
        : BufferedSocket(SI, newfd, ip), Utils(Util), Hook(HookMod)
 {
+       age = SI->Time();
        this->LinkState = WAIT_AUTH_1;
        theirchallenge.clear();
        ourchallenge.clear();
@@ -86,6 +88,7 @@ Module* TreeSocket::GetHook()
 void TreeSocket::CleanNegotiationInfo()
 {
        ModuleList.clear();
+       OptModuleList.clear();
        CapKeys.clear();
        ourchallenge.clear();
        theirchallenge.clear();
@@ -231,7 +234,7 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
                Event rmode((char*)Current->GetName().c_str(), (Module*)Utils->Creator, "lost_server");
                rmode.Send(ServerInstance);
 
-               std::deque<std::string> params;
+               parameterlist params;
                params.push_back(Current->GetName());
                params.push_back(":"+reason);
                Utils->DoOneToAllButSender(Current->GetParent()->GetName(),"SQUIT",params,Current->GetName());