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

Make Connect() not a (unnecessary) template

Browse Source
This commit is contained in:
Alexander A. Klimov 2024-01-25 14:52:08 +01:00
parent 86a20d4916
commit 1c45d7af4a
2 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/base/tcpsocket.cpp
View File

@ -1,9 +1,12 @@
/* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */
#include "base/io-engine.hpp"
#include "base/tcpsocket.hpp"
#include "base/logger.hpp"
#include "base/utility.hpp"
#include "base/exception.hpp"
#include <boost/asio/error.hpp>
#include <boost/system/system_error.hpp>
#include <boost/exception/errinfo_api_function.hpp>
#include <boost/exception/errinfo_errno.hpp>
#include <iostream>
@ -209,3 +212,38 @@ void TcpSocket::Connect(const String& node, const String& service)
#endif /* _WIN32 */
}
}
void icinga::Connect(AsioTcpSocket& socket, const String& node, const String& service, boost::asio::yield_context* yc)
{
using boost::asio::ip::tcp;
tcp::resolver resolver (IoEngine::Get().GetIoContext());
tcp::resolver::query query (node, service);
auto result (yc ? resolver.async_resolve(query, *yc) : resolver.resolve(query));
auto current (result.begin());
for (;;) {
try {
socket.open(current->endpoint().protocol());
socket.set_option(tcp::socket::keep_alive(true));
if (yc) {
socket.async_connect(current->endpoint(), *yc);
} else {
socket.connect(current->endpoint());
}
break;
} catch (const std::exception& ex) {
auto se (dynamic_cast<const boost::system::system_error*>(&ex));
if (se && se->code() == boost::asio::error::operation_aborted || ++current == result.end()) {
throw;
}
if (socket.is_open()) {
socket.close();
}
}
}
}

47
lib/base/tcpsocket.hpp
View File

@ -4,12 +4,9 @@
#define TCPSOCKET_H
#include "base/i2-base.hpp"
#include "base/io-engine.hpp"
#include "base/socket.hpp"
#include <boost/asio/error.hpp>
#include <boost/asio/ip/tcp.hpp>
#include <boost/asio/spawn.hpp>
#include <boost/system/system_error.hpp>
namespace icinga
{
@ -30,55 +27,21 @@ public:
void Connect(const String& node, const String& service);
};
typedef boost::asio::ip::tcp::socket::lowest_layer_type AsioTcpSocket;
/**
* TCP Connect based on Boost ASIO.
*
* @ingroup base
*/
template<class Socket>
void Connect(Socket& socket, const String& node, const String& service, boost::asio::yield_context* yc)
{
using boost::asio::ip::tcp;
void Connect(AsioTcpSocket& socket, const String& node, const String& service, boost::asio::yield_context* yc);
tcp::resolver resolver (IoEngine::Get().GetIoContext());
tcp::resolver::query query (node, service);
auto result (yc ? resolver.async_resolve(query, *yc) : resolver.resolve(query));
auto current (result.begin());
for (;;) {
try {
socket.open(current->endpoint().protocol());
socket.set_option(tcp::socket::keep_alive(true));
if (yc) {
socket.async_connect(current->endpoint(), *yc);
} else {
socket.connect(current->endpoint());
}
break;
} catch (const std::exception& ex) {
auto se (dynamic_cast<const boost::system::system_error*>(&ex));
if (se && se->code() == boost::asio::error::operation_aborted || ++current == result.end()) {
throw;
}
if (socket.is_open()) {
socket.close();
}
}
}
}
template<class Socket>
inline void Connect(Socket& socket, const String& node, const String& service)
inline void Connect(AsioTcpSocket& socket, const String& node, const String& service)
{
Connect(socket, node, service, nullptr);
}
template<class Socket>
inline void Connect(Socket& 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);
}