diff options
| -rw-r--r-- | src/modules/m_spanningtree/treesocket1.cpp | 8 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/treesocket2.cpp | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp index 0451b5dd4..4784c0c7f 100644 --- a/src/modules/m_spanningtree/treesocket1.cpp +++ b/src/modules/m_spanningtree/treesocket1.cpp @@ -35,6 +35,7 @@ /* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_hash.h */ + /** Because most of the I/O gubbins are encapsulated within * InspSocket, we just call the superclass constructor for * most of the action, and append a few of our own values @@ -73,12 +74,9 @@ TreeSocket::TreeSocket(SpanningTreeUtilities* Util, InspIRCd* SI, int newfd, cha * socket, and set a timer waiting for handshake before we send CAPAB etc. */ if (Hook) - { InspSocketHookRequest(this, (Module*)Utils->Creator, Hook).Send(); - Instance->Timers->AddTimer(new HandshakeTimer(Instance, this, &(Utils->LinkBlocks[0]), this->Utils)); - } - else - this->SendCapabilities(); + + Instance->Timers->AddTimer(new HandshakeTimer(Instance, this, &(Utils->LinkBlocks[0]), this->Utils)); } ServerState TreeSocket::GetLinkState() diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp index 56e1a6c4f..fa1e8ef15 100644 --- a/src/modules/m_spanningtree/treesocket2.cpp +++ b/src/modules/m_spanningtree/treesocket2.cpp @@ -41,6 +41,7 @@ int TreeSocket::WriteLine(std::string line) return this->Write(line); } + /* Handle ERROR command */ bool TreeSocket::Error(std::deque<std::string> ¶ms) { @@ -1523,4 +1524,3 @@ int TreeSocket::OnIncomingConnection(int newsock, char* ip) s = s; /* Whinge whinge whinge, thats all GCC ever does. */ return true; } - |