modulemanger: check dependencies correctly

[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 fcd698b3f4cea687a18bd20e43fb6bff0ca5e400..56f34283b72bdd5bc33ee4bf4b0892922e533bcd 100644 (file)
--- a/src/modules/m_spanningtree/handshaketimer.cpp
+++ b/src/modules/m_spanningtree/handshaketimer.cpp
@@ -1,43 +1,53 @@
-#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"
+/*       +------------------------------------+
+ *       | 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 "wildcard.h"
+#include "socket.h"
 #include "xline.h"
-#include "transport.h"
+#include "../transport.h"
+
+#include "main.h"
+#include "utils.h"
+#include "treeserver.h"
+#include "link.h"
+#include "treesocket.h"
+#include "handshaketimer.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"
+/* $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();
+       thefd = sock->GetFd();
+}
+
+HandshakeTimer::~HandshakeTimer()
+{
+       sock->hstimer = NULL;
 }
 
 void HandshakeTimer::Tick(time_t TIME)
 {
-        if (Instance->SE->GetRef(thefd) == sock)
-        {
-                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));
-                }
-        }
+       if (!sock->GetHook())
+       {
+               CancelRepeat();
+               sock->SendCapabilities(1);
+       }
+       else if (BufferedSocketHSCompleteRequest(sock, (Module*)Utils->Creator, sock->GetHook()).Send())
+       {
+               CancelRepeat();
+               BufferedSocketAttachCertRequest(sock, (Module*)Utils->Creator, sock->GetHook()).Send();
+               sock->SendCapabilities(1);
+       }
+       // otherwise, try again later
 }
+