Remove unneeded headers from spanningtree. This was done to the rest of the source...

[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..617c3164dd48081565e76711fcae57644617afb4 100644 (file)
--- a/src/modules/m_spanningtree/handshaketimer.cpp
+++ b/src/modules/m_spanningtree/handshaketimer.cpp
@@ -1,11 +1,20 @@
-#include "configreader.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/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"
@@ -17,27 +26,33 @@
 #include "m_spanningtree/treesocket.h"
 #include "m_spanningtree/handshaketimer.h"
 
-HandshakeTimer::HandshakeTimer(InspIRCd* Inst, TreeSocket* s, Link* l, SpanningTreeUtilities* u) : InspTimer(1, time(NULL)), Instance(Inst), sock(s), lnk(l), Utils(u)
+/* $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, int delay) : InspTimer(delay, time(NULL)), Instance(Inst), sock(s), lnk(l), Utils(u)
 {
-        thefd = sock->GetFd();
+       thefd = sock->GetFd();
 }
 
 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 (Instance->SE->GetRef(thefd) == sock)
+       {
+               if (!sock->GetHook())
+               {
+                       sock->SendCapabilities();
+               }
+               else
+               {
+                       if (sock->GetHook() && InspSocketHSCompleteRequest(sock, (Module*)Utils->Creator, sock->GetHook()).Send())
+                       {
+                               InspSocketAttachCertRequest(sock, (Module*)Utils->Creator, sock->GetHook()).Send();
+                               sock->SendCapabilities();
+                       }
+                       else
+                       {
+                               Instance->Timers->AddTimer(new HandshakeTimer(Instance, sock, lnk, Utils, 1));
+                       }
+               }
+       }
 }
+