Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix f7e390bd: getpeername() doesn't work on closed sockets #9213

Merged
merged 1 commit into from May 8, 2021

Conversation

TrueBrain
Copy link
Member

Motivation / Problem

I blindly assumed getpeername() works on sockets, opened or recently closed. I was wrong.

Initially testing didn't show this, as I made a last minute change to this, and failed to test this specific flow.

Description

Store the real address we are connecting to in a map, so for debug statements we can show more useful information.

This is a bit more bookkeeping, so easier to mess up; but at least it is better than not knowing what failed exactly.

As extra bonus, found a few minor mistakes: close instead of closesocket, and not cleaning the list on timeout, causing the sockets to be closed twice (absolutely no harm in doing that, just not useful).

Limitations

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, gs_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

@TrueBrain TrueBrain merged commit f187708 into OpenTTD:master May 8, 2021
@TrueBrain TrueBrain deleted the happy-eyeballs-fix branch May 8, 2021 09:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants