pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-30 20:06:39 +02:00
Code Activity

Merge branch 2.0 into 2.1.

Browse Source
This commit is contained in:
Sadie Powell
2023-08-06 13:36:27 +01:00
parent 377ba87d52 0715db7182
commit adf820c08a
12 changed files with 119 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/misc.cpp
+16 -6
View File
@@ -705,7 +705,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<Anope::string> results = Anope::ResolveMultiple(host, type);
return results.empty() ? host : results[0];
}
std::vector<Anope::string> Anope::ResolveMultiple(const Anope::string &host, int type)
{
std::vector<Anope::string> results;
addrinfo hints;
memset(&hints, 0, sizeof(hints));
@@ -716,15 +722,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<void*>(&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<void*>(&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)