tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-09-24 10:17:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Separate DNS from Connect() to allow callers to handle DNS by themselves

Browse Source
This commit is contained in:
Alexander A. Klimov 2024-01-26 11:20:50 +01:00
parent 1c45d7af4a
commit 4a05070555
2 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/base/tcpsocket.cpp
View File

@ -213,14 +213,18 @@ void TcpSocket::Connect(const String& node, const String& service)
} }
} }
void icinga::Connect(AsioTcpSocket& socket, const String& node, const String& service, boost::asio::yield_context* yc) using boost::asio::ip::tcp;
{
using boost::asio::ip::tcp;
AsioDnsResponse icinga::Resolve(const String& node, const String& service, boost::asio::yield_context* yc)
{
tcp::resolver resolver (IoEngine::Get().GetIoContext()); tcp::resolver resolver (IoEngine::Get().GetIoContext());
tcp::resolver::query query (node, service); tcp::resolver::query query (node, service);
auto result (yc ? resolver.async_resolve(query, *yc) : resolver.resolve(query)); return yc ? resolver.async_resolve(query, *yc) : resolver.resolve(query);
auto current (result.begin()); }
void icinga::Connect(AsioTcpSocket& socket, const AsioDnsResponse& to, boost::asio::yield_context* yc)
{
auto current (to.begin());
for (;;) { for (;;) {
try { try {
@ -237,7 +241,7 @@ void icinga::Connect(AsioTcpSocket& socket, const String& node, const String& se
} catch (const std::exception& ex) { } catch (const std::exception& ex) {
auto se (dynamic_cast<const boost::system::system_error*>(&ex)); auto se (dynamic_cast<const boost::system::system_error*>(&ex));
if (se && se->code() == boost::asio::error::operation_aborted || ++current == result.end()) { if (se && se->code() == boost::asio::error::operation_aborted || ++current == to.end()) {
throw; throw;
} }

29
lib/base/tcpsocket.hpp
View File

@ -28,22 +28,45 @@ public:
}; };
typedef boost::asio::ip::tcp::socket::lowest_layer_type AsioTcpSocket; typedef boost::asio::ip::tcp::socket::lowest_layer_type AsioTcpSocket;
typedef boost::asio::ip::tcp::resolver::results_type AsioDnsResponse;
AsioDnsResponse Resolve(const String& node, const String& service, boost::asio::yield_context* yc);
inline AsioDnsResponse Resolve(const String& node, const String& service)
{
return Resolve(node, service, nullptr);
}
inline AsioDnsResponse Resolve(const String& node, const String& service, boost::asio::yield_context yc)
{
return Resolve(node, service, &yc);
}
/** /**
* TCP Connect based on Boost ASIO. * TCP Connect based on Boost ASIO.
* *
* @ingroup base * @ingroup base
*/ */
void Connect(AsioTcpSocket& socket, const String& node, const String& service, boost::asio::yield_context* yc); void Connect(AsioTcpSocket& socket, const AsioDnsResponse& to, boost::asio::yield_context* yc);
inline void Connect(AsioTcpSocket& socket, const String& node, const String& service) inline void Connect(AsioTcpSocket& socket, const String& node, const String& service)
{ {
Connect(socket, node, service, nullptr); Connect(socket, Resolve(node, service, nullptr), nullptr);
} }
inline void Connect(AsioTcpSocket& socket, const String& node, const String& service, boost::asio::yield_context yc) inline void Connect(AsioTcpSocket& socket, const String& node, const String& service, boost::asio::yield_context yc)
{ {
Connect(socket, node, service, &yc); Connect(socket, Resolve(node, service, &yc), &yc);
}
inline void Connect(AsioTcpSocket& socket, const AsioDnsResponse& to)
{
Connect(socket, to, nullptr);
}
inline void Connect(AsioTcpSocket& socket, const AsioDnsResponse& to, boost::asio::yield_context yc)
{
Connect(socket, to, &yc);
} }
} }