feat: merge custom rendezvous server with builtin servers - #1
Open
hashbk wants to merge 1 commit into
Open
Conversation
When a custom-rendezvous-server is configured via Settings, include both the custom server and hardcoded RENDEZVOUS_SERVERS in the returned list so the client can register on both simultaneously.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
When a
custom-rendezvous-serveris configured via Settings, the currentget_rendezvous_servers()returns only the custom server, discarding the hardcodedRENDEZVOUS_SERVERS. This prevents the client from being online on both servers simultaneously.Changes
Config::get_rendezvous_servers()to call a newmerge_with_builtin_servers()helper when a custom server is configured, which appends the hardcodedRENDEZVOUS_SERVERS(deduplicated) to the returned list.Related
This PR is part of the dual-server-online feature. The companion PR in the main rustdesk repo modifies
RendezvousMediatorto handle multiple simultaneous server connections properly.