From cc23f6dc011fa5b548dd4a1416bd6dee107ba7b6 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Tue, 11 Jul 2023 15:08:03 +0100 Subject: Fix sending log messages from a renamed pseudoclient. If a command is named e.g. nickserv/wibble it previously tried to look up the nickserv service and if this service didn't exist then it would fall back to sending from the first available service. This caused problems if the NickServ service had been renamed to something else. Reported by @AndrioCelos on IRC. --- src/logger.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/logger.cpp b/src/logger.cpp index acacda286..49cbc05b2 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -89,7 +89,7 @@ Log::Log(LogType t, CommandSource &src, Command *_c, ChannelInfo *_ci) : u(src.G size_t sl = c->name.find('/'); this->bi = NULL; if (sl != Anope::string::npos) - this->bi = BotInfo::Find(c->name.substr(0, sl), true); + this->bi = Config->GetClient(c->name.substr(0, sl)); this->category = c->name; } -- cgit From 7f8a0c9d33afa26047f02a2032e4d101bfbfac50 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Fri, 28 Apr 2023 00:28:16 +0100 Subject: Allow Anope to look up multiple DNS results. For fixing bug 1756. --- src/misc.cpp | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/misc.cpp b/src/misc.cpp index 86d12c462..7e68686a2 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -727,7 +727,13 @@ Anope::string Anope::NormalizeBuffer(const Anope::string &buf) Anope::string Anope::Resolve(const Anope::string &host, int type) { - Anope::string result = host; + std::vector results = Anope::ResolveMultiple(host, type); + return results.empty() ? host : results[0]; +} + +std::vector Anope::ResolveMultiple(const Anope::string &host, int type) +{ + std::vector results; addrinfo hints; memset(&hints, 0, sizeof(hints)); @@ -738,15 +744,19 @@ Anope::string Anope::Resolve(const Anope::string &host, int type) addrinfo *addrresult = NULL; if (getaddrinfo(host.c_str(), NULL, &hints, &addrresult) == 0) { - sockaddrs addr; - memcpy(static_cast(&addr), addrresult->ai_addr, addrresult->ai_addrlen); - result = addr.addr(); - Log(LOG_DEBUG_2) << "Resolver: " << host << " -> " << result; + for (addrinfo *thisresult = addrresult; thisresult; thisresult = thisresult->ai_next) + { + sockaddrs addr; + memcpy(static_cast(&addr), thisresult->ai_addr, thisresult->ai_addrlen); + + results.push_back(addr.addr()); + Log(LOG_DEBUG_2) << "Resolver: " << host << " -> " << addr.addr(); + } freeaddrinfo(addrresult); } - return result; + return results; } Anope::string Anope::Random(size_t len) -- cgit From 8bf14ad5eacdc11955c4e4f3a34e9b5dcbdc7ca7 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sun, 6 Aug 2023 12:58:38 +0100 Subject: Release 2.0.14. --- src/version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/version.sh b/src/version.sh index c03b1e511..bf8b88e49 100644 --- a/src/version.sh +++ b/src/version.sh @@ -3,4 +3,4 @@ VERSION_MAJOR=2 VERSION_MINOR=0 VERSION_PATCH=14 -VERSION_EXTRA="-git" +VERSION_EXTRA="" -- cgit From 0715db71829786ec98c6922a9e32077ae396c87e Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sun, 6 Aug 2023 13:00:09 +0100 Subject: Mark as 2.0.15-git. --- src/version.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/version.sh b/src/version.sh index bf8b88e49..c4597b675 100644 --- a/src/version.sh +++ b/src/version.sh @@ -2,5 +2,5 @@ VERSION_MAJOR=2 VERSION_MINOR=0 -VERSION_PATCH=14 -VERSION_EXTRA="" +VERSION_PATCH=15 +VERSION_EXTRA="-git" -- cgit