Include explicit routing information in Command, will replace CMD_LOCALONLY return...

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

diff --git a/src/modules/m_spanningtree/handshaketimer.cpp b/src/modules/m_spanningtree/handshaketimer.cpp
index 97c9ed93e19ea6e2c1b00fc4100b8fc93d7ebaf6..1b3b1dd2227ba16176fa6de18d78f167fcdd0480 100644 (file)
--- a/src/modules/m_spanningtree/handshaketimer.cpp
+++ b/src/modules/m_spanningtree/handshaketimer.cpp
@@ -1,45 +1,55 @@
-#include "configreader.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd.h"
 #include "commands/cmd_whois.h"
 #include "commands/cmd_stats.h"
 #include "socket.h"
-#include "inspircd.h"
-#include "wildcard.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.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/handshaketimer.h"
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "link.h"
+#include "treesocket.h"
+#include "handshaketimer.h"
 
 /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */
 
-HandshakeTimer::HandshakeTimer(InspIRCd* Inst, TreeSocket* s, Link* l, SpanningTreeUtilities* u) : InspTimer(1, time(NULL)), Instance(Inst), sock(s), lnk(l), Utils(u)
+HandshakeTimer::HandshakeTimer(InspIRCd* Inst, TreeSocket* s, Link* l, SpanningTreeUtilities* u, int delay) : Timer(delay, Inst->Time(), true), Instance(Inst), sock(s), lnk(l), Utils(u)
 {
        thefd = sock->GetFd();
 }
 
+HandshakeTimer::~HandshakeTimer()
+{
+       sock->hstimer = NULL;
+}
+
 void HandshakeTimer::Tick(time_t TIME)
 {
-       if (Instance->SE->GetRef(thefd) == sock)
+       if (!sock->GetHook())
+       {
+               CancelRepeat();
+               sock->SendCapabilities();
+       }
+       else if (BufferedSocketHSCompleteRequest(sock, (Module*)Utils->Creator, sock->GetHook()).Send())
        {
-               if (sock->GetHook() && InspSocketHSCompleteRequest(sock, (Module*)Utils->Creator, sock->GetHook()).Send())
-               {
-                       InspSocketAttachCertRequest(sock, (Module*)Utils->Creator, sock->GetHook()).Send();
-                       sock->SendCapabilities();
-                       if (sock->GetLinkState() == CONNECTING)
-                       {
-                               sock->WriteLine(std::string("SERVER ")+this->Instance->Config->ServerName+" "+lnk->SendPass+" 0 :"+this->Instance->Config->ServerDesc);
-                       }
-               }
-               else
-               {
-                       Instance->Timers->AddTimer(new HandshakeTimer(Instance, sock, lnk, Utils));
-               }
+               CancelRepeat();
+               BufferedSocketAttachCertRequest(sock, (Module*)Utils->Creator, sock->GetHook()).Send();
+               sock->SendCapabilities();
        }
+       // otherwise, try again later
 }
+