diff options
| author | 2020-07-20 07:33:28 +0100 | |
|---|---|---|
| committer | 2020-07-20 07:36:44 +0100 | |
| commit | 90fb7c511fb6fc5c917d6738eca25961a52c8a9f (patch) | |
| tree | a64bce85570e572cc768a7f7d4abdfa89a526512 /src/modules | |
| parent | Split OnSetEndPoint into two events. (diff) | |
Fix the case of getError/getSendQSize and rewrite the doc comments.
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/m_httpd.cpp | 6 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/main.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/resolvers.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/treesocket1.cpp | 6 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/treesocket2.cpp | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index ebd0404b5..7c7a0a5b7 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -211,10 +211,10 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru { via->iohookprovs.back()->OnAccept(this, client, server); // IOHook may have errored - if (!getError().empty()) + if (!GetError().empty()) { ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "HTTP socket %d encountered a hook error: %s", - GetFd(), getError().c_str()); + GetFd(), GetError().c_str()); Close(); return; } @@ -243,7 +243,7 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru void OnError(BufferedSocketError err) override { ServerInstance->Logs.Log(MODNAME, LOG_DEBUG, "HTTP socket %d encountered an error: %d - %s", - GetFd(), err, getError().c_str()); + GetFd(), err, GetError().c_str()); Close(); } diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index 6ef89e62b..b69f92444 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -224,7 +224,7 @@ void ModuleSpanningTree::ConnectServer(std::shared_ptr<Link> x, std::shared_ptr< if (!newsocket->HasFd()) { ServerInstance->SNO.WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.", - x->Name.c_str(), newsocket->getError().c_str()); + x->Name.c_str(), newsocket->GetError().c_str()); ServerInstance->GlobalCulls.AddItem(newsocket); } } diff --git a/src/modules/m_spanningtree/resolvers.cpp b/src/modules/m_spanningtree/resolvers.cpp index 82c36918d..b4c9bbf06 100644 --- a/src/modules/m_spanningtree/resolvers.cpp +++ b/src/modules/m_spanningtree/resolvers.cpp @@ -75,7 +75,7 @@ void ServernameResolver::OnLookupComplete(const DNS::Query *r) { /* Something barfed, show the opers */ ServerInstance->SNO.WriteToSnoMask('l', "CONNECT: Error connecting \002%s\002: %s.", - MyLink->Name.c_str(), newsocket->getError().c_str()); + MyLink->Name.c_str(), newsocket->GetError().c_str()); ServerInstance->GlobalCulls.AddItem(newsocket); } } diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp index c3b1a9f21..64dd3d2b8 100644 --- a/src/modules/m_spanningtree/treesocket1.cpp +++ b/src/modules/m_spanningtree/treesocket1.cpp @@ -93,7 +93,7 @@ TreeSocket::TreeSocket(int newfd, ListenSocket* via, irc::sockets::sockaddrs* cl iohookprovref->OnAccept(this, client, server); // IOHook could have encountered a fatal error, e.g. if the TLS ClientHello was already in the queue and there was no common TLS version - if (!getError().empty()) + if (!GetError().empty()) { TreeSocket::OnError(I_ERR_OTHER); return; @@ -157,7 +157,7 @@ void TreeSocket::OnConnected() void TreeSocket::OnError(BufferedSocketError e) { ServerInstance->SNO.WriteGlobalSno('l', "Connection to '\002%s\002' failed with error: %s", - linkID.c_str(), getError().c_str()); + linkID.c_str(), GetError().c_str()); LinkState = DYING; Close(); } @@ -226,7 +226,7 @@ void TreeSocket::OnDataReady() SendError(ex.GetReason() + " - check the log file for details"); } - if (!getError().empty()) + if (!GetError().empty()) break; } if (LinkState != CONNECTED && recvq.length() > 4096) diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp index 97a3cfcda..b393cae8e 100644 --- a/src/modules/m_spanningtree/treesocket2.cpp +++ b/src/modules/m_spanningtree/treesocket2.cpp @@ -411,7 +411,7 @@ void TreeSocket::Close() // If the connection is fully up (state CONNECTED) // then propagate a netsplit to all peers. if (MyRoot) - MyRoot->SQuit(getError(), true); + MyRoot->SQuit(GetError(), true); ServerInstance->SNO.WriteGlobalSno('l', "Connection to '\002%s\002' failed.", linkID.c_str()); |
