Codechange: use NetworkAddress instead of two host/port variables where possible #9137
+131
−183
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
…re possible This also means we no longer need last_host/last_port, but can just use a single last_joined setting.
LordAro
reviewed
Apr 29, 2021
…e network code (#23)
LordAro
changed the title
rubidium42
approved these changes
Apr 29, 2021
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.
Motivation / Problem
While working on the network code, I noticed we had
last_hostandlast_port, which is a bit weird. As most other settings are a combination of the two. Working towards STUN support, this also becomes a bit problematic, aslast_joinedcan become a non host/port pair. As says, I set out to collapselast_host/last_portintolast_joined.Sadly, the rabbit hole was a bit deeper.
Description
This PR changes a few things, without functional changes:
hostnamein theNetworkGameInfo.std::stringvariant ofGetAddressAsStringwhere possible (reducing the amount of times I had to read+ 6 + 7with a bad comment) (basically: deduplication)NetworkAddressfor host/port pairs where possible. I know, this is a bit ironic, as recently someone changed (cbad518) a few of these fromNetworkAddressinto host/port, but that is just not working out.NetworkAddressinstead of host/port to deduplicate code. This is mostly aroundParseConnectingStringand friends.last_host/last_portwas set in various of places and also used in the GUI, while there is athis->servertelling the same. Simplified this by only setting the now newlast_joinedwhen joining a server or opening a lobby, but otherwise not using it.There is one functional changes in this PR:
The location
connect_to_ipwas set was weird. This happened onNetworkAddServer. This was called from two places. 1) when clicking "Add Server" and fill in an IP. The comment suggests it was meant for that. 2) when you open the Network GUI for every server you manually added. This often meansconnect_to_ipchanged to something completely different. I removed this last flow, and it is now only 1)Limitations
Checklist for review
Some things are not automated, and forgotten often. This list is a reminder for the reviewers.