diff options
| author | laanwj <126646+laanwj@users.noreply.github.com> | 2022-06-22 10:59:54 +0200 |
|---|---|---|
| committer | laanwj <126646+laanwj@users.noreply.github.com> | 2022-06-22 11:07:17 +0200 |
| commit | a085a554913ae8f4ed83afac830ce6dc39c9cc65 (patch) | |
| tree | e5fc3b744a6562125f67c1cff713b623fee901eb /src/test/util/net.h | |
| parent | b1a824dd06aa58618947783edee2dd891b5204dc (diff) | |
| parent | a724c39606273dfe4c6f9887ef8b77d0a98f1b34 (diff) | |
Merge bitcoin/bitcoin#25428: Remove Sock::Release() and CloseSocket()
a724c39606273dfe4c6f9887ef8b77d0a98f1b34 net: rename Sock::Reset() to Sock::Close() and make it private (Vasil Dimov)
e8ff3f0c52e7512a580bc907dc72e5bb141b4217 net: remove CloseSocket() (Vasil Dimov)
175fb2670a2a24220afb3eea99b7b65b0aa89c76 net: remove now unused Sock::Release() (Vasil Dimov)
Pull request description:
_This is a piece of #21878, chopped off to ease review._
* `Sock::Release()` is unused, thus remove it
* `CloseSocket()` is only called from `Sock::Reset()`, so move the body of `CloseSocket()` inside `Sock::Reset()` and remove `CloseSocket()` - this helps to hide low level file descriptor sockets inside the `Sock` class.
* Rename `Sock::Reset()` to `Sock::Close()` and make it `private` - to be used only in the destructor and in the `Sock` assignment operator. This simplifies the public API by removing one method from it.
ACKs for top commit:
laanwj:
Code review ACK a724c39606273dfe4c6f9887ef8b77d0a98f1b34
Tree-SHA512: 4b12586642b3d049092fadcb1877132e285ec66a80af92563a7703c6970e278e0f2064fba45c7eaa78eb65db94b3641fd5e5264f7b4f61116d1a6f3333868639
Diffstat (limited to 'src/test/util/net.h')
| -rw-r--r-- | src/test/util/net.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/test/util/net.h b/src/test/util/net.h index 37d278645a..edb45d7c8e 100644 --- a/src/test/util/net.h +++ b/src/test/util/net.h @@ -100,7 +100,7 @@ public: m_socket = INVALID_SOCKET - 1; } - ~StaticContentsSock() override { Reset(); } + ~StaticContentsSock() override { m_socket = INVALID_SOCKET; } StaticContentsSock& operator=(Sock&& other) override { @@ -108,11 +108,6 @@ public: return *this; } - void Reset() override - { - m_socket = INVALID_SOCKET; - } - ssize_t Send(const void*, size_t len, int) const override { return len; } ssize_t Recv(void* buf, size_t len, int flags) const override |