From f12fd5382fef6aa5c6f75b2614460089a9af9f27 Mon Sep 17 00:00:00 2001 From: brain Date: Mon, 23 Jul 2007 23:10:16 +0000 Subject: Fix crash on unload of modules with listening sockets -- some situations require that the socket cull list is purged *immediately*, provide facility for this. Also squish some silly error output on unloading spanningtree. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7529 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_spanningtree/treesocket1.cpp | 3 +++ src/modules/m_spanningtree/treesocket2.cpp | 3 +++ src/modules/m_spanningtree/utils.cpp | 1 + 3 files changed, 7 insertions(+) (limited to 'src/modules/m_spanningtree') diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp index 4d960cf8a..c987cb590 100644 --- a/src/modules/m_spanningtree/treesocket1.cpp +++ b/src/modules/m_spanningtree/treesocket1.cpp @@ -212,6 +212,9 @@ void TreeSocket::OnError(InspSocketError e) { Link* MyLink; + if (this->LinkState == LISTENER) + return; + switch (e) { case I_ERR_CONNECT: diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp index dcfb2b4aa..23362ca99 100644 --- a/src/modules/m_spanningtree/treesocket2.cpp +++ b/src/modules/m_spanningtree/treesocket2.cpp @@ -1501,6 +1501,9 @@ void TreeSocket::OnTimeout() void TreeSocket::OnClose() { + if (this->LinkState == LISTENER) + return; + // Connection closed. // If the connection is fully up (state CONNECTED) // then propogate a netsplit to all peers. diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp index 9d4fbf41a..bfd46ef03 100644 --- a/src/modules/m_spanningtree/utils.cpp +++ b/src/modules/m_spanningtree/utils.cpp @@ -202,6 +202,7 @@ SpanningTreeUtilities::~SpanningTreeUtilities() } } delete TreeRoot; + ServerInstance->InspSocketCull(); } void SpanningTreeUtilities::AddThisServer(TreeServer* server, TreeServerList &list) -- cgit v1.2.3