Socket: Abort pending ops on close #8389
Merged
Conversation
This file contains 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
sepalani
changed the title
|
Details regarding the issue can be found here: https://dolp.in/i11867/6 I still need to write a hardware test to check what does the Wii since the error I returned is a blind guess. I also haven't tested for regressions, ATM. |
|
According to this hardware test, the Wii returns SO_ENOTCONN when recvfrom is interrupted via close. |
sepalani
changed the title
leoetlino
approved these changes
Apr 21, 2020
| @@ -170,6 +170,12 @@ s32 WiiSocket::CloseFd() | |||
| ReturnValue = WiiSockMan::GetNetErrorCode(EITHER(WSAENOTSOCK, EBADF), "CloseFd", false); | |||
| } | |||
| fd = -1; | |||
| auto it = pending_sockops.begin(); | |||
| while (it != pending_sockops.end()) | |||
There was a problem hiding this comment.
for (auto it = pending_sockops.begin(); it != pending_sockops.end(); )(I wouldn't move it = pending_sockops.erase(it); though, as it's less readable IMO)
|
With Leoetlino's approval, I'm willing to merge this once you're done with it. Just ping me. |
This was referenced Apr 22, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
It seems there was a network regression, I'm investigating to find the root cause of it.
Meanwhile, here is a quick fix which prevent closesocket to hang forever and instead return -1 on close.
Do not merge.