mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-11 04:12:36 -03:00
net: add new method Sock::Listen() that wraps listen()
This will help to increase `Sock` usage and make more code mockable.
This commit is contained in:
parent
3ad7de225e
commit
b2733ab6a8
6 changed files with 35 additions and 1 deletions
|
@ -2408,7 +2408,7 @@ bool CConnman::BindListenPort(const CService& addrBind, bilingual_str& strError,
|
||||||
LogPrintf("Bound to %s\n", addrBind.ToString());
|
LogPrintf("Bound to %s\n", addrBind.ToString());
|
||||||
|
|
||||||
// Listen for incoming connections
|
// Listen for incoming connections
|
||||||
if (listen(sock->Get(), SOMAXCONN) == SOCKET_ERROR)
|
if (sock->Listen(SOMAXCONN) == SOCKET_ERROR)
|
||||||
{
|
{
|
||||||
strError = strprintf(_("Error: Listening for incoming connections failed (listen returned error %s)"), NetworkErrorString(WSAGetLastError()));
|
strError = strprintf(_("Error: Listening for incoming connections failed (listen returned error %s)"), NetworkErrorString(WSAGetLastError()));
|
||||||
LogPrintf("%s\n", strError.original);
|
LogPrintf("%s\n", strError.original);
|
||||||
|
|
|
@ -180,6 +180,25 @@ int FuzzedSock::Bind(const sockaddr*, socklen_t) const
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int FuzzedSock::Listen(int) const
|
||||||
|
{
|
||||||
|
// Have a permanent error at listen_errnos[0] because when the fuzzed data is exhausted
|
||||||
|
// SetFuzzedErrNo() will always set the global errno to listen_errnos[0]. We want to
|
||||||
|
// avoid this method returning -1 and setting errno to a temporary error (like EAGAIN)
|
||||||
|
// repeatedly because proper code should retry on temporary errors, leading to an
|
||||||
|
// infinite loop.
|
||||||
|
constexpr std::array listen_errnos{
|
||||||
|
EADDRINUSE,
|
||||||
|
EINVAL,
|
||||||
|
EOPNOTSUPP,
|
||||||
|
};
|
||||||
|
if (m_fuzzed_data_provider.ConsumeBool()) {
|
||||||
|
SetFuzzedErrNo(m_fuzzed_data_provider, listen_errnos);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
std::unique_ptr<Sock> FuzzedSock::Accept(sockaddr* addr, socklen_t* addr_len) const
|
std::unique_ptr<Sock> FuzzedSock::Accept(sockaddr* addr, socklen_t* addr_len) const
|
||||||
{
|
{
|
||||||
constexpr std::array accept_errnos{
|
constexpr std::array accept_errnos{
|
||||||
|
|
|
@ -66,6 +66,8 @@ public:
|
||||||
|
|
||||||
int Bind(const sockaddr*, socklen_t) const override;
|
int Bind(const sockaddr*, socklen_t) const override;
|
||||||
|
|
||||||
|
int Listen(int backlog) const override;
|
||||||
|
|
||||||
std::unique_ptr<Sock> Accept(sockaddr* addr, socklen_t* addr_len) const override;
|
std::unique_ptr<Sock> Accept(sockaddr* addr, socklen_t* addr_len) const override;
|
||||||
|
|
||||||
int GetSockOpt(int level, int opt_name, void* opt_val, socklen_t* opt_len) const override;
|
int GetSockOpt(int level, int opt_name, void* opt_val, socklen_t* opt_len) const override;
|
||||||
|
|
|
@ -129,6 +129,8 @@ public:
|
||||||
|
|
||||||
int Bind(const sockaddr*, socklen_t) const override { return 0; }
|
int Bind(const sockaddr*, socklen_t) const override { return 0; }
|
||||||
|
|
||||||
|
int Listen(int) const override { return 0; }
|
||||||
|
|
||||||
std::unique_ptr<Sock> Accept(sockaddr* addr, socklen_t* addr_len) const override
|
std::unique_ptr<Sock> Accept(sockaddr* addr, socklen_t* addr_len) const override
|
||||||
{
|
{
|
||||||
if (addr != nullptr) {
|
if (addr != nullptr) {
|
||||||
|
|
|
@ -79,6 +79,11 @@ int Sock::Bind(const sockaddr* addr, socklen_t addr_len) const
|
||||||
return bind(m_socket, addr, addr_len);
|
return bind(m_socket, addr, addr_len);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int Sock::Listen(int backlog) const
|
||||||
|
{
|
||||||
|
return listen(m_socket, backlog);
|
||||||
|
}
|
||||||
|
|
||||||
std::unique_ptr<Sock> Sock::Accept(sockaddr* addr, socklen_t* addr_len) const
|
std::unique_ptr<Sock> Sock::Accept(sockaddr* addr, socklen_t* addr_len) const
|
||||||
{
|
{
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
|
|
|
@ -103,6 +103,12 @@ public:
|
||||||
*/
|
*/
|
||||||
[[nodiscard]] virtual int Bind(const sockaddr* addr, socklen_t addr_len) const;
|
[[nodiscard]] virtual int Bind(const sockaddr* addr, socklen_t addr_len) const;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* listen(2) wrapper. Equivalent to `listen(this->Get(), backlog)`. Code that uses this
|
||||||
|
* wrapper can be unit tested if this method is overridden by a mock Sock implementation.
|
||||||
|
*/
|
||||||
|
[[nodiscard]] virtual int Listen(int backlog) const;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* accept(2) wrapper. Equivalent to `std::make_unique<Sock>(accept(this->Get(), addr, addr_len))`.
|
* 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
|
* Code that uses this wrapper can be unit tested if this method is overridden by a mock Sock
|
||||||
|
|
Loading…
Reference in a new issue