diff options
| author | laanwj <126646+laanwj@users.noreply.github.com> | 2022-06-28 13:39:51 +0200 |
|---|---|---|
| committer | laanwj <126646+laanwj@users.noreply.github.com> | 2022-06-28 13:40:05 +0200 |
| commit | ba29911e21c88f49780c6c87f94ff8ed6e764a9d (patch) | |
| tree | 72300e73e31f4e14076e196a1a27203ab15bf9cb /src/util | |
| parent | 1b5610852e13f1fe41195dc072c8e92648ba1716 (diff) | |
| parent | a8d6abba5ec4ae2a3375e9be0b739f298899eca2 (diff) | |
Merge bitcoin/bitcoin#25426: net: add new method Sock::GetSockName() that wraps getsockname() and use it in GetBindAddress()
a8d6abba5ec4ae2a3375e9be0b739f298899eca2 net: change GetBindAddress() to take Sock argument (Vasil Dimov)
748dbcd9f29dbe4110da8a06f08e3eefa95f5321 net: add new method Sock::GetSockName() that wraps getsockname() (Vasil Dimov)
Pull request description:
_This is a piece of #21878, chopped off to ease review._
Wrap the syscall `getsockname()` in `Sock::GetSockName()` and change `GetBindAddress()` to take a `Sock` argument so that it can use the wrapper.
This further encapsulates syscalls inside the `Sock` class and makes the callers mockable.
ACKs for top commit:
laanwj:
Code review ACK a8d6abba5ec4ae2a3375e9be0b739f298899eca2
Tree-SHA512: 3a73463258c0057487fb3fd67215816b03a1c5160f45e45930eaeef86bb3611ec385794cdb08339aa074feba8ad67cd2bfd3836f6cbd40834e15d933214a05dc
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/sock.cpp | 5 | ||||
| -rw-r--r-- | src/util/sock.h | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/util/sock.cpp b/src/util/sock.cpp index 1d44fbfdae..5eb0880318 100644 --- a/src/util/sock.cpp +++ b/src/util/sock.cpp @@ -102,6 +102,11 @@ int Sock::SetSockOpt(int level, int opt_name, const void* opt_val, socklen_t opt return setsockopt(m_socket, level, opt_name, static_cast<const char*>(opt_val), opt_len); } +int Sock::GetSockName(sockaddr* name, socklen_t* name_len) const +{ + return getsockname(m_socket, name, name_len); +} + bool Sock::Wait(std::chrono::milliseconds timeout, Event requested, Event* occurred) const { // We need a `shared_ptr` owning `this` for `WaitMany()`, but don't want diff --git a/src/util/sock.h b/src/util/sock.h index 5ca5f1b91b..73ceb0b62c 100644 --- a/src/util/sock.h +++ b/src/util/sock.h @@ -114,6 +114,13 @@ public: const void* opt_val, socklen_t opt_len) const; + /** + * getsockname(2) wrapper. Equivalent to + * `getsockname(this->Get(), name, name_len)`. Code that uses this + * wrapper can be unit tested if this method is overridden by a mock Sock implementation. + */ + [[nodiscard]] virtual int GetSockName(sockaddr* name, socklen_t* name_len) const; + using Event = uint8_t; /** |