diff options
| author | peavey <peavey@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-09-24 15:31:35 +0000 |
|---|---|---|
| committer | peavey <peavey@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-09-24 15:31:35 +0000 |
| commit | 9526135e338e983b574040f17ba34baa4af59487 (patch) | |
| tree | ed2935b87578dc53ca24ae461e2666b6dbc476fe /src | |
| parent | 86ac9c800fbb4371b45d3cf599ee9d8d07a1e4ab (diff) | |
Fix for listening sockets not clearing their timeout on connected. Reported by Sazpaimon.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10594 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/m_spanningtree/server.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/treesocket2.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/modules/m_spanningtree/server.cpp b/src/modules/m_spanningtree/server.cpp index 1254d14d4..d53096a87 100644 --- a/src/modules/m_spanningtree/server.cpp +++ b/src/modules/m_spanningtree/server.cpp @@ -152,6 +152,8 @@ bool TreeSocket::Outbound_Reply_Server(std::deque<std::string> ¶ms) */ this->LinkState = CONNECTED; + Utils->timeoutlist.erase(this); + TreeServer *Node = new TreeServer(this->Utils, this->ServerInstance, sname, description, sid, Utils->TreeRoot, this, x->Hidden); if (Node->DuplicateID()) diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp index 8b3fbf2fb..7e5c7fad5 100644 --- a/src/modules/m_spanningtree/treesocket2.cpp +++ b/src/modules/m_spanningtree/treesocket2.cpp @@ -173,10 +173,11 @@ bool TreeSocket::ProcessLine(std::string &line) } } this->LinkState = CONNECTED; - Link* lnk = Utils->FindLink(InboundServerName); Utils->timeoutlist.erase(this); + Link* lnk = Utils->FindLink(InboundServerName); + Node = new TreeServer(this->Utils, this->ServerInstance, InboundServerName, InboundDescription, InboundSID, Utils->TreeRoot, this, lnk ? lnk->Hidden : false); if (Node->DuplicateID()) |