Remove InspIRCd* parameters and fields

[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 e57141a7c2be25e4c9ad25188c61bc6b9a14a2e7..b264a4c2fb242333ddc424f1404c23e54d39f4ec 100644 (file)
--- a/src/modules/m_spanningtree/handshaketimer.cpp
+++ b/src/modules/m_spanningtree/handshaketimer.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  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.
@@ -11,56 +11,44 @@
  * ---------------------------------------------------
  */
 
-#include "configreader.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
-#include "socket.h"
 #include "inspircd.h"
-#include "wildcard.h"
+#include "socket.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(TreeSocket* s, Link* l, SpanningTreeUtilities* u, int delay)
+       : Timer(delay, ServerInstance->Time(), true), 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->GetIOHook())
+       {
+               CancelRepeat();
+               sock->SendCapabilities(1);
+       }
+       else if (BufferedSocketHSCompleteRequest(sock, Utils->Creator, sock->GetIOHook()).Send())
        {
-               if (!sock->GetHook())
-               {
-                       sock->SendCapabilities();
-                       if (sock->GetLinkState() == CONNECTING)
-                               sock->WriteLine(std::string("SERVER ")+this->Instance->Config->ServerName+" "+sock->MakePass(lnk->SendPass)+" 0 :"+this->Instance->Config->ServerDesc);
-               }
-               else
-               {
-                       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+" "+sock->MakePass(lnk->SendPass)+" 0 :"+this->Instance->Config->ServerDesc);
-                       }
-                       else
-                       {
-                               Instance->Timers->AddTimer(new HandshakeTimer(Instance, sock, lnk, Utils));
-                       }
-               }
+               CancelRepeat();
+               BufferedSocketAttachCertRequest(sock, Utils->Creator, sock->GetIOHook()).Send();
+               sock->SendCapabilities(1);
        }
+       // otherwise, try again later
 }