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 missing return in StreamPeerTCP::poll when connection is STATUS_CONNECTED #90741

Merged
merged 1 commit into from
Apr 16, 2024

Conversation

yorickdewid
Copy link
Contributor

If the StreamPeerTCP is polled and the TCP connection is STATUS_CONNECTED it should return after polling netsocket for events. Without return poll keeps calling _sock->connect_to_host and connect(). Calling connect() on a TCP socket is unspecified behaviour, and likely wrong.

If the `StreamPeerTCP` is polled and the TCP connection is `STATUS_CONNECTED` it should return after polling netsocket. Without `return` poll keeps calling `_sock->connect_to_host` and `connect()`.
@yorickdewid yorickdewid requested a review from a team as a code owner April 16, 2024 08:35
@AThousandShips AThousandShips requested a review from a team April 16, 2024 08:35
@akien-mga akien-mga changed the title FIX: Return if TCP is in STATUS_CONNECTED Fix missing return in StreamPeerTCP::poll when connection is STATUS_CONNECTED Apr 16, 2024
@akien-mga akien-mga added bug topic:network cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release labels Apr 16, 2024
@akien-mga akien-mga added this to the 4.3 milestone Apr 16, 2024
Copy link
Collaborator

@Faless Faless left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for spotting this, and looking into the fix.

This looks great! 🚀

@akien-mga akien-mga merged commit 0ae1dcc into godotengine:master Apr 16, 2024
16 checks passed
@akien-mga
Copy link
Member

Thanks! And congrats for your first merged Godot contribution 🎉

@akien-mga akien-mga added the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Apr 16, 2024
@akien-mga
Copy link
Member

Cherry-picked for 4.2.2.

@akien-mga akien-mga removed the cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release label Apr 16, 2024
@akien-mga
Copy link
Member

Cherry-picked for 4.1.4.

@akien-mga akien-mga removed the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Apr 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants