diff options
| -rw-r--r-- | src/inspsocket.cpp | 8 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/treesocket1.cpp | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp index 3c30fd6e8..cdc0dc26f 100644 --- a/src/inspsocket.cpp +++ b/src/inspsocket.cpp @@ -582,13 +582,9 @@ void SocketTimeout::Tick(time_t now) if (ServerInstance->SocketCull.find(this->sock) == ServerInstance->SocketCull.end()) ServerInstance->SocketCull[this->sock] = this->sock; - - return; - } - else - { - this->sock->Timeout = NULL; } + + this->sock->Timeout = NULL; } bool InspSocket::Poll() diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp index a05ed6e4c..21c6de118 100644 --- a/src/modules/m_spanningtree/treesocket1.cpp +++ b/src/modules/m_spanningtree/treesocket1.cpp @@ -216,6 +216,14 @@ void TreeSocket::OnError(InspSocketError e) if (MyLink) Utils->DoFailOver(MyLink); } + else + { + if ((errno) && (errno != EINPROGRESS) && (errno != EAGAIN)) + { + std::string errstr = strerror(errno); + this->Instance->SNO->WriteToSnoMask('l',"Connection to \002"+myhost+"\002 failed with error: " + errstr); + } + } } int TreeSocket::OnDisconnect() |