Remove Sock::Release() and CloseSocket() #25428
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Do the closing in `Sock::Reset()` and remove the standalone `CloseSocket()`. This reduces the exposure of low-level sockets (i.e. integer file descriptors) outside of the `Sock` class.
12 tasks
laanwj
reviewed
Jun 20, 2022
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. ConflictsReviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first. |
|
|
|
Concept ACK! Nice cleanup now! |
laanwj
reviewed
Jun 21, 2022
Outside of `Sock`, `Sock::Reset()` was used in just one place (in `i2p.cpp`) which can use the assignment operator instead. This simplifies the public `Sock` API by having one method less.
e0537da to
a724c39
Compare
|
|
|
Code review ACK a724c39 |
laanwj
reviewed
Jun 22, 2022
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a piece of #21878, chopped off to ease review.
Sock::Release()is unused, thus remove itCloseSocket()is only called fromSock::Reset(), so move the body ofCloseSocket()insideSock::Reset()and removeCloseSocket()- this helps to hide low level file descriptor sockets inside theSockclass.Sock::Reset()toSock::Close()and make itprivate- to be used only in the destructor and in theSockassignment operator. This simplifies the public API by removing one method from it.