diff options
| author |  Sadie Powell | 2023-05-30 02:59:39 +0100 |
|---|---|---|
| committer | Sadie Powell | 2023-05-30 02:59:39 +0100 |
| commit | 66fb6285fa67e944d14a777edf9717bdfac98e33 (patch) | |
| tree | 544e78ec8355dc81071d23e6f793f40dbec6e940 | |
| parent | Fix casing of metadata in function and event names. (diff) | |
| parent | Log when a server sends an unexpected command post-authentication. (diff) | |
Merge branch 'insp3' into master.
| -rw-r--r-- | src/coremods/core_dns.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/treesocket2.cpp | 12 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/utils.cpp | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/src/coremods/core_dns.cpp b/src/coremods/core_dns.cpp index 62d255f9e..3ad672676 100644 --- a/src/coremods/core_dns.cpp +++ b/src/coremods/core_dns.cpp @@ -924,7 +924,7 @@ public: if (DNSServer.empty()) FindDNSServer(); - if (oldserver != DNSServer || oldip != SourceIP || oldport != SourcePort) + if (oldserver != DNSServer || oldip != SourceIP || oldport != SourcePort || !SourcePort) this->manager.Rehash(DNSServer, SourceIP, SourcePort); } diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp index 13c0421e6..13288f7b1 100644 --- a/src/modules/m_spanningtree/treesocket2.cpp +++ b/src/modules/m_spanningtree/treesocket2.cpp @@ -191,6 +191,11 @@ void TreeSocket::ProcessLine(std::string& line) { this->Capab(params); } + else + { + ServerInstance->Logs.Debug(MODNAME, "Unknown command from fd {} in the WAIT_AUTH_2 phase: {}", + GetFd(), command); + } break; case CONNECTING: @@ -213,7 +218,13 @@ void TreeSocket::ProcessLine(std::string& line) { this->Capab(params); } + else + { + ServerInstance->Logs.Debug(MODNAME, "Unknown command from fd {} in the CONNECTING phase: {}", + GetFd(), command); + } break; + case CONNECTED: /* * State CONNECTED: @@ -222,6 +233,7 @@ void TreeSocket::ProcessLine(std::string& line) */ this->ProcessConnectedLine(tags, prefix, command, params); break; + case DYING: break; } diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp index defefcae0..dcb8efe35 100644 --- a/src/modules/m_spanningtree/utils.cpp +++ b/src/modules/m_spanningtree/utils.cpp @@ -205,7 +205,7 @@ void SpanningTreeUtilities::RefreshIPCache() bool isunix = L->IPAddr.find('/') != std::string::npos; if (!L->Port && !isunix) { - ServerInstance->Logs.Warning(MODNAME, "Ignoring a link block without a port."); + ServerInstance->Logs.Warning(MODNAME, "Ignoring an IP link block without a port."); /* Invalid link block */ continue; } |