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 93856f46703da1025c8c623e523c60511d5c48ab..b264a4c2fb242333ddc424f1404c23e54d39f4ec 100644 (file)
--- a/src/modules/m_spanningtree/handshaketimer.cpp
+++ b/src/modules/m_spanningtree/handshaketimer.cpp
@@ -1 +1,54 @@
-/*       +------------------------------------+\r *       | Inspire Internet Relay Chat Daemon |\r *       +------------------------------------+\r *\r *  InspIRCd: (C) 2002-2007 InspIRCd Development Team\r * See: http://www.inspircd.org/wiki/index.php/Credits\r *\r * This program is free but copyrighted software; see\r *            the file COPYING for details.\r *\r * ---------------------------------------------------\r */\r\r#include "inspircd.h"\r#include "configreader.h"\r#include "users.h"\r#include "channels.h"\r#include "modules.h"\r#include "commands/cmd_whois.h"\r#include "commands/cmd_stats.h"\r#include "socket.h"\r#include "wildcard.h"\r#include "xline.h"\r#include "transport.h"\r\r#include "m_spanningtree/main.h"\r#include "m_spanningtree/utils.h"\r#include "m_spanningtree/treeserver.h"\r#include "m_spanningtree/link.h"\r#include "m_spanningtree/treesocket.h"\r#include "m_spanningtree/handshaketimer.h"\r\r/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */\r\rHandshakeTimer::HandshakeTimer(InspIRCd* Inst, TreeSocket* s, Link* l, SpanningTreeUtilities* u, int delay) : InspTimer(delay, time(NULL)), Instance(Inst), sock(s), lnk(l), Utils(u)\r{\r       thefd = sock->GetFd();\r}\r\rvoid HandshakeTimer::Tick(time_t TIME)\r{\r     if (Instance->SE->GetRef(thefd) == sock)\r       {\r              if (!sock->GetHook())\r          {\r                      sock->SendCapabilities();\r              }\r              else\r           {\r                      if (sock->GetHook() && InspSocketHSCompleteRequest(sock, (Module*)Utils->Creator, sock->GetHook()).Send())\r                     {\r                              InspSocketAttachCertRequest(sock, (Module*)Utils->Creator, sock->GetHook()).Send();\r                            sock->SendCapabilities();\r                      }\r                      else\r                   {\r                              Instance->Timers->AddTimer(new HandshakeTimer(Instance, sock, lnk, Utils, 1));\r                 }\r              }\r      }\r}\r\r
\ No newline at end of file
+/*       +------------------------------------+
+ *       | 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 "socket.h"
+#include "xline.h"
+#include "../transport.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(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 (!sock->GetIOHook())
+       {
+               CancelRepeat();
+               sock->SendCapabilities(1);
+       }
+       else if (BufferedSocketHSCompleteRequest(sock, Utils->Creator, sock->GetIOHook()).Send())
+       {
+               CancelRepeat();
+               BufferedSocketAttachCertRequest(sock, Utils->Creator, sock->GetIOHook()).Send();
+               sock->SendCapabilities(1);
+       }
+       // otherwise, try again later
+}
+