mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-13 07:28:59 +01:00
net: add new method Sock::Accept() that wraps accept()
This will help to increase `Sock` usage and make more code mockable.
This commit is contained in:
@@ -10,6 +10,7 @@
|
||||
#include <util/system.h>
|
||||
#include <util/time.h>
|
||||
|
||||
#include <memory>
|
||||
#include <stdexcept>
|
||||
#include <string>
|
||||
|
||||
@@ -73,6 +74,32 @@ int Sock::Connect(const sockaddr* addr, socklen_t addr_len) const
|
||||
return connect(m_socket, addr, addr_len);
|
||||
}
|
||||
|
||||
std::unique_ptr<Sock> Sock::Accept(sockaddr* addr, socklen_t* addr_len) const
|
||||
{
|
||||
#ifdef WIN32
|
||||
static constexpr auto ERR = INVALID_SOCKET;
|
||||
#else
|
||||
static constexpr auto ERR = SOCKET_ERROR;
|
||||
#endif
|
||||
|
||||
std::unique_ptr<Sock> sock;
|
||||
|
||||
const auto socket = accept(m_socket, addr, addr_len);
|
||||
if (socket != ERR) {
|
||||
try {
|
||||
sock = std::make_unique<Sock>(socket);
|
||||
} catch (const std::exception&) {
|
||||
#ifdef WIN32
|
||||
closesocket(socket);
|
||||
#else
|
||||
close(socket);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
return sock;
|
||||
}
|
||||
|
||||
int Sock::GetSockOpt(int level, int opt_name, void* opt_val, socklen_t* opt_len) const
|
||||
{
|
||||
return getsockopt(m_socket, level, opt_name, static_cast<char*>(opt_val), opt_len);
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
#include <util/time.h>
|
||||
|
||||
#include <chrono>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
|
||||
/**
|
||||
@@ -96,6 +97,14 @@ public:
|
||||
*/
|
||||
[[nodiscard]] virtual int Connect(const sockaddr* addr, socklen_t addr_len) const;
|
||||
|
||||
/**
|
||||
* accept(2) wrapper. Equivalent to `std::make_unique<Sock>(accept(this->Get(), addr, addr_len))`.
|
||||
* Code that uses this wrapper can be unit tested if this method is overridden by a mock Sock
|
||||
* implementation.
|
||||
* The returned unique_ptr is empty if `accept()` failed in which case errno will be set.
|
||||
*/
|
||||
[[nodiscard]] virtual std::unique_ptr<Sock> Accept(sockaddr* addr, socklen_t* addr_len) const;
|
||||
|
||||
/**
|
||||
* getsockopt(2) wrapper. Equivalent to
|
||||
* `getsockopt(this->Get(), level, opt_name, opt_val, opt_len)`. Code that uses this
|
||||
|
||||
Reference in New Issue
Block a user